group demo routes

janosh · Feb 13, 2023 · 89aae68 · 89aae68
1 parent 35f7fbe
commit 89aae68
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 15 deletions.
diff --git 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
@@ -0,0 +1,3 @@
+<main>
+  <slot />
+</main>
diff --git a/src/routes/bohr-atoms/+page.svelte → src/routes/(demos)/bohr-atoms/+page@.svelte b/src/routes/bohr-atoms/+page.svelte → src/routes/(demos)/bohr-atoms/+page@.svelte
diff --git a/src/routes/color-scales/+page.svx → src/routes/(demos)/color-scales/+page.svx b/src/routes/color-scales/+page.svx → src/routes/(demos)/color-scales/+page.svx
diff --git a/...outes/color-scales/mp-element-counts.json → ...emos)/color-scales/mp-element-counts.json b/...outes/color-scales/mp-element-counts.json → ...emos)/color-scales/mp-element-counts.json
diff --git a/src/routes/element-tile/+page.svx → src/routes/(demos)/element-tile/+page.svx b/src/routes/element-tile/+page.svx → src/routes/(demos)/element-tile/+page.svx
diff --git 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
@@ -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
@@ -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>