From 2a444abcf3da19c871ed720dbed95b21fd311fe1 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 8 Apr 2024 12:46:48 +0100
Subject: [PATCH] feat: show repo menu on issue / proposal page

by moving the menu into the RepoHeader

enabling feature request:
nostr:nevent1qqsxpezng8ft7hydqz4g06r79n3vu2rrj560v86jhswaaxcf97zz04gw57v5f
---
 src/lib/components/repo/RepoHeader.svelte     |   5 +-
 src/lib/components/repo/type.ts               |   2 +
 src/lib/wrappers/RepoMenu.svelte              |   5 +-
 src/lib/wrappers/RepoPageWrapper.svelte       |  31 ++--
 src/routes/repo/[repo_id]/+page.svelte        |   3 +-
 .../[repo_id]/issue/[issue_id]/+page.svelte   |  97 +++++------
 .../proposal/[proposal_id]/+page.svelte       | 152 +++++++++---------
 7 files changed, 154 insertions(+), 141 deletions(-)

diff --git a/src/lib/components/repo/RepoHeader.svelte b/src/lib/components/repo/RepoHeader.svelte
index 9570c96..4e905db 100644
--- a/src/lib/components/repo/RepoHeader.svelte
+++ b/src/lib/components/repo/RepoHeader.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
+  import RepoMenu from '$lib/wrappers/RepoMenu.svelte'
   import Container from '../Container.svelte'
-  import { event_defaults } from './type'
+  import { event_defaults, type RepoPage } from './type'
 
   export let {
     event_id,
@@ -17,6 +18,7 @@
     created_at,
     loading,
   } = event_defaults
