From e4cc0d6542fc2f7358c37da4f768a1267b4bc735 Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Sat, 15 Feb 2025 18:27:30 +0000
Subject: [PATCH] fix nav styles

---
 appview/pages/pages.go                        |  14 ++-
 appview/pages/templates/layouts/repobase.html | 111 +++++-------------
 flake.nix                                     |   2 +-
 3 files changed, 41 insertions(+), 86 deletions(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 8660037c..c7b9b038 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -38,6 +38,16 @@ func funcMap() template.FuncMap {
 				return did
 			}
 		},
+		"assoc": func(values ...string) ([][]string, error) {
+			if len(values)%2 != 0 {
+				return nil, fmt.Errorf("invalid assoc call, must have an even number of arguments")
+			}
+			pairs := make([][]string, 0)
+			for i := 0; i < len(values); i += 2 {
+				pairs = append(pairs, []string{values[i], values[i+1]})
+			}
+			return pairs, nil
+		},
 	}
 }
 
@@ -186,7 +196,7 @@ type RepoIndexParams struct {
 }
 
 func (p *Pages) RepoIndexPage(w io.Writer, params RepoIndexParams) error {
-	params.Active = "index"
+	params.Active = "overview"
 	return p.executeRepo("repo/index", w, params)
 }
 
@@ -254,10 +264,12 @@ type RepoSettingsParams struct {
 	LoggedInUser                *auth.User
 	RepoInfo                    RepoInfo
 	Collaborators               [][]string
+	Active                      string
 	IsCollaboratorInviteAllowed bool
 }
 
 func (p *Pages) RepoSettings(w io.Writer, params RepoSettingsParams) error {
+	params.Active = "settings"
 	return p.executeRepo("repo/settings", w, params)
 }
 
diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html
index 86dd59bc..945e00ad 100644
--- a/appview/pages/templates/layouts/repobase.html
+++ b/appview/pages/templates/layouts/repobase.html
@@ -11,90 +11,33 @@
         {{ end }}
     </section>
     <section id="repo-links" class="min-h-screen flex flex-col">
-        <nav class="w-full max-w-3xl mx-auto">
-            <div class="relative">
-                <div class="flex relative">
-                    <a
-                        href="/{{ .RepoInfo.FullName }}"
-                        class="relative -mr-px group no-underline"
-                        hx-boost="true"
-                    >
-                        <div
-                            class="px-4 py-2 bg-white text-black min-w-[80px] text-center text-sm relative z-60 group-hover:bg-gray-50
-                            {{ if eq .Active "index" }}
-                                border-b-white border-b-0 border-gray-300
-                                border-l border-r border-t
-                            {{ else }}
-                                border-gray-300 border translate-y-[2px]
-                            {{ end }}"
-                        >
-                            overview
-                        </div>
-                    </a>
-
-                    <a
-                        href="/{{ .RepoInfo.FullName }}/issues"
-                        class="relative -mr-px group no-underline"
-                        hx-boost="true"
-                    >
-                        <div
-                            class="px-4 py-2 bg-white text-black min-w-[80px] text-center text-sm  relative z-50 group-hover:bg-gray-50
-                            {{ if eq .Active "issues" }}
-                                border-gray-500 border border-b-0 bg-white
-                            {{ else }}
-                                border-gray-300 border translate-y-[2px]
-                            {{ end }}
-                            "
-                        >
-                            issues
-                        </div>
-                    </a>
-
-                    <a
-                        href="#"
-                        class="relative -mr-px group no-underline"
-                        hx-boost="true"
-                    >
-                        <div
-                            class="px-4 py-2 bg-white text-black min-w-[80px] text-center text-sm relative z-40 group-hover:bg-gray-50
-                            {{ if eq .Active "pulls" }}
-                                border-gray-500 border border-b-0 bg-white
-                            {{ else }}
-                                border-gray-300 border translate-y-[2px]
-                            {{ end }}
-                            "
-                        >
-                            pull requests
-                        </div>
-                    </a>
-
-                    {{ if .RepoInfo.SettingsAllowed }}
-                        <a
-                            href="/{{ .RepoInfo.FullName }}/settings"
-                            class="relative -mr-px group no-underline"
-                            hx-boost="true"
-                        >
-                            <div
-                                class="px-6 py-2 bg-white text-black min-w-[80px] text-center text-sm relative z-40 group-hover:bg-gray-50
-                                {{ if .Active }}
-                                    border-gray-500 border border-b-0 bg-white
-                                {{ else }}
-                                    border-gray-300 border translate-y-[2px]
-                                {{ end }}
-                                "
-                            >
-                                settings
-                            </div>
-                        </a>
-                    {{ end }}
-                </div>
-            </div>
-        </nav>
-        <section
-            class="bg-white p-6 min-h-[200px] border border-gray-300 relative z-20 w-full max-w-3xl mx-auto"
-        >
-            {{ block "repoContent" . }}{{ end }}
-        </section>
+      <nav class="w-full mx-auto">
+        <div class="flex z-60 border-black border-b">
+          {{ $activeTabStyles := "border-black border-l border-r border-t border-b-0 -mb-px bg-white" }}
+          {{ $tabs := assoc "overview" "/"  "issues" "/issues"  "pulls" "/pulls"  "settings" "/settings" }}
+          {{ range $item := $tabs }}
+            {{ $key := index $item 0 }}
+            {{ $value := index $item 1 }}
+            <a
+              href="/{{ $.RepoInfo.FullName }}{{ $value }}"
+              class="relative -mr-px group no-underline"
+              hx-boost="true"
+            >
+              <div
+                  class="px-4 py-2 mr-1 text-black min-w-[80px] text-center text-sm relative group-hover:bg-gray-50
+                         {{ if eq $.Active $key }}{{ $activeTabStyles }}{{ end }}"
+                  >
+                  {{ $key }}
+              </div>
+            </a>
+            {{ end}}
+        </div>
+      </nav>
+      <section
+          class="bg-white p-6 min-h-[200px] border-l border-r border-b border-black relative z-20 w-full mx-auto"
+          >
+          {{ block "repoContent" . }}{{ end }}
+      </section>
     </section>
 {{ end }}
 
diff --git a/flake.nix b/flake.nix
index 43622cb9..870fb1a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -97,7 +97,7 @@
         pkgs.writeShellScriptBin "run"
         ''
           ${pkgs.air}/bin/air -c /dev/null \
-          -build.cmd "cp -f ${htmx-src} appview/pages/static/htmx.min.js && ${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o ./appview/pages/static/tw.css && ${pkgs.go}/bin/go build -o ./out/${name}.out ./cmd/${name}/main.go" \
+          -build.cmd "cp -rf ${htmx-src} appview/pages/static/htmx.min.js && ${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o ./appview/pages/static/tw.css && ${pkgs.go}/bin/go build -o ./out/${name}.out ./cmd/${name}/main.go" \
           -build.bin "./out/${name}.out" \
           -build.include_ext "go,html,css"
         '';
-- 
2.51.2