From 6d3a06e1b94b234e69247f35873c6a35c48914bb Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Sat, 21 Aug 2021 11:00:42 -0800
Subject: [PATCH] cleanup todos

---
 .../Domain/Admin/AdminEventViewer.vue         | 10 -----
 frontend/nuxt.config.js                       |  4 +-
 frontend/package.json                         |  3 +-
 frontend/pages/admin/backups.vue              |  2 +-
 .../pages/admin/manage-users/all-groups.vue   | 29 +++++++-------
 frontend/yarn.lock                            | 39 ++++++++++++++++++-
 6 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/frontend/components/Domain/Admin/AdminEventViewer.vue b/frontend/components/Domain/Admin/AdminEventViewer.vue
index b22a8b82e310..4d60d0a785ce 100644
--- a/frontend/components/Domain/Admin/AdminEventViewer.vue
+++ b/frontend/components/Domain/Admin/AdminEventViewer.vue
@@ -1,15 +1,5 @@
-// TODO: Fix date/time Localization
-
 <template>
   <div>
-    <!-- <BaseDialog
-      ref="deleteEventConfirm"
-      :title="$t('events.delete-event')"
-      :message="$t('general.confirm-delete-generic')"
-      color="error"
-      :icon="$globals.icons.alertCircle"
-      @confirm="emitDelete()"
-    /> -->
     <BaseStatCard :icon="$globals.icons.bellAlert" :color="color">
       <template #after-heading>
         <div class="ml-auto text-right">
diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js
index 405bac387216..2143fae2775d 100644
--- a/frontend/nuxt.config.js
+++ b/frontend/nuxt.config.js
@@ -1,5 +1,3 @@
-// TODO: Fix composition API "Should only be called once" error
-
 export default {
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
@@ -47,6 +45,8 @@ export default {
     "@nuxtjs/composition-api/module",
     // https://vite.nuxtjs.org/getting-started/installation
     "nuxt-vite",
+    // https://github.com/antfu/vue2-script-setup-transform
+    "vue2-script-setup-transform/nuxt",
   ],
 
   // Modules: https://go.nuxtjs.dev/config-modules
diff --git a/frontend/package.json b/frontend/package.json
index 2ee791793087..fffcf2700722 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -44,7 +44,8 @@
     "eslint-plugin-vue": "^7.12.1",
     "lint-staged": "^10.5.4",
     "nuxt-vite": "^0.1.1",
-    "prettier": "^2.3.2"
+    "prettier": "^2.3.2",
+    "vue2-script-setup-transform": "^0.2.0"
   },
   "resolutions": {
     "vite": "2.3.8"
diff --git a/frontend/pages/admin/backups.vue b/frontend/pages/admin/backups.vue
index 1867c9176487..1749ee80d1b1 100644
--- a/frontend/pages/admin/backups.vue
+++ b/frontend/pages/admin/backups.vue
@@ -93,7 +93,7 @@
     </section>
   </v-container>
 </template>
-    
+
 <script lang="ts">
 import AdminBackupImportOptions from "@/components/Domain/Admin/AdminBackupImportOptions.vue";
 import { defineComponent, reactive, toRefs, useContext, ref } from "@nuxtjs/composition-api";
diff --git a/frontend/pages/admin/manage-users/all-groups.vue b/frontend/pages/admin/manage-users/all-groups.vue
index 4ac9f432f40d..cb9adf86f0ac 100644
--- a/frontend/pages/admin/manage-users/all-groups.vue
+++ b/frontend/pages/admin/manage-users/all-groups.vue
@@ -1,6 +1,4 @@
-// TODO: Add Loading Indicator...Maybe?
 // TODO: Edit Group
-// TODO: Migrate all stuff to setup()
 <template>
   <v-container fluid>
     <BaseCardSectionTitle title="Group Management"> </BaseCardSectionTitle>
@@ -69,33 +67,30 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "@nuxtjs/composition-api";
+import { defineComponent, reactive, toRefs, useContext } from "@nuxtjs/composition-api";
 import { fieldTypes } from "~/composables/forms";
-import { useApiSingleton } from "~/composables/use-api";
 import { useGroups } from "~/composables/use-groups";
 
 export default defineComponent({
   layout: "admin",
   setup() {
-    const api = useApiSingleton();
+    const { i18n } = useContext();
     const { groups, refreshAllGroups, deleteGroup, createGroup } = useGroups();
-    return { api, groups, refreshAllGroups, deleteGroup, createGroup };
-  },
-  data() {
-    return {
+
+    const state = reactive({
       search: "",
       headers: [
         {
-          text: this.$t("group.group"),
+          text: i18n.t("group.group"),
           align: "start",
           sortable: false,
           value: "id",
         },
-        { text: this.$t("general.name"), value: "name" },
-        { text: this.$t("user.total-users"), value: "users" },
-        { text: this.$t("user.webhooks-enabled"), value: "webhookEnable" },
-        { text: this.$t("user.total-mealplans"), value: "mealplans" },
-        { text: this.$t("shopping-list.shopping-lists"), value: "shoppingLists" },
+        { text: i18n.t("general.name"), value: "name" },
+        { text: i18n.t("user.total-users"), value: "users" },
+        { text: i18n.t("user.webhooks-enabled"), value: "webhookEnable" },
+        { text: i18n.t("user.total-mealplans"), value: "mealplans" },
+        { text: i18n.t("shopping-list.shopping-lists"), value: "shoppingLists" },
         { value: "actions" },
       ],
       updateMode: false,
@@ -112,7 +107,9 @@ export default defineComponent({
           name: "",
         },
       },
-    };
+    });
+
+    return { ...toRefs(state), groups, refreshAllGroups, deleteGroup, createGroup };
   },
 });
 </script>
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 698946897095..4f8f4231e8b4 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -37,7 +37,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
   integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.16", "@babel/core@^7.14.0":
+"@babel/core@^7.11.6", "@babel/core@^7.12.16", "@babel/core@^7.14.0", "@babel/core@^7.15.0":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
   integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
@@ -288,6 +288,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.2.tgz#08d4ffcf90d211bf77e7cc7154c6f02d468d2b1d"
   integrity sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==
 
+"@babel/parser@^7.15.3":
+  version "7.15.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
+  integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
@@ -2049,6 +2054,11 @@
   dependencies:
     tslib "^2.3.0"
 
+"@vue/shared@^3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.4.tgz#ba2a09527afff27b28d08f921b4a597e9504ca7a"
+  integrity sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg==
+
 "@vueuse/core@^5.2.0":
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-5.2.0.tgz#c2c0b89d9506fdfca41cd3056e38478226bc5e31"
@@ -10019,6 +10029,13 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
+unplugin@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-0.0.6.tgz#f5b07162b3e2de66e7553fe72079241ae375d1bb"
+  integrity sha512-ZqRcCVRS5/cmYwx36ms/jJ0CLXMIjxjvk4iU2ahzn81kO0dzex9t8YzjM9IuH8vyqXTSLLBnoNm+mz5Gt5aI/g==
+  dependencies:
+    webpack-virtual-modules "^0.4.3"
+
 unquote@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
@@ -10296,6 +10313,21 @@ vue-template-es2015-compiler@^1.9.0, vue-template-es2015-compiler@^1.9.1:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
+vue2-script-setup-transform@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/vue2-script-setup-transform/-/vue2-script-setup-transform-0.2.0.tgz#5c4de063bf07cd5286103578bb483b483ae6a621"
+  integrity sha512-2EMUIqJP3LyfX3ST3n8BcEtyVLPURKqIOVO0/WT6PrXH3lXlPe0X7cJ4fqv/mp4POigmH8xJtoJ0imToOLLIQQ==
+  dependencies:
+    "@babel/core" "^7.15.0"
+    "@babel/generator" "^7.15.0"
+    "@babel/parser" "^7.15.3"
+    "@babel/traverse" "^7.15.0"
+    "@babel/types" "^7.15.0"
+    "@vue/shared" "^3.2.4"
+    htmlparser2 "^6.1.0"
+    magic-string "^0.25.7"
+    unplugin "^0.0.6"
+
 vue@^2.6.12:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
@@ -10400,6 +10432,11 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
+webpack-virtual-modules@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz#cd597c6d51d5a5ecb473eea1983a58fa8a17ded9"
+  integrity sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==
+
 webpack@^4.46.0:
   version "4.46.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"