From 0b40910284d40409c8d70eafea717382ba8461f3 Mon Sep 17 00:00:00 2001
From: Arne Schauf <git@asw.io>
Date: Sun, 4 Mar 2018 01:48:51 +0100
Subject: fix a few things

---
 .quasar/entry.js               |  4 ++--
 quasar.conf.js                 |  2 +-
 src/components/UploadVoter.vue |  2 +-
 src/pages/UploadCreate.vue     | 10 ++++------
 src/pages/UploadDetail.vue     | 41 +++++++++++++++++++----------------------
 src/pages/UploadList.vue       | 33 +++++++++++++--------------------
 6 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/.quasar/entry.js b/.quasar/entry.js
index f86359c..e50aef7 100644
--- a/.quasar/entry.js
+++ b/.quasar/entry.js
@@ -40,12 +40,12 @@ import 'src/css/app.styl'
 
 
 import Vue from 'vue'
-import Quasar, {QAlert,QLayout,QLayoutHeader,QLayoutDrawer,QPageContainer,QPage,QToolbar,QToolbarTitle,QBtn,QIcon,QList,QListHeader,QInput,QItem,QItemMain,QItemSide,QTable,QTabs,QRouteTab,QInnerLoading,QField,QStep,QStepper,QStepperNavigation,QTd,QSpinner,QCard,QCardTitle,QCardMain,QCardMedia,QCardSeparator,QCardActions,QParallax,QCheckbox,QChip,Ripple,LocalStorage,Notify} from 'quasar'
+import Quasar, {QAlert,QLayout,QLayoutHeader,QLayoutDrawer,QPageContainer,QPage,QToolbar,QToolbarTitle,QBtn,QIcon,QList,QListHeader,QInput,QItem,QItemMain,QItemSide,QTable,QTabs,QRouteTab,QInnerLoading,QField,QStep,QStepper,QStepperNavigation,QTd,QSpinner,QCard,QCardTitle,QCardMain,QCardMedia,QCardSeparator,QCardActions,QParallax,QCheckbox,QChip,Ripple,LocalStorage,Dialog} from 'quasar'
 
 Vue.config.productionTip = false
 import App from 'src/App'
 
-Vue.use(Quasar, {components: {QAlert,QLayout,QLayoutHeader,QLayoutDrawer,QPageContainer,QPage,QToolbar,QToolbarTitle,QBtn,QIcon,QList,QListHeader,QInput,QItem,QItemMain,QItemSide,QTable,QTabs,QRouteTab,QInnerLoading,QField,QStep,QStepper,QStepperNavigation,QTd,QSpinner,QCard,QCardTitle,QCardMain,QCardMedia,QCardSeparator,QCardActions,QParallax,QCheckbox,QChip},directives: {Ripple},plugins: {LocalStorage,Notify}})
+Vue.use(Quasar, {components: {QAlert,QLayout,QLayoutHeader,QLayoutDrawer,QPageContainer,QPage,QToolbar,QToolbarTitle,QBtn,QIcon,QList,QListHeader,QInput,QItem,QItemMain,QItemSide,QTable,QTabs,QRouteTab,QInnerLoading,QField,QStep,QStepper,QStepperNavigation,QTd,QSpinner,QCard,QCardTitle,QCardMain,QCardMedia,QCardSeparator,QCardActions,QParallax,QCheckbox,QChip},directives: {Ripple},plugins: {LocalStorage,Dialog}})
 
 
 
diff --git a/quasar.conf.js b/quasar.conf.js
index 0ea65c1..8705458 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -97,7 +97,7 @@ module.exports = function (ctx) {
       ],
       plugins: [
         'LocalStorage',
-        'Notify',
+        'Dialog',
       ]
     },
     // animations: 'all' --- includes all animations
diff --git a/src/components/UploadVoter.vue b/src/components/UploadVoter.vue
index 035aa11..65a5453 100644
--- a/src/components/UploadVoter.vue
+++ b/src/components/UploadVoter.vue
@@ -40,7 +40,7 @@
     methods: {
       vote (impact) {
         let that = this
-        this.$http.post(`/uploads/${this.upload._id}/vote`, {vote: {impact: impact}}).then(response => that.$emit('voted'))
+        this.$http.post(`/uploads/${this.upload._id}/vote`, {impact: impact}).then(response => that.$emit('voted'))
       },
     },
   }
