From 118855f19db19ff67e23e3859a30f33c8e40b5ca Mon Sep 17 00:00:00 2001
From: vvandenb <vvandenb12@gmail.com>
Date: Wed, 22 Mar 2023 12:10:58 +0100
Subject: [PATCH] * Added password option on Alert component

---
 .../volume/src/components/Alert/Alert.svelte  | 22 ++++++++++++++-----
 front/volume/src/components/Alert/content.ts  |  5 +++--
 front/volume/src/components/Channels.svelte   |  4 ++--
 front/volume/src/components/Chat.svelte       |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/front/volume/src/components/Alert/Alert.svelte b/front/volume/src/components/Alert/Alert.svelte
index 8ceb35b..4fbf37c 100644
--- a/front/volume/src/components/Alert/Alert.svelte
+++ b/front/volume/src/components/Alert/Alert.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   export let message;
   export let form = true;
+  export let passwordInput = false;
   export let onCancel = () => {};
   export let onOkay = () => {};
   import { content, popup } from "./content";
@@ -31,12 +32,21 @@
 <div>
   <h2>{message}</h2>
   {#if form === true}
-    <input
-      required
-      type="text"
-      bind:value
-      on:keydown={(e) => e.which === 13 && _onOkay()}
-    />
+    {#if passwordInput === true}
+      <input
+        required
+        type="password"
+        bind:value
+        on:keydown={(e) => e.which === 13 && _onOkay()}
+      />
+    {:else}
+      <input
+        required
+        type="text"
+        bind:value
+        on:keydown={(e) => e.which === 13 && _onOkay()}
+      />
+    {/if}
   {/if}
 
   <div class="buttons">
diff --git a/front/volume/src/components/Alert/content.ts b/front/volume/src/components/Alert/content.ts
index dfbf7d7..60e8095 100644
--- a/front/volume/src/components/Alert/content.ts
+++ b/front/volume/src/components/Alert/content.ts
@@ -5,10 +5,11 @@ export const popup = writable(null)
 import { bind } from 'svelte-simple-modal';
 
 let val;
-export async function show_popup(message, form = true) {
+export async function show_popup(message, form = true, passwordInput = false) {
     popup.set(bind(Alert__SvelteComponent_, {
         message,
-        form
+        form,
+        passwordInput
     }))
     await waitForCondition()
 }
diff --git a/front/volume/src/components/Channels.svelte b/front/volume/src/components/Channels.svelte
index 8817c2e..334506b 100644
--- a/front/volume/src/components/Channels.svelte
+++ b/front/volume/src/components/Channels.svelte
@@ -114,7 +114,7 @@
     }
     if (name) {
       if (channelMode === 'protected'){
-        await show_popup("Enter a password for the new channel:")
+        await show_popup("Enter a password for the new channel:", true, true)
         password = $content
         if (password == "") {
           await show_popup("Password is required #", false)
@@ -201,7 +201,7 @@
   //--------------------------------------------------------------------------------/
 
   const changePassword = async (id: number) => {
-    await show_popup("Enter the new password for this channel (leave empty to remove password) :");
+    await show_popup("Enter the new password for this channel (leave empty to remove password) :", true, true);
     let string = $content 
     const response = await fetch(API_URL + "/channels/" + id + "/password", {
       credentials: "include",
diff --git a/front/volume/src/components/Chat.svelte b/front/volume/src/components/Chat.svelte
index 101f45a..5441529 100644
--- a/front/volume/src/components/Chat.svelte
+++ b/front/volume/src/components/Chat.svelte
@@ -53,7 +53,7 @@
         ChannelId: channel.id,
       });
     } else {
-      await show_popup("Channel is protected, enter password:");
+      await show_popup("Channel is protected, enter password:", true, true);
       socket.emit("joinChannel", {
         UserId: $store.ftId,
         ChannelId: channel.id,