From 9c0bbc4b77bf9410e1f2675b7ad5032ccb0726f9 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Thu, 7 May 2026 20:16:01 +0200
Subject: [PATCH] edit sidebars

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
 src/components/NoteGraphSidebar.astro         | 30 +++++++-
 ...avSidebar.svelte => NoteNavContent.svelte} | 55 +-------------
 src/components/NoteNavSidebar.astro           | 26 +++++++
 src/pages/notes/[...slug].astro               | 75 +++++--------------
 src/pages/notes/[category].astro              | 14 ++--
 src/styles/global.css                         | 15 +++-
 src/utils/notes.ts                            | 28 +++++++
 7 files changed, 123 insertions(+), 120 deletions(-)
 rename src/components/{NoteNavSidebar.svelte => NoteNavContent.svelte} (74%)
 create mode 100644 src/components/NoteNavSidebar.astro

diff --git a/src/components/NoteGraphSidebar.astro b/src/components/NoteGraphSidebar.astro
index 71ceadf..ae91926 100644
--- a/src/components/NoteGraphSidebar.astro
+++ b/src/components/NoteGraphSidebar.astro
@@ -10,9 +10,10 @@ interface Props {
   graphEdges: { from: string; to: string }[];
   forwardLinks: CollectionEntry<"notes">[];
   backlinks: CollectionEntry<"notes">[];
+  externalLinks: { url: string; label: string }[];
 }
 
-const { entry, graphNodes, graphEdges, forwardLinks, backlinks } = Astro.props;
+const { entry, graphNodes, graphEdges, forwardLinks, backlinks, externalLinks } = Astro.props;
 ---
 
 <aside
@@ -26,7 +27,7 @@ const { entry, graphNodes, graphEdges, forwardLinks, backlinks } = Astro.props;
     >
       graph
     </p>
-    <NoteGraph client:visible nodes={graphNodes} edges={graphEdges} />
+    <NoteGraph client:load nodes={graphNodes} edges={graphEdges} />
     {
       graphNodes.length < 2 && (
         <p class="font-mono text-[9px] text-base-content/20 text-center py-2">
@@ -90,6 +91,31 @@ const { entry, graphNodes, graphEdges, forwardLinks, backlinks } = Astro.props;
     )
   }
 
+  {
+    externalLinks.length > 0 && (
+      <div class="p-3 border-t border-base-300/40">
+        <p class="font-mono text-[10px] text-base-content/25 uppercase tracking-widest mb-2">
+          external
+        </p>
+        <ul class="space-y-1">
+          {externalLinks.map(({ url, label }) => (
+            <li>
+              <a
+                href={url}
+                target="_blank"
+                rel="noopener noreferrer"
+                class="font-mono text-xs text-base-content/45 hover:text-primary/80 transition-colors block truncate"
+                title={url}
+              >
+                ↗ {label}
+              </a>
+            </li>
+          ))}
+        </ul>
+      </div>
+    )
+  }
+
   <div class="px-4 pt-4 pb-1 border-t border-base-300/40 mt-auto">
     <time
       datetime={entry.data.publishDate.toISOString()}
diff --git a/src/components/NoteNavSidebar.svelte b/src/components/NoteNavContent.svelte
similarity index 74%
rename from src/components/NoteNavSidebar.svelte
rename to src/components/NoteNavContent.svelte
index 5eb530b..60e5577 100644
--- a/src/components/NoteNavSidebar.svelte
+++ b/src/components/NoteNavContent.svelte
@@ -19,36 +19,6 @@
 
   let search = $state("");
 
-  $effect(() => {
-    const navDrawer = document.getElementById("nav-drawer") as HTMLInputElement | null;
-    if (!navDrawer) return;
-
-    const lgQuery = window.matchMedia("(min-width: 1024px)");
-
-    const overlay = document.createElement("div");
-    overlay.style.cssText =
-      "position:fixed;inset:0 0 0 14rem;background:oklch(0% 0 0/.4);z-index:51;display:none;cursor:pointer";
-    document.body.appendChild(overlay);
-
-    function update() {
-      overlay.style.display =
-        navDrawer.checked && !lgQuery.matches ? "block" : "none";
-    }
-
-    navDrawer.addEventListener("change", update);
-    lgQuery.addEventListener("change", update);
-    overlay.addEventListener("click", () => {
-      navDrawer.checked = false;
-      navDrawer.dispatchEvent(new Event("change"));
-    });
-
-    return () => {
-      navDrawer.removeEventListener("change", update);
-      lgQuery.removeEventListener("change", update);
-      overlay.remove();
-    };
-  });
-
   function getCategory(n: Note): string {
     if (n.data.category) return n.data.category;
     const parts = n.id.split("/");
@@ -95,25 +65,7 @@
   }
 </script>
 
