From 9a0459fdd3fb375a6ac37bd4ed7580288b1edb48 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 12 Jan 2024 18:16:57 +0100
Subject: [PATCH] move non pages out of pages dir

---
 test/metadata.test.mjs                     |  2 +-
 website/src/{pages => }/metadata_parser.js |  0
 website/src/my_patterns.js                 | 10 ++++++++++
 website/src/pages/examples/index.astro     |  3 ++-
 website/src/pages/swatch/[name].png.js     |  4 ++--
 website/src/pages/swatch/index.astro       |  3 ++-
 website/src/pages/swatch/list.json.js      | 17 -----------------
 7 files changed, 17 insertions(+), 22 deletions(-)
 rename website/src/{pages => }/metadata_parser.js (100%)
 create mode 100644 website/src/my_patterns.js
 delete mode 100644 website/src/pages/swatch/list.json.js

diff --git a/test/metadata.test.mjs b/test/metadata.test.mjs
index cbd0f8a3..947b045d 100644
--- a/test/metadata.test.mjs
+++ b/test/metadata.test.mjs
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { getMetadata } from '../website/src/pages/metadata_parser';
+import { getMetadata } from '../website/src/metadata_parser';
 
 describe.concurrent('Metadata parser', () => {
   it('loads a tag from inline comment', async () => {
diff --git a/website/src/pages/metadata_parser.js b/website/src/metadata_parser.js
similarity index 100%
rename from website/src/pages/metadata_parser.js
rename to website/src/metadata_parser.js
diff --git a/website/src/my_patterns.js b/website/src/my_patterns.js
new file mode 100644
index 00000000..5779cc42
--- /dev/null
+++ b/website/src/my_patterns.js
@@ -0,0 +1,10 @@
+import { getMetadata } from './metadata_parser';
+
+export function getMyPatterns() {
+  const my = import.meta.glob('../../my-patterns/**', { as: 'raw', eager: true });
+  return Object.fromEntries(
+    Object.entries(my)
+      .filter(([name]) => name.endsWith('.txt'))
+      .map(([name, raw]) => [getMetadata(raw)['title'] || name.split('/').slice(-1), raw]),
+  );
+}
diff --git a/website/src/pages/examples/index.astro b/website/src/pages/examples/index.astro
index d4440689..6b24d9ff 100644
--- a/website/src/pages/examples/index.astro
+++ b/website/src/pages/examples/index.astro
@@ -2,7 +2,7 @@
 import * as tunes from '../../../src/repl/tunes.mjs';
 import HeadCommon from '../../components/HeadCommon.astro';
 
-import { getMetadata } from '../metadata_parser';
+import { getMetadata } from '../../metadata_parser';
 
 const { BASE_URL } = import.meta.env;
 const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;
@@ -25,3 +25,4 @@ const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL
     }
   </div>
 </body>
+../../metadata_parser
\ No newline at end of file
diff --git a/website/src/pages/swatch/[name].png.js b/website/src/pages/swatch/[name].png.js
index aa8aabf3..117b75a6 100644
--- a/website/src/pages/swatch/[name].png.js
+++ b/website/src/pages/swatch/[name].png.js
@@ -2,9 +2,9 @@ import { createCanvas } from 'canvas';
 import { pianoroll } from '@strudel.cycles/core';
 import { evaluate } from '@strudel.cycles/transpiler';
 import '../../../../test/runtime.mjs';
-import { getMyPatterns } from './list.json';
+import { getMyPatterns } from '../../my_patterns';
 
-export async function get({ params, request }) {
+export async function GET({ params, request }) {
   const patterns = await getMyPatterns();
   const { name } = params;
   const tune = patterns[name];
diff --git a/website/src/pages/swatch/index.astro b/website/src/pages/swatch/index.astro
index 65484856..5f575449 100644
--- a/website/src/pages/swatch/index.astro
+++ b/website/src/pages/swatch/index.astro
@@ -1,5 +1,5 @@
 ---
-import { getMyPatterns } from './list.json';
+import { getMyPatterns } from '../../my_patterns.js';
 
 import { Content } from '../../../../my-patterns/README.md';
 import HeadCommon from '../../components/HeadCommon.astro';
@@ -37,3 +37,4 @@ const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL
     }
   </div>
 </body>
+../../list.json
diff --git a/website/src/pages/swatch/list.json.js b/website/src/pages/swatch/list.json.js
deleted file mode 100644
index 4bf6bb4a..00000000
--- a/website/src/pages/swatch/list.json.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getMetadata } from '../metadata_parser';
-
-export function getMyPatterns() {
-  const my = import.meta.glob('../../../../my-patterns/**', { as: 'raw', eager: true });
-  return Object.fromEntries(
-    Object.entries(my)
-      .filter(([name]) => name.endsWith('.txt'))
-      .map(([name, raw]) => [getMetadata(raw)['title'] || name.split('/').slice(-1), raw]),
-  );
-}
-
-export async function get() {
-  const all = await getMyPatterns();
-  return {
-    body: JSON.stringify(all),
-  };
-}