Merge branch 'master' into fix-pipeline

author: Caleb Mabry <36182383+caleb-mabry@users.noreply.github.com> 2023-02-01 15:54:26 -0500
committer: GitHub <noreply@github.com> 2023-02-01 15:54:26 -0500
commit: 39edb1077725a6b9db58b4c32323e847ece5f2f6 (patch)
tree: 2ab4e9d3c0a007684cb3fb706f70fc677e0f7eca /public
parent: 0eabb5da1759439fd01e54dc986900448f483330 (diff)
parent: f8ea065b5e6bccbebb918293e13cab4adb536b70 (diff)
2 files changed, 46 insertions, 20 deletions
diff --git a/public/client.html b/public/client.html
index 88d446c..ac27662 100644
--- a/public/client.html
+++ b/public/client.html
@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta name="description" content="An off-the-cuff courtroom drama simulator">
     <meta name="author" content="stonedDiscord">
-
+	<meta name="google-signin-client_id" content="107239014890-eo1vg90jdn2l7fgudsp9mdk8c1nraq0g.apps.googleusercontent.com">
     <meta property="og:title" content="Attorney Online">
     <meta property="og:description" content="Attorney Online is an online version of the world-renowned courtroom drama simulator that allows you to create and play out cases in an off-the-cuff format.">
     <meta property="og:type" content="website">
@@ -20,13 +20,14 @@
     <meta property="twitter:url" content="http://web.aceattorneyonline.com/">
     <meta property="twitter:image" content="https://repository-images.githubusercontent.com/78860508/89fcba80-aafd-11e9-80db-c5b10c01aba9">
 
-	<meta http-equiv="Content-Security-Policy" content="script-src-elem 'self' 'unsafe-inline' https://ajax.googleapis.com;
-	style-src-elem 'self' 'unsafe-inline' https://golden-layout.com;
-														script-src 'self' 'unsafe-inline' 'unsafe-eval' https://ajax.googleapis.com;
-														style-src 'self' 'unsafe-inline' https://golden-layout.com;
-														img-src 'self' data: file: *;
-														connect-src 'self' ws: file: *;
-														media-src 'self' file: *;">
+	<meta http-equiv="Content-Security-Policy" content="
+		script-src-elem 'self' 'unsafe-inline' https://ajax.googleapis.com https://accounts.google.com/gsi/client;
+		style-src-elem 'self' 'unsafe-inline' https://golden-layout.com https://accounts.google.com/gsi/style;
+		script-src 'self' 'unsafe-inline' 'unsafe-eval' https://ajax.googleapis.com https://accounts.google.com/gsi/client;
+		style-src 'self' 'unsafe-inline' https://golden-layout.com https://accounts.google.com/gsi/style;
+		img-src 'self' data: file: *;
+		connect-src 'self' ws: file: *;
+		media-src 'self' file: *;">
 
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="apple-touch-icon" href="logo-new.png"/>
@@ -38,8 +39,8 @@
 	<link type="text/css" rel="stylesheet" href="golden/css/goldenlayout.css" />
 	<link type="text/css" rel="stylesheet"
 		href="https://golden-layout.com/files/latest/css/goldenlayout-dark-theme.css" />
-
-	<script src="lib/jdataview.min.js"></script>
+	<script src="https://accounts.google.com/gsi/client" async defer></script>
+	<script src="lib/jdataview.min.js" async defer></script>
 </head>
 
 <body>
@@ -49,6 +50,27 @@
 		<h1 id="client_loadingtext">Loading</h1>
 		<progress id="client_loadingbar" value="0"></progress>
 	</div>
+	<div id="client_secondfactor" style="display: none">
+		<center>
+		<p>You need to authorize to continue</p>
+		<div id="g_id_onload"
+			data-client_id="107239014890-eo1vg90jdn2l7fgudsp9mdk8c1nraq0g"
+			data-context="use"
+			data-ux_mode="popup"
+			data-callback="handleCredentialResponse"
+			data-nonce=""
+			data-auto_select="true">
+		</div>
+		<div class="g_id_signin"
+			data-type="standard"
+			data-shape="rectangular"
+			data-theme="outline"
+			data-text="continue_with"
+			data-size="large"
+			data-logo_alignment="left">
+		</div>
+		</center>
+	</div>
 	<div id="client_charselect">
 		<p>Choose your character</p>
 		<button onclick="pickChar(-1)">Or spectate</button>
