Consolidate frontend types (#1245)

frontend/pages/admin/background-tasks.vue

@@ -38,10 +38,10 @@
     </v-expansion-panels>
   </v-container>
 </template>
-    
+
 <script lang="ts">
 import { defineComponent, onMounted, ref } from "@nuxtjs/composition-api";
-import { ServerTask } from "~/api/types/server-task";
+import { ServerTask } from "~/types/api-types/server";
 import { useAdminApi } from "~/composables/api";
 
 export default defineComponent({
@@ -84,4 +84,4 @@ export default defineComponent({
     };
   },
 });
-</script>
+</script>

frontend/pages/admin/manage/groups/_id.vue

@@ -28,8 +28,8 @@ import { defineComponent, useRoute, onMounted, ref } from "@nuxtjs/composition-a
 import GroupPreferencesEditor from "~/components/Domain/Group/GroupPreferencesEditor.vue";
 import { useAdminApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
+import { GroupInDB } from "~/types/api-types/user";
 import { VForm } from "~/types/vuetify";
-import { GroupRead } from "~/api/admin/admin-groups";
 
 export default defineComponent({
   components: {
@@ -48,7 +48,7 @@ export default defineComponent({
 
     const adminApi = useAdminApi();
 
-    const group = ref<GroupRead | null>(null);
+    const group = ref<GroupInDB | null>(null);
 
     const userError = ref(false);
 

frontend/pages/admin/manage/groups/index.vue

@@ -71,9 +71,9 @@
 
 <script lang="ts">
 import { defineComponent, reactive, toRefs, useContext, useRouter } from "@nuxtjs/composition-api";
-import { Group } from "~/api/class-interfaces/groups";
 import { fieldTypes } from "~/composables/forms";
 import { useGroups } from "~/composables/use-groups";
+import { GroupInDB } from "~/types/api-types/user";
 
 export default defineComponent({
   layout: "admin",
@@ -121,7 +121,7 @@ export default defineComponent({
 
     const router = useRouter();
 
-    function handleRowClick(item: Group) {
+    function handleRowClick(item: GroupInDB) {
       router.push(`/admin/manage/groups/${item.id}`);
     }
 

frontend/pages/admin/parser.vue

@@ -65,10 +65,11 @@
     </v-container>
   </v-container>
 </template>
-    
+
 <script lang="ts">
 import { defineComponent, reactive, ref, toRefs } from "@nuxtjs/composition-api";
-import { Confidence, Parser } from "~/api/class-interfaces/recipes/types";
+import { Parser } from "~/api/class-interfaces/recipes/recipe";
+import { IngredientConfidence } from "~/types/api-types/recipe";
 import { useUserApi } from "~/composables/api";
 
 type ConfidenceAttribute = "average" | "comment" | "name" | "unit" | "quantity" | "food";
@@ -85,7 +86,7 @@ export default defineComponent({
       parser: "nlp" as Parser,
     });
 
-    const confidence = ref<Confidence>({});
+    const confidence = ref<IngredientConfidence>({});
 
     function getColor(attribute: ConfidenceAttribute) {
       const percentage = getConfidence(attribute);
@@ -141,7 +142,8 @@ export default defineComponent({
       if (data) {
         state.results = true;
 
-        confidence.value = data.confidence;
+        if (data.confidence)
+          confidence.value = data.confidence;
 
         // TODO: Remove ts-ignore
         // ts-ignore because data will likely change significantly once I figure out how to return results
@@ -215,6 +217,6 @@ export default defineComponent({
   },
 });
 </script>
-    
+
 <style scoped>
-</style>
+</style>

frontend/pages/admin/site-settings.vue

@@ -259,7 +259,7 @@ export default defineComponent({
       const { data } = await adminApi.about.checkApp();
 
       if (data) {
-        appConfig.value = data;
+        appConfig.value = { ...data, isSiteSecure: false};
       }
 
       appConfig.value.isSiteSecure = isLocalHostOrHttps();
@@ -323,7 +323,7 @@ export default defineComponent({
         if (data.success) {
           state.success = true;
         } else {
-          state.error = data.error;
+          state.error = data.error ?? "";
           state.success = false;
         }
       }