From 804f88f098697fe76d920ae4c7fb1588f205843f Mon Sep 17 00:00:00 2001
From: MrMelon54 <github@mrmelon54.com>
Date: Sun, 29 Oct 2023 22:19:18 +0000
Subject: [PATCH] Some refactoring and styles

---
 src/App.svelte                        |   1 -
 src/components/RedirectCreator.svelte |   5 +-
 src/components/RedirectRow.svelte     |   4 -
 src/components/RouteCreator.svelte    |   5 +-
 src/components/RouteRow.svelte        |   4 -
 src/views/VioletView.svelte           | 232 +++++++++++++++-----------
 test-server/main.go                   |  84 ++++------
 7 files changed, 176 insertions(+), 159 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 6b1c7fd..d6fd8bb 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -171,7 +171,6 @@
 
     #option-view {
       box-sizing: border-box;
-      padding: 16px;
       overflow-y: auto;
       height: 100%;
       flex-grow: 1;
diff --git a/src/components/RedirectCreator.svelte b/src/components/RedirectCreator.svelte
index 8f2d48d..5fdc09e 100644
--- a/src/components/RedirectCreator.svelte
+++ b/src/components/RedirectCreator.svelte
@@ -30,8 +30,9 @@
 </tr>
 
 <style lang="scss">
