From dcb29e112a711324bf091708bc3b1d5f53f948c4 Mon Sep 17 00:00:00 2001 From: "Gard.Kalland" Date: Mon, 28 Apr 2025 13:29:21 +0200 Subject: [PATCH 1/3] Sorting events --- .../portal/arrangementer/+page.server.ts | 14 ++++++-- .../routes/portal/arrangementer/+page.svelte | 34 +++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/apps/www/src/routes/portal/arrangementer/+page.server.ts b/apps/www/src/routes/portal/arrangementer/+page.server.ts index dff6093c..3b484534 100644 --- a/apps/www/src/routes/portal/arrangementer/+page.server.ts +++ b/apps/www/src/routes/portal/arrangementer/+page.server.ts @@ -5,10 +5,20 @@ export const load: PageServerLoad = async ({ locals }) => { orderBy: (row, { asc }) => [asc(row.date)], with: { shifts: true - } + }, + where: (events, { gte }) => gte(events.date, new Date()) }); + const outdatedEvents = await locals.db.query.events.findMany({ + orderBy: (row, { desc }) => [desc(row.date)], + with: { + shifts: true + }, + where: (events, { lt }) => lt(events.date, new Date()) + }); + return { - events + events, + outdatedEvents }; }; diff --git a/apps/www/src/routes/portal/arrangementer/+page.svelte b/apps/www/src/routes/portal/arrangementer/+page.svelte index e1823843..ea831a15 100644 --- a/apps/www/src/routes/portal/arrangementer/+page.svelte +++ b/apps/www/src/routes/portal/arrangementer/+page.svelte @@ -2,10 +2,14 @@ import EventPreview from '$lib/components/portal/EventPreview.svelte'; import Heading from '$lib/components/ui/Heading.svelte'; import { getUser } from '$lib/context/user.context.js'; - let { data } = $props(); - let user = getUser(); + let showOutdatedEvents = $state(false); + + function toggleOutdatedEvents() { + showOutdatedEvents = !showOutdatedEvents; + } + @@ -28,3 +32,29 @@

Ingen arrangementer

{/each} + +
+ +
+ +{#if showOutdatedEvents} +
+
    + {#each data.outdatedEvents as event} +
  • + +
  • + {:else} +

    Ingen tidligere arrangementer

    + {/each} +
+
+{/if} From 5ad95de4fdfe466c42690d8c547c0c4e8c14bada Mon Sep 17 00:00:00 2001 From: "Gard.Kalland" Date: Mon, 28 Apr 2025 14:23:47 +0200 Subject: [PATCH 2/3] removed padding --- apps/www/src/routes/portal/arrangementer/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/www/src/routes/portal/arrangementer/+page.svelte b/apps/www/src/routes/portal/arrangementer/+page.svelte index ea831a15..38643b75 100644 --- a/apps/www/src/routes/portal/arrangementer/+page.svelte +++ b/apps/www/src/routes/portal/arrangementer/+page.svelte @@ -35,7 +35,7 @@
+
{#if showOutdatedEvents} -
-
    - {#each data.outdatedEvents as event} -
  • - -
  • - {:else} -

    Ingen tidligere arrangementer

    - {/each} -
-
+
+
    + {#each data.outdatedEvents as event} +
  • + +
  • + {:else} +

    Ingen tidligere arrangementer

    + {/each} +
+
{/if}