From 89aae68e0a0dd1ac31b34eaa01a0fe787be15685 Mon Sep 17 00:00:00 2001
From: Janosh Riebesell <janosh.riebesell@gmail.com>
Date: Thu, 12 Jan 2023 11:59:28 -0800
Subject: [PATCH] group demo routes

---
 package.json                                          |  1 -
 src/routes/(demos)/+layout.svelte                     |  3 +++
 .../+page.svelte => (demos)/bohr-atoms/+page@.svelte} |  0
 src/routes/{ => (demos)}/color-scales/+page.svx       |  0
 .../{ => (demos)}/color-scales/mp-element-counts.json |  0
 src/routes/{ => (demos)}/element-tile/+page.svx       |  0
 src/routes/+layout.svelte                             |  6 ++----
 src/routes/+layout.ts                                 | 11 +++++------
 src/site/Footer.svelte                                |  4 ----
 9 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 src/routes/(demos)/+layout.svelte
 rename src/routes/{bohr-atoms/+page.svelte => (demos)/bohr-atoms/+page@.svelte} (100%)
 rename src/routes/{ => (demos)}/color-scales/+page.svx (100%)
 rename src/routes/{ => (demos)}/color-scales/mp-element-counts.json (100%)
 rename src/routes/{ => (demos)}/element-tile/+page.svx (100%)

diff --git a/package.json b/package.json
index a94de38..891a90e 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
     "rehype-slug": "^5.1.0",
     "svelte": "^3.55.1",
     "svelte-check": "^3.0.2",
-    "svelte-github-corner": "^0.2.0",
     "svelte-multiselect": "^8.2.4",
     "svelte-preprocess": "^5.0.0",
     "svelte-toc": "^0.5.1",
diff --git a/src/routes/(demos)/+layout.svelte b/src/routes/(demos)/+layout.svelte
new file mode 100644
index 0000000..890b215
--- /dev/null
+++ b/src/routes/(demos)/+layout.svelte
@@ -0,0 +1,3 @@
+<main>
+  <slot />
+</main>
diff --git a/src/routes/bohr-atoms/+page.svelte b/src/routes/(demos)/bohr-atoms/+page@.svelte
similarity index 100%
rename from src/routes/bohr-atoms/+page.svelte
rename to src/routes/(demos)/bohr-atoms/+page@.svelte
diff --git a/src/routes/color-scales/+page.svx b/src/routes/(demos)/color-scales/+page.svx
similarity index 100%
rename from src/routes/color-scales/+page.svx
rename to src/routes/(demos)/color-scales/+page.svx
diff --git a/src/routes/color-scales/mp-element-counts.json b/src/routes/(demos)/color-scales/mp-element-counts.json
similarity index 100%
rename from src/routes/color-scales/mp-element-counts.json
rename to src/routes/(demos)/color-scales/mp-element-counts.json
diff --git a/src/routes/element-tile/+page.svx b/src/routes/(demos)/element-tile/+page.svx
similarity index 100%
rename from src/routes/element-tile/+page.svx
rename to src/routes/(demos)/element-tile/+page.svx
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index e4e3fdf..57bd8fc 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,7 +2,7 @@
   import { page } from '$app/stores'
   import { name, repository } from '$root/package.json'
   import { Footer } from '$site'
-  import GitHubCorner from 'svelte-github-corner'
+  import { GitHubCorner } from 'svelte-zoo'
   import '../app.css'
   import { _demo_routes } from './+layout'
 
@@ -30,9 +30,7 @@
     {/each}
   </nav>
 
-  <main>
-    <slot />
-  </main>
+  <slot />
 {:else}
   <!-- handles non-svx routes index.svelte and +error.svelte -->
   <slot />
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 4bd1b15..95506b8 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -3,13 +3,12 @@ import type { LayoutLoad } from './$types'
 
 export const prerender = true
 
-export const _demo_routes = Object.keys(import.meta.glob(`./*/+page.{svx,md}`))
-  .map((filename) => filename.split(`/`)[1])
-  .filter(
-    (name) => ![`contributing`, `changelog`, `acknowledgements`].includes(name)
-  )
+export const _demo_routes = Object.keys(
+  // eslint-disable-next-line @typescript-eslint/quotes
+  import.meta.glob('./\\(demos\\)/*/+page*.{svx,md,svelte}')
+).map((filename) => filename.split(`/`)[2])
 
-if (_demo_routes.length < 2) {
+if (_demo_routes.length < 3) {
   throw new Error(`Too few demo routes found: ${_demo_routes.length}`)
 }
 
diff --git a/src/site/Footer.svelte b/src/site/Footer.svelte
index 7a9d42f..d23061c 100644
--- a/src/site/Footer.svelte
+++ b/src/site/Footer.svelte
@@ -14,10 +14,6 @@
     <Icon icon="fa6-solid:hands-clapping" />Acknowledgements
   </a>
   <strong>&ensp;&bull;&ensp;</strong>
-  <a href="/bohr-atoms">
-    <Icon icon="mdi:atom-variant" />Bohr Atoms
-  </a>
-  <strong>&ensp;&bull;&ensp;</strong>
   <a href="/changelog">
     <Icon icon="octicon:history" />Changelog
   </a>