MMMMMMMMMMMMMMMM types

pages/channel/@me/[id].vue

@@ -4,6 +4,7 @@
 
 <script lang="ts">
 import { useGlobalStore } from '~/stores/store'
+import { IChannel } from '~/types'
 
 definePageMeta({
 	middleware: 'auth'
@@ -13,18 +14,17 @@ export default {
 	async setup() {
 		const route = useRoute()
 
-		const { channel: server } = await $fetch(`/api/channels/${route.params.id}`)
+		const server: IChannel = await $fetch(`/api/channels/${route.params.id}`)
 		if (!server) return;
 		useGlobalStore().addDM(server);
-		await useGlobalStore().setActive('dms', server.id);
+		useGlobalStore().setActive('dms', server.id);
 
-		console.log(server)
 		return {
 			server,
 		}
 	},
 	async updated() {
-		if (!useGlobalStore().activeServer == this.server) await useGlobalStore().setActive('dms', this.server.id)
+		if (!useGlobalStore().activeServer == this.server) useGlobalStore().setActive('dms', this.server.id)
 	},
 }
 </script>

pages/channel/@me/index.vue

@@ -5,8 +5,9 @@
 	</form>
 </template>
 
-<script>
+<script lang="ts">
 import { useGlobalStore } from '~/stores/store'
+import { IChannel } from '~/types'
 
 definePageMeta({  
   middleware: 'auth'
@@ -20,7 +21,7 @@ export default {
 	},
 	methods: {
 		async startDM() {
-			const { server } = await $fetch('/api/channels/createDM', { method: 'post', body: { partnerId: this.userId } })
+			const server: IChannel = await $fetch('/api/channels/createDM', { method: 'post', body: { partnerId: this.userId } }) 
 
 			useGlobalStore().addDM(server)
 			useRouter().push({ path: '/channel/@me/' + server.id })

pages/channel/[id].vue

@@ -2,36 +2,34 @@
 	<MessagePane :server="server" />
 </template>
 
+<script async setup lang="ts">
+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))
+
+if (realServer) {
+	useGlobalStore().addServer(realServer);
+	useGlobalStore().setActive('servers', realServer.id)
+}
+</script>
+
 <script lang="ts">
 import { useGlobalStore } from '~/stores/store'
+import { IChannel } from '~/types'
 
 definePageMeta({
 	middleware: 'auth'
 })
 
 export default {
-	async setup() {
-		const route = useRoute()
-
-		const { channel: server } = await $fetch(`/api/channels/${route.params.id}`)
-		if (!server) return;
-
-		const realServer = await useGlobalStore().user.servers.find((e) => e.channels.some((el) => el.id == route.params.id ) )
-
-		useGlobalStore().addServer(realServer);
-		await useGlobalStore().setActive('servers', realServer.id)
-
-
-		return {
-			server
-		}
-	},
 	async updated() {
 		if (!this.server) return;
 
 		this.server = await $fetch(`/api/channels/${route.params.id}`);
 
-		if (!await useGlobalStore().activeServer == this.server.id) await useGlobalStore().setActive('servers', this.server.id)
+		if (!useGlobalStore().activeServer == this.server.id) useGlobalStore().setActive('servers', this.server.id)
 	}
 }
 </script>

pages/login.vue

@@ -20,8 +20,9 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import { useGlobalStore } from '~/stores/store'
+import { IUser } from '~/types';
 
 definePageMeta({
 	layout: 'clean'
@@ -42,14 +43,14 @@ export default {
 					username: this.username,
 					password: this.password
 				}
-			})
+			}) as { userId: string; token: string; user: IUser; }
 
 			const userId = useCookie('userId')
 			userId.value = user.userId
 			const token = useCookie('sessionToken')
 			token.value = user.token
 
-			useGlobalStore().setUser(user)
+			useGlobalStore().setUser(user.user)
 
 			navigateTo('/channel/@me')
 		}

pages/signup.vue

@@ -29,8 +29,10 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import { NuxtLink } from '~/.nuxt/components';
 import { useGlobalStore } from '~/stores/store'
+import { IUser } from '~/types';
 
 definePageMeta({
 	layout: 'clean'
@@ -53,14 +55,14 @@ export default {
 					email: this.email,
 					password: this.password
 				}
-			})
+			}) as { userId: string; token: string; user: IUser; }
 
 			const userId = useCookie('userId')
 			userId.value = user.userId
 			const token = useCookie('sessionToken')
 			token.value = user.token
 
-			useGlobalStore().setUser(user)
+			useGlobalStore().setUser(user.user)
 
 			navigateTo('/channel/@me')
 		}