diff --git a/src/pages/UploadCreate.vue b/src/pages/UploadCreate.vue
index 53a6a36..e1d027d 100644
--- a/src/pages/UploadCreate.vue
+++ b/src/pages/UploadCreate.vue
@@ -225,12 +225,10 @@
           return
         }
         let params = {
-          upload: {
-            title: this.title,
-            description: this.description,
-            files: this.files.map(el => el._id),
-            pic: this.pic,
-          },
+          title: this.title,
+          description: this.description,
+          files: this.files.map(el => el._id),
+          pic: this.pic,
         }
         this.$http.post('/uploads', params)
           .then((response) => {
diff --git a/src/pages/UploadDetail.vue b/src/pages/UploadDetail.vue
index 53de013..b2042b6 100644
--- a/src/pages/UploadDetail.vue
+++ b/src/pages/UploadDetail.vue
@@ -95,7 +95,7 @@
           </q-btn>
           <div class="group"
                v-else
-               v-for="fid of upload.file"
+               v-for="fid of upload.files"
                :key="fid._id">
             <q-btn loader
                    no-caps
@@ -106,12 +106,12 @@
               <span slot="loading">Downloading...</span>
             </q-btn>
             <span v-if="downloadProgresses[fid._id]">
-                <q-transition enter="fadeIn" leave="fadeOut" mode="out-in">
+                <transition enter-active-class="animated fadeIn" leave-active-class="animated fadeOut" mode="out-in">
                   <span key="sizeDownloaded" v-if="downloadProgresses[fid._id].percentage < 100">
                     {{ downloadProgresses[fid._id].loaded|prettyBytes }} / {{ downloadProgresses[fid._id].total|prettyBytes }}
                   </span>
                   <span key="downloadDone" v-else><i class="fa fa-check fa-2x text-positive"></i></span>
-                </q-transition>
+                </transition>
               </span>
           </div>
         </q-card-main>
@@ -137,10 +137,7 @@
 </template>
 
 <script>
-  import {
-    Dialog,
-    openURL,
-  } from 'quasar'
+  import { openURL } from 'quasar'
   import UploadVoter from 'components/UploadVoter'
   import FileSaver from 'file-saver'
 
@@ -174,25 +171,25 @@
         let that = this
         this.$http.get(`/uploads/${this.routeId}`).then(response => {
           that.upload = response.data
+        }).catch((error) => {
+          if (error.response.status === 404) {
+            that.$router.push({name: 'upload-list'})
+          }
         })
       },
-      deleteUpload () {
+      deleteUpload (upload) {
         let that = this
-        Dialog.create({
+        this.$q.dialog({
           title: 'Delete mod?',
-          message: `Do you really want to delete the mod ${this.upload.title}?<br>This cannot be undone!`,
-          buttons: [
-            'Cancel',
-            {
-              label: '<i class="fa fa-trash-o"></i> Yes, delete!',
-              color: 'negative',
-              outline: true,
-              handler () {
-                that.$http.delete(`/uploads/${that.routeId}`).then(response => that.$router.push({name: 'upload-list'}))
-              }
-            }
-          ]
-        })
+          message: `Do you really want to delete the mod "${upload.title}"? This cannot be undone!`,
+          ok: {
+            label: 'Yes, delete!',
+            icon: 'fa-trash',
+            color: 'negative',
+            outline: true,
+          },
+          cancel: 'Cancel',
+        }).then(() => that.$http.delete(`/uploads/${upload._id}`).then(response => that.refresh()))
       },
       downloadMedia (mediaId, filename, done) {
         console.log({mediaId, done})
diff --git a/src/pages/UploadList.vue b/src/pages/UploadList.vue
index ee1723b..a37d8a1 100644
--- a/src/pages/UploadList.vue
+++ b/src/pages/UploadList.vue
@@ -25,10 +25,10 @@
           <q-btn color="negative"
                  outline
                  small
-                 icon="fa-trash-o"
+                 icon="fa-trash"
                  label="Delete"
-                 v-if="props.row.author.username === $store.state.user.decodedToken.username"
-                 @click="deleteUpload(cell.row)" />
+                 v-if="$route.params.uploadId !== props.row._id && props.row.author.username === $store.state.user.decodedToken.username"
+                 @click="deleteUpload(props.row)" />
         </q-td>
         <q-td slot='body-cell-voting' slot-scope="props" :props='props'>
           {{ props.value.sum }} <i class="fa" :class="{'fa-caret-up text-positive': props.value.sum > 0, 'fa-caret-down text-negative': props.value.sum < 0, 'fa-sort text-dark': props.value.sum === 0}"></i>
@@ -39,9 +39,6 @@
 </template>
 
 <script>
-  import {
-    Dialog,
-  } from 'quasar'
   import moment from 'moment'
 
   export default {
@@ -111,21 +108,17 @@
       },
       deleteUpload (upload) {
         let that = this
-        Dialog.create({
+        this.$q.dialog({
           title: 'Delete mod?',
-          message: `Do you really want to delete the mod ${upload.title}?<br>This cannot be undone!`,
-          buttons: [
-            'Cancel',
-            {
-              label: '<i class="fa fa-trash-o"></i> Yes, delete!',
-              color: 'negative',
-              outline: true,
-              handler () {
-                that.$http.delete(`/uploads/${upload._id}`).then(response => that.refresh())
-              }
-            }
-          ]
-        })
+          message: `Do you really want to delete the mod "${upload.title}"? This cannot be undone!`,
+          ok: {
+            label: 'Yes, delete!',
+            icon: 'fa-trash',
+            color: 'negative',
+            outline: true,
+          },
+          cancel: 'Cancel',
+        }).then(() => that.$http.delete(`/uploads/${upload._id}`).then(response => that.refresh()))
       },
     },
   }
-- 
cgit v1.2.3-54-g00ecf