From d92739bbd6a7180770924407b125b21aa96c51af Mon Sep 17 00:00:00 2001
From: legonzaur <legonzaur@live.fr>
Date: Sun, 29 Dec 2024 23:39:15 +0100
Subject: [PATCH] feat : lobby

---
 app.vue                           |  18 ++--
 components/conceptHeader.vue      |  71 +++++++++++++++
 components/header.vue             |  52 -----------
 components/lobby/game.vue         |  29 +++++++
 lobby.events.ts                   |  21 -----
 middleware/auth.global.ts         |   7 +-
 netcode/events                    |   2 +-
 netcode/handlers/lobby.handler.ts |  28 ++++++
 pages/game/[id].vue               |   1 +
 pages/index.vue                   |  48 +++++++----
 pages/words.vue                   |  18 +---
 service/game.service.ts           |  13 ---
 store/lobby.store.ts              |  70 ++++++++++-----
 store/word.store.ts               | 138 ++++++++++++++++++------------
 14 files changed, 313 insertions(+), 203 deletions(-)
 create mode 100644 components/conceptHeader.vue
 delete mode 100644 components/header.vue
 create mode 100644 components/lobby/game.vue
 delete mode 100644 lobby.events.ts
 create mode 100644 netcode/handlers/lobby.handler.ts
 create mode 100644 pages/game/[id].vue
 delete mode 100644 service/game.service.ts

diff --git a/app.vue b/app.vue
index 00c8942..814ae35 100644
--- a/app.vue
+++ b/app.vue
@@ -1,12 +1,18 @@
 <script setup lang="ts">
-import { useUserStore } from '~/store/user.store';
+import { useUserStore } from "~/store/user.store";
+import { useLobbyStore } from "./store/lobby.store";
 const userStore = useUserStore();
+const lobbyStore = useLobbyStore();
 
+userStore.whoami();
+lobbyStore.fetchGames();
+onBeforeMount(() => {
+  lobbyStore.subscribe();
+});
 
-const req = await userStore.whoami()
-
-
-
+onBeforeUnmount(() => {
+  lobbyStore.close();
+});
 </script>
 
 <template>
@@ -14,7 +20,7 @@ const req = await userStore.whoami()
     <NuxtRouteAnnouncer />
     <NuxtLayout>
       <NuxtLoadingIndicator> Loading... </NuxtLoadingIndicator>
-      <Header />
+      <ConceptHeader />
       <NuxtPage />
     </NuxtLayout>
   </div>
