From 6cc91d58ce055d07ae1bd4b53d941cd71c505662 Mon Sep 17 00:00:00 2001
From: legonzaur <legonzaur@live.fr>
Date: Thu, 27 Jun 2024 19:40:29 +0200
Subject: [PATCH] Feat : end turn

---
 components/CardsGrouped.vue |  1 -
 components/MarketCards.vue  | 15 +++++++++++----
 components/PlayerSlot.vue   |  3 +--
 netcode/interfaces.ts       | 35 +++++++++++++++++++++++++++++++++++
 nuxt.config.ts              | 14 ++++++--------
 pages/game/[id].vue         |  4 ++--
 6 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 netcode/interfaces.ts

diff --git a/components/CardsGrouped.vue b/components/CardsGrouped.vue
index d8e1579..c675c41 100644
--- a/components/CardsGrouped.vue
+++ b/components/CardsGrouped.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { containerEvents } from '~/netcode/events';
 import type { Container } from '~/netcode/interfaces';
-import type { CardParser } from '~/netcode/interfaces/cards';
 
 export interface Props {
     container: Container
diff --git a/components/MarketCards.vue b/components/MarketCards.vue
index 60ed6c7..837d0ef 100644
--- a/components/MarketCards.vue
+++ b/components/MarketCards.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts">
-import goStore, { buy, useEffect } from '@/netcode';
-import { CardEffects, type Effect } from '@/netcode/Effect'
-import { CardType } from '@/netcode/Card'
-import gsap from 'gsap'
+import type { Container } from '~/netcode/interfaces';
 
 
 
+export interface Props {
+    container: Container
+}
+
+const props = defineProps<Props>()
+
+const authStore = useAuthStore()
+
+const selfPlayer = computed(() => authStore.logged ? playerList.value?.find(p => p.user.userId == authStore.selfUser.userId) : undefined)
+
 const isTurn = computed(() => goStore.self && goStore.current_game?.started && (goStore.self.team == goStore.current_game.current_turn))
 const clientStore = useClientSideStore()
 
diff --git a/components/PlayerSlot.vue b/components/PlayerSlot.vue
index 9d30036..9887040 100644
--- a/components/PlayerSlot.vue
+++ b/components/PlayerSlot.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { endTurn } from "~/netcode";
-import type { Game, Player } from "~/netcode/interfaces";
-import { CardEffects, type CardParser } from "~/netcode/interfaces/cards";
+import type { Game, Player } from '~/netcode/interfaces';
 import { useClientSideStore } from "~/stores/turn";
 
 export interface Props {
diff --git a/netcode/interfaces.ts b/netcode/interfaces.ts
new file mode 100644
index 0000000..35b9adf
--- /dev/null
+++ b/netcode/interfaces.ts
@@ -0,0 +1,35 @@
+export interface GameObject {
+  _id: string;
+}
+
+export interface Game extends GameObject {
+  fireGems: Container;
+  market: Container;
+  marketStack: Container;
+  teams: Team[];
+  currentTurn: string;
+}
+
+export interface Team extends GameObject {
+  players: Player[];
+}
+
+export interface Player extends GameObject {
+  board: Container;
+  discard: Container;
+  hand: Container;
+  stack: Container;
+  user: User;
+}
+
+export interface User extends GameObject {
+  userId: string;
+}
+
+export interface Container extends GameObject {
+  cards: Card[];
+}
+
+export interface Card extends GameObject {
+  cardId: number;
+}
diff --git a/nuxt.config.ts b/nuxt.config.ts
index f15254e..6f4b71f 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -4,12 +4,10 @@ export default defineNuxtConfig({
   ssr: false,
   runtimeConfig: {
     public: {
-      endpoint: 'http://localhost:8765', // can be overridden by NUXT_PUBLIC_ENDPOINT environment variable
-      discordLoginEndpoint: ''
-    }
+      endpoint: "http://localhost:8765", // can be overridden by NUXT_PUBLIC_ENDPOINT environment variable
+      discordLoginEndpoint:
+        "https://discord.com/oauth2/authorize?client_id=460020057867681792&response_type=code&redirect_uri=http%3A%2F%2Flocalhost%3A8765%2Flogin&scope=identify",
+    },
   },
-  modules: [
-    '@pinia/nuxt',
-    '@pinia-plugin-persistedstate/nuxt',
-  ],
-})
+  modules: ["@pinia/nuxt", "@pinia-plugin-persistedstate/nuxt"],
+});
diff --git a/pages/game/[id].vue b/pages/game/[id].vue
index 279bcf1..c2d1583 100644
--- a/pages/game/[id].vue
+++ b/pages/game/[id].vue
@@ -131,7 +131,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <div @contextmenu.prevent="false" id="game_board">
+    <div @contextmenu.prevent="false" id="game_board" v-if="game">
         <AnimatedBackground @ready="loaded = true"></AnimatedBackground>
         <div id="stack_discard">
             <div id="stack">
@@ -145,7 +145,7 @@ onUnmounted(() => {
             </div>
         </div>
 
-        <!-- <MarketCards></MarketCards> -->
+        <!-- <MarketCards :container="game.market"></MarketCards> -->
 
         <div id="player_list_container">
             <div id="player_list">