✨ submit URL api

anucvml · Feb 27, 2022 · 4bc8fc0 · 4bc8fc0
1 parent 2bcc289
commit 4bc8fc0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -33,7 +33,7 @@
           </a>
           <router-link
               class="vertical-middle"
-              :to="'annotation'"
+              :to="'/'"
           >
             ANU CVML Video Annotation Tool
           </router-link>

diff --git a/src/hooks/annotation.js b/src/hooks/annotation.js
@@ -86,25 +86,29 @@ export const useAnnotation = () => {
         submitLoading.value = false
         if (res.ok) {
           console.log('Success', res)
-          res.text().then(text => {
-            copyToClipboard(text).then(() => {
-              utils.notify('Success (Already copied to clipboard): ' + text, 'positive')
-            }).catch((err) => {
-                console.log('Failed to copy to clipboard', err)
-                utils.notify('Failed to copy to clipboard: ' + err, 'negative')
-              }
-            )
+          res.json().then(data => {
+            const { message, clipboard } = data
+            if (message) {
+              utils.notify('Server: ' + text, 'positive')
+            }
+            if (clipboard) {
+              copyToClipboard(clipboard).then(() => {
+                utils.notify('Copied to clipboard: ' + clipboard, 'positive')
+              }).catch((err) => {
+                  console.error('Failed to copy to clipboard', err)
+                  utils.notify('Failed to copy to clipboard, please do it manually: ' + clipboard, 'negative', 10000)
+                }
+              )
+            }
           })
         } else {
-          console.log('Failed', res)
-          res.text().then(text => {
-            utils.notify('Failed: ' + text, 'warning')
-          })
+          console.error('Failed', res)
+          utils.notify(`Failed to submit: ${res.statusText} (${res.status})`, 'warning')
         }
       }).catch(err => {
         submitLoading.value = false
-        console.log('Failed', err)
-        utils.notify('Failed: ' + err, 'negative')
+        console.error('Failed', err)
+        utils.notify('Failed to submit: ' + err, 'negative')
       })
     },
     submitLoading

diff --git a/src/libs/utils.js b/src/libs/utils.js
@@ -22,13 +22,15 @@ export default {
    * Notify popup
    * @param message
    * @param color
+   * @param timeout
    * @returns
    */
-  notify (message, color = 'positive') {
+  notify (message, color = 'positive', timeout=5000) {
     return Notify.create({
       message: message,
       color: color,
-      position: 'bottom-right'
+      position: 'bottom-right',
+      timeout: timeout
     })
   },
   /**

diff --git a/src/pages/configuration/Configuration.vue b/src/pages/configuration/Configuration.vue
@@ -46,13 +46,13 @@ const handleLoad = () => {
         configurationStore.importConfig(JSON.parse(file))
         utils.notify('Load successfully!', 'positive')
       } catch (e) {
-        utils.notify(e.toString(), 'negative')
-        throw e
+        console.error(e)
+        utils.notify(`Could not load config: ${e}`, 'negative')
       }
     })
   })
 }
-const handleSave = () => { // TODO
+const handleSave = () => {
   utils.prompt(
       'Save',
       'Enter configuration filename for saving',