From a30bcfa0a87efdd70ef2b5e9ac050b6f8c7bc6cf Mon Sep 17 00:00:00 2001
From: juls0730 <juliangarner240@gmail.com>
Date: Tue, 10 Jan 2023 21:33:09 -0600
Subject: [PATCH] fixed ssr badly

---
 components/MessagePane.vue | 4 ----
 components/Sidebar.vue     | 2 +-
 layouts/default.vue        | 6 ++++--
 nuxt.config.ts             | 2 +-
 pages/channel/[id].vue     | 2 +-
 stores/store.ts            | 5 +++--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/components/MessagePane.vue b/components/MessagePane.vue
index 186724b..848bef1 100644
--- a/components/MessagePane.vue
+++ b/components/MessagePane.vue
@@ -52,10 +52,6 @@
 	</div>
 </template>
 
-<script async setup lang="ts">
-
-</script>
-
 <script lang="ts">
 import { useGlobalStore } from '~/stores/store';
 import { io } from 'socket.io-client'
diff --git a/components/Sidebar.vue b/components/Sidebar.vue
index 5ba4d6b..031ea2f 100644
--- a/components/Sidebar.vue
+++ b/components/Sidebar.vue
@@ -7,7 +7,7 @@
 					:to="'/channel/@me/' + dm.id">
 					<div
 						class="mx-2 my-4 hover:bg-[hsl(223,calc(1*6.9%),25.8%)] px-2 py-2 w-[calc(240px-1rem)] max-h-10 h-10 overflow-ellipsis rounded-md transition-colors">
-						{{ (dm.name).split('-').filter((e: string) => e !== user.id)[0] }}
+						{{ (dm.name).split('-').find((e: string) => e !== user.id) }}
 					</div>
 				</nuxt-link>
 			</div>
diff --git a/layouts/default.vue b/layouts/default.vue
index e2a0a74..f20f639 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex h-screen max-h-screen text-white">
+	<div v-if="user.id" class="flex h-screen max-h-screen text-white">
 		<Nav :user="user"/>
 		<Sidebar :server="activeServer"
 			:user="user" />
@@ -10,7 +10,9 @@
 </template>
   
 <script lang="ts">
+import { Nav, Sidebar } from '~/.nuxt/components'
 import { useGlobalStore } from '~/stores/store'
+import { IUser } from '~/types'
 
 export default {
 	data() {
@@ -24,7 +26,7 @@ export default {
 		const userStore = useGlobalStore()
 		const sessionToken = useCookie('sessionToken')
 		if (userStore.user.id === undefined && sessionToken.value) {
-			const user = await $fetch('/api/getCurrentUser')
+			const user: IUser = await $fetch('/api/getCurrentUser')
 
 			if (!user) return;
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 5f44717..ccb6157 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,7 +1,7 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 
 export default {
-    ssr: false,
+    ssr: true,
     app: {
         head: {
             meta: [
diff --git a/pages/channel/[id].vue b/pages/channel/[id].vue
index 80c8900..d83529a 100644
--- a/pages/channel/[id].vue
+++ b/pages/channel/[id].vue
@@ -7,7 +7,7 @@ const route = useRoute()
 
 const server: IChannel = await $fetch(`/api/channels/${route.params.id}`)
 
-const realServer = useGlobalStore().user.servers.find((e) => e.channels.some((el) => el.id == route.params.id))
+const realServer = useGlobalStore().user.servers.filter((e) => e.channels.some((el) => el.id == route.params.id))[0]
 
 if (realServer) {
 	useGlobalStore().addServer(realServer);
diff --git a/stores/store.ts b/stores/store.ts
index 8b516e9..d2264d6 100644
--- a/stores/store.ts
+++ b/stores/store.ts
@@ -10,11 +10,11 @@ export const useGlobalStore = defineStore('global', {
 			this.user = user;
 		},
 		addServer(server: IServer) {
-			if (this.user.servers.find((e) => e.id === server.id)) return;
+			if (!this.user.servers || this.user.servers.find((e) => e.id === server.id)) return;
 			this.user.servers.push(server)
 		},
 		addDM(dmChannel: IChannel) {
-			if (this.user.channels.includes(dmChannel)) return;
+			if (!this.user.channels || this.user.channels.find((e) => e.id === dmChannel.id)) return;
 			this.user.channels.push(dmChannel)
 		},
 		setActive(type: string, serverId: string) {
@@ -22,6 +22,7 @@ export const useGlobalStore = defineStore('global', {
 				this.activeServer = {}
 				return;
 			}
+			if (!this.user.channels || !this.user.servers) return;
 
 			type = (type === 'dm') ? 'channels' : 'servers'