Merge branch 'master' into lwh/head-distribution
# Conflicts: # server/controllers/user.js # server/router.js # src/pages/Groupmeal/components/PageHeader/config.js # src/router/Groupmeal/index.js
Showing
.editorconfig
0 → 100644
.prettierrc.js
0 → 100755
.vscode/settings.json
0 → 100644
This diff is collapsed.
{ | { | ||
"name": "op-management", | "name": "op-management", | ||
"version": "0.1.0", | "version": "0.1.0", | ||
"private": true, | "private": true, | ||
"main": "app.js", | "main": "app.js", | ||
"scripts": { | "scripts": { | ||
"dev": "sh ./bin/start.sh development", | "dev": "sh ./bin/start.sh development", | ||
"test": "sh ./bin/start.sh test", | "test": "sh ./bin/start.sh test", | ||
"prod": "sh ./bin/start.sh production", | "prod": "sh ./bin/start.sh production", | ||
"koa": "nodemon app.js", | "koa": "nodemon app.js", | ||
"web-dev": "cross-env NODE_ENV=development vue-cli-service serve", | "web-dev": "cross-env NODE_ENV=development vue-cli-service serve", | ||
"web-test": "cross-env NODE_ENV=test vue-cli-service build", | "web-test": "cross-env NODE_ENV=test vue-cli-service build", | ||
"web-build": "cross-env NODE_ENV=production vue-cli-service build", | "web-build": "cross-env NODE_ENV=production vue-cli-service build", | ||
"test:unit": "vue-cli-service test:unit", | "web-build-report": "cross-env NODE_ENV=production vue-cli-service build --report", | ||
"lint": "vue-cli-service lint" | "test:unit": "vue-cli-service test:unit", | ||
}, | "lint": "vue-cli-service lint" | ||
"dependencies": { | }, | ||
"@types/qr-image": "^3.2.4", | "dependencies": { | ||
"axios": "^0.21.1", | "axios": "^0.21.1", | ||
"core-js": "^3.6.5", | "core-js": "^3.6.5", | ||
"dayjs": "^1.10.6", | "dayjs": "^1.10.6", | ||
"element-plus": "^1.0.2-beta.44", | "element-plus": "^1.0.2-beta.44", | ||
"form-data": "^4.0.0", | "form-data": "^4.0.0", | ||
"json-bigint": "^1.0.0", | "json-bigint": "^1.0.0", | ||
"koa": "^2.13.1", | "koa": "^2.13.1", | ||
"koa-body": "^4.2.0", | "koa-body": "^4.2.0", | ||
"koa-bodyparser": "^4.3.0", | "koa-bodyparser": "^4.3.0", | ||
"koa-router": "^10.0.0", | "koa-router": "^10.0.0", | ||
"koa-static": "^5.0.0", | "koa-static": "^5.0.0", | ||
"koa-views": "^7.0.1", | "koa-views": "^7.0.1", | ||
"moment": "^2.29.1", | "moment": "^2.29.1", | ||
"qr-image": "^3.2.0", | "qr-image": "^3.2.0", | ||
"request": "^2.88.2", | "request": "^2.88.2", | ||
"uglifyjs-webpack-plugin": "^2.2.0", | "uuid": "^8.3.2", | ||
"uuid": "^8.3.2", | "vue": "3.0.11", | ||
"vue": "3.0.11", | "vue-router": "^4.0.0-beta.12", | ||
"vue-router": "^4.0.0-beta.12", | "vuex": "^4.0.0-beta.4" | ||
"vuex": "^4.0.0-beta.4" | }, | ||
}, | "devDependencies": { | ||
"devDependencies": { | "@vue/cli-plugin-babel": "^4.5.6", | ||
"@testing-library/vue": "^6.4.2", | "@vue/cli-plugin-eslint": "~4.5.0", | ||
"@vue/cli-plugin-babel": "^4.5.6", | "@vue/cli-service": "^4.5.6", | ||
"@vue/cli-plugin-eslint": "^4.5.6", | "@vue/compiler-sfc": "^3.0.0-beta.1", | ||
"@vue/cli-plugin-unit-jest": "^4.5.6", | "@vue/eslint-config-prettier": "^6.0.0", | ||
"@vue/cli-service": "^4.5.6", | "babel-eslint": "^10.1.0", | ||
"@vue/compiler-sfc": "^3.0.0-beta.1", | "cross-env": "^7.0.3", | ||
"@vue/eslint-config-prettier": "^6.0.0", | "eslint": "^6.7.2", | ||
"@vue/test-utils": "^2.0.0-alpha.1", | "eslint-plugin-prettier": "^3.3.1", | ||
"babel-eslint": "^10.1.0", | "eslint-plugin-vue": "^7.17.0", | ||
"babel-jest": "^27.0.6", | "less": "^3.0.4", | ||
"cross-env": "^7.0.3", | "less-loader": "^5.0.0", | ||
"eslint": "^6.7.2", | "lint-staged": "^11.1.2", | ||
"eslint-plugin-prettier": "^3.1.3", | "nodemon": "^2.0.7", | ||
"eslint-plugin-vue": "^7.0.0-alpha.0", | "pm2": "3.5.1", | ||
"jest": "^27.0.6", | "prettier": "^2.2.1" | ||
"less": "^3.0.4", | }, | ||
"less-loader": "^5.0.0", | "browserslist": [ | ||
"nodemon": "^2.0.7", | "> 1%", | ||
"pm2": "3.5.1", | "last 10 versions", | ||
"prettier": "^1.19.1", | "not ie <= 8", | ||
"vue3-jest": "^27.0.0-alpha.1" | "iOS >= 8", | ||
}, | "Android >= 4.1" | ||
"browserslist": [ | ], | ||
"> 1%", | "license": "YIDIAN", | ||
"last 10 versions", | "gitHooks": { | ||
"not ie <= 8", | "pre-commit": "lint-staged" | ||
"iOS >= 8", | }, | ||
"Android >= 4.1" | "lint-staged": { | ||
], | "src/**/*.{js,vue}": [ | ||
"license": "YIDIAN" | "eslint --fix" | ||
], | |||
"server/**/*.js": [ | |||
"eslint --fix" | |||
] | |||
} | |||
} | } |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment