zoeissleeping/discord-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ssr badly

Browse Source
This commit is contained in:
Zoe
2023-01-10 21:33:09 -06:00
parent cd76dfc147
commit a30bcfa0a8
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/MessagePane.vue
View File

@@ -52,10 +52,6 @@
</div> </div>
</template> </template>
<script async setup lang="ts">
</script>
<script lang="ts"> <script lang="ts">
import { useGlobalStore } from '~/stores/store'; import { useGlobalStore } from '~/stores/store';
import { io } from 'socket.io-client' import { io } from 'socket.io-client'

2
components/Sidebar.vue
View File

@@ -7,7 +7,7 @@
:to="'/channel/@me/' + dm.id"> :to="'/channel/@me/' + dm.id">
<div <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"> 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> </div>
</nuxt-link> </nuxt-link>
</div> </div>

6
layouts/default.vue
View File

@@ -1,5 +1,5 @@
<template> <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"/> <Nav :user="user"/>
<Sidebar :server="activeServer" <Sidebar :server="activeServer"
:user="user" /> :user="user" />
@@ -10,7 +10,9 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Nav, Sidebar } from '~/.nuxt/components'
import { useGlobalStore } from '~/stores/store' import { useGlobalStore } from '~/stores/store'
import { IUser } from '~/types'
export default { export default {
data() { data() {
@@ -24,7 +26,7 @@ export default {
const userStore = useGlobalStore() const userStore = useGlobalStore()
const sessionToken = useCookie('sessionToken') const sessionToken = useCookie('sessionToken')
if (userStore.user.id === undefined && sessionToken.value) { if (userStore.user.id === undefined && sessionToken.value) {
const user = await $fetch('/api/getCurrentUser') const user: IUser = await $fetch('/api/getCurrentUser')
if (!user) return; if (!user) return;

2
nuxt.config.ts
View File

@@ -1,7 +1,7 @@
// https://v3.nuxtjs.org/api/configuration/nuxt.config // https://v3.nuxtjs.org/api/configuration/nuxt.config
export default { export default {
ssr: false, ssr: true,
app: { app: {
head: { head: {
meta: [ meta: [

2
pages/channel/[id].vue
View File

@@ -7,7 +7,7 @@ const route = useRoute()
const server: IChannel = await $fetch(`/api/channels/${route.params.id}`) 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) { if (realServer) {
useGlobalStore().addServer(realServer); useGlobalStore().addServer(realServer);

5
stores/store.ts
View File

@@ -10,11 +10,11 @@ export const useGlobalStore = defineStore('global', {
this.user = user; this.user = user;
}, },
addServer(server: IServer) { 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) this.user.servers.push(server)
}, },
addDM(dmChannel: IChannel) { 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) this.user.channels.push(dmChannel)
}, },
setActive(type: string, serverId: string) { setActive(type: string, serverId: string) {
@@ -22,6 +22,7 @@ export const useGlobalStore = defineStore('global', {
this.activeServer = {} this.activeServer = {}
return; return;
} }
if (!this.user.channels || !this.user.servers) return;
type = (type === 'dm') ? 'channels' : 'servers' type = (type === 'dm') ? 'channels' : 'servers'