From ca68c61f3a763d1de7920182db917909f5a7d97a Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Sun, 7 Mar 2021 23:49:49 -0800
Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20Framework/Modal=20for=20settings=20?=
 =?UTF-8?q?coming=20together=20=E2=9C=A8=20Changing=20inline=20script=20to?=
 =?UTF-8?q?=20now=20run=20in=20an=20async=20block=20=E2=9D=97=20No=20more?=
 =?UTF-8?q?=20callback=20hell,=20literally=20anything=20can=20be=20written?=
 =?UTF-8?q?=20with=20async/await=20or=20callbacks=20when=20appropos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 freechat-client/pages/index.html         | 81 +++++++++++++++---------
 freechat-client/sass/settings-modal.scss |  4 ++
 freechat-client/sass/style.scss          |  1 +
 3 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 freechat-client/sass/settings-modal.scss

diff --git a/freechat-client/pages/index.html b/freechat-client/pages/index.html
index e0d72e6..0a5bb66 100644
--- a/freechat-client/pages/index.html
+++ b/freechat-client/pages/index.html
@@ -21,7 +21,7 @@
 	</button>
 	<div class="collapse navbar-collapse" id="navbar-opts">
 		<ul class="navbar-nav mr-auto" style="display: inline-block;">
-			<button class="btn btn-outline-secondary btn-nav-settings me-2" type="button" id="settings-btn">Settings</button>
+			<button class="btn btn-outline-secondary btn-nav-settings" type="button" id="settings-btn" data-toggle="modal", data-target="#settings-modal">Settings</button>
 			<button class="btn btn-outline-secondary btn-nav-settings" type="button" id="join-btn" data-toggle="modal", data-target="#joinform">Join</button>
 		</ul>
 		<!-- SERVER LIST -->
@@ -71,6 +71,24 @@
 	</div>
 </div>
 
+<div id="settings-modal" class="modal fade" tabindex="-1">
+	<div class="modal-dialog">
+		<div class="modal-content join-style">
+			<div class="modal-header"> <h5 class="modal-title">Settings</h5> </div>
+			<div class="modal-body">
+				<form> 
+					<div clas="form-group">
+						<label for="admin-json" class="form-label">For admins: Dump the provided json to automatically add it to your config</label>
+						<textarea id="admin-json" rows="5" class="settings-textarea"></textarea>
+						<input class="btn btn-outline-success" type="button" id="add-admin-json" value="Add to config"/>
+						<label for="admin-json" class=form-label" id="admin-json-err"></label>
+					</div>
+				 </form>
+			</div>
+		</div>
+	</div>
+</div>
+
 <!-- Warning Toast -->
 <div class="toast" role="alert" aria-live="assertive" aria-atomic="true">
   <div class="toast-header">
@@ -94,51 +112,56 @@
 <script type="text/javascript" src="../node_modules/popper.js/dist/umd/popper-utils.js"></script>
 <script type="text/javascript" src="../node_modules/bootstrap/dist/js/bootstrap.bundle.js"></script>
 <script>
+(async () => {
 	const { ipcRenderer } = require('electron')
-	const config = ipcRenderer.sendSync('config-request')
 	const auth = require('../src/auth.js')
 	const channels = require('../src/channels.js')
 
+	const { add_server_to_config } = require ('../src/settings.js')
+
+
 	// used for basic styling on server buttons
 	const classes = 'btn btn-outline-secondary btn-nav-settings'
 
 	// NOTE: this will probably take minute if your in a lot of servers
 	// even worse if server owners are running debug builds like tards
 	// get a new jwt from each server on startup
-	auth.init(config)
-		.then(updated_cfg => {
-			for(const server_cfg of updated_cfg['servers']) {
-				const remote = server_cfg['server']
-				const user = server_cfg['user']
+	$('#add-admin-json').click(async () => await add_server_to_config() )
+	
+	try {
+		let config = await ipcRenderer.invoke('config-request')
+		await auth.init(config)
 
-				// html generation
-				const id = remote['hostname']
-				const txt = remote['name']
+		for(const server_cfg of config['servers']) {
+			const remote = server_cfg['server']
+			const user = server_cfg['user']
+
+			// html generation
+			const id = remote['hostname']
+			const txt = remote['name']
 
-				$('#server-list').append(
-					$('<input>').attr({
-						type: 'button',
-						'class' : classes,
-						id: id,
-						value: txt
-					})
-				)
-				console.log(user)
-				$(`#${id}`).on('click', () =>  {
-					channels.list(remote, user)
-				})
-			}
-		})
-		.catch(err => {
-			console.log(err, err.options)
 			$('#server-list').append(
 				$('<input>').attr({
 					type: 'button',
-					'class': classes + ' disabled',
-					value: `${err.options.url.hostname}`
+					'class' : classes,
+					id: id,
+					value: txt
 				})
 			)
-		})
+
+			$(`#${id}`).on('click', () => channels.list(remote, user))
+		}
+	} catch(err) {
+		console.log(err)
+		$('#server-list').append(
+			$('<input>').attr({
+				type: 'button',
+				'class': classes + ' disabled',
+				value: 'Problems setting up from config'
+			})
+		)
+	}
+})()
 </script>
 </html>
 
diff --git a/freechat-client/sass/settings-modal.scss b/freechat-client/sass/settings-modal.scss
new file mode 100644
index 0000000..9a60848
--- /dev/null
+++ b/freechat-client/sass/settings-modal.scss
@@ -0,0 +1,4 @@
+.settings-textarea {
+	width: 100%;
+	margin-bottom: 1em;
+}
diff --git a/freechat-client/sass/style.scss b/freechat-client/sass/style.scss
index f41ea1e..5518697 100644
--- a/freechat-client/sass/style.scss
+++ b/freechat-client/sass/style.scss
@@ -2,6 +2,7 @@
 @import 'scroll';
 @import 'join-modal';
 @import 'channels';
+@import 'settings-modal';
 
 body {
     color: $text;