From 70717158028e71cbda482766df1e26e8bcde6a12 Mon Sep 17 00:00:00 2001
From: Pheuw1 <49028192+Pheuw1@users.noreply.github.com>
Date: Mon, 13 Mar 2023 17:53:02 +0100
Subject: [PATCH 1/3] uuid for socketKey

---
 back/volume/src/users/entity/user.entity.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/volume/src/users/entity/user.entity.ts b/back/volume/src/users/entity/user.entity.ts
index a14d0e3..f1369ae 100644
--- a/back/volume/src/users/entity/user.entity.ts
+++ b/back/volume/src/users/entity/user.entity.ts
@@ -34,7 +34,7 @@ export class User {
   @Column({ default: false, nullable: true })
     isVerified: boolean
 
-  @Column({ unique: true })
+  @Column('uuid',{ unique: true })
     socketKey: string
 
   @Column({ unique: true })

From edf30e3353c70b077d82f29786c283e1111a95f0 Mon Sep 17 00:00:00 2001
From: WalidMoovin <walidsdt.2@gmail.com>
Date: Mon, 13 Mar 2023 16:52:07 +0100
Subject: [PATCH 2/3] chans

---
 front/volume/src/components/Channels.svelte | 40 ++++++++++++++++++---
 front/volume/src/components/Chat.svelte     | 13 +++++++
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/front/volume/src/components/Channels.svelte b/front/volume/src/components/Channels.svelte
index 1a4d2a0..bddeaae 100644
--- a/front/volume/src/components/Channels.svelte
+++ b/front/volume/src/components/Channels.svelte
@@ -7,14 +7,27 @@
     password: string;
     messages: Array<chatMessagesType>;
   }
+  import { onMount } from "svelte";
+  import { API_URL, store } from "../Auth";
+    import { dataset_dev } from "svelte/internal";
 </script>
 
 <script lang="ts">
+
   //--------------------------------------------------------------------------------/
 
   export let channels: Array<ChannelsType> = [];
+  // onMount(async () => {
+  //   const res = await fetch(API_URL + "/channels" + $store.ftId, {
+  //     method: "GET",
+  //     mode: "cors",
+  //   });
+  //   const data = await res.json();
+  //   channels = data;
+  // });
 
   //--------------------------------------------------------------------------------/
