diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index ec2632a..daab6ce 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,7 +1,13 @@ @@ -9,4 +15,30 @@ -{@render children?.()} +
+ +
+ {@render children?.()} + +
+
+ + +
+
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts new file mode 100644 index 0000000..1ccd9e0 --- /dev/null +++ b/src/routes/+page.server.ts @@ -0,0 +1,6 @@ +import { redirect } from '@sveltejs/kit'; +import type { PageServerLoad } from './$types'; + +export const load: PageServerLoad = ({ }) => { + redirect(308, '/standards'); +}; diff --git a/src/routes/+page.svelte b/src/routes/standards/+page.svelte similarity index 60% rename from src/routes/+page.svelte rename to src/routes/standards/+page.svelte index 9d3a36c..e588495 100644 --- a/src/routes/+page.svelte +++ b/src/routes/standards/+page.svelte @@ -76,89 +76,82 @@ }; -
-
-
- - Metrics - +
+
+ Metrics +
+ -
- + - + - + +
+
- -
- +
+ + Parameters + -
- - Parameters - - -
+
+
General -
+
-
+
Data Generation @@ -178,7 +171,7 @@
-
- - -
- -
-
-

- {allStandards.byActivity(selected.activity).getMetadata().name} -

-
-

{selected.metrics.gender}

-

- {#if allStandards - .byActivity(selected.activity) - .getMetadata().generators.length} - (Generated data: {allStandards - .byActivity(selected.activity) - .getMetadata() - .generators.map((g) => g.metric) - .join(", ")}) - {:else} - (Generated data: NONE) - {/if} -

-
+
+ - {#if !selected.metrics.age} - {#each allStandards.agesFor(selected.activity, selected.metrics.gender) as age} - {@render standardsTable(selected.activity, { - ...selected.metrics, - age, - })} - {/each} - {:else} - {@render standardsTable(selected.activity, selected.metrics)} - {/if} - - +
+ +
+
+
+

+ {#if allStandards + .byActivity(selected.activity) + .getMetadata().generators.length} + (Generated data: {allStandards + .byActivity(selected.activity) + .getMetadata() + .generators.map((g) => g.metric) + .join(", ")}) + {:else} + (Generated data: NONE) + {/if} +

+
+
+ + {#if !selected.metrics.age} + {#each allStandards.agesFor(selected.activity, selected.metrics.gender) as age} + {@render standardsTable(selected.activity, { + ...selected.metrics, + age, + })} + {/each} + {:else} + {@render standardsTable(selected.activity, selected.metrics)} + {/if} +
{#snippet standardsTable(activity: Activity, metrics: Metrics)} {#snippet standardsTableRow(standard: Standard)}