From ef12c61ea942a8a8cda11f4218a48c57a31594c3 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sat, 1 Jun 2024 19:36:27 +0200
Subject: [PATCH] Worked on commands, notifications

---
 env.d.ts                                   | 44 -------------------
 src/App.vue                                |  2 +
 src/components/Game.vue                    |  1 +
 src/components/World.vue                   |  2 +-
 src/components/screens/Characters.vue      | 17 ++++----
 src/components/screens/Login.vue           | 15 ++++---
 src/components/sprites/Character.vue       |  7 +--
 src/components/sprites/MapEntity.vue       |  1 +
 src/components/sprites/NPC.vue             |  1 +
 src/components/utilities/Modal.vue         |  6 +++
 src/components/utilities/Notifications.vue | 28 ++++++++++++
 src/engine/Player/IPlayer.ts               |  2 +-
 src/engine/Player/Player.ts                |  6 +--
 src/stores/notifications.ts                | 19 ++++++++
 src/stores/socket.ts                       | 11 ++---
 src/types.ts                               | 50 ++++++++++++++++++++++
 16 files changed, 136 insertions(+), 76 deletions(-)
 create mode 100644 src/components/sprites/MapEntity.vue
 create mode 100644 src/components/sprites/NPC.vue
 create mode 100644 src/components/utilities/Notifications.vue
 create mode 100644 src/stores/notifications.ts
 create mode 100644 src/types.ts

diff --git a/env.d.ts b/env.d.ts
index 773d2bb..11f02fe 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -1,45 +1 @@
 /// <reference types="vite/client" />
-export type User = {
-  id: number;
-  username: string;
-  password: string;
-  characters: Character[];
-};
-
-export type Character = {
-  id: number;
-  userId: number;
-  user: User;
-  name: string;
-  hitpoints: number;
-  mana: number;
-  level: number;
-  experience: number;
-  role: string;
-  position_x: number;
-  position_y: number;
-  rotation: number;
-  zoneId: number;
-  zone: Zone;
-  chats: Chat[];
-};
-
-export type Zone = {
-  id: number;
-  name: string;
-  width: number;
-  height: number;
-  tiles: Record<string, any>;
-  characters: Character[];
-  chats: Chat[];
-};
-
-export type Chat = {
-  id: number;
-  characterId: number;
-  character: Character;
-  zoneId: number;
-  zone: Zone;
-  message: string;
-  createdAt: Date;
-};
diff --git a/src/App.vue b/src/App.vue
index 3317109..0f18d2d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,5 @@
 <template>
+  <Notifications />
   <Login v-if="screen === 'login'" />
   <Register v-if="screen === 'register'" />
   <Characters v-if="screen === 'characters'" />
@@ -8,6 +9,7 @@
 <script setup lang="ts">
 import { type Ref, ref } from 'vue'
 import { useSocketStore } from '@/stores/socket'
+import Notifications from '@/components/utilities/Notifications.vue'
 import Login from '@/components/screens/Login.vue'
 import Register from '@/components/screens/Register.vue'
 import Characters from '@/components/screens/Characters.vue'
diff --git a/src/components/Game.vue b/src/components/Game.vue
index 3b7fd84..0dcf769 100644
--- a/src/components/Game.vue
+++ b/src/components/Game.vue
@@ -1,4 +1,5 @@
 <template>
+  <Notifications />
   <div class="game-container">
     <div class="top-ui">
       <Hud />
diff --git a/src/components/World.vue b/src/components/World.vue
index 304dd6d..09a04e1 100644
--- a/src/components/World.vue
+++ b/src/components/World.vue
@@ -1,7 +1,7 @@
 <template>
   <TilemapLayer v-if="zoneStore.isLoaded" :tilemap="tileMap" :tileset="zoneStore.getTiles" ref="tilemapLayer" :layerIndex="0" :cull-padding-x="10" :cull-padding-y="10" />
   <Controls :layer="layer" />
-  <Player :layer="layer" />
+  <Character :layer="layer" />
   <Container v-if="zoneStore.isLoaded && zoneStore.getPlayers.length > 0">
     <Character :layer="layer" v-for="player in zoneStore.getPlayers" :key="player.id" :player="player" />
   </Container>
diff --git a/src/components/screens/Characters.vue b/src/components/screens/Characters.vue
index 01744e7..9e70133 100644
--- a/src/components/screens/Characters.vue
+++ b/src/components/screens/Characters.vue
@@ -13,8 +13,9 @@
 
     <div class="buttons-wrapper">
       <button @click="select_character()">Play</button>
-      <button @click="isModalOpen = true">Create New</button>
-      <button @click="delete_character()">Delete</button>
+      <button @click="isModalOpen = true">Create  New</button>
+      <!-- @TODO : Add a confirmation dialog -->
+      <button v-if="selected_character" @click="delete_character()">Delete</button>
     </div>
   </div>
 </div>
