Release 1.7.0

benoitdemaegdt · Nov 20, 2019 · 7b9e829 · 7b9e829
2 parents 7e786c7 + 3980cab
commit 7b9e829
Show file tree

Hide file tree

Showing 22 changed files with 820 additions and 452 deletions.
diff --git a/client/.eslintrc.js b/client/.eslintrc.js
@@ -7,6 +7,7 @@ module.exports = {
   extends: [
     'plugin:vue/essential',
     'plugin:prettier/recommended',
+    'eslint:recommended',
     '@vue/prettier'
   ],
   rules: {

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "maxplorateur-client",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "scripts": {
     "serve": "node_modules/.bin/vue-cli-service serve",
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "axios": "^0.19.0",
-    "core-js": "^3.4.0",
+    "core-js": "^3.4.1",
     "register-service-worker": "^1.6.2",
     "vue": "^2.6.10",
     "vue-router": "^3.1.3",
-    "vuetify": "^2.1.9",
+    "vuetify": "^2.1.10",
     "vuex": "^3.1.2"
   },
   "devDependencies": {
@@ -24,22 +24,22 @@
     "@vue/cli-plugin-eslint": "^4.0.5",
     "@vue/cli-plugin-pwa": "^4.0.5",
     "@vue/cli-service": "^4.0.5",
-    "@vue/eslint-config-prettier": "^5.0.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/test-utils": "^1.0.0-beta.29",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
-    "eslint": "^5.16.0",
+    "eslint": "^6.6.0",
     "eslint-plugin-prettier": "^3.1.1",
-    "eslint-plugin-vue": "^6.0.0",
+    "eslint-plugin-vue": "^6.0.1",
     "jest": "^24.9.0",
     "prettier": "^1.19.1",
-    "sass": "^1.23.3",
+    "sass": "^1.23.7",
     "sass-loader": "^7.1.0",
     "vue-cli-plugin-vuetify": "^2.0.2",
     "vue-jest": "^3.0.5",
     "vue-template-compiler": "^2.6.10",
-    "vuetify-loader": "^1.2.2"
+    "vuetify-loader": "^1.3.1"
   },
   "postcss": {
     "plugins": {

diff --git a/client/src/App.vue b/client/src/App.vue
@@ -17,25 +17,6 @@ export default Vue.extend({
   name: 'App',
   components: {
     Navigation
-  },
-  created() {
-    /**
-     * if jwt is expired : logout
-     */
-    this.$http.interceptors.response.use(undefined, err => {
-      const errorResponse = err.response;
-      if (
-        errorResponse.status === 401 &&
-        errorResponse.config &&
-        !errorResponse.config.__isRetryRequest &&
-        errorResponse.data &&
-        errorResponse.data.message === 'jwt expired'
-      ) {
-        this.$store.dispatch('logout');
-        this.$router.push('/');
-      }
-      throw err;
-    });
   }
 });
 </script>

diff --git a/client/src/components/AlertDeletion.vue b/client/src/components/AlertDeletion.vue
@@ -6,11 +6,21 @@
 
     <v-card-text class="cardText mt-3">
       Êtes-vous sûr de vouloir supprimer cette alerte ?
+      <div class="text-center">
+        <v-progress-circular
+          v-show="loading"
+          indeterminate
+          color="primary"
+        ></v-progress-circular>
+        <p v-if="error" class="subtitle-2 red--text mt-2 mb-0">
+          {{ this.errorMessage }}
+        </p>
+      </div>
     </v-card-text>
 
     <v-divider></v-divider>
 
-    <v-card-actions>
+    <v-card-actions class="justify-center">
       <v-btn class="closeBtn" color="#616161" text @click="closeDialog()">
         Annuler
       </v-btn>
@@ -24,13 +34,36 @@
 <script>
 export default {
   name: 'alert-deletion',
+  props: {
+    alert: Object
+  },
+  data() {
+    return {
+      loading: false,
+      error: false,
+      errorMessage: ''
+    };
+  },
   methods: {
-    deleteTravelAlert() {
-      this.$emit('delete:travelAlert');
-      this.closeDialog();
+    async deleteTravelAlert() {
+      try {
+        this.clearState();
+        this.loading = true;
+        await this.$store.dispatch('deleteAlert', this.alert);
+        this.loading = false;
+        this.closeDialog();
+      } catch (err) {
+        this.loading = false;
+        this.error = true;
+        this.errorMessage = err.message;
+      }
     },
     closeDialog() {
       this.$emit('close:dialog');
+    },
+    clearState() {
+      this.error = false;
+      this.errorMessage = '';
     }
   }
 };