Merge pull request #68 from thefrontside/cl/make-embeddable

Make this site embeddable into another
thefrontside · Dec 17, 2024 · 0c2d9dd · 0c2d9dd
2 parents da5f9ec + 8629a5e
commit 0c2d9dd
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 113 deletions.
diff --git a/.github/workflows/cli-release.yml b/.github/workflows/cli-release.yml
@@ -20,15 +20,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: setup deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
+          deno-version: v2.x
 
       - name: Get Version
         id: vars
         run: echo ::set-output name=version::$(echo ${{github.ref_name}} | sed 's/^v//')
 
-
       - name: Setup Node
         uses: actions/setup-node@v2
         with:

diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml
@@ -20,15 +20,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: setup deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
+          deno-version: v2.x
 
       - name: Get Version
         id: vars
         run: echo ::set-output name=version::$(echo ${{github.ref_name}} | sed 's/^v//')
 
-
       - name: Setup Node
         uses: actions/setup-node@v2
         with:

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -26,9 +26,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: setup deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
+          deno-version: v2.x
 
       - name: format
         run: deno fmt --check
@@ -37,6 +37,4 @@ jobs:
         run: deno lint
 
       - name: test
-        run: |
-          deno task test
-          cd www && deno task test
+        run: deno task test
diff --git a/deno.lock b/deno.lock
diff --git a/www/components/DocsSidebar.tsx b/www/components/DocsSidebar.tsx
@@ -27,7 +27,7 @@ export function SidebarCategory(props: {
 
   return (
     <li class="my-2 block">
-      <a href={href} class={outerLink}>{title}</a>
+      <a href={`/${href}`} class={outerLink}>{title}</a>
       {entries.length > 0 && (
         <ol class="pl-4 list-decimal nested">
           {entries.map((entry) => (
@@ -49,7 +49,7 @@ export function SidebarEntry(props: {
 
   return (
     <li class="my-0.5">
-      <a href={href} class={innerLink}>{title}</a>
+      <a href={`/${href}`} class={innerLink}>{title}</a>
     </li>
   );
 }
diff --git a/www/components/DocsTitle.tsx b/www/components/DocsTitle.tsx
@@ -2,7 +2,7 @@ export default function DocsTitle(props: { title: string }) {
   return (
     <>
       <a
-        href="."
+        href="/"
         class="text(2xl gray-900) block flex items-center"
       >
         GraphGen

diff --git a/www/components/Header.tsx b/www/components/Header.tsx
@@ -25,9 +25,9 @@ export default function Header(props: { title: string; active: string }) {
 
 function Logo() {
   return (
-    <a href="." class="flex mr-3 items-center">
+    <a href="/" class="flex mr-3 items-center">
       <img
-        src="logo.svg"
+        src="/logo.svg"
         alt="GraphGen logo"
         width={40}
         height={46}

diff --git a/www/components/NavigationBar.tsx b/www/components/NavigationBar.tsx
@@ -6,7 +6,7 @@ export default function NavigationBar(
   const items = [
     {
       name: "Docs",
-      href: "docs/introduction",
+      href: "/docs/introduction",
     },
     {
       name: "Discord",
@@ -15,7 +15,7 @@ export default function NavigationBar(
   ];
   const isHome = props.active == "/";
   return (
-    <nav class={"flex " + props.class ?? ""}>
+    <nav class={"flex " + (props.class ?? "")}>
       <ul class="flex justify-center items-center gap-4 mx-4 my-6 flex-wrap">
         {items.map((item) => (
           <li>

diff --git a/www/routes/docs/[...slug].tsx b/www/routes/docs/[...slug].tsx
@@ -66,8 +66,7 @@ export default function DocsPage(props: PageProps<Data>) {
     <>
       <Head>
         <title>{props.data.page?.title ?? "Not Found"} | graphgen docs</title>
-        <base href={props.data.base ?? "/"} />
-        <link rel="stylesheet" href={`gfm.css?build=${__FRSH_BUILD_ID}`} />
+        <link rel="stylesheet" href={`/gfm.css?build=${BUILD_ID}`} />
         {description && <meta name="description" content={description} />}
       </Head>
       <div class="flex flex-col min-h-screen">