From ec58ef0e37958d474b5a70e8aca804710940d005 Mon Sep 17 00:00:00 2001
From: CoolElectronics <me@coolelectronics.me>
Date: Thu, 17 Aug 2023 12:55:50 -0400
Subject: [PATCH] update visuals of <Proxy/>

---
 frontend/src/App.svelte   |  4 --
 frontend/src/Proxy.svelte | 80 ++++++++++++++++++++++++++++++++++-----
 server/src/main.ts        | 16 +++++++-
 3 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index b2e8f4f..23d7bd7 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -404,8 +404,4 @@
     background-color: rgb(var(--m3-scheme-background));
     color: rgb(var(--m3-scheme-on-background));
   }
-  iframe {
-    outline: none;
-    border: none;
-  }
 </style>
diff --git a/frontend/src/Proxy.svelte b/frontend/src/Proxy.svelte
index 7de9f21..8065930 100644
--- a/frontend/src/Proxy.svelte
+++ b/frontend/src/Proxy.svelte
@@ -1,12 +1,20 @@
 <script lang="ts">
   import { BareClient } from "bare-client-custom";
-  import { SegmentedButtonContainer, SegmentedButtonItem } from "m3-svelte";
+  import {
+    Card,
+    SegmentedButtonContainer,
+    SegmentedButtonItem,
+  } from "m3-svelte";
   import { Win, openWindow } from "../../corium";
+  import Icon from "@iconify/svelte";
 
   let selectedProxy = "ultraviolet";
 
   let url: string = "http://google.com";
 
+  import iconBack from "@iconify-icons/ic/outline-arrowback";
+  import { onMount } from "svelte";
+
   let proxyIframe: HTMLIFrameElement;
 
   function frameLoad() {
@@ -39,15 +47,52 @@
       );
     }
   }
+  onMount(() => {
+    visitURL(url);
+  });
 </script>
 
-<div class="container h-full w-full">
-  <div class="flex">
-    <div class="container">
-      <input bind:value={url} type="text" />
-      <button on:click={() => visitURL(url)}>Go!</button>
+<div class="h-full w-full flex flex-col">
+  <div class="flex p-2">
+    <div class="flex text-xl items-center w-full">
+      <button>
+        <Icon icon="fluent-mdl2:back" />
+      </button>
+      <div class="p-2" />
+      <button>
+        <Icon icon="fluent-mdl2:forward" />
+      </button>
+      <button
+        class="text-2xl px-4"
+        on:click={() => {
+          console.log("a");
+          visitURL(url);
+        }}
+      >
+        <Icon icon="tabler:reload" />
+      </button>
+      <div id="urlbar" class="flex items-center flex-1">
+        <div class="text-2xl px-2">
+          <Icon icon="ic:round-search" />
+        </div>
+        <input
+          bind:value={url}
+          type="text"
+          class="flex-1"
+          on:keydown={(e) => {
+            console.log(e);
+            if (e.key === "Enter") {
+              visitURL(url);
+            }
+          }}
+        />
+      </div>
+
+      <button class="text-2xl pl-3">
+        <Icon icon="ic:round-settings" />
+      </button>
     </div>
-    {#if !import.meta.env.VITE_ADRIFT_SINGLEFILE}
+    <!-- {#if !import.meta.env.VITE_ADRIFT_SINGLEFILE}
       <div>
         <SegmentedButtonContainer>
           <input
@@ -70,7 +115,24 @@
           <SegmentedButtonItem input="dynamic">Dynamic</SegmentedButtonItem>
         </SegmentedButtonContainer>
       </div>
-    {/if}
+    {/if} -->
   </div>
-  <iframe class="h-full w-full" bind:this={proxyIframe} on:load={frameLoad} />
+  <iframe class="flex-1" bind:this={proxyIframe} on:load={frameLoad} />
 </div>
+
+<style>
+  #urlbar {
+    border: solid 0.0625rem rgb(var(--m3-scheme-outline));
+    padding: 0.5rem;
+    border-radius: 0.75rem;
+  }
+  input {
+    background-color: transparent;
+    outline: none;
+    border: none;
+  }
+  iframe {
+    outline: none;
+    border: none;
+  }
+</style>
diff --git a/server/src/main.ts b/server/src/main.ts
index 3f12f34..4ea2630 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -88,8 +88,20 @@ async function login(credentials: any) {
 
     console.log(chalk.blue("Starting server!"));
     if (conf.type == "swarm") {
-        let trackerws = new WebSocket(tracker.tracker + "/join");
-        connectTracker(trackerws);
+        let connect = () => {
+            let trackerws = new WebSocket(tracker.tracker + "/join");
+            trackerws.onclose = () => {
+                console.log(`Disconnected from tracker. Retrying...`)
+                setTimeout(() => {
+                    connect();
+                }, 10000);
+            };
+            trackerws.onopen = () => {
+                console.log(`Connected to tracker ${tracker.tracker}`)
+            }
+            connectTracker(trackerws);
+        };
+        connect();
     } else {
         initializeApp(tracker.firebase);