From aed7497d574c343496d83462e9073c5fd3922ec1 Mon Sep 17 00:00:00 2001 From: "Phyks (Lucas Verney)" Date: Sun, 25 Nov 2018 17:43:54 +0100 Subject: [PATCH] Bump dependencies --- .eslintrc.js | 9 +- package.json | 18 +- src/App.vue | 26 +- src/components/Alert.vue | 8 +- src/components/Intro.vue | 7 - src/components/PermissionsSwitches.vue | 19 +- src/components/ReportCard.vue | 22 +- src/components/ReportDialog/ReportTile.vue | 2 +- src/components/ReportDialog/index.vue | 7 +- src/components/ReportIssueModal.vue | 11 +- src/components/ReportsDescription.vue | 9 +- src/components/ShareMapViewModal.vue | 13 +- src/tools/index.js | 4 +- src/views/About.vue | 23 +- src/views/Map.vue | 13 +- src/views/Onboarding.vue | 16 +- yarn.lock | 266 +++++++++++++-------- 17 files changed, 329 insertions(+), 144 deletions(-) delete mode 100644 src/components/Intro.vue diff --git a/.eslintrc.js b/.eslintrc.js index 1053bb4..22f256e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,18 +2,17 @@ module.exports = { root: true, - parser: 'babel-eslint', parserOptions: { + parser: 'babel-eslint', sourceType: 'module' }, env: { browser: true, }, // https://github.com/standard/standard/blob/master/docs/RULES-en.md - extends: 'airbnb-base', - // required to lint *.vue files - plugins: [ - 'html' + extends: [ + 'airbnb-base', + 'plugin:vue/essential', ], // check if imports actually resolve 'settings': { diff --git a/package.json b/package.json index 58e530e..a1c96a0 100644 --- a/package.json +++ b/package.json @@ -23,32 +23,32 @@ "roboto-fontface": "^0.9.0", "serviceworker-webpack-plugin": "^1.0.1", "vue": "^2.5.2", - "vue-i18n": "^8.3.0", - "vue-router": "^3.0.1", - "vuetify": "^1.3.6", + "vue-i18n": "^8.3.2", + "vue-router": "^3.0.2", + "vuetify": "^1.3.9", "vuex": "^3.0.1", "whatwg-fetch": "^3.0.0" }, "devDependencies": { - "@babel/core": "^7.1.5", + "@babel/core": "^7.1.6", "@babel/plugin-syntax-dynamic-import": "^7.0.0", - "@babel/preset-env": "^7.1.5", + "@babel/preset-env": "^7.1.6", "app-manifest-webpack-plugin": "^1.1.3", "babel-eslint": "^10.0.1", "babel-loader": "^8.0.4", "copy-webpack-plugin": "^4.6.0", "css-loader": "^1.0.1", - "eslint": "^5.8.0", + "eslint": "^5.9.0", "eslint-config-airbnb-base": "^13.1.0", "eslint-friendly-formatter": "^4.0.1", "eslint-import-resolver-webpack": "^0.10.1", "eslint-loader": "^2.1.1", - "eslint-plugin-html": "^4.0.6", "eslint-plugin-import": "^2.14.0", + "eslint-plugin-vue": "^4.7.1", "friendly-errors-webpack-plugin": "^1.6.1", "html-webpack-plugin": "^3.2.0", "image-webpack-loader": "^4.5.0", - "mini-css-extract-plugin": "^0.4.4", + "mini-css-extract-plugin": "^0.4.5", "optimize-css-assets-webpack-plugin": "^5.0.1", "portfinder": "^1.0.19", "postcss-loader": "^3.0.0", @@ -62,7 +62,7 @@ "vue-loader": "^15.4.2", "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.5.2", - "webpack": "^4.25.1", + "webpack": "^4.26.0", "webpack-bundle-analyzer": "^3.0.3", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.10", diff --git a/src/App.vue b/src/App.vue index 5021930..be3c38f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,7 +24,11 @@ cloud_upload - + more_vert @@ -53,11 +57,20 @@ arrow_back
- +
- + @@ -96,6 +109,13 @@ export default { || this.$store.getters.getLastLocation ); }, + showMenu() { + return ( + this.$route.name === 'Onboarding' + || this.$route.name === 'Map' + || this.$route.name === 'SharedMap' + ); + }, unsentReportsLength() { return this.$store.state.unsentReports.length; }, diff --git a/src/components/Alert.vue b/src/components/Alert.vue index f09f5b4..f6a213c 100644 --- a/src/components/Alert.vue +++ b/src/components/Alert.vue @@ -1,6 +1,12 @@ - - diff --git a/src/components/PermissionsSwitches.vue b/src/components/PermissionsSwitches.vue index da8e81b..c66fab6 100644 --- a/src/components/PermissionsSwitches.vue +++ b/src/components/PermissionsSwitches.vue @@ -2,7 +2,7 @@