From 0496b345771c5976c2cbfdaff9173aba83af283f Mon Sep 17 00:00:00 2001
From: simplonco <simplonco@simplonco.co>
Date: Sat, 14 Jan 2023 23:05:01 +0100
Subject: [PATCH]   wip add and change password + changed on_click

---
 .../api_back/src/chat/chat.controller.ts      |  7 ++++
 .../src/pieces/chat/Element_button.svelte     |  4 +--
 .../src/pieces/chat/Layout_home.svelte        |  2 +-
 .../src/pieces/chat/Layout_invite.svelte      |  2 +-
 .../src/pieces/chat/Layout_new.svelte         |  2 +-
 .../src/pieces/chat/Layout_room.svelte        |  2 +-
 .../src/pieces/chat/Layout_room_set.svelte    | 36 +++++++++++++++++--
 7 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
index 5911f152..33dcf948 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
@@ -302,6 +302,13 @@ export class ChatController {
 		const room_name = await this.chatService.getCurrentRoomName(req.user.username);
 		const room = await this.chatService.getRoomByName(room_name);
 		const users = room.users;
+
+		let index = users.indexOf(req.user.username);
+		if (index > -1)
+		{
+			users.splice(index, 1);
+		}
+
 		res.status(HttpStatus.OK).json({ users: users });
 		printCaller("- out ");
 	}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Element_button.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Element_button.svelte
index 4f82c334..bd5148b4 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Element_button.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Element_button.svelte
@@ -2,7 +2,6 @@
 	<Button
 		bind:layout
 		new_layout=""
-		on_click={}
 		my_class=""
 		my_title=""
 	>
@@ -17,7 +16,6 @@
 	export let my_class = "";
 	export let my_title = "";
 	export let new_layout = "";
-	export let on_click = "";
 
 	function update_layout() {
 		layout.set(new_layout);
@@ -25,7 +23,7 @@
 
 </script>
 
-<button on:click={update_layout} on:click={on_click} title={my_title} class={my_class}>
+<button on:click={update_layout} on:click title={my_title} class={my_class}>
 	<p><slot></slot></p>
 </button>
 
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_home.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_home.svelte
index 096d2733..044a7437 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_home.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_home.svelte
@@ -55,7 +55,7 @@
 				<p>rooms are loading...</p>
 			{:then rooms}
 				{#each rooms as room}
-					<Button my_class="list" on_click={function() {go_to_room(room)}}>
+					<Button my_class="list" on:click={function() {go_to_room(room)}}>
 						{room.client_name}
 					</Button>
 				{/each}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_invite.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_invite.svelte
index 36aa78a5..10b86d4b 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_invite.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_invite.svelte
@@ -52,7 +52,7 @@
 				<p>users are loading...</p>
 			{:then users}
 				{#each users as user}
-					<Button my_class="list" on_click={function() {invite_this_user(user.username)}}>
+					<Button my_class="list" on:click={function() {invite_this_user(user.username)}}>
 						{user.username}
 					</Button>
 				{/each}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_new.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_new.svelte
index 77c5af26..a6940d57 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_new.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_new.svelte
@@ -56,7 +56,7 @@
 				<p>rooms are loading...</p>
 			{:then rooms}
 				{#each rooms as room}
-					<Button my_class="list" on_click={function() {join_rooms(room)}}>
+					<Button my_class="list" on:click={function() {join_rooms(room)}}>
 						{room.name}
 					</Button>
 				{/each}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room.svelte
index 03a0e918..49de63a7 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room.svelte
@@ -71,7 +71,7 @@
 	</div>
 
 	<!-- send -->
-	<Button my_class="send" on_click={send_msg}>
+	<Button my_class="send" on:click={send_msg}>
 		send
 	</Button>
 
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room_set.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room_set.svelte
index cdd986af..018c3ecc 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room_set.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room_set.svelte
@@ -8,9 +8,26 @@
 
 	let users = get_room_users();
 
+	console.log("current_room:", $current_room);
+
+	function change_password()
+	{
+		console.log("in change_password");
+	}
+
+	function remove_password()
+	{
+		console.log("in remove_password");
+	}
+
+	function add_password()
+	{
+		console.log("in add_password");
+	}
+
 	function user_profile()
 	{
-		console/log("in user_profile");
+		console.log("in user_profile");
 	}
 
 	function user_leave_room()
@@ -42,13 +59,26 @@
 	<!-- panel_room_set -->
 	<div class="panel panel_room_set __border_top">
 		{#if $current_room.type !== "direct"}
-			<Button on_click={user_leave_room}>
+			<Button on:click={user_leave_room}>
 				leave
 			</Button>
 			<Button new_layout="invite">
 				invite someone
 			</Button>
 		{/if}
+		{#if $current_room.protection }
+			<p class="__center">this room is password protected</p>
+			<Button on:click={change_password}>
+				change password
+			</Button>
+			<Button on:click={remove_password}>
+				remove password
+			</Button>
+		{:else}
+			<Button on:click={add_password}>
+				add password
+			</Button>
+		{/if}
 		<p>room users :</p>
 		<div class="room_users">
 			<div class="__show_if_only_child">
@@ -58,7 +88,7 @@
 				<p>list of users is loading...</p>
 			{:then users}
 				{#each users as user}
-					<Button new_layout="user" my_class="list" on_click={user_profile}>
+					<Button new_layout="user" my_class="list" on:click={user_profile}>
 						{user}
 					</Button>
 				{/each}