Browse Source

chore(webapp): version bumps and related adjustments

Peter Thomassen 5 years ago
parent
commit
7eed390e97
3 changed files with 32 additions and 32 deletions
  1. 25 25
      webapp/package.json
  2. 2 2
      webapp/src/App.vue
  3. 5 5
      webapp/src/views/CrudList.vue

+ 25 - 25
webapp/package.json

@@ -10,35 +10,35 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@mdi/font": "^4.5.95",
-    "axios": "~0.19.0",
-    "core-js": "~3.6.4",
-    "javascript-time-ago": "^2.0.7",
+    "@mdi/font": "^5.3.45",
+    "axios": "~0.19.2",
+    "core-js": "~3.6.5",
+    "javascript-time-ago": "^2.0.13",
     "roboto-fontface": "*",
-    "vue": "~2.6.10",
+    "vue": "~2.6.11",
     "vue-clipboard2": "~0.3.1",
-    "vue-router": "~3.1.6",
+    "vue-router": "~3.3.4",
     "vuelidate": "^0.7.5",
-    "vuetify": "^2.2.20",
-    "vuex": "^3.1.3"
+    "vuetify": "^2.3.4",
+    "vuex": "^3.5.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.0",
-    "@vue/cli-plugin-e2e-cypress": "^4.0.0",
-    "@vue/cli-plugin-eslint": "^4.0.0",
-    "@vue/cli-plugin-router": "^4.0.0",
-    "@vue/cli-plugin-unit-mocha": "^4.0.0",
-    "@vue/cli-plugin-vuex": "^4.0.0",
-    "@vue/cli-service": "^4.3.0",
-    "@vue/test-utils": "1.0.0-beta.29",
-    "babel-eslint": "^10.0.3",
-    "chai": "^4.1.2",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "sass": "^1.19.0",
-    "sass-loader": "^8.0.0",
-    "vue-cli-plugin-vuetify": "^2.0.2",
-    "vue-template-compiler": "^2.6.10",
-    "vuetify-loader": "~1.4.3"
+    "@vue/cli-plugin-babel": "^4.4.6",
+    "@vue/cli-plugin-e2e-cypress": "^4.4.6",
+    "@vue/cli-plugin-eslint": "^4.4.6",
+    "@vue/cli-plugin-router": "^4.4.6",
+    "@vue/cli-plugin-unit-mocha": "^4.4.6",
+    "@vue/cli-plugin-vuex": "^4.4.6",
+    "@vue/cli-service": "^4.4.6",
+    "@vue/test-utils": "1.0.3",
+    "babel-eslint": "^10.1.0",
+    "chai": "^4.2.0",
+    "eslint": "^7.5.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "sass": "^1.26.10",
+    "sass-loader": "^9.0.2",
+    "vue-cli-plugin-vuetify": "^2.0.7",
+    "vue-template-compiler": "^2.6.11",
+    "vuetify-loader": "~1.6.0"
   }
 }

+ 2 - 2
webapp/src/App.vue

@@ -88,7 +88,7 @@
       </template>
     </v-app-bar>
 
-    <v-content>
+    <v-main>
       <v-banner v-for="alert in $store.state.alerts" :key="alert.id">
         <v-icon
           slot="icon"
@@ -124,7 +124,7 @@
               style="z-index: 3"
       ></v-progress-linear>
       <router-view/>
-    </v-content>
+    </v-main>
     <v-footer
       class="d-flex flex-column align-stretch pa-0 white--text text--darken-1 elevation-12"
     >

+ 5 - 5
webapp/src/views/CrudList.vue

@@ -9,7 +9,7 @@
             color="error"
             multi-line
             vertical
-            :timeout="0"
+            :timeout="-1"
           >
             {{ errors[errors.length - 1] }}
             <v-btn @click="snackbar = false">
@@ -18,7 +18,7 @@
           </v-snackbar>
           <v-snackbar
             v-model="snackbarInfo"
-            :timeout="0"
+            :timeout="-1"
           >
             <span v-html="snackbarInfoText"></span>
             <v-btn
@@ -396,7 +396,7 @@ export default {
         const result = {};
         let key;
         for (key in obj) {
-          if (obj.hasOwnProperty(key) && !predicate(obj[key])) {
+          if (Object.prototype.hasOwnProperty.call(obj, key) && !predicate(obj[key])) {
             result[key] = obj[key];
           }
         }
@@ -529,7 +529,7 @@ export default {
         this.destroyDialogError = e;
       } else if (this.createDialog) {
         // see if e contains field-specific errors
-        if (Object.keys(e).every(key => this.columns.hasOwnProperty(key))) {
+        if (Object.keys(e).every(key => Object.prototype.hasOwnProperty.call(this.columns, key))) {
           // assume we obtained field-specific error(s),
           // so let's assign them to the input fields
           for (const c in e) {
@@ -554,7 +554,7 @@ export default {
      */
     resourcePath(p, obj, marker) {
       for (const property in obj) {
-        if (obj.hasOwnProperty(property)) {
+        if (Object.prototype.hasOwnProperty.call(obj, property)) {
           p = p.replace(`${marker}{${property}}`, obj[property]);
         }
       }