various bug fixes

This commit is contained in:
Zoe
2023-04-21 01:25:27 -05:00
parent 3ea8167569
commit 4890d657b5
12 changed files with 137 additions and 41 deletions

View File

@@ -1,16 +1,11 @@
<template>
<Suspense>
<div class="flex h-screen max-h-screen text-white">
<Nav />
<Sidebar />
<div class="w-[calc(100vw-88px-240px)] h-full">
<slot />
</div>
</div>
<template #fallback>
Loading...
</template>
</Suspense>
<div class="flex h-screen max-h-screen text-white">
<Nav />
<Sidebar />
<div class="w-[calc(100vw-88px-240px)] h-full">
<slot />
</div>
</div>
</template>
<script lang="ts">
@@ -21,8 +16,7 @@ import { io } from 'socket.io-client';
export default {
async setup() {
const globalStore = useGlobalStore();
const sessionToken = useCookie('sessionToken');
if (globalStore.user.id === undefined && sessionToken.value) {
if (globalStore.user.id === undefined) {
const route = useRoute();
const headers = useRequestHeaders(['cookie']) as Record<string, string>;
const [user, { dms, servers }] = await Promise.all([
@@ -37,7 +31,13 @@ export default {
globalStore.setServers(servers);
globalStore.setDms(dms);
if (route.params.id && typeof route.params.id === 'string') {
if (!globalStore.getServerByChannelId(route.params.id)) {
navigateTo('/');
return;
}
globalStore.setActiveServer(route.path.includes('@me') ? 'dms' : 'servers', route.params.id);
} else {
globalStore.setActiveServerType(route.path.includes('@me') ? 'dms' : 'servers');
}
}
},