diff --git a/components/conceptHeader.vue b/components/conceptHeader.vue
new file mode 100644
index 0000000..047edf1
--- /dev/null
+++ b/components/conceptHeader.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { GameResponseDTO } from "~/netcode/events/dto/gameresponse.dto";
+import { useLobbyStore } from "~/store/lobby.store";
+import { useUserStore } from "~/store/user.store";
+
+const userStore = useUserStore();
+const lobbyStore = useLobbyStore();
+
+const currentGames = computed(() => {
+  const games = Object.values(lobbyStore.games).filter((g) =>
+    g.players.some((p) => p.user.id == userStore.self?.id)
+  );
+  console.log(games);
+  return games;
+});
+</script>
+
+<template>
+  <header>
+    <div id="self">
+      <template v-if="userStore.has_contacted">
+        <ClientOnly>
+          <template v-if="userStore.self && userStore.self.id">
+            <User :id="userStore.self.id"></User>
+            <button>Logout</button>
+          </template>
+          <button v-else>Login</button>
+        </ClientOnly>
+      </template>
+
+      <template v-else> Contacting server... </template>
+    </div>
+
+    <div id="links">
+      <NuxtLink to="/">Home</NuxtLink>
+      <NuxtLink to="/words">Words</NuxtLink>
+    </div>
+
+    <div id="games">
+      <NuxtLink v-for="game of currentGames" :to="'/game/' + game.id"
+        ><div>Back to Current Game</div></NuxtLink
+      >
+    </div>
+  </header>
+</template>
+
+<style lang="css" scoped>
+header,
+header * {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-wrap: nowrap;
+}
+header > * {
+  flex: 1 1 0px;
+}
+
+div#self {
+  gap: 10px;
+  height: 32px;
+}
+
+div#links {
+  flex-grow: 4;
+  gap: 1%;
+}
+
+div#links {
+}
+</style>
diff --git a/components/header.vue b/components/header.vue
deleted file mode 100644
index 95d5054..0000000
--- a/components/header.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<script setup lang="ts">
-
-import { useUserStore } from '~/store/user.store';
-
-const userStore = useUserStore();
-
-</script>
-
-<template>
-    <header>
-        <div id="self">
-            <template v-if="userStore.has_contacted">
-                <ClientOnly>
-                    <template v-if="userStore.self && userStore.self.id">
-                        <User :id="userStore.self.id"></User>
-                        <button>Logout</button>
-                    </template>
-                    <button v-else>Login</button>
-                </ClientOnly>
-            </template>
-
-            <template v-else>
-                Contacting server...
-            </template>
-        </div>
-
-        <div id="links">
-            <NuxtLink to="/">Home</NuxtLink>
-            <NuxtLink to="/words">Words</NuxtLink>
-        </div>
-
-    </header>
-</template>
-
-<style lang="css" scoped>
-header,
-header * {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-wrap: nowrap;
-}
-
-div#self {
-    height: 32px
-}
-
-div#links {
-    width: 100%;
-    gap: 1%;
-}
-</style>
\ No newline at end of file
diff --git a/components/lobby/game.vue b/components/lobby/game.vue
new file mode 100644
index 0000000..2295307
--- /dev/null
+++ b/components/lobby/game.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { useLobbyStore } from "~/store/lobby.store";
+import { useUserStore } from "~/store/user.store";
+
+export interface Props {
+  id: number;
+}
+
+const loading = ref(false);
+
+const lobbyStore = useLobbyStore();
+const userStore = useUserStore();
+const props = defineProps<Props>();
+
+const game = lobbyStore.games[props.id];
+</script>
+
+<template>
+  {{ game }}
+  <NuxtLink :to="'/game/' + id"
+    ><input type="button" value="open" :disabled="!userStore.self || loading"
+  /></NuxtLink>
+</template>
+
+<style lang="css" scoped>
+input:disabled {
+  cursor: wait;
+}
+</style>
diff --git a/lobby.events.ts b/lobby.events.ts
deleted file mode 100644
index 3a98aa2..0000000
--- a/lobby.events.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { GameResponseDTO } from './dto/gameresponse.dto';
-import { PlayerResponseDTO } from './dto/playerresponse.dto';
-
-export class GameCreateEvent extends GameResponseDTO {
-  type: 'create';
-}
-
-export class GameDeleteEvent {
-  type: 'delete';
-  constructor(public id?: number) {}
-}
-export class GameJoinEvent {
-  type: 'joingame';
-  gameId: number;
-  constructor(
-    public player: PlayerResponseDTO,
-    game?: Partial<GameResponseDTO>,
-  ) {
-    this.gameId = game.id;
-  }
-}
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index 36f5e08..9b76e65 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -2,18 +2,19 @@ const validPaths = ["/", "/rules", "/test", "/words"];
 
 export default defineNuxtRouteMiddleware(async (to, from) => {
   const config = useRuntimeConfig();
+  if (to.path.startsWith("/game/")) {
+    return;
+  }
   if (to.path == "/login") {
-    console.log("hey")
     const code = to.query.code;
     if (!code) {
       navigateTo(config.public.discordLoginEndpoint, { external: true });
     } else {
       navigateTo("/login");
     }
-    return
+    return;
   }
 
-
   if (validPaths.includes(to.path)) {
     return;
   }
diff --git a/netcode/events b/netcode/events
index 72935ba..49adbde 160000
--- a/netcode/events
+++ b/netcode/events
@@ -1 +1 @@
-Subproject commit 72935ba3f59fa8b5399207937f28cc686e5239f6
+Subproject commit 49adbdec5b00604e725d1809a36a8bb94d4e9576
diff --git a/netcode/handlers/lobby.handler.ts b/netcode/handlers/lobby.handler.ts
new file mode 100644
index 0000000..34e90d2
--- /dev/null
+++ b/netcode/handlers/lobby.handler.ts
@@ -0,0 +1,28 @@
+import { useLobbyStore } from "~/store/lobby.store";
+import type { LobbyCreateEvent, LobbyDeleteEvent, LobbyJoinEvent, LobbyLeaveEvent, LobbyStartEvent } from "../events/lobby.events";
+
+
+
+export const handlers = {
+  create: (event: LobbyCreateEvent) => {
+    const lobbyStore = useLobbyStore();
+    lobbyStore.games[event.game.id] = event.game
+  },
+  start: (event:LobbyStartEvent)=>{
+    const lobbyStore = useLobbyStore()
+    lobbyStore.games[event.game.id].started = true
+  },
+  delete:(event: LobbyDeleteEvent)=>{
+    const lobbyStore = useLobbyStore()
+    delete lobbyStore.games[event.id]
+  },
+  join:(event: LobbyJoinEvent)=>{
+    const lobbyStore = useLobbyStore()
+    lobbyStore.games[event.game.id].players.push(event.player)
+  },
+  leave:(event: LobbyLeaveEvent)=>{
+    const lobbyStore = useLobbyStore()
+    const playerIndex = lobbyStore.games[event.game.id].players.findIndex(p=>p.user.id == event.player.user.id)
+    lobbyStore.games[event.game.id].players.splice(playerIndex,1)
+  }
+};
diff --git a/pages/game/[id].vue b/pages/game/[id].vue
new file mode 100644
index 0000000..773d3dd
--- /dev/null
+++ b/pages/game/[id].vue
@@ -0,0 +1 @@
+<template>Hello</template>
diff --git a/pages/index.vue b/pages/index.vue
index eb3d181..940a952 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,26 +1,38 @@
 <script setup lang="ts">
-import { subscribe } from "~/netcode";
-import { getGames } from "~/service/game.service";
+import { useLobbyStore } from "~/store/lobby.store";
+import { useUserStore } from "~/store/user.store";
 
-let eventSource: EventSource;
+const loading = ref(false);
+const lobbyStore = useLobbyStore();
+const userStore = useUserStore();
 
-const games = await getGames();
-
-onBeforeMount(() => {
-  eventSource = subscribe(`/games/subscribe`);
-  eventSource.addEventListener("message", async (message) => {
-    console.log(message);
-  });
-});
-
-onUnmounted(() => {
-  if (eventSource) {
-    eventSource.close();
+async function createGame() {
+  if (loading.value) {
+    return;
   }
-});
+  loading.value = true;
+  await lobbyStore.createGame().catch((e) => {
+    if (e.data.statusCode == 400) {
+      console.error("Owned game limit reached");
+    } else {
+      console.log(e);
+    }
+  });
+}
 </script>
 
 <template>
-  <div v-for="game in games" :key="game.id"></div>
-  <input type="button" value="Create Game" />
+  <LobbyGame v-for="game in lobbyStore.games" :key="game.id" :id="game.id" />
+  <input
+    type="button"
+    value="Create Game"
+    @click="createGame"
+    :disabled="!userStore.self"
+  />
 </template>
+
+<style lang="css" scoped>
+input:disabled {
+  cursor: wait;
+}
+</style>
diff --git a/pages/words.vue b/pages/words.vue
index 7c90638..14803fc 100644
--- a/pages/words.vue
+++ b/pages/words.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { subscribe } from "~/netcode";
-import { handlers } from "~/netcode/handlers/word.handler";
 import { useWordStore } from "~/store/word.store";
 
 const newWord = ref("");
@@ -11,7 +9,7 @@ await wordStore.fetchWordList();
 const loading = ref(false);
 const wordInput = ref<HTMLInputElement | null>(null);
 
-async function createWord(e: Event) {
+async function createWord() {
   if (loading.value) {
     return;
   }
@@ -29,22 +27,12 @@ async function createWord(e: Event) {
   }
 }
 
-let eventSource: EventSource;
 onBeforeMount(() => {
-  eventSource = subscribe(`/words/subscribe`);
-  eventSource.addEventListener("message", async (message) => {
-    const data = JSON.parse(message.data);
-    const type = data.type as string;
-    if (type in handlers) {
-      handlers[type as keyof typeof handlers](data);
-    }
-  });
+  wordStore.subscribe();
 });
 
 onUnmounted(() => {
-  if (eventSource) {
-    eventSource.close();
-  }
+  wordStore.close();
 });
 </script>
 
diff --git a/service/game.service.ts b/service/game.service.ts
deleted file mode 100644
index 2aa5674..0000000
--- a/service/game.service.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { GameResponseDTO } from "~/netcode/events/dto/gameresponse.dto";
-
-export async function getGames() {
-  const config = useRuntimeConfig();
-  const data = await useFetch<GameResponseDTO[]>(
-    config.public.endpoint + `/games`,
-    {
-      credentials: "include",
-      immediate: true,
-    }
-  );
-  return data.data
-}
diff --git a/store/lobby.store.ts b/store/lobby.store.ts
index a8cf455..283d38e 100644
--- a/store/lobby.store.ts
+++ b/store/lobby.store.ts
@@ -1,25 +1,55 @@
 import { defineStore } from "pinia";
+import { subscribe } from "~/netcode";
 import type { GameResponseDTO } from "~/netcode/events/dto/gameresponse.dto";
-import { UserResponseDTO } from "~/netcode/events/dto/userresponse.dto";
+import { handlers } from "~/netcode/handlers/lobby.handler";
 
 export const useLobbyStore = defineStore("lobby", {
-    state: () => ({
-        games: {} as Record<string, GameResponseDTO,
-    }),
-    actions: {
-        async fetchGames() {
-            const config = useRuntimeConfig();
-            const data = await useFetch<GameResponseDTO[]>(config.public.endpoint + `/users/` + id, {
-                credentials: "include",
-                immediate: true
-            })
-            if(data.data.value){
-                for(const game of data.data.value){
-                    this.games[game.id]  = game
-                } 
-            }
-           
-            return data.data
-        },
+  state: () => ({
+    games: {} as Record<number, GameResponseDTO>,
+    eventSource: null as null | EventSource,
+  }),
+  actions: {
+    async subscribe() {
+      this.eventSource = subscribe(`/games/subscribe`);
+      this.eventSource.addEventListener("message", async (message) => {
+        const data = JSON.parse(message.data);
+        const type = data.type as string;
+        if (type in handlers) {
+          handlers[type as keyof typeof handlers](data);
+        }
+      });
     },
-});
\ No newline at end of file
+    async close() {
+      this.eventSource?.close();
+    },
+    async fetchGames() {
+      const config = useRuntimeConfig();
+      const data = await useFetch<GameResponseDTO[]>(
+        config.public.endpoint + `/games/`,
+        {
+          credentials: "include",
+          immediate: true,
+        }
+      );
+      if (data.data.value) {
+        for (const game of data.data.value) {
+          this.games[game.id] = game;
+        }
+      }
+
+      return data.data;
+    },
+    async createGame() {
+      const config = useRuntimeConfig();
+      const data = await $fetch<GameResponseDTO>(
+        config.public.endpoint + "/games",
+        {
+          method: "POST",
+          credentials: "include",
+        }
+      );
+      this.games[data.id] = data;
+      return data;
+    },
+  },
+});
diff --git a/store/word.store.ts b/store/word.store.ts
index 06d743e..4ecfc82 100644
--- a/store/word.store.ts
+++ b/store/word.store.ts
@@ -1,60 +1,90 @@
 import { defineStore } from "pinia";
+import { subscribe } from "~/netcode";
 import { WordResponseDTO } from "~/netcode/events/dto/wordresponse.dto";
+import { handlers } from "~/netcode/handlers/word.handler";
 
 export const useWordStore = defineStore("word", {
-    state: () => ({
-        words: {} as Record<string, WordResponseDTO>,
-    }),
-    actions: {
-        async fetchWordList() {
-            const config = useRuntimeConfig();
-            const data = await useFetch<WordResponseDTO[]>(config.public.endpoint + `/words/all`, {
-                credentials: "include",
-            })
-            if (data.data.value && !data.error.value) {
-
-                for (const word of data.data.value) {
-                    this.words[word.id] = word
-                }
-            }
-            return data
-        },
-        async enableWord(word: WordResponseDTO) {
-            const config = useRuntimeConfig();
-            const data = await $fetch<WordResponseDTO>(config.public.endpoint + `/words/` + word.id + "/enable", {
-                credentials: "include",
-                method: "PUT"
-            })
-            word.enabled = true
-            return data
-        },
-        async disableWord(word: WordResponseDTO) {
-            const config = useRuntimeConfig();
-            const data = await $fetch<WordResponseDTO>(config.public.endpoint + `/words/` + word.id + "/disable", {
-                credentials: "include",
-                method: "PUT"
-            })
-            word.enabled = false
-            return data
-        },
-
-        async createWord(value: string) {
-            const config = useRuntimeConfig();
-            const data = await $fetch<WordResponseDTO>(config.public.endpoint + `/words/`, {
-                credentials: "include",
-                body: { value },
-                method: "POST"
-            })
-            this.words[data.id] = data
-            return data
-        },
-        async deleteWord(word: WordResponseDTO){
-            const config = useRuntimeConfig();
-            const data = await $fetch<WordResponseDTO>(config.public.endpoint + `/words/`+word.id, {
-                credentials: "include",
-                method: "DELETE"
-            })
-            delete this.words[word.id]
+  state: () => ({
+    words: {} as Record<string, WordResponseDTO>,
+    eventSource: null as null | EventSource,
+  }),
+  actions: {
+    async subscribe() {
+      this.eventSource = subscribe(`/words/subscribe`);
+      this.eventSource.addEventListener("message", async (message) => {
+        const data = JSON.parse(message.data);
+        const type = data.type as string;
+        if (type in handlers) {
+          handlers[type as keyof typeof handlers](data);
         }
+      });
     },
-});
\ No newline at end of file
+    async close() {
+      this.eventSource?.close();
+    },
+    async fetchWordList() {
+      const config = useRuntimeConfig();
+      const data = await useFetch<WordResponseDTO[]>(
+        config.public.endpoint + `/words/all`,
+        {
+          credentials: "include",
+        }
+      );
+      if (data.data.value && !data.error.value) {
+        for (const word of data.data.value) {
+          this.words[word.id] = word;
+        }
+      }
+      return data;
+    },
+    async enableWord(word: WordResponseDTO) {
+      const config = useRuntimeConfig();
+      const data = await $fetch<WordResponseDTO>(
+        config.public.endpoint + `/words/` + word.id + "/enable",
+        {
+          credentials: "include",
+          method: "PUT",
+        }
+      );
+      word.enabled = true;
+      return data;
+    },
+    async disableWord(word: WordResponseDTO) {
+      const config = useRuntimeConfig();
+      const data = await $fetch<WordResponseDTO>(
+        config.public.endpoint + `/words/` + word.id + "/disable",
+        {
+          credentials: "include",
+          method: "PUT",
+        }
+      );
+      word.enabled = false;
+      return data;
+    },
+
+    async createWord(value: string) {
+      const config = useRuntimeConfig();
+      const data = await $fetch<WordResponseDTO>(
+        config.public.endpoint + `/words/`,
+        {
+          credentials: "include",
+          body: { value },
+          method: "POST",
+        }
+      );
+      this.words[data.id] = data;
+      return data;
+    },
+    async deleteWord(word: WordResponseDTO) {
+      const config = useRuntimeConfig();
+      const data = await $fetch<WordResponseDTO>(
+        config.public.endpoint + `/words/` + word.id,
+        {
+          credentials: "include",
+          method: "DELETE",
+        }
+      );
+      delete this.words[word.id];
+    },
+  },
+});