From 57d43664728392f3c478398f03bd3957a921890f Mon Sep 17 00:00:00 2001
From: MrMelon54 <github@mrmelon54.com>
Date: Mon, 13 Nov 2023 20:19:52 +0000
Subject: [PATCH] Some minor changes on the sites view

---
 src/views/SitesView.svelte | 23 ++++++++++++++++++-----
 test-server/main.go        |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/views/SitesView.svelte b/src/views/SitesView.svelte
index d3061f4..2b77267 100644
--- a/src/views/SitesView.svelte
+++ b/src/views/SitesView.svelte
@@ -91,15 +91,21 @@
         </thead>
         <tbody class="invert-rows">
           {#each tableKeys as key (key)}
+            {@const site = $sitesTable[key]}
+            {@const domain = site.domain.replace(/[^0-9a-z-]/gi, "-")}
             <tr>
-              <td><a href="https://{$sitesTable[key].domain}" target="_blank">{$sitesTable[key].domain}</a></td>
+              <td><a href="https://{site.domain}" target="_blank">{site.domain}</a></td>
               <td class="branch-cell">
-                {#each $sitesTable[key].branches as branch}
-                  <div>{branch}</div>
-                  <div><button on:click={() => deleteBranch($sitesTable[key], branch)}>Delete Branch</button></div>
+                {#each site.branches as branch}
+                  {#if branch == ""}
+                    <div><a href="https://{domain}_main.sites.1f349.com" target="_blank" class="main-or-master">main or master</a></div>
+                  {:else}
+                    <div><a href="https://{domain}_{branch}.sites.1f349.com" target="_blank">{branch}</a></div>
+                  {/if}
+                  <div><button on:click={() => deleteBranch(site, branch)}>Delete Branch</button></div>
                 {/each}
               </td>
-              <td><button on:click={() => resetSiteSecret($sitesTable[key])}>Reset Secret</button></td>
+              <td><button on:click={() => resetSiteSecret(site)}>Reset Secret</button></td>
             </tr>
           {/each}
         </tbody>
@@ -117,5 +123,12 @@
   .branch-cell {
     display: grid;
     grid-template-columns: repeat(2, auto);
+
+    width: fit-content;
+    gap: 8px;
+  }
+
+  .main-or-master {
+    color: lightgreen;
   }
 </style>
diff --git a/test-server/main.go b/test-server/main.go
index 17b97de..5481fae 100644
--- a/test-server/main.go
+++ b/test-server/main.go
@@ -173,13 +173,13 @@ func apiServer(verify mjwt.Verifier) {
 		for i := 0; i < 20; i++ {
 			m = append(m, map[string]any{
 				"domain":   uuid.NewString() + ".example.com",
-				"branches": []string{"@", "@beta"},
+				"branches": []string{"", "beta"},
 			})
 		}
 		for i := 0; i < 20; i++ {
 			m = append(m, map[string]any{
 				"domain":   uuid.NewString() + ".example.org",
-				"branches": []string{"@", "@alpha"},
+				"branches": []string{"", "alpha"},
 			})
 		}
 		json.NewEncoder(rw).Encode(m)