@@ -58,17 +59,15 @@ const characters = ref([]);
 const selected_character = ref(null);
 function select_character() {
   console.log(selected_character.value);
-  if (selected_character.value) {
-    socket.getConnection.emit('character:connect', {character_id: selected_character.value});
-    socket.getConnection.on('character:connect', (data: Character) => socket.setCharacter(data));
-  }
+  if (!selected_character.value) return;
+  socket.getConnection.emit('character:connect', {character_id: selected_character.value});
+  socket.getConnection.on('character:connect', (data: Character) => socket.setCharacter(data));
 }
 
 // Delete character logics
 function delete_character() {
-  if (selected_character.value) {
-    socket.getConnection.emit('character:delete', {character_id: selected_character.value});
-  }
+  if (!selected_character.value) return;
+  socket.getConnection.emit('character:delete', {character_id: selected_character.value});
 }
 
 // Create character logics
diff --git a/src/components/screens/Login.vue b/src/components/screens/Login.vue
index a685370..017a8a5 100644
--- a/src/components/screens/Login.vue
+++ b/src/components/screens/Login.vue
@@ -25,11 +25,11 @@
   <img src="/assets/bglogin.png" id="bg-img" alt="New Quest login background" />
 </template>
 
-<script setup>
-import { onMounted, ref } from 'vue'
+<script setup lang="ts">
+import { ref } from 'vue'
 import { useSocketStore } from '@/stores/socket.ts'
 import {login, register} from '@/services/authentication.ts'
