From dfb3f485c3b8670f001239deadd10c42e86aebaa Mon Sep 17 00:00:00 2001
From: velzie <velzie@velzie.rip>
Date: Sun, 13 Oct 2024 11:08:01 -0400
Subject: [PATCH] percury unblocker design refresh

---
 static/index.html |  14 +++-
 static/ui.js      | 170 +++++++++++++++++++++++++++-------------------
 2 files changed, 115 insertions(+), 69 deletions(-)

diff --git a/static/index.html b/static/index.html
index bccde16..c3e7647 100644
--- a/static/index.html
+++ b/static/index.html
@@ -11,6 +11,18 @@
 			href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&amp;family=Inter+Tight:ital,wght@0,100..900;1,100..900&amp;family=Inter:wght@100..900&amp;display=swap&amp;"
 			rel="stylesheet"
 		/>
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+		<link
+			href="https://fonts.googleapis.com/css2?family=Hind:wght@300;400;500;600;700&display=swap"
+			rel="stylesheet"
+		/>
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+		<link
+			href="https://fonts.googleapis.com/css2?family=Hind:wght@300;400;500;600;700&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"
+			rel="stylesheet"
+		/>
 		<style>
 			body,
 			html,
@@ -25,7 +37,7 @@
 				height: 100vh;
 				margin: 0;
 				padding: 0;
-				background-color: #121212;
+				background-color: #050505;
 				overflow: hidden;
 			}
 		</style>
diff --git a/static/ui.js b/static/ui.js
index a0ce2a0..dd784f5 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -38,6 +38,61 @@ const store = $store(
 	{ ident: "settings", backing: "localstorage", autosave: "auto" }
 );
 connection.setTransport("/epoxy/index.mjs", [{ wisp: store.wispurl }]);
