updated vuejs & dependencies to latest versions, fix issue darryldeco…

…de#3 for deprecated attribute, more improvements & fixes
codyodell · Dec 21, 2017 · 54442b0 · 54442b0
1 parent 34a4cef
commit 54442b0
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 73 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,19 +10,20 @@
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "axios": "^0.16.2",
+    "axios": "^0.17.1",
     "bootstrap-sass": "^3.3.7",
     "cross-env": "^5.0.1",
     "jquery": "^3.1.1",
-    "laravel-mix": "^1.0",
+    "laravel-mix": "^1.7.0",
     "lodash": "^4.17.4",
-    "vue": "^2.1.10"
+    "vue": "^2.5.13"
   },
   "dependencies": {
+    "dropzone": "^5.2.0",
     "moment": "^2.18.1",
-    "vue-router": "^2.7.0",
+    "vue-router": "^3.0.1",
     "vue-spinner": "^1.0.2",
-    "vuetify": "^0.16.4",
+    "vuetify": "^0.17.5",
     "vuex": "^2.4.1"
   }
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/manifest.js b/public/js/manifest.js
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/resources/assets/js/components/FileGroupLists.vue b/resources/assets/js/components/FileGroupLists.vue
@@ -26,7 +26,7 @@
                 :items="items"
                 :total-items="totalItems"
                 class="elevation-1">
-            <template slot="headerCell" scope="props">
+            <template slot="headerCell" slot-scope="props">
                 <span v-if="props.header.value=='file_count'">
                     <v-icon>dns</v-icon> {{ props.header.text }}
                 </span>
@@ -35,7 +35,7 @@
                 </span>
                 <span v-else>{{ props.header.text }}</span>
             </template>
-            <template slot="items" scope="props">
+            <template slot="items" slot-scope="props">
                 <td>
                     <v-btn @click="showDialog('file_group_edit',props.item)" icon small>
                         <v-icon dark class="blue--text">edit</v-icon>

diff --git a/resources/assets/js/components/FileLists.vue b/resources/assets/js/components/FileLists.vue
@@ -25,7 +25,7 @@
                 :items="items"
                 :total-items="totalItems"
                 class="elevation-1">
-            <template slot="headerCell" scope="props">
+            <template slot="headerCell" slot-scope="props">
                 <span v-if="props.header.value=='thumb'">
                     <v-icon>panorama</v-icon> {{ props.header.text }}
                 </span>
@@ -37,10 +37,10 @@
                 </span>
                 <span v-else>{{ props.header.text }}</span>
             </template>
-            <template slot="items" scope="props">
+            <template slot="items" slot-scope="props">
                 <td class="wask_td_action">
                     <v-btn @click="showDialog('file_show',props.item)" icon small>
-                        <v-icon dark class="red--text">search</v-icon>
+                        <v-icon dark class="blue--text">search</v-icon>
                     </v-btn>
                     <v-btn @click="trash(props.item)" icon small>
                         <v-icon dark class="red--text">delete</v-icon>
@@ -49,7 +49,7 @@
                 <td>
                     <v-avatar
                             tile
-                            :size="50"
+                            :size="'50px'"
                             class="grey lighten-4">
                         <img :src="`/files/`+props.item.id+`/preview?w=50&action=fit`"/>
                     </v-avatar>

diff --git a/resources/assets/js/components/GroupLists.vue b/resources/assets/js/components/GroupLists.vue
@@ -26,7 +26,7 @@
                 :items="items"
                 :total-items="totalItems"
                 class="elevation-1">
-            <template slot="headerCell" scope="props">
+            <template slot="headerCell" slot-scope="props">
                 <span v-if="props.header.value=='name'">
                     <v-icon>person</v-icon> {{ props.header.text }}
                 </span>
@@ -41,7 +41,7 @@
                 </span>
                 <span v-else>{{ props.header.text }}</span>
             </template>
-            <template slot="items" scope="props">
+            <template slot="items" slot-scope="props">
                 <td>
                     <v-menu>
                         <v-btn icon slot="activator" dark>
@@ -67,7 +67,7 @@
         </v-data-table>
 
         <!-- dialog for show permissions -->
-        <v-dialog v-model="dialogs.showPermissions.show" lazy absolute>
+        <v-dialog v-model="dialogs.showPermissions.show" lazy absolute max-width="300px">
             <v-card>
                 <v-card-title>
                     <div class="headline"><v-icon>vpn_key</v-icon> Group Permissions</div>

diff --git a/resources/assets/js/components/PermissionLists.vue b/resources/assets/js/components/PermissionLists.vue
@@ -26,7 +26,7 @@
                 :items="items"
                 :total-items="totalItems"
                 class="elevation-1">
-            <template slot="headerCell" scope="props">
+            <template slot="headerCell" slot-scope="props">
                 <span v-if="props.header.value=='permission'">
                     <v-icon>vpn_key</v-icon> {{ props.header.text }}
                 </span>
@@ -35,7 +35,7 @@
                 </span>
                 <span v-else>{{ props.header.text }}</span>
             </template>
-            <template slot="items" scope="props">
+            <template slot="items" slot-scope="props">
                 <td>
                     <v-menu>
                         <v-btn icon slot="activator" dark>

diff --git a/resources/assets/js/components/UserLists.vue b/resources/assets/js/components/UserLists.vue
@@ -29,7 +29,7 @@
                 :items="items"
                 :total-items="totalItems"
                 class="elevation-1">
-            <template slot="headerCell" scope="props">
+            <template slot="headerCell" slot-scope="props">
                 <span v-if="props.header.value=='name'">
                     <v-icon>person</v-icon> {{ props.header.text }}
                 </span>
@@ -44,7 +44,7 @@
                 </span>
                 <span v-else>{{ props.header.text }}</span>
             </template>
-            <template slot="items" scope="props">
+            <template slot="items" slot-scope="props">
                 <td>
                     <v-menu>
                         <v-btn icon slot="activator" dark>
@@ -76,7 +76,7 @@
         </v-data-table>
 
         <!-- dialog for show permissions -->
-        <v-dialog v-model="dialogs.showPermissions.show" lazy absolute>
+        <v-dialog v-model="dialogs.showPermissions.show" lazy absolute max-width="300px">
             <v-card>
                 <v-card-title>
                     <div class="headline"><v-icon>vpn_key</v-icon> User Permissions</div>