From 3511bedaec19779e81a902e1117d5943b645277a Mon Sep 17 00:00:00 2001
From: SebClem <seb6596@gmail.com>
Date: Thu, 16 Jun 2022 12:23:36 +0200
Subject: [PATCH] :hammer: Redirect if guild is not available

---
 .vscode/settings.json       |  4 +-
 src/stores/mutualGuilds.ts  |  2 +-
 src/tools/GuildTools.ts     | 20 +++++++++
 src/views/GuildHomeView.vue | 83 ++++++++++++++++++++-----------------
 src/views/HomeView.vue      | 28 +++++++------
 5 files changed, 86 insertions(+), 51 deletions(-)
 create mode 100644 src/tools/GuildTools.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0a2328e..ffab266 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,5 +13,7 @@
   "javascript.inlayHints.propertyDeclarationTypes.enabled": true,
   "javascript.inlayHints.parameterNames.suppressWhenArgumentMatchesName": true,
   "javascript.inlayHints.parameterNames.enabled": "literals",
-  
+  "emmet.includeLanguages": {
+    "vue": "html"
+  }
 }
diff --git a/src/stores/mutualGuilds.ts b/src/stores/mutualGuilds.ts
index b543514..edc2440 100644
--- a/src/stores/mutualGuilds.ts
+++ b/src/stores/mutualGuilds.ts
@@ -6,7 +6,7 @@ export const useMutualGuildsStore = defineStore({
   state: () => ({
     guilds: [] as Array<Guild>,
     loaded: false,
-    lastGuildId: "",
+    lastGuildId: undefined as string | undefined,
   }),
   getters: {},
   actions: {
diff --git a/src/tools/GuildTools.ts b/src/tools/GuildTools.ts
new file mode 100644
index 0000000..78e257c
--- /dev/null
+++ b/src/tools/GuildTools.ts
@@ -0,0 +1,20 @@
+import type { Guild } from "@/data/Guild";
+import { useMutualGuildsStore } from "@/stores/mutualGuilds";
+import type { Router } from "vue-router";
+
+function redirectIfNoGuild(guild: Guild | undefined, router: Router) {
+  const guildStore = useMutualGuildsStore();
+  if (!guild) {
+    guildStore.lastGuildId = guildStore.guilds[0]?.id;
+    if (guildStore.lastGuildId) {
+      router.push({
+        name: "guildHome",
+        params: { guildId: guildStore.lastGuildId },
+      });
+    } else {
+      router.push({ name: "home" });
+    }
+  }
+}
+
+export { redirectIfNoGuild };
diff --git a/src/views/GuildHomeView.vue b/src/views/GuildHomeView.vue
index 70cbde0..dc079a2 100644
--- a/src/views/GuildHomeView.vue
+++ b/src/views/GuildHomeView.vue
@@ -1,58 +1,67 @@
 <template>
-  <v-row>
-    <v-col>
-      <v-card>
-        <v-card-title class="d-flex">
-          <v-avatar :color="guild?.iconUrl ? '' : 'grey-darken-3'" class="mr-3">
-            <v-img v-if="guild?.iconUrl" :src="guild.iconUrl"></v-img>
-            <template v-if="!guild?.iconUrl">{{ guild?.name[1] }}</template>
-          </v-avatar>
-          <span class="mr-auto">{{ guild?.name }}</span>
-          <v-icon
-            icon="mdi-account-wrench"
-            color="green"
-            v-if="guild?.canManage"
-          ></v-icon>
-        </v-card-title>
-      </v-card>
-    </v-col>
-  </v-row>
-  <v-row>
-    <v-col>
-      <v-container>
-        <v-row>
-          <v-col cols="6">
-            <MusicPreviewComponent></MusicPreviewComponent>
-          </v-col>
-          <v-col cols="6">
-            <StatsPreviewComponent></StatsPreviewComponent>
-          </v-col>
-          <v-col cols="6">
-            <SettingPreviewComponent />
-          </v-col>
-        </v-row>
-      </v-container>
-    </v-col>
-  </v-row>
+  <div>
+    <v-row>
+      <v-col>
+        <v-card>
+          <v-card-title class="d-flex">
+            <v-avatar
+              :color="guild?.iconUrl ? '' : 'grey-darken-3'"
+              class="mr-3"
+            >
+              <v-img v-if="guild?.iconUrl" :src="guild.iconUrl"></v-img>
+              <template v-if="!guild?.iconUrl">{{ guild?.name[1] }}</template>
+            </v-avatar>
+            <span class="mr-auto">{{ guild?.name }}</span>
+            <v-icon
+              icon="mdi-account-wrench"
+              color="green"
+              v-if="guild?.canManage"
+            ></v-icon>
+          </v-card-title>
+        </v-card>
+      </v-col>
+    </v-row>
+    <v-row>
+      <v-col>
+        <v-container>
+          <v-row>
+            <v-col cols="6">
+              <MusicPreviewComponent></MusicPreviewComponent>
+            </v-col>
+            <v-col cols="6">
+              <StatsPreviewComponent></StatsPreviewComponent>
+            </v-col>
+            <v-col cols="6">
+              <SettingPreviewComponent />
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-col>
+    </v-row>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { useMutualGuildsStore } from "@/stores/mutualGuilds";
 import { ref, watch } from "vue";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import SettingPreviewComponent from "../components/guild/home/SettingPreviewComponent.vue";
 import MusicPreviewComponent from "../components/guild/home/MusicPreviewComponent.vue";
 import StatsPreviewComponent from "../components/guild/home/StatsPreviewComponent.vue";
+import { redirectIfNoGuild } from "@/tools/GuildTools";
 
 const guildStore = useMutualGuildsStore();
 const route = useRoute();
+const router = useRouter();
 
 const guild = ref(guildStore.getGuild(route.params.guildId as string));
-
+redirectIfNoGuild(guild.value, router);
 watch(
   () => route.params.guildId,
   (value, oldValue) => {
     guild.value = guildStore.getGuild(value as string);
+    guildStore.lastGuildId = guild.value?.id;
+    redirectIfNoGuild(guild.value, router);
   }
 );
 </script>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 044edf7..f86f458 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,11 +1,13 @@
 <template>
-  <v-row v-if="!userStore.isLoggedIn">
-    <v-col>
-      <v-btn to="/oauth2/redirect" prepend-icon="mdi-discord" color="primary">
-        Login
-      </v-btn>
-    </v-col>
-  </v-row>
+  <div>
+    <v-row v-if="!userStore.isLoggedIn">
+      <v-col>
+        <v-btn to="/oauth2/redirect" prepend-icon="mdi-discord" color="primary">
+          Login
+        </v-btn>
+      </v-col>
+    </v-row>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -20,12 +22,14 @@ const router = useRouter();
 onBeforeMount(() => {
   if (userStore.isLoggedIn) {
     if (!mutualGuildStore.lastGuildId) {
-      mutualGuildStore.lastGuildId = mutualGuildStore.guilds[0].id;
+      mutualGuildStore.lastGuildId = mutualGuildStore.guilds[0]?.id;
+    }
+    if (mutualGuildStore.lastGuildId) {
+      router.push({
+        name: "guildHome",
+        params: { guildId: mutualGuildStore.lastGuildId },
+      });
     }
-    router.push({
-      name: "guildHome",
-      params: { guildId: mutualGuildStore.lastGuildId },
-    });
   }
 });
 </script>