+  export let selected_tab: RepoPage = 'about'
   let short_name: string
   $: {
     if (name && name.length > 45) short_name = name.slice(0, 45) + '...'
@@ -41,5 +43,6 @@
         >{short_name}</a
       >
     {/if}
+    <RepoMenu {identifier} {selected_tab} />
   </Container>
 </div>
diff --git a/src/lib/components/repo/type.ts b/src/lib/components/repo/type.ts
index cd955a6..d343c1d 100644
--- a/src/lib/components/repo/type.ts
+++ b/src/lib/components/repo/type.ts
@@ -80,6 +80,8 @@ export const summary_defaults: RepoSummary = {
   created_at: 0,
 }
 
+export type RepoPage = 'about' | 'issues' | 'proposals'
+
 export interface RepoReadme {
   md: string
   loading: boolean
diff --git a/src/lib/wrappers/RepoMenu.svelte b/src/lib/wrappers/RepoMenu.svelte
index ef9a4f6..2f43530 100644
--- a/src/lib/wrappers/RepoMenu.svelte
+++ b/src/lib/wrappers/RepoMenu.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
+  import type { RepoPage } from '$lib/components/repo/type'
   import { issue_summaries } from '$lib/stores/Issues'
   import { proposal_summaries } from '$lib/stores/Proposals'
   import { selected_repo_readme } from '$lib/stores/repo'
 
-  export let selected_tab: '' | 'proposals' | 'issues' = ''
+  export let selected_tab: RepoPage = 'about'
   export let identifier = ''
 </script>
 
@@ -13,7 +14,7 @@
       <a
         href={`/repo/${identifier}`}
         class="tab"
-        class:tab-active={selected_tab === ''}
+        class:tab-active={selected_tab === 'about'}
       >
         About
       </a>
diff --git a/src/lib/wrappers/RepoPageWrapper.svelte b/src/lib/wrappers/RepoPageWrapper.svelte
index 1484d80..76107b8 100644
--- a/src/lib/wrappers/RepoPageWrapper.svelte
+++ b/src/lib/wrappers/RepoPageWrapper.svelte
@@ -9,10 +9,11 @@
   import Container from '$lib/components/Container.svelte'
   import { ensureProposalSummaries } from '$lib/stores/Proposals'
   import { ensureIssueSummaries } from '$lib/stores/Issues'
-  import RepoMenu from '$lib/wrappers/RepoMenu.svelte'
+  import type { RepoPage } from '$lib/components/repo/type'
 
   export let identifier = ''
-  export let selected_tab: '' | 'issues' | 'proposals' = ''
+  export let selected_tab: RepoPage = 'about'
+  export let with_side_bar = true
 
   ensureSelectedRepoCollection(identifier)
   ensureProposalSummaries(identifier)
@@ -52,17 +53,19 @@
     </div>
   </Container>
 {:else}
-  <RepoHeader {...$selected_repo_event} />
-
-  <Container>
-    <div class="mt-2 md:flex">
-      <div class="md:mr-2 md:w-2/3">
-        <RepoMenu {identifier} {selected_tab} />
-        <slot />
-      </div>
-      <div class="prose ml-2 hidden w-1/3 md:flex">
-        <RepoDetails repo_id={identifier} />
+  <RepoHeader {...$selected_repo_event} {selected_tab} />
+  {#if with_side_bar}
+    <Container>
+      <div class="mt-2 md:flex">
+        <div class="md:mr-2 md:w-2/3">
+          <slot />
+        </div>
+        <div class="prose ml-2 hidden w-1/3 md:flex">
+          <RepoDetails repo_id={identifier} />
+        </div>
       </div>
-    </div>
-  </Container>
+    </Container>
+  {:else}
+    <slot />
+  {/if}
 {/if}
diff --git a/src/routes/repo/[repo_id]/+page.svelte b/src/routes/repo/[repo_id]/+page.svelte
index 578bae7..bd5524e 100644
--- a/src/routes/repo/[repo_id]/+page.svelte
+++ b/src/routes/repo/[repo_id]/+page.svelte
@@ -7,14 +7,13 @@
   export let data: { repo_id: string }
   let identifier = data.repo_id
 
-  let selected_tab: '' | 'issues' | 'proposals' = ''
   $: {
     if ($selected_repo_readme.failed === true)
       goto(`/repo/${identifier}/proposals`)
   }
 </script>
 
-<RepoPageWrapper {identifier} {selected_tab}>
+<RepoPageWrapper {identifier} selected_tab="about">
   <div class="my-3 rounded-lg border border-base-400">
     <div class="border-b border-base-400 bg-base-300 px-6 py-3">
       <h4 class="">README.md</h4>
diff --git a/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte b/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte
index ac8056e..f215a5c 100644
--- a/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte
+++ b/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte
@@ -9,11 +9,11 @@
     selected_issue_full,
     selected_issue_replies,
   } from '$lib/stores/Issue'
-  import RepoHeader from '$lib/components/repo/RepoHeader.svelte'
   import Thread from '$lib/wrappers/Thread.svelte'
   import Container from '$lib/components/Container.svelte'
   import ProposalHeader from '$lib/components/proposals/ProposalHeader.svelte'
   import ProposalDetails from '$lib/components/proposals/ProposalDetails.svelte'
+  import RepoPageWrapper from '$lib/wrappers/RepoPageWrapper.svelte'
 
   export let data: {
     repo_id: string
@@ -38,51 +38,54 @@
   }
 </script>
 
-{#if !repo_error}
-  <RepoHeader {...$selected_repo_event} />
-{/if}
-
-{#if issue_error}
-  <Container>
-    <div role="alert" class="alert alert-error m-auto mt-6 w-full max-w-xs">
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        class="h-6 w-6 shrink-0 stroke-current"
-        fill="none"
-        viewBox="0 0 24 24"
-        ><path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
-        /></svg
-      >
-      <span>Error! cannot find Issue {repo_error ? 'or repo ' : ''}event</span>
-    </div>
-  </Container>
-{:else}
-  <ProposalHeader {...$selected_issue_full.summary} />
-  <Container>
-    <div class="mx-auto max-w-6xl lg:flex">
-      <div class="md:mr-2 lg:w-2/3">
-        <div class="max-w-4xl">
-          {#if $selected_issue_full.issue_event}
-            <Thread
-              type="issue"
-              event={$selected_issue_full.issue_event}
-              replies={$selected_issue_replies}
-            />
-          {/if}
-        </div>
+<RepoPageWrapper
+  identifier={repo_id}
+  with_side_bar={false}
+  selected_tab="issues"
+>
+  {#if issue_error}
+    <Container>
+      <div role="alert" class="alert alert-error m-auto mt-6 w-full max-w-xs">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="h-6 w-6 shrink-0 stroke-current"
+          fill="none"
+          viewBox="0 0 24 24"
+          ><path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
+          /></svg
+        >
+        <span>Error! cannot find Issue {repo_error ? 'or repo ' : ''}event</span
+        >
       </div>
-      <div class="prose ml-2 hidden w-1/3 lg:flex">
-        <ProposalDetails
-          type="issue"
-          summary={$selected_issue_full.summary}
-          labels={$selected_issue_full.labels}
-          loading={$selected_issue_full.loading}
-        />
+    </Container>
+  {:else}
+    <ProposalHeader {...$selected_issue_full.summary} />
+    <Container>
+      <div class="mx-auto max-w-6xl lg:flex">
+        <div class="md:mr-2 lg:w-2/3">
+          <div class="max-w-4xl">
+            {#if $selected_issue_full.issue_event}
+              <Thread
+                type="issue"
+                event={$selected_issue_full.issue_event}
+                replies={$selected_issue_replies}
+              />
+            {/if}
+          </div>
+        </div>
+        <div class="prose ml-2 hidden w-1/3 lg:flex">
+          <ProposalDetails
+            type="issue"
+            summary={$selected_issue_full.summary}
+            labels={$selected_issue_full.labels}
+            loading={$selected_issue_full.loading}
+          />
+        </div>
       </div>
-    </div>
-  </Container>
-{/if}
+    </Container>
+  {/if}
+</RepoPageWrapper>
diff --git a/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte b/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte
index b3fe116..98d1ee4 100644
--- a/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte
+++ b/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte
@@ -10,10 +10,10 @@
     selected_proposal_replies,
   } from '$lib/stores/Proposal'
   import ProposalHeader from '$lib/components/proposals/ProposalHeader.svelte'
-  import RepoHeader from '$lib/components/repo/RepoHeader.svelte'
   import Thread from '$lib/wrappers/Thread.svelte'
   import ProposalDetails from '$lib/components/proposals/ProposalDetails.svelte'
   import Container from '$lib/components/Container.svelte'
+  import RepoPageWrapper from '$lib/wrappers/RepoPageWrapper.svelte'
 
   export let data: {
     repo_id: string
@@ -38,83 +38,85 @@
   }
 </script>
 
-{#if !repo_error}
-  <RepoHeader {...$selected_repo_event} />
-{/if}
+<RepoPageWrapper
+  identifier={repo_id}
+  with_side_bar={false}
+  selected_tab="proposals"
+>
+  {#if proposal_error}
+    <Container>
+      <div role="alert" class="alert alert-error m-auto mt-6 w-full max-w-xs">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="h-6 w-6 shrink-0 stroke-current"
+          fill="none"
+          viewBox="0 0 24 24"
+          ><path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
+          /></svg
+        >
+        <span
+          >Error! cannot find Proposal {repo_error ? 'or repo ' : ''}event</span
+        >
+      </div>
+    </Container>
+  {:else}
+    <ProposalHeader {...$selected_proposal_full.summary} />
+    <Container>
+      <div class="mx-auto max-w-6xl lg:flex">
+        <div class="lg:w-2/3 xl:mr-2">
+          <div class="max-w-4xl">
+            {#if $selected_proposal_full.proposal_event}
+              <Thread
+                type="proposal"
+                event={$selected_proposal_full.proposal_event}
+                replies={$selected_proposal_replies}
+              />
+            {/if}
+          </div>
+        </div>
+        <div class="prose ml-2 hidden w-1/3 lg:block">
+          <div role="alert" class="alert mt-3 max-w-2">
+            <div class="text-center">
+              <div>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  class="inline h-6 w-6 shrink-0 stroke-info"
+                  ><path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+                  ></path></svg
+                >
+                <h3 class="prose mx-1 inline text-sm font-bold">
+                  view in local git repository
+                </h3>
+              </div>
 
-{#if proposal_error}
-  <Container>
-    <div role="alert" class="alert alert-error m-auto mt-6 w-full max-w-xs">
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        class="h-6 w-6 shrink-0 stroke-current"
-        fill="none"
-        viewBox="0 0 24 24"
-        ><path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
-        /></svg
-      >
-      <span
-        >Error! cannot find Proposal {repo_error ? 'or repo ' : ''}event</span
-      >
-    </div>
-  </Container>
-{:else}
-  <ProposalHeader {...$selected_proposal_full.summary} />
-  <Container>
-    <div class="mx-auto max-w-6xl lg:flex">
-      <div class="lg:w-2/3 xl:mr-2">
-        <div class="max-w-4xl">
-          {#if $selected_proposal_full.proposal_event}
-            <Thread
+              <p class="mx-0 mb-1 mt-2 text-xs">
+                <a href="/ngit">install ngit</a>, run
+                <span class="rounded bg-neutral p-1 font-mono"
+                  ><span class="py-3">ngit list</span></span
+                > from the local repository and select the proposal title
+              </p>
+            </div>
+          </div>
+          <div class="block">
+            <ProposalDetails
               type="proposal"
-              event={$selected_proposal_full.proposal_event}
-              replies={$selected_proposal_replies}
+              summary={$selected_proposal_full.summary}
+              labels={$selected_proposal_full.labels}
+              loading={$selected_proposal_full.loading}
             />
-          {/if}
-        </div>
-      </div>
-      <div class="prose ml-2 hidden w-1/3 lg:block">
-        <div role="alert" class="max-w-2 alert mt-3">
-          <div class="text-center">
-            <div>
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                fill="none"
-                viewBox="0 0 24 24"
-                class="inline h-6 w-6 shrink-0 stroke-info"
-                ><path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-                ></path></svg
-              >
-              <h3 class="prose mx-1 inline text-sm font-bold">
-                view in local git repository
-              </h3>
-            </div>
-
-            <p class="mx-0 mb-1 mt-2 text-xs">
-              <a href="/ngit">install ngit</a>, run
-              <span class="rounded bg-neutral p-1 font-mono"
-                ><span class="py-3">ngit list</span></span
-              > from the local repository and select the proposal title
-            </p>
           </div>
         </div>
-        <div class="block">
-          <ProposalDetails
-            type="proposal"
-            summary={$selected_proposal_full.summary}
-            labels={$selected_proposal_full.labels}
-            loading={$selected_proposal_full.loading}
-          />
-        </div>
       </div>
-    </div>
-  </Container>
-{/if}
+    </Container>
+  {/if}
+</RepoPageWrapper>