diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 0000000..5d66f56 --- /dev/null +++ b/npm-debug.log @@ -0,0 +1,32 @@ +0 info it worked if it ends with ok +1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'dev' ] +2 info using npm@3.10.10 +3 info using node@v6.11.0 +4 verbose stack Error: Failed to parse json +4 verbose stack Trailing comma in array at 73:3 +4 verbose stack ] +4 verbose stack ^ +4 verbose stack at parseError (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:390:11) +4 verbose stack at parseJson (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:79:23) +4 verbose stack at /usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:48:5 +4 verbose stack at /usr/local/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:78:16 +4 verbose stack at tryToString (fs.js:456:3) +4 verbose stack at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:443:12) +5 verbose cwd /Users/jiachenpan/www/Github/vueAdmin-template +6 error Darwin 15.0.0 +7 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "dev" +8 error node v6.11.0 +9 error npm v3.10.10 +10 error file /Users/jiachenpan/www/Github/vueAdmin-template/package.json +11 error code EJSONPARSE +12 error Failed to parse json +12 error Trailing comma in array at 73:3 +12 error ] +12 error ^ +13 error File: /Users/jiachenpan/www/Github/vueAdmin-template/package.json +14 error Failed to parse package.json data. +14 error package.json must be actual JSON, not just JavaScript. +14 error +14 error This is not a bug in npm. +14 error Tell the package author to fix their package.json file. JSON.parse +15 verbose exit [ 1, true ] diff --git a/package.json b/package.json index 2bdff76..ff2e8a4 100644 --- a/package.json +++ b/package.json @@ -1,74 +1,19 @@ { - "name": "vue-admin", + "name": "vue-cli-template-admin", "version": "1.0.0", - "description": "A Vue.js project", + "license": "MIT", + "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", "author": "Pan ", "private": true, - "scripts": { - "dev": "node build/dev-server.js", - "start": "node build/dev-server.js", - "build": "node build/build.js", - "lint": "eslint --ext .js,.vue src" - }, - "dependencies": { - "axios": "0.16.2", - "element-ui": "1.3.7", - "js-cookie": "^2.1.4", - "normalize.css": "3.0.2", - "nprogress": "^0.2.0", - "vue": "2.3.3", - "vue-router": "2.5.3", - "vuex": "2.3.1" - }, "devDependencies": { - "autoprefixer": "6.7.2", - "babel-core": "6.22.1", - "babel-eslint": "7.1.1", - "babel-loader": "6.2.10", - "babel-plugin-transform-runtime": "6.22.0", - "babel-preset-env": "1.3.2", - "babel-preset-stage-2": "6.22.0", - "babel-register": "6.22.0", - "chalk": "1.1.3", - "connect-history-api-fallback": "1.3.0", - "copy-webpack-plugin": "4.0.1", - "css-loader": "0.28.0", - "eslint": "3.19.0", - "eslint-friendly-formatter": "2.0.7", - "eslint-loader": "1.7.1", - "eslint-plugin-html": "2.0.0", - "eventsource-polyfill": "0.9.6", - "express": "4.14.1", - "extract-text-webpack-plugin": "2.0.0", - "file-loader": "0.11.1", - "friendly-errors-webpack-plugin": "1.1.3", - "html-webpack-plugin": "2.28.0", - "http-proxy-middleware": "0.17.3", - "webpack-bundle-analyzer": "2.2.1", - "semver": "5.3.0", - "shelljs": "0.7.6", - "opn": "4.0.2", - "optimize-css-assets-webpack-plugin": "1.3.0", - "ora": "1.2.0", - "rimraf": "2.6.0", - "node-sass": "^4.5.0", - "sass-loader": "6.0.5", - "url-loader": "0.5.8", - "vue-loader": "12.1.0", - "vue-style-loader": "3.0.1", - "vue-template-compiler": "2.3.3", - "webpack": "2.6.1", - "webpack-dev-middleware": "1.10.0", - "webpack-hot-middleware": "2.18.0", - "webpack-merge": "4.1.0" + "vue-cli": "^2.8.1" }, - "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" + "keywords": [ + "vue", + "element", + "admin", + "vuex", + "boilerplate", + "axios" ] } diff --git a/.babelrc b/template/.babelrc similarity index 100% rename from .babelrc rename to template/.babelrc diff --git a/.eslintignore b/template/.eslintignore similarity index 100% rename from .eslintignore rename to template/.eslintignore diff --git a/.eslintrc.js b/template/.eslintrc.js similarity index 100% rename from .eslintrc.js rename to template/.eslintrc.js diff --git a/.gitignore b/template/.gitignore similarity index 100% rename from .gitignore rename to template/.gitignore diff --git a/.postcssrc.js b/template/.postcssrc.js similarity index 100% rename from .postcssrc.js rename to template/.postcssrc.js diff --git a/README.md b/template/README.md similarity index 100% rename from README.md rename to template/README.md diff --git a/build/build.js b/template/build/build.js similarity index 100% rename from build/build.js rename to template/build/build.js diff --git a/build/check-versions.js b/template/build/check-versions.js similarity index 100% rename from build/check-versions.js rename to template/build/check-versions.js diff --git a/build/dev-client.js b/template/build/dev-client.js similarity index 100% rename from build/dev-client.js rename to template/build/dev-client.js diff --git a/build/dev-server.js b/template/build/dev-server.js similarity index 100% rename from build/dev-server.js rename to template/build/dev-server.js diff --git a/build/utils.js b/template/build/utils.js similarity index 100% rename from build/utils.js rename to template/build/utils.js diff --git a/build/vue-loader.conf.js b/template/build/vue-loader.conf.js similarity index 100% rename from build/vue-loader.conf.js rename to template/build/vue-loader.conf.js diff --git a/build/webpack.base.conf.js b/template/build/webpack.base.conf.js similarity index 100% rename from build/webpack.base.conf.js rename to template/build/webpack.base.conf.js diff --git a/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js similarity index 100% rename from build/webpack.dev.conf.js rename to template/build/webpack.dev.conf.js diff --git a/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js similarity index 100% rename from build/webpack.prod.conf.js rename to template/build/webpack.prod.conf.js diff --git a/config/dev.env.js b/template/config/dev.env.js similarity index 100% rename from config/dev.env.js rename to template/config/dev.env.js diff --git a/config/index.js b/template/config/index.js similarity index 100% rename from config/index.js rename to template/config/index.js diff --git a/config/prod.env.js b/template/config/prod.env.js similarity index 100% rename from config/prod.env.js rename to template/config/prod.env.js diff --git a/favicon.ico b/template/favicon.ico similarity index 100% rename from favicon.ico rename to template/favicon.ico diff --git a/index.html b/template/index.html similarity index 100% rename from index.html rename to template/index.html diff --git a/template/package.json b/template/package.json new file mode 100644 index 0000000..2bdff76 --- /dev/null +++ b/template/package.json @@ -0,0 +1,74 @@ +{ + "name": "vue-admin", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "Pan ", + "private": true, + "scripts": { + "dev": "node build/dev-server.js", + "start": "node build/dev-server.js", + "build": "node build/build.js", + "lint": "eslint --ext .js,.vue src" + }, + "dependencies": { + "axios": "0.16.2", + "element-ui": "1.3.7", + "js-cookie": "^2.1.4", + "normalize.css": "3.0.2", + "nprogress": "^0.2.0", + "vue": "2.3.3", + "vue-router": "2.5.3", + "vuex": "2.3.1" + }, + "devDependencies": { + "autoprefixer": "6.7.2", + "babel-core": "6.22.1", + "babel-eslint": "7.1.1", + "babel-loader": "6.2.10", + "babel-plugin-transform-runtime": "6.22.0", + "babel-preset-env": "1.3.2", + "babel-preset-stage-2": "6.22.0", + "babel-register": "6.22.0", + "chalk": "1.1.3", + "connect-history-api-fallback": "1.3.0", + "copy-webpack-plugin": "4.0.1", + "css-loader": "0.28.0", + "eslint": "3.19.0", + "eslint-friendly-formatter": "2.0.7", + "eslint-loader": "1.7.1", + "eslint-plugin-html": "2.0.0", + "eventsource-polyfill": "0.9.6", + "express": "4.14.1", + "extract-text-webpack-plugin": "2.0.0", + "file-loader": "0.11.1", + "friendly-errors-webpack-plugin": "1.1.3", + "html-webpack-plugin": "2.28.0", + "http-proxy-middleware": "0.17.3", + "webpack-bundle-analyzer": "2.2.1", + "semver": "5.3.0", + "shelljs": "0.7.6", + "opn": "4.0.2", + "optimize-css-assets-webpack-plugin": "1.3.0", + "ora": "1.2.0", + "rimraf": "2.6.0", + "node-sass": "^4.5.0", + "sass-loader": "6.0.5", + "url-loader": "0.5.8", + "vue-loader": "12.1.0", + "vue-style-loader": "3.0.1", + "vue-template-compiler": "2.3.3", + "webpack": "2.6.1", + "webpack-dev-middleware": "1.10.0", + "webpack-hot-middleware": "2.18.0", + "webpack-merge": "4.1.0" + }, + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/src/App.vue b/template/src/App.vue similarity index 99% rename from src/App.vue rename to template/src/App.vue index 16fce5e..481dfb3 100644 --- a/src/App.vue +++ b/template/src/App.vue @@ -9,6 +9,7 @@ export default { name: 'app' } + diff --git a/src/api/login.js b/template/src/api/login.js similarity index 100% rename from src/api/login.js rename to template/src/api/login.js diff --git a/src/api/table.js b/template/src/api/table.js similarity index 100% rename from src/api/table.js rename to template/src/api/table.js diff --git a/src/assets/404_images/404.png b/template/src/assets/404_images/404.png similarity index 100% rename from src/assets/404_images/404.png rename to template/src/assets/404_images/404.png diff --git a/src/assets/404_images/404_cloud.png b/template/src/assets/404_images/404_cloud.png similarity index 100% rename from src/assets/404_images/404_cloud.png rename to template/src/assets/404_images/404_cloud.png diff --git a/src/assets/iconfont/iconfont.js b/template/src/assets/iconfont/iconfont.js similarity index 100% rename from src/assets/iconfont/iconfont.js rename to template/src/assets/iconfont/iconfont.js diff --git a/src/components/Hamburger/index.vue b/template/src/components/Hamburger/index.vue similarity index 100% rename from src/components/Hamburger/index.vue rename to template/src/components/Hamburger/index.vue diff --git a/src/components/Icon-svg/index.vue b/template/src/components/Icon-svg/index.vue similarity index 100% rename from src/components/Icon-svg/index.vue rename to template/src/components/Icon-svg/index.vue diff --git a/src/main.js b/template/src/main.js similarity index 100% rename from src/main.js rename to template/src/main.js diff --git a/src/router/_import_development.js b/template/src/router/_import_development.js similarity index 100% rename from src/router/_import_development.js rename to template/src/router/_import_development.js diff --git a/src/router/_import_production.js b/template/src/router/_import_production.js similarity index 100% rename from src/router/_import_production.js rename to template/src/router/_import_production.js diff --git a/src/router/index.js b/template/src/router/index.js similarity index 100% rename from src/router/index.js rename to template/src/router/index.js diff --git a/src/store/getters.js b/template/src/store/getters.js similarity index 100% rename from src/store/getters.js rename to template/src/store/getters.js diff --git a/src/store/index.js b/template/src/store/index.js similarity index 100% rename from src/store/index.js rename to template/src/store/index.js diff --git a/src/store/modules/app.js b/template/src/store/modules/app.js similarity index 100% rename from src/store/modules/app.js rename to template/src/store/modules/app.js diff --git a/src/store/modules/permission.js b/template/src/store/modules/permission.js similarity index 100% rename from src/store/modules/permission.js rename to template/src/store/modules/permission.js diff --git a/src/store/modules/user.js b/template/src/store/modules/user.js similarity index 100% rename from src/store/modules/user.js rename to template/src/store/modules/user.js diff --git a/src/styles/element-ui.scss b/template/src/styles/element-ui.scss similarity index 100% rename from src/styles/element-ui.scss rename to template/src/styles/element-ui.scss diff --git a/src/styles/index.scss b/template/src/styles/index.scss similarity index 100% rename from src/styles/index.scss rename to template/src/styles/index.scss diff --git a/src/styles/mixin.scss b/template/src/styles/mixin.scss similarity index 100% rename from src/styles/mixin.scss rename to template/src/styles/mixin.scss diff --git a/src/utils/fetch.js b/template/src/utils/fetch.js similarity index 100% rename from src/utils/fetch.js rename to template/src/utils/fetch.js diff --git a/src/utils/index.js b/template/src/utils/index.js similarity index 100% rename from src/utils/index.js rename to template/src/utils/index.js diff --git a/src/utils/validate.js b/template/src/utils/validate.js similarity index 100% rename from src/utils/validate.js rename to template/src/utils/validate.js diff --git a/src/views/404.vue b/template/src/views/404.vue similarity index 100% rename from src/views/404.vue rename to template/src/views/404.vue diff --git a/src/views/dashboard/index.vue b/template/src/views/dashboard/index.vue similarity index 100% rename from src/views/dashboard/index.vue rename to template/src/views/dashboard/index.vue diff --git a/src/views/layout/AppMain.vue b/template/src/views/layout/AppMain.vue similarity index 100% rename from src/views/layout/AppMain.vue rename to template/src/views/layout/AppMain.vue diff --git a/src/views/layout/Layout.vue b/template/src/views/layout/Layout.vue similarity index 100% rename from src/views/layout/Layout.vue rename to template/src/views/layout/Layout.vue diff --git a/src/views/layout/Levelbar.vue b/template/src/views/layout/Levelbar.vue similarity index 100% rename from src/views/layout/Levelbar.vue rename to template/src/views/layout/Levelbar.vue diff --git a/src/views/layout/Navbar.vue b/template/src/views/layout/Navbar.vue similarity index 100% rename from src/views/layout/Navbar.vue rename to template/src/views/layout/Navbar.vue diff --git a/src/views/layout/Sidebar.vue b/template/src/views/layout/Sidebar.vue similarity index 100% rename from src/views/layout/Sidebar.vue rename to template/src/views/layout/Sidebar.vue diff --git a/src/views/layout/SidebarItem.vue b/template/src/views/layout/SidebarItem.vue similarity index 100% rename from src/views/layout/SidebarItem.vue rename to template/src/views/layout/SidebarItem.vue diff --git a/src/views/layout/index.js b/template/src/views/layout/index.js similarity index 100% rename from src/views/layout/index.js rename to template/src/views/layout/index.js diff --git a/src/views/login/index.vue b/template/src/views/login/index.vue similarity index 100% rename from src/views/login/index.vue rename to template/src/views/login/index.vue diff --git a/src/views/page/form.vue b/template/src/views/page/form.vue similarity index 100% rename from src/views/page/form.vue rename to template/src/views/page/form.vue diff --git a/src/views/table/index.vue b/template/src/views/table/index.vue similarity index 100% rename from src/views/table/index.vue rename to template/src/views/table/index.vue diff --git a/static/.gitkeep b/template/static/.gitkeep similarity index 100% rename from static/.gitkeep rename to template/static/.gitkeep