From 7188e58f4c1a5ab9b4b5d9c5451646e99c72fc1a Mon Sep 17 00:00:00 2001
From: hayden <hay-kot@pm.me>
Date: Tue, 2 Feb 2021 20:44:44 -0900
Subject: [PATCH] general cleanup

---
 frontend/src/components/Settings/Backup/index.vue      |  2 +-
 .../components/Settings/General/HomePageSettings.vue   | 10 ++++++++--
 frontend/src/components/Settings/General/index.vue     |  7 +++----
 .../components/Settings/Migration/MigrationCard.vue    |  2 +-
 frontend/src/components/Settings/Theme/index.vue       | 10 ++++++----
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Settings/Backup/index.vue b/frontend/src/components/Settings/Backup/index.vue
index 830fd8ee3..2db3f9681 100644
--- a/frontend/src/components/Settings/Backup/index.vue
+++ b/frontend/src/components/Settings/Backup/index.vue
@@ -22,7 +22,7 @@
         <span>
           <UploadBtn
             class="mt-1"
-            url="/api/backups/upload/"
+            url="/api/backups/upload"
             @uploaded="getAvailableBackups"
           />
         </span>
diff --git a/frontend/src/components/Settings/General/HomePageSettings.vue b/frontend/src/components/Settings/General/HomePageSettings.vue
index a5ff936df..10acc4ecc 100644
--- a/frontend/src/components/Settings/General/HomePageSettings.vue
+++ b/frontend/src/components/Settings/General/HomePageSettings.vue
@@ -92,7 +92,9 @@
                     <v-list-item-content>
                       <v-list-item-title v-text="item.name"></v-list-item-title>
                     </v-list-item-content>
-                    <v-list-item-icon @click="deleteActiveCategory(index)">
+                    <v-list-item-icon
+                      @click="deleteCategoryfromDatabase(item.slug)"
+                    >
                       <v-icon>mdi-delete</v-icon>
                     </v-list-item-icon>
                   </v-list-item>
@@ -114,6 +116,7 @@
 </template>
 
 <script>
+import api from "../../../api";
 import draggable from "vuedraggable";
 
 export default {
@@ -136,6 +139,10 @@ export default {
     },
   },
   methods: {
+    deleteCategoryfromDatabase(category) {
+      api.categories.delete(category);
+      this.$store.dispatch("requestHomePageSettings");
+    },
     getOptions() {
       this.showLimit = this.$store.getters.getShowLimit;
       this.showRecent = this.$store.getters.getShowRecent;
@@ -145,7 +152,6 @@ export default {
       this.homeCategories.splice(index, 1);
     },
     saveSettings() {
-
       this.homeCategories.forEach((element, index) => {
         element.position = index + 1;
       });
diff --git a/frontend/src/components/Settings/General/index.vue b/frontend/src/components/Settings/General/index.vue
index b04b7246c..16f4f8bcc 100644
--- a/frontend/src/components/Settings/General/index.vue
+++ b/frontend/src/components/Settings/General/index.vue
@@ -14,10 +14,11 @@
     <HomePageSettings />
     <v-divider></v-divider>
     <v-card-text>
-      <h2 class="mt-1 mb-1">{{ $t("settings.language") }}</h2>
+      <h2 class="mt-1 mb-4">{{ $t("settings.language") }}</h2>
       <v-row>
-        <v-col>
+        <v-col cols="3">
           <v-select
+            dense
             v-model="selectedLang"
             :items="langOptions"
             item-text="name"
@@ -26,8 +27,6 @@
           >
           </v-select>
         </v-col>
-        <v-spacer></v-spacer>
-        <v-spacer></v-spacer>
       </v-row>
     </v-card-text>
     <v-divider></v-divider>
diff --git a/frontend/src/components/Settings/Migration/MigrationCard.vue b/frontend/src/components/Settings/Migration/MigrationCard.vue
index 8487f237d..e366900e0 100644
--- a/frontend/src/components/Settings/Migration/MigrationCard.vue
+++ b/frontend/src/components/Settings/Migration/MigrationCard.vue
@@ -6,7 +6,7 @@
       <span>
         <UploadBtn
           class="mt-1"
-          :url="`/api/migrations/${folder}/upload/`"
+          :url="`/api/migrations/${folder}/upload`"
           @uploaded="$emit('refresh')"
         />
       </span>
diff --git a/frontend/src/components/Settings/Theme/index.vue b/frontend/src/components/Settings/Theme/index.vue
index 7c876f7c1..6819dc97b 100644
--- a/frontend/src/components/Settings/Theme/index.vue
+++ b/frontend/src/components/Settings/Theme/index.vue
@@ -21,7 +21,9 @@
             mandatory
             @change="setStoresDarkMode"
           >
-            <v-btn value="system"> {{ $t("settings.theme.default-to-system") }} </v-btn>
+            <v-btn value="system">
+              {{ $t("settings.theme.default-to-system") }}
+            </v-btn>
 
             <v-btn value="light"> {{ $t("settings.theme.light") }} </v-btn>
 
@@ -51,13 +53,13 @@
               return-object
               v-model="selectedTheme"
               @change="themeSelected"
-              :rules="[v => !!v || $t('settings.theme.theme-is-required')]"
+              :rules="[(v) => !!v || $t('settings.theme.theme-is-required')]"
               required
             >
             </v-select>
           </v-col>
           <v-col>
-            <v-btn-toggle group>
+            <v-btn-toggle group class="mt-n5">
               <NewThemeDialog @new-theme="appendTheme" class="mt-1" />
               <v-btn text color="error" @click="deleteSelectedThemeValidation">
                 {{ $t("general.delete") }}
@@ -184,7 +186,7 @@ export default {
       //Change to default if deleting current theme.
       if (
         !this.availableThemes.some(
-          theme => theme.name === this.selectedTheme.name
+          (theme) => theme.name === this.selectedTheme.name
         )
       ) {
         await this.$store.dispatch("resetTheme");