-<aside
-  class="w-56 shrink-0 flex flex-col border-r border-base-300/60 h-full pt-2 lg:pt-0"
-  style="background: oklch(4% 0 0);"
->
-  <!-- Mobile close bar -->
-  <div class="lg:hidden flex items-center justify-between px-3 py-2 border-b border-base-300/40 shrink-0">
-    <span class="font-mono text-[10px] text-base-content/30 uppercase tracking-widest">nav</span>
-    <label
-      for="nav-drawer"
-      class="cursor-pointer text-base-content/30 hover:text-base-content/70 transition-colors p-1"
-      aria-label="close sidebar"
-    >
-      <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M18 6 6 18M6 6l12 12"/>
-      </svg>
-    </label>
-  </div>
-
-  <!-- Search -->
+<div class="flex flex-col flex-1 min-h-0">
   <div class="px-3 py-3 border-b border-base-300/40 shrink-0">
     <div
       class="flex items-center gap-1.5 px-2 py-1.5 rounded-md bg-base-200/50 border border-base-300/40 focus-within:border-base-300/70 transition-colors"
@@ -128,7 +80,6 @@
     </div>
   </div>
 
-  <!-- Nav -->
   <nav class="flex-1 min-h-0 overflow-y-auto overflow-x-hidden px-2 py-2 space-y-px">
     {#each categories as cat}
       {@const catNotes = notes.filter(
@@ -137,7 +88,6 @@
       {#if catNotes.length > 0 || !search}
         {@const isFolder = notes.some((n) => n.id.includes("/") && getCategory(n) === cat)}
         <div>
-          <!-- Category header -->
           <div class="flex items-center w-full">
             <button
               onclick={() => toggle(cat)}
@@ -172,7 +122,6 @@
             {/if}
           </div>
 
-          <!-- Notes list -->
           {#if openCategories.includes(cat)}
             <ul
               class="ml-4 mt-0.5 pb-1 space-y-px"
@@ -200,4 +149,4 @@
       {/if}
     {/each}
   </nav>
-</aside>
+</div>
diff --git a/src/components/NoteNavSidebar.astro b/src/components/NoteNavSidebar.astro
new file mode 100644
index 0000000..71b1146
--- /dev/null
+++ b/src/components/NoteNavSidebar.astro
@@ -0,0 +1,26 @@
+---
+import NoteNavContent from "./NoteNavContent.svelte";
+import type { CollectionEntry } from "astro:content";
+
+interface Props {
+  notes: CollectionEntry<"notes">[];
+  currentEntry?: CollectionEntry<"notes">;
+  currentCategory?: string;
+  categories: string[];
+}
+
+const { notes, currentEntry, currentCategory, categories } = Astro.props;
+---
+
+<aside
+  class="w-56 shrink-0 flex flex-col border-r border-base-300/60 h-full"
+  style="background: oklch(4% 0 0);"
+>
+  <NoteNavContent
+    client:load
+    notes={notes}
+    currentEntry={currentEntry}
+    currentCategory={currentCategory}
+    categories={categories}
+  />
+</aside>
diff --git a/src/pages/notes/[...slug].astro b/src/pages/notes/[...slug].astro
index 0db256a..3c89f10 100644
--- a/src/pages/notes/[...slug].astro
+++ b/src/pages/notes/[...slug].astro
@@ -3,10 +3,10 @@ import { getCollection, render } from "astro:content";
 import Layout from "../../layouts/Layout.astro";
 import { List, PanelRight } from "@lucide/astro";
 import NoteTOC from "../../components/NoteTOC.astro";
-import NoteNavSidebar from "../../components/NoteNavSidebar.svelte";
+import NoteNavSidebar from "../../components/NoteNavSidebar.astro";
 import NoteGraphSidebar from "../../components/NoteGraphSidebar.astro";
 import NoteVars from "../../components/NoteVars.svelte";
-import { getCategory, extractLinks, extractHeadings } from "../../utils/notes";
+import { getCategory, extractLinks, extractExternalLinks, extractHeadings } from "../../utils/notes";
 
 export async function getStaticPaths() {
   const notes = await getCollection("notes");
@@ -61,11 +61,17 @@ const noteVars = [
 ];
 
 const headings = extractHeadings(entry.body ?? "");
+const externalLinks = extractExternalLinks(entry.body ?? "");
 ---
 
 <style>
-  @media (min-width: 1024px) {
-    .drawer.lg\:drawer-open > .drawer-side,
+  @media (min-width: 768px) {
+    .drawer.md\:drawer-open > .drawer-side {
+      top: 3rem;
+      height: calc(100vh - 3rem);
+    }
+  }
+  @media (min-width: 1280px) {
     .drawer.xl\:drawer-open > .drawer-side {
       top: 3rem;
       height: calc(100vh - 3rem);
@@ -78,11 +84,11 @@ const headings = extractHeadings(entry.body ?? "");
   description={entry.data.description}
 >
   <main class="max-w-screen-2xl mx-auto">
-    <div class="drawer lg:drawer-open min-h-[calc(100vh-3rem)]">
+    <div class="drawer md:drawer-open min-h-[calc(100vh-3rem)]">
       <input id="nav-drawer" type="checkbox" class="drawer-toggle" />
 
       <div class="drawer-content flex min-h-[calc(100vh-3rem)] min-w-0">
-        <div class="drawer drawer-end xl:drawer-open w-full">
+        <div class="drawer drawer-end xl:drawer-open w-full" id="right-drawer">
           <input id="graph-drawer" type="checkbox" class="drawer-toggle" />
 
           <div class="drawer-content flex flex-col min-w-0">
@@ -117,7 +123,7 @@ const headings = extractHeadings(entry.body ?? "");
                   <div class="flex items-center gap-2">
                     <label
                       for="nav-drawer"
-                      class="btn btn-ghost btn-xs lg:hidden font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
+                      class="btn btn-ghost btn-xs md:hidden font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
                     >
                       <List size={11} />
                       nav
@@ -126,7 +132,7 @@ const headings = extractHeadings(entry.body ?? "");
                     <label
                       for="graph-drawer"
                       id="graph-toggle"
-                      class="btn btn-ghost btn-xs font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
+                      class="btn btn-ghost btn-xs xl:hidden font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
                       title="Toggle graph"
                     >
                       <PanelRight size={11} />
@@ -206,25 +212,26 @@ const headings = extractHeadings(entry.body ?? "");
             </main>
           </div>
 
-          <div class="drawer-side z-40">
+          <div class="drawer-side z-[60]">
             <label
               for="graph-drawer"
               aria-label="close sidebar"
-              class="drawer-overlay xl:hidden"></label>
+              class="drawer-overlay"></label>
             <NoteGraphSidebar
               entry={entry}
               graphNodes={graphNodes}
               graphEdges={graphEdges}
               forwardLinks={forwardLinks}
               backlinks={backlinks}
+              externalLinks={externalLinks}
             />
           </div>
         </div>
       </div>
 
-      <div class="drawer-side z-50">
+      <div class="drawer-side z-[70]">
+        <label for="nav-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
         <NoteNavSidebar
-          client:load
           notes={sortedNotes}
           currentEntry={entry}
           categories={categories}
@@ -288,51 +295,7 @@ const headings = extractHeadings(entry.body ?? "");
       });
   }
 
-  function initXlGraphToggle() {
-    const graphDrawer = document.getElementById(
-      "graph-drawer",
-    ) as HTMLInputElement | null;
-    if (!graphDrawer) return;
-
-    const outerDrawer = graphDrawer.closest<HTMLElement>(".drawer.drawer-end");
-    const xlQuery = window.matchMedia("(min-width: 1280px)");
-    const STORAGE_KEY = "notes-graph-sidebar";
-
-    function setXlSidebar(open: boolean) {
-      if (!outerDrawer) return;
-      if (open) {
-        outerDrawer.classList.add("xl:drawer-open");
-      } else {
-        outerDrawer.classList.remove("xl:drawer-open");
-      }
-      localStorage.setItem(STORAGE_KEY, open ? "1" : "0");
-    }
-
-    const graphToggle = document.getElementById("graph-toggle");
-    graphToggle?.addEventListener("click", (e) => {
-      if (!xlQuery.matches) return;
-      e.preventDefault();
-      setXlSidebar(!outerDrawer?.classList.contains("xl:drawer-open"));
-    });
-
-    if (xlQuery.matches) {
-      const saved = localStorage.getItem(STORAGE_KEY);
-      // Open by default unless user explicitly closed it
-      setXlSidebar(saved !== "0");
-    }
-
-    xlQuery.addEventListener("change", (e) => {
-      if (!e.matches) {
-        outerDrawer?.classList.remove("xl:drawer-open");
-      } else {
-        const saved = localStorage.getItem(STORAGE_KEY);
-        setXlSidebar(saved !== "0");
-      }
-    });
-  }
-
   document.addEventListener("astro:page-load", () => {
     injectHeadingAnchors();
-    initXlGraphToggle();
   });
 </script>
diff --git a/src/pages/notes/[category].astro b/src/pages/notes/[category].astro
index d824d82..fb6a622 100644
--- a/src/pages/notes/[category].astro
+++ b/src/pages/notes/[category].astro
@@ -1,7 +1,7 @@
 ---
 import { getCollection } from "astro:content";
 import Layout from "../../layouts/Layout.astro";
-import NoteNavSidebar from "../../components/NoteNavSidebar.svelte";
+import NoteNavSidebar from "../../components/NoteNavSidebar.astro";
 import { getCategory } from "../../utils/notes";
 import { List } from "@lucide/astro";
 
@@ -41,8 +41,8 @@ if (!categoryNotes) {
 ---
 
 <style>
-  @media (min-width: 1024px) {
-    .drawer.lg\:drawer-open > .drawer-side {
+  @media (min-width: 768px) {
+    .drawer.md\:drawer-open > .drawer-side {
       top: 3rem;
       height: calc(100vh - 3rem);
     }
@@ -54,7 +54,7 @@ if (!categoryNotes) {
   description={`Notes on ${category}.`}
 >
   <main class="max-w-screen-2xl mx-auto">
-    <div class="drawer lg:drawer-open min-h-[calc(100vh-3rem)]">
+    <div class="drawer md:drawer-open min-h-[calc(100vh-3rem)]">
       <input id="nav-drawer" type="checkbox" class="drawer-toggle" />
 
       <div class="drawer-content flex flex-col min-w-0">
@@ -74,7 +74,7 @@ if (!categoryNotes) {
               </div>
               <label
                 for="nav-drawer"
-                class="btn btn-ghost btn-xs lg:hidden font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
+                class="btn btn-ghost btn-xs md:hidden font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
               >
                 <List size={11} />
                 nav
@@ -163,9 +163,9 @@ if (!categoryNotes) {
         </main>
       </div>
 
-      <div class="drawer-side z-50">
+      <div class="drawer-side z-[70]">
+        <label for="nav-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
         <NoteNavSidebar
-          client:load
           notes={allNotes}
           currentCategory={category}
           categories={categories}
diff --git a/src/styles/global.css b/src/styles/global.css
index d30ad8e..6fbde39 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -36,6 +36,13 @@
   --noise: 0;
 }
 
+.drawer-side > aside > astro-island {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0;
+}
+
 .btn:not(.btn-circle):not(.btn-square) {
   @apply rounded-lg;
 }
@@ -50,7 +57,9 @@
     background: transparent;
     color: var(--color-base-content);
     text-decoration: none !important;
-    transition: background 0.15s ease, border-color 0.15s ease;
+    transition:
+      background 0.15s ease,
+      border-color 0.15s ease;
     margin-block: 0.25rem;
   }
   .link-card::after {
@@ -60,7 +69,9 @@
     opacity: 0;
     color: var(--color-primary);
     font-size: 0.75rem;
-    transition: opacity 0.15s ease, transform 0.15s ease;
+    transition:
+      opacity 0.15s ease,
+      transform 0.15s ease;
     transform: translate(-4px, 4px);
     flex-shrink: 0;
   }
diff --git a/src/utils/notes.ts b/src/utils/notes.ts
index 40d0420..df048f3 100644
--- a/src/utils/notes.ts
+++ b/src/utils/notes.ts
@@ -15,6 +15,34 @@ function slugify(text: string): string {
     .replace(/ +/g, "-");
 }
 
+export function extractExternalLinks(body: string): { url: string; label: string }[] {
+  const seen = new Set<string>();
+  const links: { url: string; label: string }[] = [];
+
+  // Markdown: [label](https://...)
+  const mdRe = /\[([^\]]+)\]\((https?:\/\/[^)]+)\)/g;
+  let m;
+  while ((m = mdRe.exec(body)) !== null) {
+    if (!seen.has(m[2])) {
+      seen.add(m[2]);
+      links.push({ url: m[2], label: m[1] });
+    }
+  }
+
+  // HTML: <a href="https://...">...</a> — use h4 content as label if present, else href host
+  const htmlRe = /<a\s[^>]*href="(https?:\/\/[^"]+)"[^>]*>([\s\S]*?)<\/a>/g;
+  while ((m = htmlRe.exec(body)) !== null) {
+    const url = m[1];
+    if (seen.has(url)) continue;
+    seen.add(url);
+    const h4 = m[2].match(/<h4[^>]*>([\s\S]*?)<\/h4>/);
+    const label = h4 ? h4[1].trim() : new URL(url).hostname;
+    links.push({ url, label });
+  }
+
+  return links;
+}
+
 export function extractLinks(body: string): string[] {
   const re = /\(\/notes\/([^)#\s]+)(?:#[^)\s]*)?\)/g;
   const ids: string[] = [];