@@ -228,7 +250,7 @@
 					<input id="ic_chat_name" name="ic_chat_name" type="text">
 					<br>
 					<label for="showname">Show others:</label>
-					<input id="showname" name="showname" type="checkbox" onclick="showname_click()">
+					<input id="showname" name="showname" type="checkbox" onclick="showname_click()" checked>
 					<br>
 					<br>
 					<label for="check_nonint">Noninterrupting Preanimation:</label>
@@ -466,16 +488,16 @@
 			<select id="client_chatboxselect" name="client_chatboxselect" onchange="setChatbox(this.value)">
 				<option value="dynamic" selected>Use characters</option>
 				<option value="aa">AA</option>
-				<option value="chatdd">DD / SoJ</option>
+				<option value="dd">DD / SoJ</option>
 				<option value="dgs">DGS</option>
-				<option value="chatplvsaa">PL vs AA</option>
+				<option value="plvsaa">PL vs AA</option>
 				<option value="trilogy">Trilogy</option>
-				<option value="chatfuture">Future theme</option>
+				<option value="future">Future theme</option>
 				<option value="legacy">old webAO</option>
-				<option value="chat999">999</option>
+				<option value="999">999</option>
 				<option value="acww">Animal Crossing</option>
 				<option value="dr1">DR 1</option>
-				<option value="chatdr2">DR 2</option>
+				<option value="dr2">DR 2</option>
 				<option value="drv3">DR 3</option>
 				<option value="drae">DR: AE</option>
 				<option value="ddlc">DDLC</option>
@@ -483,7 +505,7 @@
 				<option value="key">Key</option>
 				<option value="n64zelda">N64 Zelda</option>
 				<option value="papermario">Paper Mario</option>
-				<option value="chatp3">Persona 3</option>
+				<option value="p3">Persona 3</option>
 				<option value="p4">Persona 4</option>
 				<option value="p5">Persona 5</option>
 				<option value="halla">VA-11 HALL-A</option>
@@ -499,8 +521,9 @@
 			<br>
 			<br>
 			<p>Ini editing (experimental)</p>
-			<label for="client_ininame">Iniedit Character:</label>
-			<input type="text" id="client_ininame" name="client_ininame"></select>
+			<label for="client_iniselect">Iniedit Character:</label>
+			<select id="client_iniselect" name="client_iniselect" onchange="updateIniswap()"></select>
+			<input id="client_ininame" name="client_ininame"></input>
 			<button id="client_inichange" onclick="iniedit()">Change</button>
 			<br>
 			<br>
diff --git a/public/index.html b/public/index.html
index 8d0b1c4..1469359 100644
--- a/public/index.html
+++ b/public/index.html
@@ -95,11 +95,14 @@
             <p>webAO requires JavaScript to work</p>
         </div>
         </noscript>
-        <ul class="serverlist" id="masterlist">
+        <ul class="serverlist">
             <li id="server-2" class="available" onmouseover="setServ(-2)">
                 <p>Singleplayer (beta)</p>
                 <a class="button" href="client.html?mode=replay">Try</a>
             </li>
+        </ul>
+        <ul class="serverlist" id="masterlist"></ul>
+        <ul class="serverlist">
             <li id="server-1" class="unavailable" onmouseover="setServ(-1)">
                 <p>Localhost</p>
                 <a class="button" href="client.html?mode=watch&ip=127.0.0.1:50001">Watch</a>
author	Caleb Mabry <36182383+caleb-mabry@users.noreply.github.com>	2023-02-01 15:54:26 -0500
committer	GitHub <noreply@github.com>	2023-02-01 15:54:26 -0500
commit	39edb1077725a6b9db58b4c32323e847ece5f2f6 (patch)
tree	2ab4e9d3c0a007684cb3fb706f70fc677e0f7eca /public
parent	0eabb5da1759439fd01e54dc986900448f483330 (diff)
parent	f8ea065b5e6bccbebb918293e13cab4adb536b70 (diff)