-import { useCookies } from '@vueuse/integrations/useCookies'
+import { useNotificationStore } from '@/stores/notifications'
 
 const bgm = ref('bgm');
 if (bgm.value.paused) {
@@ -38,6 +38,7 @@ if (bgm.value.paused) {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+const notifications = useNotificationStore()
 const socket = useSocketStore();
 const username = ref('');
 const password = ref('');
@@ -45,7 +46,7 @@ const password = ref('');
 async function loginFunc() {
   // check if username and password are valid
   if (username.value === '' || password.value === '') {
-    alert('Please enter a valid username and password');
+    notifications.addNotification({ message: 'Please enter a valid username and password' });
     return;
   }
 
@@ -53,7 +54,7 @@ async function loginFunc() {
   const success = await login(username.value, password.value);
 
   if (!success) {
-    alert('Invalid username or password');
+    notifications.addNotification({ message: 'Invalid username or password' });
   }
 
   // if (success) {}
@@ -62,7 +63,7 @@ async function loginFunc() {
 async function registerFunc() {
   // check if username and password are valid
   if (username.value === '' || password.value === '') {
-    alert('Please enter a valid username and password');
+    notifications.addNotification({ message: 'Please enter a valid username and password' });
     return;
   }
 
@@ -70,7 +71,7 @@ async function registerFunc() {
   const success = await register(username.value, password.value);
 
   if (!success) {
-    alert('Username already exists');
+    notifications.addNotification({ message: 'Username already exists' });
   }
 
   // if (success) {}
diff --git a/src/components/sprites/Character.vue b/src/components/sprites/Character.vue
index 428a210..a9f04b1 100644
--- a/src/components/sprites/Character.vue
+++ b/src/components/sprites/Character.vue
@@ -1,12 +1,13 @@
 <template>
-
   <Container>
     <Text
-      :text="'Hello world'"
+      :text="props.player?.name"
+      :x="position.x - 50"
+      :y="position.y - 80"
       :style="{
         fontFamily: 'Helvetica, Arial',
         color: '#42B883',
-        fontSize: '26px',
+        fontSize: '20px',
         fontStyle: 'bold',
         strokeThickness: 8,
         stroke: '#213547'
diff --git a/src/components/sprites/MapEntity.vue b/src/components/sprites/MapEntity.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/components/sprites/MapEntity.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/components/sprites/NPC.vue b/src/components/sprites/NPC.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/components/sprites/NPC.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/components/utilities/Modal.vue b/src/components/utilities/Modal.vue
index 5c6198a..1622013 100644
--- a/src/components/utilities/Modal.vue
+++ b/src/components/utilities/Modal.vue
@@ -42,6 +42,12 @@ const x = ref(0);
 const y = ref(0);
 const isDragging = ref(false);
 
+// set modal position center of the screen
+onMounted(() => {
+  x.value = (window.innerWidth / 2) - 150;
+  y.value = (window.innerHeight / 2) - 100;
+});
+
 const startDrag = (event: MouseEvent) => {
   isDragging.value = true;
   startX = event.clientX;
diff --git a/src/components/utilities/Notifications.vue b/src/components/utilities/Notifications.vue
new file mode 100644
index 0000000..d620292
--- /dev/null
+++ b/src/components/utilities/Notifications.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="notifications">
+    <Modal v-for="notification in notifications.getNotifications" :key="notification.id" :isModalOpen="true" @modal:close="closeNotification(notification.id)">
+      <template #modal-body>
+          <p>{{ notification.message }}</p>
+      </template>
+    </Modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useNotificationStore } from '@/stores/notifications'
+import { useSocketStore } from '@/stores/socket'
+import Modal from '@/components/utilities/Modal.vue'
+
+const notifications = useNotificationStore();
+const socket = useSocketStore();
+
+if (socket.getConnection) {
+  socket.getConnection.on('notification', (data: any) => {
+    notifications.addNotification(data);
+  });
+}
+
+function closeNotification(id: string) {
+  notifications.removeNotification(id);
+}
+</script>
\ No newline at end of file
diff --git a/src/engine/Player/IPlayer.ts b/src/engine/Player/IPlayer.ts
index f7be52a..5654212 100644
--- a/src/engine/Player/IPlayer.ts
+++ b/src/engine/Player/IPlayer.ts
@@ -1,6 +1,6 @@
 export default interface IPlayer {
   readonly id: number;
-  username: string;
+  name: string;
   coords: {
       x: number;
       y: number;
diff --git a/src/engine/Player/Player.ts b/src/engine/Player/Player.ts
index 753fde8..cdd0337 100644
--- a/src/engine/Player/Player.ts
+++ b/src/engine/Player/Player.ts
@@ -2,12 +2,12 @@ import type IPlayer from '@/engine/Player/IPlayer';
 
 export default class Player implements IPlayer {
     id: number;
-    username: string;
+    name: string;
     coords: { x: number; y: number; };
 
-    constructor(id: number, username: string, coords: { x: number; y: number; }) {
+    constructor(id: number, name: string, coords: { x: number; y: number; }) {
         this.id = id;
-        this.username = username;
+        this.name = name;
         this.coords = coords;
     }
 }
\ No newline at end of file
diff --git a/src/stores/notifications.ts b/src/stores/notifications.ts
new file mode 100644
index 0000000..a49a273
--- /dev/null
+++ b/src/stores/notifications.ts
@@ -0,0 +1,19 @@
+import { defineStore, type StoreDefinition } from 'pinia'
+import type { Notification } from '@/types'
+
+export const useNotificationStore: StoreDefinition = defineStore('notifications', {
+  state: () => ({
+    notifications: [] as Notification[]
+  }),
+  getters: {
+    getNotifications: (state: any) => state.notifications
+  },
+  actions: {
+    addNotification(notification: Notification) {
+      this.notifications.push(notification);
+    },
+    removeNotification(index: number) {
+      this.notifications.splice(index, 1);
+    }
+  }
+});
\ No newline at end of file
diff --git a/src/stores/socket.ts b/src/stores/socket.ts
index 6d52f35..a3fc9d6 100644
--- a/src/stores/socket.ts
+++ b/src/stores/socket.ts
@@ -2,9 +2,10 @@ import { defineStore, type StoreDefinition } from 'pinia'
 import { io, Socket } from 'socket.io-client';
 import {useCookies} from '@vueuse/integrations/useCookies'
 import config from '@/config';
-import type { Character, User } from '../../env'
+import type { Character, User } from '@/types'
+import { useNotificationStore } from '@/stores/notifications'
 
-export const useSocketStore: StoreDefinition<any> = defineStore('socket', {
+export const useSocketStore: StoreDefinition = defineStore('socket', {
   state: () => ({
     connection: null as Socket | null,
     user: null as User | null,
@@ -36,12 +37,6 @@ export const useSocketStore: StoreDefinition<any> = defineStore('socket', {
         console.log("Reconnect failed")
         this.disconnectSocket();
       })
-
-      this.connection.on('notification', (data: any) => {
-        if(data.error) console.error(data.error);
-        if (data.success) console.log(data.success);
-        if (data.message) console.log(data.message);
-      });
     },
     disconnectSocket() {
       if (!this.connection) return;
diff --git a/src/types.ts b/src/types.ts
new file mode 100644
index 0000000..70073b2
--- /dev/null
+++ b/src/types.ts
@@ -0,0 +1,50 @@
+export type Notification = {
+  id?: number;
+  message: string;
+  type?: string;
+};
+
+export type User = {
+  id: number;
+  username: string;
+  password: string;
+  characters: Character[];
+};
+
+export type Character = {
+  id: number;
+  userId: number;
+  user: User;
+  name: string;
+  hitpoints: number;
+  mana: number;
+  level: number;
+  experience: number;
+  role: string;
+  position_x: number;
+  position_y: number;
+  rotation: number;
+  zoneId: number;
+  zone: Zone;
+  chats: Chat[];
+};
+
+export type Zone = {
+  id: number;
+  name: string;
+  width: number;
+  height: number;
+  tiles: Record<string, any>;
+  characters: Character[];
+  chats: Chat[];
+};
+
+export type Chat = {
+  id: number;
+  characterId: number;
+  character: Character;
+  zoneId: number;
+  zone: Zone;
+  message: string;
+  createdAt: Date;
+};
\ No newline at end of file