From e3af9d7acbb1a6a92b91b827fa4e511bfc60b3ab Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sun, 21 Jul 2024 20:31:13 +0200
Subject: [PATCH] Removed gmPanel store and moved its logics to gameStore

---
 src/components/utilities/GmPanel.vue          |  6 ++---
 src/components/utilities/GmTools.vue          |  6 ++---
 .../zoneEditor/partials/ZoneSettings.vue      | 13 ++++++----
 src/stores/game.ts                            | 24 +++++++++++--------
 src/stores/gmPanel.ts                         | 20 ----------------
 5 files changed, 28 insertions(+), 41 deletions(-)
 delete mode 100644 src/stores/gmPanel.ts

diff --git a/src/components/utilities/GmPanel.vue b/src/components/utilities/GmPanel.vue
index 8588330..35a7dd0 100644
--- a/src/components/utilities/GmPanel.vue
+++ b/src/components/utilities/GmPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <Modal :isModalOpen="gmPanelStore.isOpen" @modal:close="() => gmPanelStore.toggle()" :modal-width="1000" :modal-height="650">
+  <Modal :isModalOpen="gameStore.isGmPanelOpen" @modal:close="() => gameStore.toggleGmPanel()" :modal-width="1000" :modal-height="650">
     <template #modalHeader>
       <h3 class="m-0 font-medium shrink-0">GM Panel</h3>
       <div class="flex gap-1.5 flex-wrap">
@@ -21,9 +21,9 @@
 import { ref } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
 import AssetManager from '@/components/utilities/assetManager/AssetManager.vue'
-import { useGmPanelStore } from '@/stores/gmPanel'
+import { useGameStore } from '@/stores/game'
 
-const gmPanelStore = useGmPanelStore()
+const gameStore = useGameStore()
 
 let toggle = ref('asset-manager')
 </script>
diff --git a/src/components/utilities/GmTools.vue b/src/components/utilities/GmTools.vue
index cc85d78..963037c 100644
--- a/src/components/utilities/GmTools.vue
+++ b/src/components/utilities/GmTools.vue
@@ -5,7 +5,7 @@
     </template>
     <template #modalBody>
       <div class="content flex flex-col gap-2.5 m-4 h-20">
-        <button class="btn-cyan py-1.5 px-4 w-full" type="button" @click="gmPanelStore.toggle()">Toggle GM panel</button>
+        <button class="btn-cyan py-1.5 px-4 w-full" type="button" @click="gameStore.toggleGmPanel()">Toggle GM panel</button>
         <button class="btn-cyan py-1.5 px-4 w-full" type="button" @click="() => zoneEditorStore.toggleActive()">Zone manager</button>
       </div>
     </template>
@@ -14,8 +14,8 @@
 <script setup lang="ts">
 import Modal from '@/components/utilities/Modal.vue'
 import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGmPanelStore } from '@/stores/gmPanel'
+import { useGameStore } from '@/stores/game'
 
 const zoneEditorStore = useZoneEditorStore()
-const gmPanelStore = useGmPanelStore()
+const gameStore = useGameStore()
 </script>
diff --git a/src/components/utilities/zoneEditor/partials/ZoneSettings.vue b/src/components/utilities/zoneEditor/partials/ZoneSettings.vue
index b3cf0c8..e71a468 100644
--- a/src/components/utilities/zoneEditor/partials/ZoneSettings.vue
+++ b/src/components/utilities/zoneEditor/partials/ZoneSettings.vue
@@ -10,19 +10,22 @@
           <div class="gap-2.5 flex flex-wrap">
             <div class="w-full flex flex-col mb-5">
               <label class="mb-1.5 font-titles" for="name">Name</label>
-              <input class="input-cyan max-w-64" v-model="name" name="name" id="name" />
+              <input class="input-cyan" v-model="name" name="name" id="name" />
             </div>
             <div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
               <label class="mb-1.5 font-titles" for="name">Width</label>
-              <input class="input-cyan max-w-64" v-model="width" name="name" id="name" type="number" />
+              <input class="input-cyan" v-model="width" name="name" id="name" type="number" />
             </div>
             <div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
               <label class="mb-1.5 font-titles" for="name">Height</label>
-              <input class="input-cyan max-w-64" v-model="height" name="name" id="name" type="number" />
+              <input class="input-cyan" v-model="height" name="name" id="name" type="number" />
             </div>
             <div class="w-full flex flex-col mb-5">
-              <label class="mb-1.5 font-titles" for="name">PVP enabled</label>
-              <input class="input-cyan max-w-64" name="name" id="name" />
+              <label class="mb-1.5 font-titles" for="pvp">PVP enabled</label>
+              <select class="input-cyan" name="pvp" id="pvp">
+                <option value="0">No</option>
+                <option value="1">Yes</option>
+              </select>
             </div>
           </div>
         </form>
diff --git a/src/stores/game.ts b/src/stores/game.ts
index 40ad4d2..87785b1 100644
--- a/src/stores/game.ts
+++ b/src/stores/game.ts
@@ -10,12 +10,25 @@ export const useGameStore = defineStore('game', {
     token: '' as string | null,
     connection: null as Socket | null,
     user: null as User | null,
-    character: null as Character | null
+    character: null as Character | null,
+    isGmPanelOpen: false
   }),
   actions: {
     setScreen(screen: string) {
       this.screen = screen
     },
+    setToken(token: string) {
+      this.token = token
+    },
+    setUser(user: User | null) {
+      this.user = user
+    },
+    setCharacter(character: Character | null) {
+      this.character = character
+    },
+    toggleGmPanel() {
+      this.isGmPanelOpen = !this.isGmPanelOpen
+    },
     initConnection() {
       this.connection = io(config.server_endpoint, {
         secure: !config.development,
@@ -49,14 +62,5 @@ export const useGameStore = defineStore('game', {
 
       useCookies().remove('token')
     },
-    setToken(token: string) {
-      this.token = token
-    },
-    setUser(user: User | null) {
-      this.user = user
-    },
-    setCharacter(character: Character | null) {
-      this.character = character
-    }
   }
 })
diff --git a/src/stores/gmPanel.ts b/src/stores/gmPanel.ts
deleted file mode 100644
index 3b2fed5..0000000
--- a/src/stores/gmPanel.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { defineStore } from 'pinia'
-import type { Character } from '@/types'
-import config from '@/config'
-
-export const useGmPanelStore = defineStore('gmPanel', {
-  state: () => ({
-    isOpen: false
-  }),
-  actions: {
-    toggle() {
-      this.isOpen = !this.isOpen
-    },
-    open() {
-      this.isOpen = true
-    },
-    close() {
-      this.isOpen = false
-    }
-  }
-})