+
   export let onSelectChannel: (channel: ChannelsType) => void;
   const selectChat = (id: string) => {
     const channel = channels.find((c) => c.id === id);
@@ -25,7 +38,7 @@
 
   //--------------------------------------------------------------------------------/
 
-  const createChannel = () => {
+  const createChannel = async () => {
     const name = prompt("Enter a name for the new channel:");
     if (name) {
       const privacy = prompt(
@@ -49,17 +62,36 @@
           password,
           messages: [],
         };
-        channels = [newChannel, ...channels];
+        // const response = await fetch(API_URL + "/channels" + $store.ftId , {
+        //   method: "POST",
+        //   mode: "cors",
+        //   body: JSON.stringify(newChannel),
+        // });
+        // const data = await response.json();
+        // if (data.ok) {
+        //   channels = [newChannel, ...channels];
+        // } else {
+        //   alert("Error creating channel");
+        // }
       }
     }
-    // TODO: save to database
   };
 
   //--------------------------------------------------------------------------------/
 
-  const removeChannel = (id: string) => {
+  const removeChannel = async (id: string) => {
     let string = prompt("type 'delete' to delete this channel");
     if (string === "delete") {
+      // const response = await fetch(API_URL + "/channels" + $store.ftId + "/" + id, {
+      //   method: "DELETE",
+      //   mode: "cors",
+      // });
+      // const data = await response.json();
+      // if (data.ok) {
+      //   channels = channels.filter((c) => c.id !== id);
+      // } else {
+      //   alert("Error deleting channel");
+      // }
       channels = channels.filter((c) => c.id !== id);
     }
     // TODO: save to database
diff --git a/front/volume/src/components/Chat.svelte b/front/volume/src/components/Chat.svelte
index d3bc755..4e47e99 100644
--- a/front/volume/src/components/Chat.svelte
+++ b/front/volume/src/components/Chat.svelte
@@ -79,6 +79,19 @@
   // }
 
   //--------------------------------------------------------------------------------/
+
+  const blockUser = async () => {
+    const res = await fetch(API_URL + "/chat/block", {
+      method: "POST",
+      mode: "cors",
+    });
+    const data = await res.json();
+    if (data.success) {
+      alert("User blocked");
+    } else {
+      alert("Failed to block user");
+    }
+  }; 
 </script>
 
 <div class="overlay">

From b4c8a49dab7e6b226e3fd9a21d02b3980c383e09 Mon Sep 17 00:00:00 2001
From: WalidMoovin <walidsdt.2@gmail.com>
Date: Mon, 13 Mar 2023 18:21:42 +0100
Subject: [PATCH 3/3] chat

---
 front/volume/src/App.svelte                 |  13 +-
 front/volume/src/components/Channels.svelte |   9 +-
 front/volume/src/components/Chat.svelte     | 178 +++++++++++++++++---
 3 files changed, 165 insertions(+), 35 deletions(-)

diff --git a/front/volume/src/App.svelte b/front/volume/src/App.svelte
index 6290326..dec61c1 100644
--- a/front/volume/src/App.svelte
+++ b/front/volume/src/App.svelte
@@ -86,17 +86,7 @@
   function clickChannels() {
     setAppState(APPSTATE.CHANNELS);
   }
-  let channels: Array<ChannelsType> = [
-    { id: "1", name: "General", messages: [], privacy: "public", password: "" },
-    {
-      id: "2",
-      name: "Lobby",
-      messages: [],
-      privacy: "private",
-      password: "test",
-    },
-    { id: "3", name: "Game", messages: [], privacy: "private", password: "" },
-  ];
+  let channels: Array<ChannelsType> = [];
   let selectedChannel: ChannelsType;
   const handleSelectChannel = (channel: ChannelsType) => {
     selectedChannel = channel;
@@ -151,7 +141,6 @@
           on:keydown={() => setAppState(APPSTATE.CHANNELS)}
         >
           <Chat
-            chatMessages={selectedChannel.messages}
             on:view-profile={openIdProfile}
             on:add-friend={addFriend}
             on:invite-to-game={pong.inviteToGame}
diff --git a/front/volume/src/components/Channels.svelte b/front/volume/src/components/Channels.svelte
index bddeaae..6a7b989 100644
--- a/front/volume/src/components/Channels.svelte
+++ b/front/volume/src/components/Channels.svelte
@@ -5,11 +5,11 @@
     name: string;
     privacy: string;
     password: string;
-    messages: Array<chatMessagesType>;
+    owner: string;
   }
   import { onMount } from "svelte";
   import { API_URL, store } from "../Auth";
-    import { dataset_dev } from "svelte/internal";
+  import { dataset_dev } from "svelte/internal";
 </script>
 
 <script lang="ts">
@@ -58,9 +58,9 @@
         const newChannel: ChannelsType = {
           id: Math.random().toString(),
           name,
-          privacy,
+          owner: $store.username,
           password,
-          messages: [],
+          privacy,
         };
         // const response = await fetch(API_URL + "/channels" + $store.ftId , {
         //   method: "POST",
@@ -73,6 +73,7 @@
         // } else {
         //   alert("Error creating channel");
         // }
+        channels = [newChannel, ...channels];
       }
     }
   };