+
+function Config() {
+	this.css = `
+    .cfg * {
+      margin: 2px;
+    }
+    .buttons button {
+      border: 1px solid #4c8bf5;
+      background-color: #313131;
+      border-radius: 0.75em;
+      color: #fff;
+      padding: 0.45em;
+    }
+    .cfg input {
+      border: none;
+      background-color: #313131;
+      border-radius: 0.75em;
+      color: #fff;
+      outline: none;
+      padding: 0.45em;
+    }
+    .input_row input {
+      flex-grow: 1
+    }
+
+  `;
+	return html`
+      <dialog class=${["cfg"]}>
+       
+        <div style="align-self: end">
+          <div class=${[flex, "buttons"]}>
+            <button on:click=${() => connection.setTransport("/baremod/index.mjs", [store.bareurl])}>use bare server 3</button>
+            <button on:click=${() =>
+							connection.setTransport("/libcurl/index.mjs", [
+								{
+									wisp: store.wispurl,
+									proxy: store.proxy ? store.proxy : undefined,
+								},
+							])}>use libcurl.js</button>
+            <button on:click=${() => connection.setTransport("/epoxy/index.mjs", [{ wisp: store.wispurl }])}>use epoxy</button>
+            <button on:click=${() => window.open(this.urlencoded)}>open in fullscreen</button>
+          </div>
+        </div>
+ <div class=${[flex, col, "input_row"]}>
+          <label for="wisp_url_input">Wisp URL:</label>
+          <input id="wisp_url_input" bind:value=${use(store.wispurl)}></input>
+        </div>
+        <div class=${[flex, col, "input_row"]}>
+          <label for="bare_url_input">Bare URL:</label>
+          <input id="bare_url_input" bind:value=${use(store.bareurl)}></input>
+        </div>
+    </dialog>
+  `;
+}
+
 function App() {
 	this.urlencoded = "";
 	this.css = `
@@ -45,38 +100,48 @@ function App() {
     height: 100%;
     color: #e0def4;
     display: flex;
-    align-items: center;
-    justify-content: center;
     flex-direction: column;
+    padding: 0.5em;
+    padding-top: 0;
+    box-sizing: border-box;
+
+    a {
+    color: #e0def4;
+    }
+
     input,
     button {
       font-family: "Inter", system-ui, -apple-system, BlinkMacSystemFont,
         sans-serif;
     }
+    .version {
+    }
     h1 {
       font-family: "Inter Tight", "Inter", system-ui, -apple-system, BlinkMacSystemFont,
       sans-serif;
       margin-bottom: 0;
     }
     iframe {
-      border: 2px solid #313131;
       background-color: #fff;
-      border-radius: 0.5rem;
-      margin: 1em;
-      margin-top: 0.5em;
-      width: calc(100% - 2em);
-      height: calc(100% - 8em);
+      border: none;
+      border-radius: 0.3em;
+      flex: 1;
+      width: 100%;
     }
 
     input.bar {
+      font-family: "Inter";
+      padding: 0.1em;
+      padding-left: 0.3em;
       border: none;
       outline: none;
       color: #fff;
-      height: 2em;
-      text-align: center;
-      border-radius: 0.75em;
-      background-color: #313131;
-      padding: 0.30em;
+      height: 1.5em;
+      border-radius: 0.3em;
+      flex: 1;
+
+      background-color: #121212;
+      border: 1px solid #313131;
     }
     .input_row > label {
       font-size: 0.7rem;
@@ -86,36 +151,23 @@ function App() {
       margin: 0;
       margin-top: 0.2em;
     }
-    .cfg * {
-      margin: 2px;
-    }
-    .buttons button {
-      border: 1px solid #4c8bf5;
-      background-color: #313131;
-      border-radius: 0.75em;
-      color: #fff;
-      padding: 0.45em;
-    }
-    .cfg input {
-      border: none;
-      background-color: #313131;
-      border-radius: 0.75em;
-      color: #fff;
-      outline: none;
-      padding: 0.45em;
+
+    .nav {
+      padding-top: 0.3em;
+      padding-bottom: 0.3em;
+      gap: 0.3em;
     }
-    .input_row input {
-      flex-grow: 1
+    spacer {
+      margin-left: 10em;
     }
 
     .nav button {
-      margin-right: 0.25em;
-      margin-left: 0.25em;
       color: #fff;
       outline: none;
       border: none;
-      border-radius: 0.75em;
-      background-color: #313131;
+      border-radius: 0.30em;
+      background-color: #121212;
+      border: 1px solid #313131;
     }
   `;
 	this.url = store.url;
@@ -146,44 +198,26 @@ function App() {
 		return frame.go(this.url);
 	};
 
+	const cfg = h(Config);
+	document.body.appendChild(cfg);
+
 	return html`
       <div>
-      <h1>scramjet</h1>
-      <p>surf the unblocked and mostly buggy web</p>
+      <div class=${[flex, "nav"]}>
 
-      <div class=${[flex, "cfg"]}>
-       
-        <div style="align-self: end">
-          <div class=${[flex, "buttons"]}>
-            <button on:click=${() => connection.setTransport("/baremod/index.mjs", [store.bareurl])}>use bare server 3</button>
-            <button on:click=${() =>
-							connection.setTransport("/libcurl/index.mjs", [
-								{
-									wisp: store.wispurl,
-									proxy: store.proxy ? store.proxy : undefined,
-								},
-							])}>use libcurl.js</button>
-            <button on:click=${() => connection.setTransport("/epoxy/index.mjs", [{ wisp: store.wispurl }])}>use epoxy</button>
-            <button on:click=${() => window.open(this.urlencoded)}>open in fullscreen</button>
-          </div>
-        </div>
- <div class=${[flex, col, "input_row"]}>
-          <label for="wisp_url_input">Wisp URL:</label>
-          <input id="wisp_url_input" bind:value=${use(store.wispurl)}></input>
-        </div>
-        <div class=${[flex, col, "input_row"]}>
-          <label for="bare_url_input">Bare URL:</label>
-          <input id="bare_url_input" bind:value=${use(store.bareurl)}></input>
-        </div>
-    </div>
-      <div class=${[flex, "nav"]} style="width: 60%">
+        <button on:click=${() => cfg.showModal()}>config</button>
         <button on:click=${() => frame.back()}>&lt;-</button>
-        <input class="bar" style="flex: 1" bind:value=${use(this.url)} on:input=${(
-					e
-				) => {
+        <button on:click=${() => frame.forward()}>-&gt;</button>
+
+        <input class="bar" bind:value=${use(this.url)} on:input=${(e) => {
 					this.url = e.target.value;
 				}} on:keyup=${(e) => e.keyCode == 13 && (store.url = this.url) && handleSubmit()}></input>
-        <button on:click=${() => frame.forward()}>-&gt;</button>
+
+        <button on:click=${() => window.open(scramjet.encodeUrl(this.url))}>open</button>
+
+        <p class="version">
+          <b>scramjet</b> ${$scramjet.version.version} <a href="https://github.com/MercuryWorkshop/scramjet/tree/${$scramjet.version.build}">${$scramjet.version.build}</a>
+        </p>
       </div>
       ${frame.frame}
     </div>