From c1ab90518c4250db342a6d4556d5273832bd7a83 Mon Sep 17 00:00:00 2001
From: Ash Monty <git@ashmonty.com>
Date: Mon, 4 Jul 2022 22:19:26 +0200
Subject: [PATCH] style: minor changes to account page

---
 public/assets/css/account.css    |  8 +++----
 src/routers/account.js           |  2 --
 views/account/account.handlebars | 38 ++++++++++++++++++--------------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/public/assets/css/account.css b/public/assets/css/account.css
index ca03116..6c91735 100644
--- a/public/assets/css/account.css
+++ b/public/assets/css/account.css
@@ -118,13 +118,11 @@
 }
 
 fieldset {
+  position: relative;
   height: min-content;
   padding: 0;
   border: none;
 }
-fieldset:disabled form label {
-  cursor: not-allowed;
-}
 
 .setting-card .server-selection {
   display: flex;
@@ -162,9 +160,11 @@ fieldset:disabled form label {
   background: #383f6b;
 }
 
-.setting-card.sign-in-history a button {
+.setting-card button {
   width: 100%;
+  height: fit-content;
   padding: 12px 48px;
+  align-self: flex-end;
   cursor: pointer;
   background: #383f6b;
 }
diff --git a/src/routers/account.js b/src/routers/account.js
index 8184e4b..b8c61ea 100644
--- a/src/routers/account.js
+++ b/src/routers/account.js
@@ -193,8 +193,6 @@ router.get('/', async (request, response) => {
 		renderData.discordAuthURL = discordAuthURL;
 	}
 
-	renderData.isTester = false;
-
 	response.render('account/account', renderData);
 });
 
diff --git a/views/account/account.handlebars b/views/account/account.handlebars
index 072f1a3..ef6a6a2 100644
--- a/views/account/account.handlebars
+++ b/views/account/account.handlebars
@@ -19,7 +19,7 @@
 				</a>
 
 				<a class="button secondary" id="account-upgrade" href="/account/upgrade">
-					<p class="caption">Upgrade Account</p>
+					<p class="caption">Upgrade account</p>
 				</a>
 			</div>
 		</div>
@@ -58,9 +58,8 @@
 			</div>
 
 			<div class="setting-card">
-				<h2 class="header">Server Environment</h2>
-			{{#if isTester}}
-				<fieldset>
+				<h2 class="header">Server environment</h2>
+				<fieldset {{#unless isTester}}disabled{{/unless}}>
 					<form class="server-selection" id="server">
 						<input type="radio" id="prod" name="server_selection" value="prod" checked="{{ eq account.server_access_level 'prod'}}">
 						<label for="prod">
@@ -74,6 +73,7 @@
 							</svg>
 							<h2>Production</h2>
 						</label>
+						{{#if isTester}}
 						<input type="radio" id="beta" name="server_selection" value="beta" checked="{{ neq account.server_access_level 'prod'}}">
 						<label for="beta">
 							<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -81,20 +81,14 @@
 							</svg>
 							<h2>Beta</h2>
 						</label>
+						{{/if}}
 					</form>
 				</fieldset>
-				{{#if discordUser}}
-					<p>Connected to Discord as {{ discordUser.username }}#{{ discordUser.discriminator }}</p>
-					<button class="button secondary" id="remove-discord-connection">Remove Discord account</button>
-				{{else}}
-					<a href="{{ discordAuthURL }}">
-						<button class="button secondary" id="link-discord-account">Link Discord account</button>
-					</a>
-				{{/if}}
-			{{else}}
-				<p>Account is not a beta tester, locked to production servers.</p>
+			{{#unless isTester}}
 				<p>Beta servers are exclusive to beta testers.<br>To become a beta tester, upgrade to a higher account tier.</p>
-			{{/if}}
+			{{else}}
+				<p>Your current tier (insert current tier{{currentTier}}) gives you beta server access. Cool!</p>
+			{{/unless}}
 			</div>
 			
 			<h2 class="section-header" id="security">Sign in and security</h2>
@@ -134,13 +128,25 @@
 			</div>
 
 			<h2 class="section-header" id="other">Other settings</h2>
-			<div class="setting-card span-both-columns">
+				<div class="setting-card">
+					<h2 class="header">Discord</h2>
+						{{#if discordUser}}
+					<p>Connected to Discord as {{ discordUser.username }}#{{ discordUser.discriminator }}</p>
+					<button class="button secondary" id="remove-discord-connection">Remove Discord account</button>
+				{{else}}
+					<p>To link your Discord account, run /whatever in the <a href="https://invite.gg/pretendo" >Discord server</a></p>
+				{{/if}}
+			</div>
+
+			<div class="setting-card">
 				<h2 class="header">Newsletter</h2>
 				<form id="other">
 					<input type="checkbox" id="marketing" name="marketing" {{#if account.flags.marketing}}checked{{/if}}>
 					<label for="marketing">Receive project updates via email (you can opt-out at any time)</label>
 				</form>
 			</div>
+
+
 		</div>
 	</div>
 	{{> footer }}