diff --git a/package-lock.json b/package-lock.json index 69201da..35e5a2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4283,6 +4283,15 @@ "rimraf": "^2.6.1" } }, + "eslint-plugin-prettier": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz", + "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, "eslint-plugin-vue": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz", @@ -4648,6 +4657,12 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "fast-glob": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", @@ -8635,6 +8650,15 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "requires": { + "fast-diff": "^1.1.2" + } + }, "pretty-error": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", diff --git a/package.json b/package.json index b9b8e66..775126e 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "axios": "^0.19.0", "babel-eslint": "^10.0.3", "eslint": "^5.16.0", + "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-vue": "^5.0.0", "material-design-icons-iconfont": "^5.0.1", "prettier": "^1.19.1", diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 9d79aca..4a9c8a2 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,4 +1,5 @@ -const main = 'http://192.168.5.118:5000/' +//const main = 'http://192.168.5.118:5000/' +const main = 'http://localhost:5000/' const url = { login: main + 'login',