diff --git a/front/volume/src/components/Chat.svelte b/front/volume/src/components/Chat.svelte
index 4e47e99..a2521f9 100644
--- a/front/volume/src/components/Chat.svelte
+++ b/front/volume/src/components/Chat.svelte
@@ -45,6 +45,8 @@
   function openProfile(username: string) {
     showProfileMenu = true;
     selectedUser = username;
+    showChatMembers = false;
+    showChannelSettings = false;
   }
   function closeProfileMenu() {
     showProfileMenu = false;
@@ -57,6 +59,7 @@
   let showChatMembers = false;
   function toggleChatMembers() {
     showChatMembers = !showChatMembers;
+    showChannelSettings = false;
   }
   let chatMembers: Array<User> = [
     { username: "user1" },
@@ -80,18 +83,122 @@
 
   //--------------------------------------------------------------------------------/
 
-  const blockUser = async () => {
-    const res = await fetch(API_URL + "/chat/block", {
-      method: "POST",
-      mode: "cors",
-    });
-    const data = await res.json();
-    if (data.success) {
-      alert("User blocked");
-    } else {
-      alert("Failed to block user");
-    }
-  }; 
+  let showChannelSettings = false;
+  function toggleChannelSettings() {
+    showChannelSettings = !showChannelSettings;
+    showChatMembers = false;
+  }
+
+  //--------------------------------------------------------------------------------/
+
+  const blockUser = async (username : string) => {
+  };
+
+  //--------------------------------------------------------------------------------/
+
+  const banUser = async (username : string) => {
+    // const prompt = window.prompt("Enter ban duration in seconds");
+    // const res1 = await fetch(API_URL + "/user/" + username, {
+    //   mode: "cors",
+    // });
+    // const data1 = await res1.json();
+
+    // const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/ban", {
+    //   method: "POST",
+    //   mode: "cors",
+    // });
+    // const data2 = await res2.json();
+    // if (res2.ok) {
+    //   alert("User banned");
+    // } else {
+    //   alert("Failed to ban user");
+    // }
+  };
+
+  //--------------------------------------------------------------------------------/
+
+  const kickUser = async (username : string) => {
+    // set-up channel joining and kicking
+    // const res1 = await fetch(API_URL + "/user/" + username, {
+    //   mode: "cors",
+    // });
+    // const data1 = await res1.json();
+
+    // const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/kick", {
+    //   method: "POST",
+    //   mode: "cors",
+    // });
+    // const data2 = await res2.json();
+    // if (res2.ok) {
+    //   alert("User kicked");
+    // } else {
+    //   alert("Failed to kick user");
+    // }
+  };
+
+  //--------------------------------------------------------------------------------/
+
+  const muteUser = async (username : string) => {
+    // use minutes prompt to determine mute duration
+    // const prompt = window.prompt("Enter mute duration in seconds");
+    // const res1 = await fetch(API_URL + "/user/" + username, {
+    //   mode: "cors",
+    // });
+    // const data1 = await res1.json();
+
+    // const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/mute", {
+    //   method: "POST",
+    //   mode: "cors",
+    // });
+    // const data2 = await res2.json();
+    // if (res2.ok) {
+    //   alert("User muted");
+    // } else {
+    //   alert("Failed to mute user");
+    // }
+  };
+
+  //--------------------------------------------------------------------------------/
+
+  const adminUser = async (username : string) => {
+    // const res1 = await fetch(API_URL + "/user/" + username, {
+    //   mode: "cors",
+    // });
+    // const data1 = await res1.json();
+
+    // const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/admin", {
+    //   method: "POST",
+    //   mode: "cors",
+    // });
+    // const data2 = await res2.json();
+    // if (res2.ok) {
+    //   alert("User admined");
+    // } else {
+    //   alert("Failed to admin user");
+    // }
+  };
+
+  //--------------------------------------------------------------------------------/
+
+  const removeAdminUser = async (username : string) => {
+    // const res1 = await fetch(API_URL + "/user/" + username, {
+    //   mode: "cors",
+    // });
+    // const data1 = await res1.json();
+
+    // const res2 = await fetch(API_URL + "/chat/channels/" + data1.ftId + "/admin", {
+    //   method: "DELETE",
+    //   mode: "cors",
+    // });
+    // const data2 = await res2.json();
+    // if (res2.ok) {
+    //   alert("User admin removed");
+    // } else {
+    //   alert("Failed to remove admin user");
+    // }
+  };
+
+  //--------------------------------------------------------------------------------/
 </script>
 
 <div class="overlay">
@@ -138,7 +245,8 @@
             >
           </li>
           <li>
-            <button on:click={() => dispatch("block-user", selectedUser)}
+            <!-- block only if not blocked -->
+            <button on:click={() => blockUser(selectedUser)}
               >Block User</button
             >
           </li>
@@ -168,17 +276,35 @@
               <li>
                 <p>
                   {member.username}
-                  <button>ban</button>
-                  <button>kick</button>
-                  <button>mute</button>
-                  <button>admin</button>
-                </p>
+                  <button on:click={() => banUser(member.username)}>ban</button>
+                  <button on:click={() => kickUser(member.username)}>kick</button>
+                  <button on:click={() => muteUser(member.username)}>mute</button>
+                  <button on:click={() => adminUser(member.username)}>promote</button>
+                  <button on:click={() => removeAdminUser(member.username)}>demote</button>
+                  <p> ----------------------------------------------------------------------------------- </p>
               </li>
             {/each}
           </ul>
         </div>
       </div>
     {/if}
+    <button
+      on:click|stopPropagation={toggleChannelSettings}
+      on:keydown|stopPropagation>Channel Settings</button
+    >
+    {#if showChannelSettings}
+      <div
+        class="channelSettings"
+        on:click|stopPropagation
+        on:keydown|stopPropagation
+      >
+        <div>
+          <button>Change Password</button>
+          <button>Set Password</button>
+          <button>Remove Password</button>
+        </div>
+      </div>
+    {/if}
   </div>
 </div>
 
@@ -225,6 +351,20 @@
   }
 
   .chatMembers button {
-    width: 3.5rem;
+    width: 6rem;
+  }
+
+  .channelSettings {
+    position: absolute;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    padding: 1rem;
+    max-height: 100px;
+    overflow-y: scroll;
+  }
+
+  .channelSettings button {
+    width: 5rem;
   }
 </style>