-  tr:nth-child(2n) {
-    background-color: #2a2a2a;
+  tr.created {
+    position: sticky;
+    top: 0;
   }
 
   .desc textarea {
diff --git a/src/components/RedirectRow.svelte b/src/components/RedirectRow.svelte
index 43776ff..9dc833b 100644
--- a/src/components/RedirectRow.svelte
+++ b/src/components/RedirectRow.svelte
@@ -41,10 +41,6 @@
 {/if}
 
 <style lang="scss">
-  tr:nth-child(2n) {
-    background-color: #2a2a2a;
-  }
-
   tr.created {
     background-color: #1a5100;
 
diff --git a/src/components/RouteCreator.svelte b/src/components/RouteCreator.svelte
index 65b9d62..06984de 100644
--- a/src/components/RouteCreator.svelte
+++ b/src/components/RouteCreator.svelte
@@ -28,8 +28,9 @@
 </tr>
 
 <style lang="scss">
-  tr:nth-child(2n) {
-    background-color: #2a2a2a;
+  tr.created {
+    position: sticky;
+    top: 0;
   }
 
   .desc textarea {
diff --git a/src/components/RouteRow.svelte b/src/components/RouteRow.svelte
index ceaec41..41c3623 100644
--- a/src/components/RouteRow.svelte
+++ b/src/components/RouteRow.svelte
@@ -38,10 +38,6 @@
 {/if}
 
 <style lang="scss">
-  tr:nth-child(2n) {
-    background-color: #2a2a2a;
-  }
-
   tr.created {
     background-color: #1a5100;
 
diff --git a/src/views/VioletView.svelte b/src/views/VioletView.svelte
index 6e96c26..b5c2d33 100644
--- a/src/views/VioletView.svelte
+++ b/src/views/VioletView.svelte
@@ -136,93 +136,111 @@
   }
 </script>
 
-<div style="padding:8px;background-color:#bb7900;">
-  Warning: This is currently still under development, however it DOES update the real server routes and redirects
+<div class="wrapper">
+  <div style="padding:8px;background-color:#bb7900;">
+    Warning: This is currently still under development, however it DOES update the real server routes and redirects
+  </div>
+
+  <div class="scrolling-area">
+    {#await promiseForRoutes}
+      <div class="text-padding">
+        <h2>Routes</h2>
+        <div>Loading...</div>
+      </div>
+    {:then}
+      <table>
+        <thead>
+          <tr>
+            <th colspan="6"><h2>Routes</h2></th>
+          </tr>
+          <tr>
+            <th>Source</th>
+            <th>Destination</th>
+            <th>Flags</th>
+            <th>Description</th>
+            <th>Active</th>
+            <th>Option</th>
+          </tr>
+          <RouteCreator
+            on:make={e => {
+              const x = e.detail;
+              routeData[x.src] = {client: x, server: routeData[x.src]?.server};
+              routeSrcs.push(x.src);
+              routeSrcs = routeSrcs;
+            }}
+          />
+        </thead>
+        <tbody>
+          {#each routeSrcs as src (src)}
+            {#if routeData[src]}
+              <RouteRow bind:route={routeData[src]} />
+            {:else}
+              <tr><td colspan="5">Error loading row for {src}</td></tr>
+            {/if}
+          {/each}
+        </tbody>
+      </table>
+    {:catch err}
+      <div class="text-padding">
+        <h2>Routes</h2>
+        <div>Administrator... I hardly know her?</div>
+        <div>{err}</div>
+      </div>
+    {/await}
+
+    {#await promiseForRedirects}
+      <div class="text-padding">
+        <h2>Redirects</h2>
+        <div>Loading...</div>
+      </div>
+    {:then}
+      <table>
+        <thead>
+          <tr>
+            <th colspan="8"><h2>Redirects</h2></th>
+          </tr>
+          <tr>
+            <th>Source</th>
+            <th>Destination</th>
+            <th>Flags</th>
+            <th>Code</th>
+            <th>Description</th>
+            <th>Active</th>
+            <th>Option</th>
+          </tr>
+          <RedirectCreator
+            on:make={e => {
+              const x = e.detail;
+              redirectData[x.src] = {client: x, server: redirectData[x.src]?.server};
+              redirectSrcs.push(x.src);
+              redirectSrcs = redirectSrcs;
+            }}
+          />
+        </thead>
+        <tbody>
+          {#each redirectSrcs as src (src)}
+            {#if redirectData[src]}
+              <RedirectRow bind:redirect={redirectData[src]} />
+            {:else}
+              <tr><td colspan="5">Error loading row for {src}</td></tr>
+            {/if}
+          {/each}
+        </tbody>
+      </table>
+    {:catch err}
+      <div class="text-padding">
+        <h2>Redirects</h2>
+        <div>Administrator... I hardly know her?</div>
+        <div>{err}</div>
+      </div>
+    {/await}
+  </div>
+
+  <div class="footer">
+    <button on:click={() => saveChanges()}>Save Changes</button>
+  </div>
 </div>
 
-<h2>Routes</h2>
-{#await promiseForRoutes}
-  <div>Loading...</div>
-{:then}
-  <table>
-    <thead>
-      <tr>
-        <th>Source</th>
-        <th>Destination</th>
-        <th>Flags</th>
-        <th>Description</th>
-        <th>Active</th>
-        <th>Option</th>
-      </tr>
-    </thead>
-    <tbody>
-      {#each routeSrcs as src (src)}
-        {#if routeData[src]}
-          <RouteRow bind:route={routeData[src]} />
-        {:else}
-          <tr><td colspan="5">Error loading row for {src}</td></tr>
-        {/if}
-      {/each}
-
-      <RouteCreator
-        on:make={e => {
-          const x = e.detail;
-          routeData[x.src] = {client: x, server: routeData[x.src]?.server};
-          routeSrcs.push(x.src);
-          routeSrcs = routeSrcs;
-        }}
-      />
-    </tbody>
-  </table>
-{:catch err}
-  <div>{err}</div>
-{/await}
-
-<h2>Redirects</h2>
-{#await promiseForRedirects}
-  <div>Loading...</div>
-{:then}
-  <table>
-    <thead>
-      <tr>
-        <th>Source</th>
-        <th>Destination</th>
-        <th>Flags</th>
-        <th>Code</th>
-        <th>Description</th>
-        <th>Active</th>
-        <th>Option</th>
-      </tr>
-    </thead>
-    <tbody>
-      {#each redirectSrcs as src (src)}
-        {#if redirectData[src]}
-          <RedirectRow bind:redirect={redirectData[src]} />
-        {:else}
-          <tr><td colspan="5">Error loading row for {src}</td></tr>
-        {/if}
-      {/each}
-
-      <RedirectCreator
-        on:make={e => {
-          const x = e.detail;
-          redirectData[x.src] = {client: x, server: redirectData[x.src]?.server};
-          redirectSrcs.push(x.src);
-          redirectSrcs = redirectSrcs;
-        }}
-      />
-    </tbody>
-  </table>
-{:catch err}
-  <div>{err}</div>
-{/await}
-
-<div class="footer-fake" />
-
-<footer>
-  <button on:click={() => saveChanges()}>Save Changes</button>
-</footer>
-
 <style lang="scss">
   table {
     border-collapse: collapse;
@@ -230,7 +248,25 @@
     width: 100%;
 
     thead {
-      background-color: #04aa6d;
+      background-color: #333333;
+      position: sticky;
+      top: 0;
+      z-index: 9999;
+      box-shadow: 0 4px 8px #0003, 0 6px 20px #00000030;
+
+      th h2 {
+        margin: 0;
+      }
+    }
+
+    tbody :global(tr) {
+      &:nth-child(2n) {
+        background-color: #2a2a2a;
+      }
+
+      &:nth-child(2n + 1) {
+        background-color: #242424;
+      }
     }
 
     :global(th),
@@ -240,16 +276,26 @@
     }
   }
 
-  .footer-fake {
-    height: 50px;
+  .wrapper {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+
+    .scrolling-area {
+      overflow: auto;
+      height: 100%;
+    }
   }
 
-  footer {
-    position: absolute;
-    bottom: 0;
+  .text-padding {
+    padding: 4px 16px;
+  }
+
+  .footer {
     height: 50px;
     background-color: #2c2c2c;
-    width: calc(100% - 150px - 32px);
     box-shadow: 0 -4px 8px #0003, 0 -6px 20px #00000030;
 
     button {
@@ -262,8 +308,8 @@
       font-size: 20px;
       font-weight: 700;
       line-height: 24px;
-      width: calc(100%);
       height: 50px;
+      padding: 4px 16px;
     }
   }
 </style>
diff --git a/test-server/main.go b/test-server/main.go
index 1977eb2..95a6b31 100644
--- a/test-server/main.go
+++ b/test-server/main.go
@@ -105,72 +105,50 @@ var serveApiCors = cors.New(cors.Options{
 func apiServer(verify mjwt.Verifier) {
 	r := http.NewServeMux()
 	r.Handle("/v1/violet/route", hasPerm(verify, "violet:route", func(rw http.ResponseWriter, req *http.Request) {
-		json.NewEncoder(rw).Encode([]map[string]any{
-			{
-				"src":    "example.com",
+		m := make([]map[string]any, 0, 40)
+		for i := 0; i < 20; i++ {
+			m = append(m, map[string]any{
+				"src":    uuid.NewString() + ".example.com",
 				"dst":    "127.0.0.1:8080",
 				"desc":   "This is a test description",
 				"flags":  181,
 				"active": true,
-			},
-			{
-				"src":    "test.example.com",
-				"dst":    "127.0.0.1:8081",
-				"desc":   "This is a test description",
-				"flags":  17,
-				"active": true,
-			},
-			{
-				"src":    "example.org/hello",
-				"dst":    "127.0.0.1:8082",
-				"desc":   "This is a test description",
-				"flags":  16,
-				"active": true,
-			},
-			{
-				"src":    "test.example.org/hello",
-				"dst":    "127.0.0.1:8083",
-				"desc":   "This is a test description",
-				"flags":  15,
-				"active": true,
-			},
-		})
-	}))
-	r.Handle("/v1/violet/redirect", hasPerm(verify, "violet:redirect", func(rw http.ResponseWriter, req *http.Request) {
-		json.NewEncoder(rw).Encode([]map[string]any{
-			{
-				"src":    "example.org",
-				"dst":    "127.0.0.1:8084",
-				"desc":   "This is a test description",
-				"flags":  181,
-				"code":   307,
-				"active": true,
-			},
-			{
-				"src":    "test.example.org",
+			})
+		}
+		for i := 0; i < 20; i++ {
+			m = append(m, map[string]any{
+				"src":    uuid.NewString() + ".example.org",
 				"dst":    "127.0.0.1:8085",
 				"desc":   "This is a test description",
 				"flags":  17,
-				"code":   302,
 				"active": true,
-			},
-			{
-				"src":    "example.org/hello",
-				"dst":    "127.0.0.1:8086",
+			})
+		}
+		json.NewEncoder(rw).Encode(m)
+	}))
+	r.Handle("/v1/violet/redirect", hasPerm(verify, "violet:redirect", func(rw http.ResponseWriter, req *http.Request) {
+		m := make([]map[string]any, 0, 40)
+		for i := 0; i < 20; i++ {
+			m = append(m, map[string]any{
+				"src":    uuid.NewString() + ".example.com",
+				"dst":    "test1.example.com",
 				"desc":   "This is a test description",
-				"flags":  16,
+				"flags":  1,
 				"code":   308,
 				"active": true,
-			},
-			{
-				"src":    "test.example.org/hello",
-				"dst":    "127.0.0.1:8087",
+			})
+		}
+		for i := 0; i < 20; i++ {
+			m = append(m, map[string]any{
+				"src":    uuid.NewString() + ".example.org",
+				"dst":    "test2.example.org",
 				"desc":   "This is a test description",
-				"flags":  15,
-				"code":   301,
+				"flags":  3,
+				"code":   307,
 				"active": true,
-			},
-		})
+			})
+		}
+		json.NewEncoder(rw).Encode(m)
 	}))
 
 	logger := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {