From 4a2640e0b42e86ae6d815dfc7273ad696b57edff Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Sat, 5 Apr 2025 10:40:27 +0200
Subject: [PATCH 1/8] Pull the latest tag from git, on build, and display it
 top-right on the About page.

---
 src/routes/about/+page.svelte | 10 ++++++++--
 vite.config.ts                | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index 9e4ee80..00a14c8 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -1,10 +1,16 @@
 <script lang='ts'>
   import { Heading } from "flowbite-svelte";
+  
+  // Get the git tag version from environment variables
+  const gitTagVersion = import.meta.env.GIT_TAG || 'development';
 </script>
 
 <div class='w-full flex justify-center'>
   <main class='main-leather flex flex-col space-y-4 max-w-2xl w-full mt-4 mb-4'>
-    <Heading tag='h1' class='h-leather mb-2'>About</Heading>
+    <div class="flex justify-between items-center">
+      <Heading tag='h1' class='h-leather mb-2'>About</Heading>
+      <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded">Version: {gitTagVersion}</span>
+    </div>
     <p>Alexandria is a reader and writer for <a href="https://github.com/nostr-protocol/nips/pull/1600" class='underline' target="_blank">curated publications</a> (in Asciidoc), and will eventually also support long-form articles (Markdown) and wiki pages (Asciidoc). It is produced by the <a href="https://wikistr.com/gitcitadel-project" class='underline' target="_blank">GitCitadel project team</a>.</p>
 
     <p>Please submit support issues on the <a href="https://gitcitadel.com/r/naddr1qvzqqqrhnypzplfq3m5v3u5r0q9f255fdeyz8nyac6lagssx8zy4wugxjs8ajf7pqy88wumn8ghj7mn0wvhxcmmv9uqq5emfw33kjarpv3jkcs83wav" class='underline' target="_blank">project repo page</a> and follow us on <a href="https://github.com/ShadowySupercode/gitcitadel" class='underline' target="_blank">GitHub</a> and <a href="https://geyser.fund/project/gitcitadel" class='underline' target="_blank">Geyserfund</a>.</p>
@@ -53,4 +59,4 @@
     <p><img src="/screenshots/Documentation.png" alt="Documentation" class='image-border'></p>
 
   </main>
-</div>
\ No newline at end of file
+</div>
diff --git a/vite.config.ts b/vite.config.ts
index b9ba52c..7a6e207 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,9 +1,26 @@
 import { sveltekit } from "@sveltejs/kit/vite";
 import { defineConfig } from "vite";
+import { execSync } from "child_process";
+
+// Function to get the latest git tag
+function getLatestGitTag() {
+  try {
+    // Get the latest git tag
+    const tag = execSync('git describe --tags --abbrev=0').toString().trim();
+    return tag;
+  } catch (error) {
+    console.error("Failed to get git tag:", error);
+    return "unknown";
+  }
+}
 
 export default defineConfig({
   plugins: [sveltekit()],
   test: {
     include: ['./tests/unit/**/*.unit-test.js']
+  },
+  define: {
+    // Expose the git tag as a global variable
+    'import.meta.env.GIT_TAG': JSON.stringify(getLatestGitTag())
   }
 });

From b763ecd99f09373c69770717025e84e739a8df3b Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Sat, 5 Apr 2025 11:47:23 +0200
Subject: [PATCH 2/8] Refactored a bit. Changed a tags to buttons that look
 like hyperlinks, to preserve normal button functionality.

---
 src/lib/components/Login.svelte                |  2 +-
 src/lib/components/util/CardActions.svelte     | 18 +++++++++---------
 src/lib/components/util/CopyToClipboard.svelte |  4 ++--
 src/lib/components/util/Profile.svelte         | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lib/components/Login.svelte b/src/lib/components/Login.svelte
index 2d77763..1456149 100644
--- a/src/lib/components/Login.svelte
+++ b/src/lib/components/Login.svelte
@@ -50,7 +50,7 @@
     <Popover
       class='popover-leather w-fit'
       placement='bottom'
-      target='avatar'
+      triggeredBy='#avatar'
     >
       <div class='w-full flex space-x-2'>
         <Button
diff --git a/src/lib/components/util/CardActions.svelte b/src/lib/components/util/CardActions.svelte
index 41f0c1c..32476a1 100644
--- a/src/lib/components/util/CardActions.svelte
+++ b/src/lib/components/util/CardActions.svelte
@@ -114,32 +114,32 @@
       <div class='flex flex-col text-nowrap'>
         <ul class="space-y-2">
           <li>
-            <a href="" role="button" class='btn-leather' onclick={viewDetails}>
+            <button type="button" class='btn-leather' onclick={viewDetails}>
               <EyeOutline class="inline mr-2"  /> View details
-            </a>
+            </button>
           </li>
           <li>
-            <a role="button" class='btn-leather' onclick={shareNjump}>
+            <button type="button" class='btn-leather' onclick={shareNjump}>
               {#if shareLinkCopied}
                 <ClipboardCheckOutline class="inline mr-2" /> Copied!
               {:else}
                 <ShareNodesOutline class="inline mr-2" /> Share via NJump
               {/if}
-            </a>
+            </button>
           </li>
           <li>
-            <a role="button" class='btn-leather' onclick={copyEventId}>
+            <button type="button" class='btn-leather' onclick={copyEventId}>
               {#if eventIdCopied}
                 <ClipboardCheckOutline class="inline mr-2" /> Copied!
               {:else}
                 <ClipboardCleanOutline class="inline mr-2" /> Copy event ID
               {/if}
-            </a>
+            </button>
           </li>
           <li>
-            <a href="" role="button" class='btn-leather' onclick={viewJson}>
+            <button type="button" class='btn-leather' onclick={viewJson}>
               <CodeOutline class="inline mr-2"  /> View JSON
-            </a>
+            </button>
           </li>
         </ul>
       </div>
@@ -157,7 +157,7 @@
     <div class="flex flex-row space-x-4">
       {#if image}
       <div class="flex col">
-        <img class="max-w-48" src={image} />
+        <img class="max-w-48" src={image} alt="Publication cover image for {title}" />
       </div>
       {/if}
       <div class="flex flex-col col space-y-5  justify-center  align-middle">
diff --git a/src/lib/components/util/CopyToClipboard.svelte b/src/lib/components/util/CopyToClipboard.svelte
index 9e72c79..63f1aa7 100644
--- a/src/lib/components/util/CopyToClipboard.svelte
+++ b/src/lib/components/util/CopyToClipboard.svelte
@@ -18,10 +18,10 @@
   }
 </script>
 
-<a role="button" class='btn-leather text-nowrap' onclick={copyToClipboard}>
+<button type="button" class='btn-leather text-nowrap' onclick={copyToClipboard}>
   {#if copied}
     <ClipboardCheckOutline class="!fill-none dark:!fill-none inline mr-1" /> Copied!
   {:else}
     <ClipboardCleanOutline class="!fill-none dark:!fill-none inline mr-1" /> {displayText}
   {/if}
-</a>
\ No newline at end of file
+</button>
diff --git a/src/lib/components/util/Profile.svelte b/src/lib/components/util/Profile.svelte
index fd23c9f..a44cba1 100644
--- a/src/lib/components/util/Profile.svelte
+++ b/src/lib/components/util/Profile.svelte
@@ -46,10 +46,12 @@ function shortenNpub(long: string|undefined) {
       class='h-6 w-6 cursor-pointer'
       src={pfp}
       alt={username}
+      id="profile-avatar"
     />
     {#key username || tag}
       <Popover
-        target="avatar"
+        placement="bottom"
+        triggeredBy="#profile-avatar"
         class='popover-leather w-[180px]'
         trigger='hover'
       >
@@ -70,15 +72,13 @@ function shortenNpub(long: string|undefined) {
               </li>
               {#if isNav}
                 <li>
-                  <a
-                    href=""
+                  <button
                     id='sign-out-button'
                     class='btn-leather text-nowrap mt-3 flex self-stretch align-middle hover:text-primary-400 dark:hover:text-primary-500'
                     onclick={handleSignOutClick}
-                    role="button"
                   >
                     <ArrowRightToBracketOutline class='mr-1 !h-6 !w-6 inline !fill-none dark:!fill-none' /> Sign out
-                  </a>
+                  </button>
                 </li>
               {:else}
                 <!-- li>

From 4e40ca7beac1fb9923f3830761168a0064deebd2 Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Sun, 6 Apr 2025 08:21:58 +0200
Subject: [PATCH 3/8] Add Dyno settings, for the version info

---
 import_map.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/import_map.json b/import_map.json
index 7398dc6..daca291 100644
--- a/import_map.json
+++ b/import_map.json
@@ -13,6 +13,7 @@
     "svelte": "npm:svelte@5.0.x",
     "flowbite": "npm:flowbite@2.2.x",
     "flowbite-svelte": "npm:flowbite-svelte@0.44.x",
-    "flowbite-svelte-icons": "npm:flowbite-svelte-icons@2.0.x"
+    "flowbite-svelte-icons": "npm:flowbite-svelte-icons@2.0.x",
+    "child_process": "node:child_process"
   }
 } 
\ No newline at end of file

From a3b1408c81d019c1a154b9cfccbd8a8582f17047 Mon Sep 17 00:00:00 2001
From: vnugent <public@vaughnnugent.com>
Date: Mon, 7 Apr 2025 13:56:25 -0400
Subject: [PATCH 4/8] refactor(app): #162 change version variable name and
 disable wrapping

---
 src/routes/about/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index 00a14c8..38ba29d 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -2,14 +2,14 @@
   import { Heading } from "flowbite-svelte";
   
   // Get the git tag version from environment variables
-  const gitTagVersion = import.meta.env.GIT_TAG || 'development';
+  const appVersion = import.meta.env.APP_VERSION || 'development';
 </script>
 
 <div class='w-full flex justify-center'>
   <main class='main-leather flex flex-col space-y-4 max-w-2xl w-full mt-4 mb-4'>
     <div class="flex justify-between items-center">
       <Heading tag='h1' class='h-leather mb-2'>About</Heading>
-      <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded">Version: {gitTagVersion}</span>
+      <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-nowrap">Version: {appVersion}</span>
     </div>
     <p>Alexandria is a reader and writer for <a href="https://github.com/nostr-protocol/nips/pull/1600" class='underline' target="_blank">curated publications</a> (in Asciidoc), and will eventually also support long-form articles (Markdown) and wiki pages (Asciidoc). It is produced by the <a href="https://wikistr.com/gitcitadel-project" class='underline' target="_blank">GitCitadel project team</a>.</p>
 

From 173d8942ca2a849ea5f25e64d61b1cc874008bf6 Mon Sep 17 00:00:00 2001
From: vnugent <public@vaughnnugent.com>
Date: Mon, 7 Apr 2025 14:00:45 -0400
Subject: [PATCH 5/8] refactor: #162 Use package version in CI, update var, and
 fallbacks

---
 vite.config.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 7a6e207..9074493 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,14 +3,21 @@ import { defineConfig } from "vite";
 import { execSync } from "child_process";
 
 // Function to get the latest git tag
-function getLatestGitTag() {
+function getAppVersionString() {
+  // if running in ci context, we can assume the package has been properly versioned
+  if (process.env.ALEXANDIRA_IS_CI_BUILD) {
+      console.info("Running in CI context, using package version");
+      return process.env.npm_package_version;
+  }
+
   try {
-    // Get the latest git tag
+    // Get the latest git tag, assuming git is installed and tagged branch is available
     const tag = execSync('git describe --tags --abbrev=0').toString().trim();
     return tag;
   } catch (error) {
     console.error("Failed to get git tag:", error);
-    return "unknown";
+    // Fallback to package version
+    return process.env.npm_package_version;
   }
 }
 
@@ -20,7 +27,7 @@ export default defineConfig({
     include: ['./tests/unit/**/*.unit-test.js']
   },
   define: {
-    // Expose the git tag as a global variable
-    'import.meta.env.GIT_TAG': JSON.stringify(getLatestGitTag())
+    // Expose the app version as a global variable
+    'import.meta.env.APP_VERSION': JSON.stringify(getAppVersionString())
   }
 });

From d119d304577a10467b98190409ac3c80c4615e9d Mon Sep 17 00:00:00 2001
From: vnugent <public@vaughnnugent.com>
Date: Mon, 7 Apr 2025 14:15:45 -0400
Subject: [PATCH 6/8] remove debug console log

---
 vite.config.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vite.config.ts b/vite.config.ts
index 9074493..f62eb54 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,7 +6,6 @@ import { execSync } from "child_process";
 function getAppVersionString() {
   // if running in ci context, we can assume the package has been properly versioned
   if (process.env.ALEXANDIRA_IS_CI_BUILD) {
-      console.info("Running in CI context, using package version");
       return process.env.npm_package_version;
   }
 

From 52a353ebe18ac3168de58f6a7b4f36465aa13fee Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Wed, 9 Apr 2025 20:31:45 +0200
Subject: [PATCH 7/8] Changed logic to the sequence: package version git tag
 version development version -> hidden

closes #162
---
 src/routes/about/+page.svelte |  6 ++++--
 vite.config.ts                | 10 ++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index f9c81cf..b6c0f6c 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -3,13 +3,16 @@
   
   // Get the git tag version from environment variables
   const appVersion = import.meta.env.APP_VERSION || 'development';
+  const isVersionKnown = appVersion !== 'development';
 </script>
 
 <div class='w-full flex justify-center'>
   <main class='main-leather flex flex-col space-y-6 max-w-2xl w-full my-6 px-4'>
     <div class="flex justify-between items-center">
       <Heading tag='h1' class='h-leather mb-2'>About</Heading>
-      <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-nowrap">Version: {appVersion}</span>
+      {#if isVersionKnown}
+        <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-nowrap">Version: {appVersion}</span>
+      {/if}
     </div>
     
     <P class="mb-3">
@@ -102,4 +105,3 @@
     
     </main>
 </div>
-
diff --git a/vite.config.ts b/vite.config.ts
index 5d73bc3..4dc4254 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,18 +5,16 @@ import { execSync } from "child_process";
 // Function to get the latest git tag
 function getAppVersionString() {
   // if running in ci context, we can assume the package has been properly versioned
-  if (process.env.ALEXANDIRA_IS_CI_BUILD) {
-      return process.env.npm_package_version;
+  if (process.env.ALEXANDIRA_IS_CI_BUILD && process.env.npm_package_version && process.env.npm_package_version.trim() !== '') {
+    return process.env.npm_package_version;
   }
-
+    
   try {
     // Get the latest git tag, assuming git is installed and tagged branch is available
     const tag = execSync('git describe --tags --abbrev=0').toString().trim();
     return tag;
   } catch (error) {
-    console.error("Failed to get git tag:", error);
-    // Fallback to package version
-    return process.env.npm_package_version;
+    return 'development';
   }
 }
 

From 1d2e2026c0602f05264c689dc15766e27bd1d484 Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Sat, 12 Apr 2025 20:50:29 +0200
Subject: [PATCH 8/8] Integrate version label into the new About page header

---
 src/routes/about/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index 6267348..ace2103 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -10,11 +10,11 @@
   <main class='main-leather flex flex-col space-y-6 max-w-2xl w-full my-6 px-4'>
     <div class="flex justify-between items-center">
       <Heading tag='h1' class='h-leather mb-2'>About the Library of Alexandria</Heading>
-    <Img src="/screenshots/old_books.jpg" alt="Alexandria icon" />
       {#if isVersionKnown}
         <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-nowrap">Version: {appVersion}</span>
       {/if}
     </div>
+    <Img src="/screenshots/old_books.jpg" alt="Alexandria icon" />
 
     <P class="mb-3">
         Alexandria is a reader and writer for <A href="/publication?d=gitcitadel-project-documentation-curated-publications-specification-7-by-stella-v-1">curated publications</A> (in Asciidoc), wiki pages (Asciidoc), and will eventually also support long-form articles (Markdown). It is produced by the <A href="/publication?d=gitcitadel-project-documentation-gitcitadel-project-1-by-stella-v-1">GitCitadel project team</A>.