From 43cfc8d8154188d7c0fb5b22a2168a3fff9e810d Mon Sep 17 00:00:00 2001
From: lana-k <skochetova89@gmail.com>
Date: Sun, 28 Feb 2021 21:26:37 +0100
Subject: [PATCH] DbUpload refactoring

---
 src/components/DbUpload.vue | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/components/DbUpload.vue b/src/components/DbUpload.vue
index 03dc749..852d357 100644
--- a/src/components/DbUpload.vue
+++ b/src/components/DbUpload.vue
@@ -1,24 +1,18 @@
 <template>
   <div class="db-upload-container">
-    <label for="assetsFieldHandle">
+    <div class="drop-area-container">
       <div
         class="drop-area"
         @dragover.prevent="state = 'dragover'"
         @dragleave.prevent="state=''"
         @drop.prevent="drop"
+        @click="browse"
       >
-        <input
-          type="file"
-          id="assetsFieldHandle"
-          @change="loadDb"
-          ref="file"
-          accept=".db,.sqlite,.sqlite3"
-        />
         <div class="text">
           Drop the database file here or click to choose a file from your computer.
         </div>
       </div>
-    </label>
+    </div>
     <div v-if="illustrated" id="img-container">
       <img id="drop-file-top-img" :src="require('@/assets/images/top.svg')" />
       <img
@@ -48,6 +42,8 @@
 </template>
 
 <script>
+import fu from '@/fileUtils'
+
 export default {
   name: 'DbUpload',
   props: {
@@ -75,26 +71,29 @@ export default {
     }
   },
   methods: {
-    loadDb () {
+    loadDb (file) {
       this.state = 'drop'
-      return Promise.all([this.$db.loadDb(this.$refs.file.files[0]), this.animationPromise])
-        .then(([{ dbName, schema }]) => {
-          this.$store.commit('saveSchema', { dbName, schema })
+      return Promise.all([this.$db.loadDb(file), this.animationPromise])
+        .then(([schema]) => {
+          this.$store.commit('saveSchema', schema)
           if (this.$route.path !== '/editor') {
             this.$router.push('/editor')
           }
         })
     },
+    browse () {
+      fu.getFileFromUser('.db,.sqlite,.sqlite3')
+        .then(this.loadDb)
+    },
     drop (event) {
-      this.$refs.file.files = event.dataTransfer.files
-      this.loadDb()
+      this.loadDb(event.dataTransfer.files[0])
     }
   }
 }
 </script>
 
 <style scoped>
-label {
+.drop-area-container {
   display: inline-block;
   border: 1px dashed var(--color-border);
   padding: 8px;
@@ -117,10 +116,6 @@ label {
   height: 100%;
 }
 
-input {
-  display: none;
-}
-
 #img-container {
   position: absolute;
   top: calc(50% - 120px);