+
{isCreating ? m.elections_create() : m.elections_edit()}
-
-
-
- {#if $errors.committeeId}
-
{$errors.committeeId}
- {/if}
-
diff --git a/src/routes/(app)/elections/[id]/edit/+page.server.ts b/src/routes/(app)/elections/[id]/edit/+page.server.ts
index dd18852e9..3e0ca790b 100644
--- a/src/routes/(app)/elections/[id]/edit/+page.server.ts
+++ b/src/routes/(app)/elections/[id]/edit/+page.server.ts
@@ -1,29 +1,33 @@
import { error, fail } from "@sveltejs/kit";
import type { Actions, PageServerLoad } from "./$types";
import { superValidate } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
-import { redirect } from "$lib/utils/redirect";
+import { zod4 } from "sveltekit-superforms/adapters";
+import { redirect } from "sveltekit-flash-message/server";
import { electionSchema } from "../../schemas";
import * as m from "$paraglide/messages";
import dayjs from "dayjs";
export const load: PageServerLoad = async ({ locals, params }) => {
const { prisma } = locals;
- const electionPromise = prisma.election.findFirst({
- where: { id: params.id },
- });
- const committeesPromise = prisma.committee.findMany({
- orderBy: [{ shortName: "asc" }],
- select: {
- id: true,
- name: true,
- nameSv: true,
- nameEn: true,
- },
- });
+ const [election, committees] = await Promise.all([
+ prisma.election.findFirst({
+ where: { id: params.id },
+ }),
- const election = await electionPromise;
+ prisma.committee.findMany({
+ orderBy: [{ shortName: "asc" }],
+ select: {
+ id: true,
+ name: true,
+ nameSv: true,
+ nameEn: true,
+ darkImageUrl: true,
+ lightImageUrl: true,
+ monoImageUrl: true,
+ },
+ }),
+ ]);
if (!election) {
throw error(404, m.elections_notFound());
@@ -31,13 +35,13 @@ export const load: PageServerLoad = async ({ locals, params }) => {
return {
election,
- committees: await committeesPromise,
+ committees,
form: await superValidate(
{
...election,
expiresAt: dayjs(election.expiresAt).format("YYYY-MM-DD"),
},
- zod(electionSchema),
+ zod4(electionSchema),
),
};
};
@@ -46,7 +50,7 @@ export const actions: Actions = {
update: async (event) => {
const { request, locals, params } = event;
const { prisma } = locals;
- const form = await superValidate(request, zod(electionSchema));
+ const form = await superValidate(request, zod4(electionSchema));
if (!form.valid) return fail(400, { form });
const id = params.id;
console.log(form.data);
diff --git a/src/routes/(app)/elections/[id]/edit/+page.svelte b/src/routes/(app)/elections/[id]/edit/+page.svelte
index 946ad4dc1..ed9fa0985 100644
--- a/src/routes/(app)/elections/[id]/edit/+page.svelte
+++ b/src/routes/(app)/elections/[id]/edit/+page.svelte
@@ -1,9 +1,9 @@
diff --git a/src/routes/(app)/elections/create/+page.server.ts b/src/routes/(app)/elections/create/+page.server.ts
index af7bc6719..df29e6313 100644
--- a/src/routes/(app)/elections/create/+page.server.ts
+++ b/src/routes/(app)/elections/create/+page.server.ts
@@ -1,8 +1,8 @@
import { fail } from "@sveltejs/kit";
import type { Actions, PageServerLoad } from "./$types";
import { superValidate } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
-import { redirect } from "$lib/utils/redirect";
+import { zod4 } from "sveltekit-superforms/adapters";
+import { redirect } from "sveltekit-flash-message/server";
import { electionSchema } from "../schemas";
import * as m from "$paraglide/messages";
import dayjs from "dayjs";
@@ -22,6 +22,9 @@ export const load: PageServerLoad = async ({ locals }) => {
name: true,
nameSv: true,
nameEn: true,
+ darkImageUrl: true,
+ lightImageUrl: true,
+ monoImageUrl: true,
},
});
@@ -36,7 +39,7 @@ export const load: PageServerLoad = async ({ locals }) => {
return {
committees,
election,
- form: await superValidate(zod(electionSchema)),
+ form: await superValidate(zod4(electionSchema)),
};
};
@@ -44,7 +47,7 @@ export const actions: Actions = {
create: async (event) => {
const { request, locals } = event;
const { prisma } = locals;
- const form = await superValidate(request, zod(electionSchema));
+ const form = await superValidate(request, zod4(electionSchema));
if (!form.valid) return fail(400, { form });
const { markdownSv, markdownEn, link, expiresAt, committeeId } = form.data;
await prisma.election.create({
diff --git a/src/routes/(app)/elections/create/+page.svelte b/src/routes/(app)/elections/create/+page.svelte
index e51f5d9d7..4f4f33fd6 100644
--- a/src/routes/(app)/elections/create/+page.svelte
+++ b/src/routes/(app)/elections/create/+page.svelte
@@ -3,7 +3,7 @@
import ElectionEditor from "../ElectionEditor.svelte";
import type { PageData } from "./$types";
- export let data: PageData;
+ let { data }: { data: PageData } = $props();
diff --git a/src/routes/(app)/events/+layout.svelte b/src/routes/(app)/events/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/events/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/events/+page.svelte b/src/routes/(app)/events/+page.svelte
index 45b116c27..0a8eebb03 100644
--- a/src/routes/(app)/events/+page.svelte
+++ b/src/routes/(app)/events/+page.svelte
@@ -1,58 +1,5 @@
-
-
-
-
+
diff --git a/src/routes/(app)/events/DateSpan.svelte b/src/routes/(app)/events/DateSpan.svelte
deleted file mode 100644
index 8c407a347..000000000
--- a/src/routes/(app)/events/DateSpan.svelte
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- {#if end == undefined}
-
{relativeDate(start)}
- {start?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
- {:else if Math.abs(start.valueOf() - end.valueOf()) < 24 * 60 * 60 * 1000}
-
{relativeDate(start)}
- {start?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })} →
- {end?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
- {:else}
-
-
- {relativeDate(start)}
- {start?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
- →
-
- {relativeDate(end)}
- {end?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
-
- {/if}
-
diff --git a/src/routes/(app)/events/Event.svelte b/src/routes/(app)/events/Event.svelte
deleted file mode 100644
index 89145acb4..000000000
--- a/src/routes/(app)/events/Event.svelte
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-{#if event.imageUrl}
-
- })
-
-{/if}
-
-
-
- {event.title}
- {#if event.removedAt}
- Raderat
- {/if}
-
- {#if event.isCancelled}
- {m.events_cancelled()}
- {/if}
-
-
-
-{#if event.location}
-
-{/if}
-{#if event.link}
-
-{/if}
-
-
-
-
-
-{#if event.shortDescription}
-
-{/if}
-
-
-
diff --git a/src/routes/(app)/events/EventEditor.svelte b/src/routes/(app)/events/EventEditor.svelte
deleted file mode 100644
index 4725190ef..000000000
--- a/src/routes/(app)/events/EventEditor.svelte
+++ /dev/null
@@ -1,283 +0,0 @@
-
-
-
-
-
- {m.events_create_preview()}
-
-
- {#each $form.tags as selectedTag}
- {@const tag = allTags.find((t) => t.id === selectedTag.id)}
-
- {/each}
-
-
-
-
-
-
diff --git a/src/routes/(app)/events/EventPage.svelte b/src/routes/(app)/events/EventPage.svelte
deleted file mode 100644
index 4f7975d17..000000000
--- a/src/routes/(app)/events/EventPage.svelte
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
- {#each data.events as event (event.id)}
-
- {/each}
-
-
diff --git a/src/routes/(app)/events/EventPageLoad.ts b/src/routes/(app)/events/EventPageLoad.ts
index c0c18ce08..36ddffbdc 100644
--- a/src/routes/(app)/events/EventPageLoad.ts
+++ b/src/routes/(app)/events/EventPageLoad.ts
@@ -6,7 +6,7 @@ import {
getPageSizeOrThrowSvelteError,
} from "$lib/utils/url.server";
import type { ServerLoadEvent } from "@sveltejs/kit";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { superValidate } from "sveltekit-superforms/server";
const eventPageLoad =
@@ -38,7 +38,7 @@ const eventPageLoad =
events,
pageCount,
allTags,
- interestedGoingForm: await superValidate(zod(interestedGoingSchema)),
+ interestedGoingForm: await superValidate(zod4(interestedGoingSchema)),
};
};
diff --git a/src/routes/(app)/events/InterestedGoingButtons.svelte b/src/routes/(app)/events/InterestedGoingButtons.svelte
deleted file mode 100644
index d5905c088..000000000
--- a/src/routes/(app)/events/InterestedGoingButtons.svelte
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-{#if $page.data.member}
-
-
-
-{/if}
diff --git a/src/routes/(app)/events/InterestedGoingList.svelte b/src/routes/(app)/events/InterestedGoingList.svelte
deleted file mode 100644
index 0bbcfd245..000000000
--- a/src/routes/(app)/events/InterestedGoingList.svelte
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-{#if going.length > 0}
-
-
-{/if}
-{#if going.length > 0 && interested.length > 0}
-
-{/if}
-{#if interested.length > 0}
-
-
-{/if}
diff --git a/src/routes/(app)/events/SmallEventCard.svelte b/src/routes/(app)/events/SmallEventCard.svelte
deleted file mode 100644
index 1c34c3b5e..000000000
--- a/src/routes/(app)/events/SmallEventCard.svelte
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
- {#each event.tags as tag}
- {tag.name}
- {/each}
-
-
-
-
-
- {event.title}
- {#if event.removedAt}
- Raderat
- {/if}
-
- {#if event.isCancelled}
- {m.events_cancelled()}
- {/if}
-
-
-
-
- {#if Math.abs(event.startDatetime.valueOf() - event.endDatetime.valueOf()) < 24 * 60 * 60 * 1000}
- {relativeDate(event.startDatetime)}
-
- {event.startDatetime?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })} →
- {event.endDatetime?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
- {:else}
-
-
- {relativeDate(event.startDatetime)}
-
- {event.startDatetime?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
- →
-
- {relativeDate(event.endDatetime)}
-
- {event.endDatetime?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
-
-
-
-
-
- {#if event.shortDescription}
-
- {/if}
-
-
-
-
-
-
diff --git a/src/routes/(app)/events/[slug]/+page.server.ts b/src/routes/(app)/events/[slug]/+page.server.ts
index 437515e36..562c792b6 100644
--- a/src/routes/(app)/events/[slug]/+page.server.ts
+++ b/src/routes/(app)/events/[slug]/+page.server.ts
@@ -7,7 +7,7 @@ import {
} from "$lib/zod/comments";
import { error } from "@sveltejs/kit";
import { superValidate } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { getEvent } from "$lib/events/getEvents";
import type { Actions, PageServerLoad } from "./$types";
import { isAuthorized } from "$lib/utils/authorization";
@@ -39,10 +39,10 @@ export const load: PageServerLoad = async ({ locals, params }) => {
canEdit,
canScan,
canDelete,
- commentForm: await superValidate(zod(commentSchema)),
- removeCommentForm: await superValidate(zod(removeCommentSchema)),
- removeEventForm: await superValidate(zod(removeEventSchema)),
- interestedGoingForm: await superValidate(zod(interestedGoingSchema)),
+ commentForm: await superValidate(zod4(commentSchema)),
+ removeCommentForm: await superValidate(zod4(removeCommentSchema)),
+ removeEventForm: await superValidate(zod4(removeEventSchema)),
+ interestedGoingForm: await superValidate(zod4(interestedGoingSchema)),
};
};
diff --git a/src/routes/(app)/events/[slug]/+page.svelte b/src/routes/(app)/events/[slug]/+page.svelte
index b7ed4e444..0a8eebb03 100644
--- a/src/routes/(app)/events/[slug]/+page.svelte
+++ b/src/routes/(app)/events/[slug]/+page.svelte
@@ -1,157 +1,5 @@
-
-
-
-
-
-
- {#if data.canScan}
-
-
-
- {/if}
- {#if data.canEdit}
-
-
-
- {/if}
- {#if data.canDelete}
-
- {/if}
-
- {#each event.tags as tag}
-
- {/each}
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/events/[slug]/edit/+page.server.ts b/src/routes/(app)/events/[slug]/edit/+page.server.ts
index 6f25e030b..9f18b85d7 100644
--- a/src/routes/(app)/events/[slug]/edit/+page.server.ts
+++ b/src/routes/(app)/events/[slug]/edit/+page.server.ts
@@ -4,7 +4,7 @@ import apiNames from "$lib/utils/apiNames";
import { authorize } from "$lib/utils/authorization";
import * as m from "$paraglide/messages";
import { error } from "@sveltejs/kit";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { superValidate } from "sveltekit-superforms/server";
import type { Actions, PageServerLoad } from "./$types";
import { getAllTags } from "$lib/news/tags";
@@ -50,7 +50,7 @@ export const load: PageServerLoad = async ({ locals, params }) => {
recurringParentId: event?.recurringParentId,
form: await superValidate(
completeEvent,
- zod(eventSchema.and(z.object({ editType: actionType }))),
+ zod4(eventSchema.and(z.object({ editType: actionType }))),
),
};
};
diff --git a/src/routes/(app)/events/[slug]/edit/+page@(app).svelte b/src/routes/(app)/events/[slug]/edit/+page@(app).svelte
deleted file mode 100644
index c9f6b5f5e..000000000
--- a/src/routes/(app)/events/[slug]/edit/+page@(app).svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
diff --git a/src/routes/(app)/events/[slug]/scan/+page.svelte b/src/routes/(app)/events/[slug]/scan/+page.svelte
index 322b11ab3..b513928b7 100644
--- a/src/routes/(app)/events/[slug]/scan/+page.svelte
+++ b/src/routes/(app)/events/[slug]/scan/+page.svelte
@@ -1,75 +1,5 @@
-
-
-
- {m.events_scanning()}: {event.title}
-
-
- {#if event.imageUrl}
-
-
-
- {/if}
-
-
- {#if event.location}
-
{m.events_location()}: {event.location}
- {/if}
-
- {relativeDate(event.startDatetime)}
- {event.startDatetime?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })} →
- {event.endDatetime?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
-
-
-
-
-
{m.events_scanInstructions()}
-
{m.events_scanDescription()}
- {#if error}
-
- {error}
-
- {/if}
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/events/[slug]/scan/[consumable]/+page.svelte b/src/routes/(app)/events/[slug]/scan/[consumable]/+page.svelte
index 64413e32a..b513928b7 100644
--- a/src/routes/(app)/events/[slug]/scan/[consumable]/+page.svelte
+++ b/src/routes/(app)/events/[slug]/scan/[consumable]/+page.svelte
@@ -1,175 +1,5 @@
-
- {#if !consumable}
-
-
-
-
{m.events_scan_status()}
-
- {m.events_ticket_not_found()}
-
-
{m.events_ticket_not_found_description()}
-
-
-
-
- {:else}
- {@const shoppable = consumable.shoppable}
- {@const member = consumable.member}
- {@const questionResponses = consumable.questionResponses || []}
- {@const hasQuestionResponses = questionResponses.length > 0}
-
-
-
-
{m.events_scan_ticket()}
-
{shoppable.title}
-
-
-
-
-
{m.events_scan_status()}
-
- {#if consumable.shoppable.event.slug !== slug}
- {m.events_invalid_wrong_event()}
-
- {m.events_ticket_not_valid_for_this_event()}
- {:else if consumable.consumedAt && Date.now() - consumable.consumedAt.getTime() < fiveMinutesInMs}
-
- {m.events_consumed_just_now()}
- {:else if consumable.consumedAt}
- {m.events_invalid_already_consumed()}
- {:else if consumable.purchasedAt}
- {m.events_valid_not_consumed()}
- {:else}
- {m.events_invalid_not_purchased()}
- {/if}
-
- {#if consumable.consumedAt}
-
- {m.events_consumed_at()}
- {dayjs(consumable.consumedAt).format("YYYY-MM-DD HH:mm")}
-
- {/if}
-
-
-
-
{m.events_owner()}
-
- {#if member}
-
-
-
- {#if member.picturePath}
-
- {:else}
-
- {/if}
-
-
-
- {member.firstName}
- {member.lastName}
- ({member.studentId})
-
-
- {:else if consumable.externalCustomerEmail}
- {consumable.externalCustomerEmail}
- {:else}
- {m.events_unknown_owner()}
- {/if}
-
-
-
-
- {#if hasQuestionResponses}
-
{m.events_responses()}
-
- {#each questionResponses as response}
-
- {response.question.title}:
- {response.answer}
-
- {/each}
-
- {/if}
-
-
{m.events_event_details()}
-
-
- {m.events_event()}:
- {shoppable.event.title}
-
-
- {m.events_date()}:
- {dayjs(shoppable.event.startDatetime).format(
- "YYYY-MM-DD HH:mm",
- )}
-
-
- {m.events_description()}:
-
- {shoppable.event.description ||
- m.events_no_description_available()}
-
-
-
-
-
-
-
- {/if}
-
+
diff --git a/src/routes/(app)/events/all-events/+page.svelte b/src/routes/(app)/events/all-events/+page.svelte
index 5519af1ed..0a8eebb03 100644
--- a/src/routes/(app)/events/all-events/+page.svelte
+++ b/src/routes/(app)/events/all-events/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(app)/events/calendar/+page.svelte b/src/routes/(app)/events/calendar/+page.svelte
index fb9b1d461..0a8eebb03 100644
--- a/src/routes/(app)/events/calendar/+page.svelte
+++ b/src/routes/(app)/events/calendar/+page.svelte
@@ -1,15 +1,5 @@
-
-
-
-
-
- {m.events_calendar_list()}
-
-
+
diff --git a/src/routes/(app)/events/calendar/Calendar.svelte b/src/routes/(app)/events/calendar/Calendar.svelte
deleted file mode 100644
index 33e8e62b4..000000000
--- a/src/routes/(app)/events/calendar/Calendar.svelte
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/events/create/+page.server.ts b/src/routes/(app)/events/create/+page.server.ts
index 1a5f8fb43..0a7280909 100644
--- a/src/routes/(app)/events/create/+page.server.ts
+++ b/src/routes/(app)/events/create/+page.server.ts
@@ -1,7 +1,7 @@
import { actionType, eventSchema } from "$lib/events/schema";
import { createEvent } from "$lib/events/server/actions";
import { error } from "@sveltejs/kit";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { superValidate } from "sveltekit-superforms/server";
import type { Actions, PageServerLoad } from "./$types";
import { getAllTags } from "$lib/news/tags";
@@ -15,7 +15,7 @@ export const load: PageServerLoad = async ({ locals }) => {
allTags,
form: await superValidate(
{ organizer: `${member.firstName} ${member.lastName}` },
- zod(eventSchema.and(z.object({ editType: actionType }))),
+ zod4(eventSchema.and(z.object({ editType: actionType }))),
),
};
};
diff --git a/src/routes/(app)/events/create/+page@(app).svelte b/src/routes/(app)/events/create/+page@(app).svelte
deleted file mode 100644
index 6edf13ae0..000000000
--- a/src/routes/(app)/events/create/+page@(app).svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
diff --git a/src/routes/(app)/events/id/[id]/+server.ts b/src/routes/(app)/events/id/[id]/+server.ts
index 2e9d71407..3592fb871 100644
--- a/src/routes/(app)/events/id/[id]/+server.ts
+++ b/src/routes/(app)/events/id/[id]/+server.ts
@@ -1,7 +1,7 @@
+import { eventLink } from "$lib/events/events";
import authorizedPrismaClient from "$lib/server/authorizedPrisma";
-import { eventLink, redirect } from "$lib/utils/redirect";
import { slugWithCount, slugify } from "$lib/utils/slugify";
-import { error } from "@sveltejs/kit";
+import { error, redirect } from "@sveltejs/kit";
/**
* This endpoint is a backup in case an event doesn't have a slug.
diff --git a/src/routes/(app)/events/tv/+page@.svelte b/src/routes/(app)/events/tv/+page@.svelte
deleted file mode 100644
index 313568323..000000000
--- a/src/routes/(app)/events/tv/+page@.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- {#each data.events as event (event.id)}
-
- {/each}
-
diff --git a/src/routes/(app)/events/tv/TVEventCard.svelte b/src/routes/(app)/events/tv/TVEventCard.svelte
deleted file mode 100644
index 4bf6ac54b..000000000
--- a/src/routes/(app)/events/tv/TVEventCard.svelte
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
- {#each event.tags as tag}
- {tag.name}
- {/each}
-
-
-
-
-
- {dayjsDate.format("MMMM")}
-
-
- {dayjsDate.format("DD")}
-
-
-
{event.title}
-
-
-
- {#if Math.abs(event.startDatetime.valueOf() - event.endDatetime.valueOf()) < 24 * 60 * 60 * 1000}
- {relativeDate(event.startDatetime)}
-
- {event.startDatetime?.toLocaleTimeString(["sv"], {
- hour: "2-digit",
- minute: "2-digit",
- })} →
- {event.endDatetime?.toLocaleTimeString(["sv"], {
- hour: "2-digit",
- minute: "2-digit",
- })}
- {:else}
-
-
- {relativeDate(event.startDatetime)}
-
- {event.startDatetime?.toLocaleTimeString(["sv"], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
- →
-
- {relativeDate(event.endDatetime)}
-
- {event.endDatetime?.toLocaleTimeString(["sv"], {
- hour: "2-digit",
- minute: "2-digit",
- })}
-
-
-
-
- {#if event.shortDescription}
-
- {/if}
-
-
-
-
-
-
diff --git a/src/routes/(app)/expenses/+layout.svelte b/src/routes/(app)/expenses/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/expenses/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/expenses/+page.server.ts b/src/routes/(app)/expenses/+page.server.ts
index 85dd9b676..e1d229966 100644
--- a/src/routes/(app)/expenses/+page.server.ts
+++ b/src/routes/(app)/expenses/+page.server.ts
@@ -1,4 +1,4 @@
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "@sveltejs/kit";
import { error } from "@sveltejs/kit";
import { expensesInclusion } from "./getExpenses";
import { isAuthorized } from "$lib/utils/authorization";
diff --git a/src/routes/(app)/expenses/+page.svelte b/src/routes/(app)/expenses/+page.svelte
index 26742e2d3..0a8eebb03 100644
--- a/src/routes/(app)/expenses/+page.svelte
+++ b/src/routes/(app)/expenses/+page.svelte
@@ -1,77 +1,5 @@
-
-
-
-
-
-{#if myExpenses.length === 0 && expensesToSign.length === 0}
-
Inga utlägg
-{:else}
- {#if expensesToSign.length > 0}
-
- Utlägg som ska signeras
-
-
- {/if}
- {#if myExpenses.length > 0}
-
- {/if}
-{/if}
-
-{#if selectedExpense}
-
-
-
-{/if}
+
diff --git a/src/routes/(app)/expenses/ExpenseDetailView.svelte b/src/routes/(app)/expenses/ExpenseDetailView.svelte
deleted file mode 100644
index b0977e8f9..000000000
--- a/src/routes/(app)/expenses/ExpenseDetailView.svelte
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
-
- {expense.isGuildCard ? "Sektionskort" : "Privat utlägg"}
-
-
- Skapad
- {dayjs(expense.createdAt).format("DD MMM YYYY, HH:mm")}
-
-
-
- {getFullName(expense.member)}
-
-
-
-
-
-
-
-
Kvittodatum
- {dayjs(expense.date).format("DD MMM YYYY")}
-
-
-
Beskrivning
- {expense.description}
-
-
-{#if canSign}
-
-{/if}
-
-{#if isAuthorized(apiNames.EXPENSES.BOOKKEEPING, user) && !expense.hasBeenSentToBookkeeping && expense.items.every((item) => item.signedAt)}
-
-{/if}
-
-{#if updateEnhance}
-
- {#each expense.items as item}
-
- {/each}
-
-{:else}
-
- {#each expense.items as item}
-
- {/each}
-
-{/if}
diff --git a/src/routes/(app)/expenses/ExpensesTable.svelte b/src/routes/(app)/expenses/ExpensesTable.svelte
deleted file mode 100644
index b72fd81a9..000000000
--- a/src/routes/(app)/expenses/ExpensesTable.svelte
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
-
- | Date |
- Kostnadsställe(n) |
- Description |
- {#if !hide.from}
- Från |
- {/if}
- {#if !hide.signer}
- Assigned to |
- {/if}
- {#if !hide.signed}
- Signerad |
- {/if}
- Privat |
- Totalbelopp |
- |
-
-
-
- {#each expenses as expense (expense.id)}
-
- {
- if (selectedExpense === expense) selectedExpense = undefined;
- else selectedExpense = expense;
- }}
- >
- | {dayjs(expense.date).format("DD/MM/YYYY")} |
-
- {[...new Set(expense.items.map((item) => item.costCenter))].join(
- ", ",
- )}
- |
- {expense.description} |
- {#if !hide.from}
-
-
- {getFullName(expense.member)}
- |
- {/if}
- {#if !hide.signer}
-
- {#each uniqueSigners(expense) as signer (signer.id)}
-
-
- {getFullName(signer)}
-
-
- {/each}
- |
- {/if}
- {#if !hide.signed}
-
- {#if expense.items.every((item) => item.signedAt !== null)}
-
-
-
- {:else if expense.items.some((item) => item.signedAt !== null)}
-
-
-
- {:else}
-
-
-
- {/if}
- |
- {/if}
-
- {#if !expense.isGuildCard}
-
-
-
- {:else}
-
-
-
- {/if}
- |
-
- {expense.items
- .reduce((acc, item) => acc + item.amount / 100, 0)
- .toLocaleString()} kr
- |
-
-
-
-
-
- |
-
- {/each}
-
-
-
diff --git a/src/routes/(app)/expenses/[id]/+page.server.ts b/src/routes/(app)/expenses/[id]/+page.server.ts
index c8d8c0c11..1da602b26 100644
--- a/src/routes/(app)/expenses/[id]/+page.server.ts
+++ b/src/routes/(app)/expenses/[id]/+page.server.ts
@@ -1,9 +1,9 @@
import apiNames from "$lib/utils/apiNames";
import { isAuthorized } from "$lib/utils/authorization";
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "sveltekit-flash-message/server";
import { error } from "@sveltejs/kit";
import { fail, message, superValidate } from "sveltekit-superforms";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { z } from "zod";
import { getCostCenter } from "../config";
import { expensesInclusion } from "../getExpenses";
@@ -33,8 +33,8 @@ export const load = async ({ locals, params }) => {
}
return {
expense,
- updateItemForm: await superValidate(zod(updateItemSchema)),
- updateForm: await superValidate(expense, zod(updateExpenseSchema)),
+ updateItemForm: await superValidate(zod4(updateItemSchema)),
+ updateForm: await superValidate(expense, zod4(updateExpenseSchema)),
};
};
@@ -45,7 +45,7 @@ const approveReceiptSchema = z.object({
export const actions = {
updateReceipt: async ({ params, request, locals }) => {
const { prisma, member } = locals;
- const form = await superValidate(request, zod(updateItemSchema));
+ const form = await superValidate(request, zod4(updateItemSchema));
if (params.id.length === 0 || Number.isNaN(Number(params.id)))
throw error(404, "Expense id should be a number");
@@ -102,7 +102,7 @@ export const actions = {
},
update: async ({ params, request, locals }) => {
const { prisma } = locals;
- const form = await superValidate(request, zod(updateExpenseSchema));
+ const form = await superValidate(request, zod4(updateExpenseSchema));
if (params.id.length === 0 || Number.isNaN(Number(params.id)))
throw error(404, "Expense id should be a number");
@@ -154,7 +154,7 @@ export const actions = {
fail,
message: "Du måste vara inloggad för att av-godkänna utlägg",
});
- const form = await superValidate(request, zod(approveReceiptSchema));
+ const form = await superValidate(request, zod4(approveReceiptSchema));
if (!form.valid) return fail(400, { form });
const canAlwaysSign = isAuthorized(apiNames.EXPENSES.CERTIFICATION, user);
try {
@@ -198,7 +198,7 @@ export const actions = {
throw error(401, "Du måste vara inloggad för att godkänna utlägg");
if (params.id.length === 0 || Number.isNaN(Number(params.id)))
throw error(404, "Expense id should be a number");
- const form = await superValidate(request, zod(approveReceiptSchema));
+ const form = await superValidate(request, zod4(approveReceiptSchema));
if (!form.valid) return fail(400, { form });
const canAlwaysSign = isAuthorized(apiNames.EXPENSES.CERTIFICATION, user);
try {
diff --git a/src/routes/(app)/expenses/[id]/+page.svelte b/src/routes/(app)/expenses/[id]/+page.svelte
index 6c997be32..0a8eebb03 100644
--- a/src/routes/(app)/expenses/[id]/+page.svelte
+++ b/src/routes/(app)/expenses/[id]/+page.svelte
@@ -1,14 +1,5 @@
-
-
-
-
+
diff --git a/src/routes/(app)/expenses/[id]/ExpenseReceipt.svelte b/src/routes/(app)/expenses/[id]/ExpenseReceipt.svelte
deleted file mode 100644
index 878531653..000000000
--- a/src/routes/(app)/expenses/[id]/ExpenseReceipt.svelte
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
- (showImage = false)}>
- 
- Ladda ner
-
-
diff --git a/src/routes/(app)/expenses/all/+page.svelte b/src/routes/(app)/expenses/all/+page.svelte
index 48c5c9ad8..0a8eebb03 100644
--- a/src/routes/(app)/expenses/all/+page.svelte
+++ b/src/routes/(app)/expenses/all/+page.svelte
@@ -1,86 +1,5 @@
-
-
-
-
-
- My expenses
-
-
-
-{#if data.allExpenses.length > 0}
-
-
-{:else}
-
Inga utlägg
-{/if}
-
-{#if selectedExpense}
-
-
-
-{/if}
+
diff --git a/src/routes/(app)/expenses/upload/+page.server.ts b/src/routes/(app)/expenses/upload/+page.server.ts
index 74fc51c87..9f1f6e2a0 100644
--- a/src/routes/(app)/expenses/upload/+page.server.ts
+++ b/src/routes/(app)/expenses/upload/+page.server.ts
@@ -2,12 +2,12 @@ import { PUBLIC_BUCKETS_FILES } from "$env/static/public";
import { removeFilesWithoutAccessCheck } from "$lib/files/fileHandler";
import { uploadFile } from "$lib/files/uploadFiles";
import authorizedPrismaClient from "$lib/server/authorizedPrisma";
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "sveltekit-flash-message/server";
import * as m from "$paraglide/messages";
import type { Prisma } from "@prisma/client";
import type { AuthUser } from "@zenstackhq/runtime";
import { fail } from "sveltekit-superforms";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { message, superValidate } from "sveltekit-superforms/server";
import createBasicReceipt from "../baseItem";
import { getCostCenter } from "../config";
@@ -35,7 +35,7 @@ export const load: PageServerLoad = async ({ locals: { user } }) => {
isGuildCard: false,
receipts: [createBasicReceipt()],
},
- zod(expenseSchema),
+ zod4(expenseSchema),
{
errors: false,
},
@@ -149,7 +149,7 @@ export const actions: Actions = {
default: async (event) => {
const { locals, request } = event;
const { prisma, user, member } = locals;
- const form = await superValidate(request, zod(expenseSchema), {
+ const form = await superValidate(request, zod4(expenseSchema), {
allowFiles: true,
});
if (!form.valid) return fail(400, { form });
diff --git a/src/routes/(app)/expenses/upload/+page.svelte b/src/routes/(app)/expenses/upload/+page.svelte
index b4eb45c06..0a8eebb03 100644
--- a/src/routes/(app)/expenses/upload/+page.svelte
+++ b/src/routes/(app)/expenses/upload/+page.svelte
@@ -1,49 +1,5 @@
-
-
-
+
diff --git a/src/routes/(app)/expenses/upload/ExpenseReceipt.svelte b/src/routes/(app)/expenses/upload/ExpenseReceipt.svelte
deleted file mode 100644
index 514d06f06..000000000
--- a/src/routes/(app)/expenses/upload/ExpenseReceipt.svelte
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
onFileSelected(e)}
- accept="application/pdf,image/*"
- />
-
- {#each $values as _, i}
- {
- $values = [...$values.slice(0, i), ...$values.slice(i + 1)];
- }}
- />
- {/each}
-
-
-
- {#if $errors}
- {#each $errors as error}
-
-
- {error}
-
-
- {/each}
- {/if}
-
diff --git a/src/routes/(app)/expenses/upload/ExpenseReceiptRow.svelte b/src/routes/(app)/expenses/upload/ExpenseReceiptRow.svelte
deleted file mode 100644
index 7fef9cda7..000000000
--- a/src/routes/(app)/expenses/upload/ExpenseReceiptRow.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
- {#if onRemove}
-
- {/if}
-
diff --git a/src/routes/(app)/expenses/upload/ExpenseReceiptsForm.svelte b/src/routes/(app)/expenses/upload/ExpenseReceiptsForm.svelte
deleted file mode 100644
index 8ce4004aa..000000000
--- a/src/routes/(app)/expenses/upload/ExpenseReceiptsForm.svelte
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
- {#each $values as _, index}
- {
- $values = [...$values.slice(0, index), ...$values.slice(index + 1)];
- }}
- />
- {/each}
-
-
-
- {#if $errors}
- {#each $errors as error}
-
-
- {error}
-
-
- {/each}
- {/if}
-
diff --git a/src/routes/(app)/gallery/+layout.svelte b/src/routes/(app)/gallery/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/gallery/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/gallery/+page.svelte b/src/routes/(app)/gallery/+page.svelte
index 2017899cf..0a8eebb03 100644
--- a/src/routes/(app)/gallery/+page.svelte
+++ b/src/routes/(app)/gallery/+page.svelte
@@ -1,46 +1,5 @@
-
-
-
-
{m.gallery()}
-
- {#if canCreate}
-
- {/if}
-
-
-
-
- {#each albums as album (album)}
-
- {/each}
-
-
+
diff --git a/src/routes/(app)/gallery/AlbumCard.svelte b/src/routes/(app)/gallery/AlbumCard.svelte
deleted file mode 100644
index 65ed3a072..000000000
--- a/src/routes/(app)/gallery/AlbumCard.svelte
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
- {m.gallery_show_pictures()}
-
- 
-
-
-
{album[0].split(/ (.*)/s)[1]}
-
-
{album[0].split(" ")[0]}
-
- {album[1].length}
- {album[1].length > 1 ? m.gallery_pictures() : m.gallery_picture()}
-
-
-
-
diff --git a/src/routes/(app)/gallery/album/[slug]/+page.svelte b/src/routes/(app)/gallery/album/[slug]/+page.svelte
index dd5d9da1a..0a8eebb03 100644
--- a/src/routes/(app)/gallery/album/[slug]/+page.svelte
+++ b/src/routes/(app)/gallery/album/[slug]/+page.svelte
@@ -1,104 +1,5 @@
-
-
-
-
-
-
{m.gallery_back()}
-
-
-
-
{albumName}
- {albumDate}
-
-
- {#if data.metadata}
-
{m.gallery_photographer() + ": " + data.metadata.photographer}
-
{m.gallery_editor() + ": " + data.metadata.editor}
- {/if}
-
-
-
- {#each pictures as picture, index (picture)}
-
- {/each}
-
-
-
+
diff --git a/src/routes/(app)/gallery/upload/+page.server.ts b/src/routes/(app)/gallery/upload/+page.server.ts
index e18bd31b2..e37f31433 100644
--- a/src/routes/(app)/gallery/upload/+page.server.ts
+++ b/src/routes/(app)/gallery/upload/+page.server.ts
@@ -1,13 +1,13 @@
import { fail } from "@sveltejs/kit";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { message, superValidate, withFiles } from "sveltekit-superforms/server";
import type { Actions, PageServerLoad } from "./$types";
import { uploadSchema } from "./types";
import { uploadAlbumFiles } from "./uploadFiles";
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "@sveltejs/kit";
export const load: PageServerLoad = async () => {
- const form = await superValidate(zod(uploadSchema));
+ const form = await superValidate(zod4(uploadSchema));
return { form };
};
@@ -15,7 +15,7 @@ export const actions: Actions = {
default: async ({ request, locals }) => {
const { user } = locals;
- const form = await superValidate(request, zod(uploadSchema), {
+ const form = await superValidate(request, zod4(uploadSchema), {
allowFiles: true,
});
diff --git a/src/routes/(app)/gallery/upload/+page.svelte b/src/routes/(app)/gallery/upload/+page.svelte
index 186ca8ed3..0a8eebb03 100644
--- a/src/routes/(app)/gallery/upload/+page.svelte
+++ b/src/routes/(app)/gallery/upload/+page.svelte
@@ -1,80 +1,5 @@
-
-
-
{m.gallery_back()}
-
{m.gallery_uploadAlbum()}
-
+
diff --git a/src/routes/(app)/home/+layout.svelte b/src/routes/(app)/home/+layout.svelte
index 6e6a3054f..f44ebeb9f 100644
--- a/src/routes/(app)/home/+layout.svelte
+++ b/src/routes/(app)/home/+layout.svelte
@@ -1,3 +1,7 @@
+
+
-
+ {@render children?.()}
diff --git a/src/routes/(app)/home/+page.server.ts b/src/routes/(app)/home/+page.server.ts
index 591d2edb5..e846f2dd3 100644
--- a/src/routes/(app)/home/+page.server.ts
+++ b/src/routes/(app)/home/+page.server.ts
@@ -1,4 +1,4 @@
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "@sveltejs/kit";
import type { PageServerLoad } from "./$types";
import { loadHomeData } from "$lib/server/loadHomeData";
import { APP_PREFERRED_PAGE_COOKIE } from "$lib/components/postReveal/types";
diff --git a/src/routes/(app)/home/+page.svelte b/src/routes/(app)/home/+page.svelte
index e564e3c0a..d1a081ba4 100644
--- a/src/routes/(app)/home/+page.svelte
+++ b/src/routes/(app)/home/+page.svelte
@@ -1,95 +1,22 @@
-
-
-
-
-
-
- {#if $page.data.member}
-
- {getFullName($page.data.member)}
-
-
- {#if data.hasActiveMandate}
-
- {m.home_volunteer()}
-
-
- {/if}
- {/if}
-
-
-
-
-
-
-
-
- {#if data.readmeIssues}
-
- {/if}
-
-
-
-
-
-
-
-
+
+
+
+ Hej, {data.member?.firstName}!
+
+
+
+
Event
+
({
+ startDate: e.startDatetime,
+ endDate: e.endDatetime,
+ slug: e.slug ?? "",
+ title: e.title,
+ }))}
+/>
diff --git a/src/routes/(app)/info/[slug]/+page.svelte b/src/routes/(app)/info/[slug]/+page.svelte
index 7fc12a630..0a8eebb03 100644
--- a/src/routes/(app)/info/[slug]/+page.svelte
+++ b/src/routes/(app)/info/[slug]/+page.svelte
@@ -1,18 +1,5 @@
-
-
-
-
- {#if data && isAuthorized(`markdowns:${data.slug}:update`, data.user)}
-
Edit
- {/if}
-
-
-
- {#if data.isCreating}
-
-
- You're creating a new page under {$page.params["slug"]}.
-
-
- {/if}
-
-
-
-
diff --git a/src/routes/(app)/medals/+page.server.ts b/src/routes/(app)/medals/+page.server.ts
index 97a167325..6414ba360 100644
--- a/src/routes/(app)/medals/+page.server.ts
+++ b/src/routes/(app)/medals/+page.server.ts
@@ -2,6 +2,7 @@ import type { PageServerLoad } from "./$types";
import type { Semester } from "$lib/utils/semesters";
import { medalRecipients } from "$lib/server/medals/medals";
import { getSemesterOrThrowSvelteError } from "$lib/utils/url.server";
+import sync from "$lib/search/sync";
export const load: PageServerLoad = async ({ locals, url }) => {
const { prisma } = locals;
@@ -9,6 +10,7 @@ export const load: PageServerLoad = async ({ locals, url }) => {
const semester: Semester = getSemesterOrThrowSvelteError(url);
const recipients = await medalRecipients(prisma, semester);
+ sync();
return {
recipients,
diff --git a/src/routes/(app)/medals/+page.svelte b/src/routes/(app)/medals/+page.svelte
index e5586a4e8..0a8eebb03 100644
--- a/src/routes/(app)/medals/+page.svelte
+++ b/src/routes/(app)/medals/+page.svelte
@@ -1,54 +1,5 @@
-
-
-
-
-
toString(currentSemester - i)}
- getPageNumber={(page) =>
- currentSemester -
- parseSemesterFromString(page, () => {
- throw error(400, "Invalid semester");
- })}
- fieldName="semester"
- showFirst={true}
- showLast={true}
- class="max-w"
- />
-
- {#if isAuthorized(apiNames.MEDALS.MANAGE, data.user)}
-
- CSV
-
- {/if}
-
-
-
-
- {medal}
- {#if recipients.length > 1}
- ({recipients.length} st)
- {/if}
-
-
-
-
-
-
-
-
- {#each everyOtherGroup as group (group.medal)}
-
- {/each}
-
-
- {#each everyOtherGroup2 as group (group.medal)}
-
- {/each}
-
-
- {#each groups as group (group.medal)}
-
- {/each}
-
diff --git a/src/routes/(app)/members/+layout.svelte b/src/routes/(app)/members/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/members/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/members/+page.svelte b/src/routes/(app)/members/+page.svelte
index 31492d877..0a8eebb03 100644
--- a/src/routes/(app)/members/+page.svelte
+++ b/src/routes/(app)/members/+page.svelte
@@ -1,105 +1,5 @@
-
-
-
-
-
-
- (thisYear - n).toString()}
- getPageNumber={(n) => parseInt((thisYear - parseInt(n)).toString())}
-/>
-
-
- {#if programme !== "all"}
-
- {/if}
-
- {#if members.length === 0}
- {m.members_noMembers()}
- {:else if members.length > 1}
- {m.members_members({ x: members.length })}
- {:else}
- {m.members_oneMember()}
- {/if}
-
-
+ {@render desktop()}
+
+
+{#snippet mobile(klass: string)}
+
+
+
+ {#if canEdit}
+
+ {/if}
+
+
+
+ {member.email}
+
+ {#if member.nickname}
+ "{member.nickname}"
+
{/if}
+ {#if member.bio}
+ Bio
+
+ {/if}
+
+
+
+ {#if Object.keys(mandatesByYear).length > 0}
+
{m.positions()}
+ {#each Object.entries(mandatesByYear)
+ .toSorted()
+ .toReversed() as [year, mandates] (year)}
+
+
{year}
+
+ {#if mandates}
+
+ {#each mandates as mandate (mandate.id)}
+
+ {/each}
+
+ {/if}
+
+ {#if member.nollaIn?.year.toString() === year}
+
+ {/if}
+
+ {/each}
+ {/if}
+
+
{m.medals()}
+ {#each medals as medal (medal.medal)}
+
+ {/each}
+
+
{m.doors()}
+
+ {#each doorAccess as doorAccess}
+
+
+
+
+
+ {doorAccess.verboseName}
+
+
+ {#each doorAccess.roles as role (role)}
+ {role}
+ {/each}
+
+ {/each}
+
+ {/if}
+
+
+
+
+ {member.nickname ? "“" + member.nickname + "”" : ""}
+
+
+
{year}
+
+
+ {#if mandates}
+ {#each mandates as mandate (mandate.id)}
+
+ {/each}
+ {/if}
+ {#if member.nollaIn?.year.toString() === year}
+
+ {/if}
+
+
+
+ {#each data.publishedArticles as article, index (article.id)}
+
+ {/each}
+
+
-
-
- {getFullName(member, { hideNickname: true })}
-
-
- {#if member?.nickname}
-
- “{member.nickname}
- ”
-
- {/if}
-
-
-
- {#if member.graduationYear}
-
- {m.members_graduated()}: {member.graduationYear}
-
- {/if}
-
-
- {#if member.email}
-
- {member.email}
-
- {/if}
-
- {#if canEdit}
-
-
- {/if}
-
-
- {#if isEditing}
-
- {/if}
-
- {#if member.bio}
-
- {/if}
-
- {#if medals.length > 0}
-
- {/if}
-
- {#if Object.keys(mandatesByYear).length > 0}
-
- {/if}
-
- {#if doorAccess.length > 0}
-
- Dörraccess
- {#each doorAccess as doorAccess}
-
-
-
- {doorAccess.verboseName}
-
- {#each doorAccess.roles as role}
- {role}
- {/each}
-
- {/each}
-
- {/if}
-
{article.header}
-
-
+
-
-
-
- {m.news_published({
- date: article.publishedAt?.toLocaleDateString(languageTag()) ?? "???",
- })}
-
-
+
+
+
{article.header}
+
+ {#if canEdit}
{/if}
+ {#if canDelete}{@render removeArticle()}{/if}
+
+
+ {@render children?.()}
+
+
+ {dayjs(article.createdAt).format("YYYY-MM-DD")}
+
+
+
+ {#each article.tags as tag (tag.id)}
+
+ {/each}
+
+
+ {#if article.imageUrls}
+
+ {/if}
+
-
+{#snippet removeArticle()}
+
+
+
+
+
+
+ {m.news_dialog_title()}
+
+ {m.news_dialog_desc()}
+
+
+
+ {m.cancel()}
+
+
+
+
+{/snippet}
diff --git a/src/routes/(app)/news/ArticleEditor.svelte b/src/routes/(app)/news/ArticleEditor.svelte
index 5b1090072..fb2995294 100644
--- a/src/routes/(app)/news/ArticleEditor.svelte
+++ b/src/routes/(app)/news/ArticleEditor.svelte
@@ -1,86 +1,84 @@
+ let {
+ data,
+ allTags,
+ authorOptions,
+ superform = superForm(data, { dataType: "json", delayMs: 500 }),
+ formEnd,
+ committees,
+ }: {
+ allTags: Array>;
+ authorOptions: AuthorOption[];
+ data: SuperValidated;
+ superform?: SuperForm;
+ formEnd?: Snippet;
+ committees: Array, "id" | "name">>;
+ } = $props();
-
-
-
- {m.news_preview()}
-
-
+ const { form } = $derived(superform);
+ let activeTab: "sv" | "en" = $state("sv");
+
+ let tagIds = $form.tags
+ .values()
+ .toArray()
+ .flat()
+ .map((t) => t.id);
+
-
- {#each $form.tags as selectedTag}
- {@const tag = allTags.find((t) => t.id === selectedTag.id)}
-
- {/each}
-
-
-
-
+
+
+
tagIds.includes(t.id)),
+ committeeId: $form.committeeId == undefined ? null : $form.committeeId,
+ notificationText: null,
+ scheduledId: null,
+ shouldSendNotification: false,
+ }}
+ canEdit={false}
+ canDelete={false}
+ >
+
+
-
- {header}
-
-
- {#if images.length > 1}
-
- {images.length}+
-
- {/if}
-
+
+
+
+ {getLocale() === "sv" ? data.headerSv : data.headerEn}
+
+
+ {dayjs(data.publishedAt).format("YYYY-MM-DD")}
+
+
+
+
+
+
+ {`${data.author.firstName} "${data.author.nickname}" ${data.author.lastName}`}
+
+
+
-
-
-
-
-
-
{images.length - 3}+
-
-
-
+
+
+ {#if groupedResults.articles.length > 0}
+
+ {#each groupedResults.articles as result, i (`article-${i}`)}
+
+ {/each}
+
+ {/if}
+
-
- {#each article.tags as tag}
- {tag.name}
- {/each}
-
-
-
-
-
-
-
-
- {#if dayjs(article.createdAt).diff(dayjs(), "week") < -1}
- {dayjs(article.createdAt).format("YYYY-MM-DD")}
- {:else}
- {dayjs(article.createdAt).fromNow()}
- {/if}
-
-
-
-
-
-
-
-
-{/if}
diff --git a/src/routes/(app)/news/create/+page.server.ts b/src/routes/(app)/news/create/+page.server.ts
index 4c538f4cd..267dd6930 100644
--- a/src/routes/(app)/news/create/+page.server.ts
+++ b/src/routes/(app)/news/create/+page.server.ts
@@ -5,7 +5,7 @@ import apiNames from "$lib/utils/apiNames";
import { authorize } from "$lib/utils/authorization";
import * as m from "$paraglide/messages";
import { error } from "@sveltejs/kit";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { superValidate } from "sveltekit-superforms/server";
import type { Actions, PageServerLoad } from "./$types";
import { getAllTags } from "$lib/news/tags";
@@ -14,27 +14,36 @@ export const load: PageServerLoad = async ({ locals }) => {
const { prisma, user } = locals;
authorize(apiNames.NEWS.CREATE, user);
- const allTags = await getAllTags(prisma, true);
- const currentMemberWithMandates = await prisma.member.findUnique({
- where: {
- studentId: user?.studentId,
- },
- include: {
- mandates: {
- where: {
- startDate: {
- lte: new Date(),
+ const [allTags, currentMemberWithMandates, committees] = await Promise.all([
+ getAllTags(prisma, true),
+ prisma.member.findUnique({
+ where: {
+ studentId: user?.studentId,
+ },
+ include: {
+ mandates: {
+ where: {
+ startDate: {
+ lte: new Date(),
+ },
+ endDate: {
+ gte: new Date(),
+ },
},
- endDate: {
- gte: new Date(),
+ include: {
+ position: true,
},
},
- include: {
- position: true,
- },
},
- },
- });
+ }),
+ prisma.committee.findMany({
+ select: {
+ id: true,
+ name: true,
+ },
+ }),
+ ]);
+
if (!currentMemberWithMandates)
throw error(500, m.news_errors_memberNotFound());
const authorOptions = await getArticleAuthorOptions(
@@ -49,11 +58,12 @@ export const load: PageServerLoad = async ({ locals }) => {
sendNotification: true,
author: authorOptions[0],
},
- zod(createSchema),
+ zod4(createSchema),
{
errors: false,
},
),
+ committees,
};
};
diff --git a/src/routes/(app)/news/create/+page.svelte b/src/routes/(app)/news/create/+page.svelte
new file mode 100644
index 000000000..8d561d987
--- /dev/null
+++ b/src/routes/(app)/news/create/+page.svelte
@@ -0,0 +1,52 @@
+
+
+}
+ superform={superform as unknown as SuperForm}
+ committees={data.committees}
+>
+ {#snippet formEnd()}
+
+
+
+
+
+
{m.news_notification_explanation()}
+
-
-
-
-
-
diff --git a/src/routes/(app)/news/likes.ts b/src/routes/(app)/news/likes.ts
index 34895acfa..84b4174e1 100644
--- a/src/routes/(app)/news/likes.ts
+++ b/src/routes/(app)/news/likes.ts
@@ -1,13 +1,13 @@
import { getFullName } from "$lib/utils/client/member";
import sendNotification from "$lib/utils/notifications";
import { NotificationType } from "$lib/utils/notifications/types";
-import { fail, type RequestEvent } from "@sveltejs/kit";
+import { fail, type Action } from "@sveltejs/kit";
import {
message,
superValidate,
type Infer,
} from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { z } from "zod";
import * as m from "$paraglide/messages";
@@ -17,10 +17,10 @@ export const likeSchema = z.object({
export type LikeSchema = Infer;
export const likesAction =
- (shouldLike: boolean) =>
- async ({ request, locals }: RequestEvent, string>) => {
+ (shouldLike: boolean): Action =>
+ async ({ request, locals }) => {
const { prisma, user, member } = locals;
- const form = await superValidate(request, zod(likeSchema));
+ const form = await superValidate(request, zod4(likeSchema));
if (!form.valid) return fail(400, { form });
const article = await prisma.article.update({
diff --git a/src/routes/(app)/news/tags/+page.server.ts b/src/routes/(app)/news/tags/+page.server.ts
index 8db93ce9f..9de46b211 100644
--- a/src/routes/(app)/news/tags/+page.server.ts
+++ b/src/routes/(app)/news/tags/+page.server.ts
@@ -6,7 +6,7 @@ import {
superValidate,
type Infer,
} from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { z } from "zod";
import type { Actions, PageServerLoad } from "./$types";
import { authorize } from "$lib/utils/authorization";
@@ -17,8 +17,8 @@ export const load: PageServerLoad = async ({ locals }) => {
authorize(apiNames.TAGS.READ, user);
const tags = await prisma.tag.findMany({ orderBy: { nameSv: "asc" } });
- const createForm = await superValidate(zod(createSchema));
- const updateForm = await superValidate(zod(updateSchema));
+ const createForm = await superValidate(zod4(createSchema));
+ const updateForm = await superValidate(zod4(updateSchema));
return {
tags,
createForm,
@@ -42,7 +42,7 @@ export type UpdateSchema = Infer;
export const actions: Actions = {
create: async ({ request, locals }) => {
const { prisma } = locals;
- const form = await superValidate(request, zod(createSchema));
+ const form = await superValidate(request, zod4(createSchema));
if (!form.valid) return fail(400, { form });
await prisma.tag.create({
data: {
@@ -56,7 +56,7 @@ export const actions: Actions = {
},
update: async ({ request, locals }) => {
const { prisma } = locals;
- const form = await superValidate(request, zod(updateSchema));
+ const form = await superValidate(request, zod4(updateSchema));
if (!form.valid) return fail(400, { form });
const { id, ...data } = form.data;
try {
diff --git a/src/routes/(app)/news/tags/+page.svelte b/src/routes/(app)/news/tags/+page.svelte
index cadbf2a9a..0a8eebb03 100644
--- a/src/routes/(app)/news/tags/+page.svelte
+++ b/src/routes/(app)/news/tags/+page.svelte
@@ -1,66 +1,5 @@
-
-
-
-
-
-
-
-
- | {m.news_tags_preview()} |
- {m.news_tags_name()} |
- {m.news_tags_name()} (EN) |
- {m.news_tags_color()} |
- |
-
-
-
- {#each data.tags as tag (tag.id)}
-
- {/each}
-
-
-
{m.news_tags_addNew()}
-
-
+
diff --git a/src/routes/(app)/news/tags/TagEditorRow.svelte b/src/routes/(app)/news/tags/TagEditorRow.svelte
deleted file mode 100644
index c19b4afeb..000000000
--- a/src/routes/(app)/news/tags/TagEditorRow.svelte
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
- |
- {#if !isEditing}
- {tag.nameSv} |
- {tag.nameEn ?? ""} |
- {tag.color} |
-
-
- |
- {:else}
-
-
- |
- {/if}
-
diff --git a/src/routes/(app)/news/tv/+page.svelte b/src/routes/(app)/news/tv/+page.svelte
new file mode 100644
index 000000000..0a8eebb03
--- /dev/null
+++ b/src/routes/(app)/news/tv/+page.svelte
@@ -0,0 +1,5 @@
+
+
+
diff --git a/src/routes/(app)/news/tv/+page@.svelte b/src/routes/(app)/news/tv/+page@.svelte
deleted file mode 100644
index a991012e8..000000000
--- a/src/routes/(app)/news/tv/+page@.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- {#each data["articles"] as article (article.id)}
-
- {/each}
-
diff --git a/src/routes/(app)/news/tv/TVArticleCard.svelte b/src/routes/(app)/news/tv/TVArticleCard.svelte
deleted file mode 100644
index 7c3fec633..000000000
--- a/src/routes/(app)/news/tv/TVArticleCard.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
- {#each article.tags as tag}
- {tag.name}
- {/each}
-
-
-
-
- {article.header}
-
-
-
-
-
-
-
-
-
-
-
- {#if dayjs(article.createdAt).diff(dayjs(), "week") < -1}
- {dayjs(article.createdAt).format("YYYY-MM-DD")}
- {:else}
- {dayjs(article.createdAt).fromNow()}
- {/if}
-
-
-
-
+
+
+ {#snippet child({ props })}
+
+ {/snippet}
+
+ {
+ // Don't steal focus when opened via hover
+ if (canHover()) e.preventDefault();
+ }}
+ >
+
+
+
+
+{:then notifications}
+ {@const list = notifications ?? []}
+
+ {#each list as notification (notification.id)}
+
+ {/each}
+ {#if list.length === 0}
+
+ {m.navbar_bell_noNotifications()}
+
+ {/if}
+
+
+
+{/await}
diff --git a/src/routes/(app)/notifications/data.remote.ts b/src/routes/(app)/notifications/data.remote.ts
new file mode 100644
index 000000000..879951705
--- /dev/null
+++ b/src/routes/(app)/notifications/data.remote.ts
@@ -0,0 +1,90 @@
+import { form, getRequestEvent } from "$app/server";
+import { m } from "$paraglide/messages";
+import z from "zod";
+
+export const readAllNotifications = form(z.object({}), async () => {
+ const { user, prisma } = getRequestEvent().locals;
+ if (!user?.memberId) {
+ return {
+ message: m.notifications_errors_notLoggedIn(),
+ type: "error" as const,
+ };
+ }
+ await prisma.notification.updateMany({
+ where: {
+ memberId: user.memberId,
+ readAt: null,
+ },
+ data: {
+ readAt: new Date(),
+ },
+ });
+ return {
+ message: m.notifications_notificationsRead(),
+ type: "hidden" as const,
+ };
+});
+
+export const deleteAllNotifications = form(z.object({}), async () => {
+ const { user, prisma } = getRequestEvent().locals;
+ if (!user?.memberId) {
+ return {
+ message: m.notifications_errors_notLoggedIn(),
+ type: "error" as const,
+ };
+ }
+ await prisma.notification.deleteMany({
+ where: {
+ memberId: user.memberId,
+ },
+ });
+ return {
+ message: m.notifications_notificationsRemoved(),
+ type: "success" as const,
+ };
+});
+
+export const deleteNotification = form(
+ z.object({
+ notificationId: z
+ .string()
+ .optional()
+ .transform((val) => (val !== undefined ? Number(val) : undefined)),
+ notificationIds: z
+ .string()
+ .optional()
+ .transform((val) => (val ? val.split(",").map(Number) : [])),
+ }),
+ async (data) => {
+ const { user, prisma } = getRequestEvent().locals;
+ if (data.notificationIds.length > 0) {
+ await prisma.notification.deleteMany({
+ where: {
+ memberId: user!.memberId,
+ id: {
+ in: data.notificationIds,
+ },
+ },
+ });
+ return {
+ message: m.notifications_notificationsRemoved(),
+ type: "success" as const,
+ };
+ } else if (data.notificationId) {
+ await prisma.notification.delete({
+ where: {
+ memberId: user!.memberId,
+ id: data.notificationId,
+ },
+ });
+ return {
+ message: m.notifications_notificationRemoved(),
+ type: "success" as const,
+ };
+ }
+ return {
+ message: m.notifications_errors_couldNotRemove(),
+ type: "error" as const,
+ };
+ },
+);
diff --git a/src/routes/(app)/onboarding/+layout@.svelte b/src/routes/(app)/onboarding/+layout@.svelte
index 3cbdb15bf..f07eb63c1 100644
--- a/src/routes/(app)/onboarding/+layout@.svelte
+++ b/src/routes/(app)/onboarding/+layout@.svelte
@@ -1,6 +1,5 @@
-
-
+{@render children?.()}
diff --git a/src/routes/(app)/onboarding/+page.server.ts b/src/routes/(app)/onboarding/+page.server.ts
index 8225e5d30..ae8be3359 100644
--- a/src/routes/(app)/onboarding/+page.server.ts
+++ b/src/routes/(app)/onboarding/+page.server.ts
@@ -1,9 +1,9 @@
import { memberSchema } from "$lib/zod/schemas";
import { superValidate, type Infer } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import type { Actions, PageServerLoad } from "./$types";
import { error, fail } from "@sveltejs/kit";
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "sveltekit-flash-message/server";
import * as m from "$paraglide/messages";
export const load: PageServerLoad = async ({ locals }) => {
@@ -40,7 +40,7 @@ export const load: PageServerLoad = async ({ locals }) => {
classProgramme: member.classProgramme ?? "D",
classYear: member.classYear ?? new Date().getFullYear(),
},
- zod(memberSchema),
+ zod4(memberSchema),
),
member,
phadderGroups,
@@ -63,7 +63,7 @@ export type UpdateSchema = Infer;
export const actions: Actions = {
update: async ({ locals, request, cookies }) => {
const { prisma } = locals;
- const form = await superValidate(request, zod(updateSchema));
+ const form = await superValidate(request, zod4(updateSchema));
if (!form.valid) return fail(400, { form });
const studentId = locals.user?.studentId;
if (studentId) {
diff --git a/src/routes/(app)/onboarding/+page.svelte b/src/routes/(app)/onboarding/+page.svelte
index d7ffbf437..a00c42997 100644
--- a/src/routes/(app)/onboarding/+page.svelte
+++ b/src/routes/(app)/onboarding/+page.svelte
@@ -1,7 +1,4 @@
-
{m.onboarding_welcome()}
{m.onboarding_fillInInfoBelow()}
@@ -48,110 +65,128 @@
method="POST"
action="?/update"
use:enhance
- class="form-control gap-2"
+ class="mt-4 flex flex-col gap-2"
>
-
-
-
+
-
+
+
+ bind:value={$form.email}
+ {...$constraints.email}
+ aria-errormessage={$errors.email?.at(0)}>
-
+
+
-
-
-
-
diff --git a/src/routes/(app)/positions/+layout.svelte b/src/routes/(app)/positions/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/positions/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/positions/+page.server.ts b/src/routes/(app)/positions/+page.server.ts
index 7eb901a4b..845e9254a 100644
--- a/src/routes/(app)/positions/+page.server.ts
+++ b/src/routes/(app)/positions/+page.server.ts
@@ -4,7 +4,7 @@ import {
superValidate,
type Infer,
} from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { z } from "zod";
import * as m from "$paraglide/messages";
import type { Actions, PageServerLoad } from "./$types";
@@ -20,7 +20,7 @@ export const load: PageServerLoad = async ({ locals }) => {
const updateForms = Object.fromEntries(
positions.map((pos) => [
pos.id,
- superValidate(pos, zod(updateSchema), { id: pos.id }),
+ superValidate(pos, zod4(updateSchema), { id: pos.id }),
]),
);
@@ -40,7 +40,7 @@ export type UpdatePositionAttributeSchema = Infer
;
export const actions: Actions = {
update: async ({ request, locals }) => {
const { prisma } = locals;
- const form = await superValidate(request, zod(updateSchema));
+ const form = await superValidate(request, zod4(updateSchema));
if (!form.valid) return fail(400, { form });
await prisma.position.update({
where: { id: form.data.id },
diff --git a/src/routes/(app)/positions/+page.svelte b/src/routes/(app)/positions/+page.svelte
index e9c2ec846..0a8eebb03 100644
--- a/src/routes/(app)/positions/+page.svelte
+++ b/src/routes/(app)/positions/+page.svelte
@@ -1,77 +1,5 @@
-
-
-
-
-{#each Object.keys(groupedByCommitte) as comId}
- {@const positions = groupedByCommitte[comId] ?? []}
-
-
- {getCommitteeDisplayName(positions[0]?.committee)}
-
- {#each positions.toSorted((a, b) => {
- if (a.boardMember != b.boardMember) return a.boardMember ? -1 : 1;
- return a.nameSv.localeCompare(b.nameSv);
- }) as position}
- {#await data.updateForms[position.id] then form}
-
-
{position.nameSv}
- {#if isAuthorized(apiNames.POSITION.UPDATE, data.user)}
-
- {/if}
-
- {/await}
- {/each}
-
- {#if data.position.committee}
-
-
-
-
-
- {/if}
-
-
-
-
- {#if isAuthorized(apiNames.MANDATE.CREATE, data.user)}
-
- {/if}
- {#if isAuthorized(apiNames.POSITION.UPDATE, data.user)}
-
- {/if}
-
-
-
- {#if data.position.description}
-
{data.position.description}
- {/if}
-
- {#if data.position.email}
-
- {/if}
- {#if data.position.emailAliases.length > 0}
-
- {m.positions_theFollowingAddresses()}
-
-
- {#each data.position.emailAliases.filter((alias) => alias.email != data.position.email) as alias}
-
- {alias.email}
-
- {/each}
-
- {/if}
- {#if mandateYearRatios.length !== 0}
-
-
- {m.positions_historical_mandate_distribution_per_study_year()}
-
- ({mandateStatsCutoffYears} {m.positions_years()})
-
-
- {#each mandateYearRatios as { studyYear, percentage }}
-
-
- {m.positions_study_year()} {studyYear}
-
-
-
- {percentage.toFixed(1)}%
-
-
- {/each}
-
- {/if}
-
-
{year}
-
-
- {#each groupedByYear[year] ?? [] as mandate (mandate.id)}
-
- {/each}
-
-
-{/each}
-
-{m.positions_all_positions()}
+
diff --git a/src/routes/(app)/positions/[id]/AddMandateForm.svelte b/src/routes/(app)/positions/[id]/AddMandateForm.svelte
deleted file mode 100644
index 9b3715a5f..000000000
--- a/src/routes/(app)/positions/[id]/AddMandateForm.svelte
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/positions/[id]/DeleteMandateForm.svelte b/src/routes/(app)/positions/[id]/DeleteMandateForm.svelte
deleted file mode 100644
index c8f0ce4d9..000000000
--- a/src/routes/(app)/positions/[id]/DeleteMandateForm.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/positions/[id]/Mandate.svelte b/src/routes/(app)/positions/[id]/Mandate.svelte
deleted file mode 100644
index 20d6bcb61..000000000
--- a/src/routes/(app)/positions/[id]/Mandate.svelte
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/positions/[id]/UpdateMandateForm.svelte b/src/routes/(app)/positions/[id]/UpdateMandateForm.svelte
deleted file mode 100644
index 516cbc2d9..000000000
--- a/src/routes/(app)/positions/[id]/UpdateMandateForm.svelte
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/positions/[id]/UpdatePositionForm.svelte b/src/routes/(app)/positions/[id]/UpdatePositionForm.svelte
deleted file mode 100644
index 4abf72e62..000000000
--- a/src/routes/(app)/positions/[id]/UpdatePositionForm.svelte
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/privacy-policy/+layout.svelte b/src/routes/(app)/privacy-policy/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/privacy-policy/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/privacy-policy/+page.svelte b/src/routes/(app)/privacy-policy/+page.svelte
index 80a6b19c9..0a8eebb03 100644
--- a/src/routes/(app)/privacy-policy/+page.svelte
+++ b/src/routes/(app)/privacy-policy/+page.svelte
@@ -1,100 +1,5 @@
-
-
- Policy för hantering av personuppgifter (Privacy Policy)
-
- 1 Formalia
-
- 1.1 Sammanfattning
- Policy för hantering av personuppgifter beskriver hur sektionen skall hantera
- personuppgifter och vilken bakgrund som finns i olika situationer.
- 1.2 Syfte
- Denna policy har tagits fram för att säkerställa att D-sektionen följer GDPR
- samt att underlätta för funktionärer att hantera personuppgifter på ett korrekt
- sätt.
- 1.3 Omfattning
- Sektionen i sin helhet.
- 1.4 Historik
- Policyn är antagen på styrelsemöte S24 2018. Uppdaterad enl. Policy för Policyer
- på HTM2 2021. Uppdaterad enl. Policy för styrdokument på VTM-extra 2023. Policyn
- updaterades VTM-extra 2023 av Rafael Holgersson.
-
+
- 2 Insamling av personuppgifter
-
-
- 2.1 Insamling
- D-sektionens utskott kan inför evenemang eller i andra sektionsrelaterade fall
- behöva samla in och förvara personuppgifter internt för att evenemanget ska kunna
- genomföras på ett smidigt sätt. Exempel på tillfällen kan vara:
-
- - Sittning eller annan fest
- - Lunchföreläsning, Casekväll eller liknande
- - Idrottsevenemang
-
- Syftet med att samla in personuppgifter inför ett evenemang, vem som har tillgång
- till dessa samt under vilken tidsperiod de lagras ska tydliggöras i Sektionens
- registerförteckning. Samma information skall också tydligt framgå för personen
- som skall lämna sina uppgifter. Exempel på personuppgifter som kan sparas tillfälligt:
-
- - För- och efternamn
- - Årskurs
- - Matpreferens
- - E-postadress
- - Telefonnummer
-
- Insamlingen av personuppgifter kan ske genom utskick av formulär eller i samband
- med betalning/anmälningslänk.
-
- 2.2 Samtycke
- I samband med att personuppgifterna hämtas skall godkännande från personen i
- fråga också hämtas. Samtycke måste lämnas aktivt och tydligt samt skall sparas
- tills dess att uppgifterna raderas. Samtycke kan ges muntligt om detta dokumenteras
- på tillfredsställande vis. Om personen inte godkänner att dennes personuppgifter
- sparas ska Sektionen ej spara dessa. Det är funktionären som samlade in uppgifterna
- som ansvarar för att vid samma tillfälle också samla in samtycke. Det ska vara
- tydligt framgå vad som sparas och till vilket syfte.
-
-
- 3 Lagring av personuppgifter
- Personuppgifter som tillfälligt samlas in lagras på konton kopplade till Sektionens
- Googlekonton. Uppgifterna lagras tills dess att evenemanget är genomfört och det
- inte längre finns något syfte att spara dem.
-
- 3.1 Tillgänglighet
- Vid behov kan andra funktionärer ges tillgång till de insamlade personuppgifterna
- i ställföreträdande syfte eller som extra bemanning. Den ansvariga funktionären
- ska kunna redogör vem som har haft tillgång till systemet, i vilket syfte och
- under vilken tidsperiod.
-
-
- 4 Hantering
- De insamlade uppgifterna hanteras av funktionären som är ansvarig över evenemanget
- och som samlade in uppgifterna. Ordförande för berört utskott är ansvarig för att
- funktionären hanterar uppgifterna enligt policyn. Personuppgifter från det tillfälliga
- registret kan endast begäras ut av personen i fråga under förutsättningen att den
- kan identifiera sig med godkänd ID-handling. I övrigt kan endast personuppgifter
- lämnas ut till andra parter på skriftligt beslut från Styrelsen. Styrelsen är skyldig
- att informera personen ifråga innan personuppgifterna lämnas ut.
-
- 4.1 Spridning
- Funktionären som samlar in personuppgifterna är ansvarig för att uppgifterna
- inte sprids eller missbrukas på något sätt. Vid dataintrång eller annat missbruk
- skall personen vars uppgifter utnyttjats underrättas om situationen direkt. Styrelsen
- är ansvarig för att berörda parter underrättas vid dataintrång/spridning/missbruk.
-
- 4.2 Radering
- När man samlar in godkännande för lagringen av personuppgifter ska också ett
- datum anges där personuppgifterna kommer raderas. Detta datumet ska vara efter
- potentiellt evenemang eller då de inte längre kommer användas. Exempel kan vara
- efter ett val, eller i slutet av året när ens funktionärer har fått sitt tack.
- Om radering ej är möjlig ska uppgifterna anonymiseras. Funktionären som samlat
- in personuppgifterna är ansvarig för radering/anonymisering.
-
-
- 5 Ansvar
- D-sektionen och dess företrädare (d.v.s styrelsen) är ytterst ansvarig för att
- insamling, lagring samt hantering av personuppgifter sker på korrekt sätt enligt
- lag och sektionens antagna bestämmelser. Respektive utskottsordförande är ansvarig
- för att medlemmarna inom utskottet sköter insamling, lagring och hantering på rätt
- sätt.
-
+
diff --git a/src/routes/(app)/readme/[year]/[number]/+page.svelte b/src/routes/(app)/readme/[year]/[number]/+page.svelte
index b8d516f03..0a8eebb03 100644
--- a/src/routes/(app)/readme/[year]/[number]/+page.svelte
+++ b/src/routes/(app)/readme/[year]/[number]/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(app)/readme/[year]/[number]/Readme.svelte b/src/routes/(app)/readme/[year]/[number]/Readme.svelte
deleted file mode 100644
index 0a11d82fb..000000000
--- a/src/routes/(app)/readme/[year]/[number]/Readme.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/search/+page.server.ts b/src/routes/(app)/search/+page.server.ts
index 097ece674..a8a314898 100644
--- a/src/routes/(app)/search/+page.server.ts
+++ b/src/routes/(app)/search/+page.server.ts
@@ -3,7 +3,6 @@ import {
availableSearchIndexes,
type SearchDataWithType,
} from "$lib/search/searchTypes";
-import { i18n } from "$lib/utils/i18n";
import { fail } from "@sveltejs/kit";
export const actions = {
@@ -33,9 +32,7 @@ export const actions = {
data.get("offset")?.toString() ?? "0",
);
- // Check which language to search in and get the correct route
- const apiRoute = i18n.resolveRoute("/api/search", event.locals.language);
- const url = new URL(apiRoute, event.request.url);
+ const url = new URL("/api/search", event.request.url);
url.searchParams.set("query", query);
url.searchParams.set("indexes", JSON.stringify(indexes));
url.searchParams.set("limit", limit.toString());
diff --git a/src/routes/(app)/search/+page.svelte b/src/routes/(app)/search/+page.svelte
index 1331371e4..0a8eebb03 100644
--- a/src/routes/(app)/search/+page.svelte
+++ b/src/routes/(app)/search/+page.svelte
@@ -1,230 +1,5 @@
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/settings/+layout.svelte b/src/routes/(app)/settings/+layout.svelte
index 6e6a3054f..f44ebeb9f 100644
--- a/src/routes/(app)/settings/+layout.svelte
+++ b/src/routes/(app)/settings/+layout.svelte
@@ -1,3 +1,7 @@
+
+
-
+ {@render children?.()}
diff --git a/src/routes/(app)/settings/+page.server.ts b/src/routes/(app)/settings/+page.server.ts
index 9d69f7555..97937ad16 100644
--- a/src/routes/(app)/settings/+page.server.ts
+++ b/src/routes/(app)/settings/+page.server.ts
@@ -1,4 +1,3 @@
-import { settingsActions, settingsLoad } from "$lib/member/settings";
+import { settingsLoad } from "$lib/member/settings";
export const load = settingsLoad;
-export const actions = settingsActions;
diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/+page.svelte
index 7b6444f93..bbd4619e8 100644
--- a/src/routes/(app)/settings/+page.svelte
+++ b/src/routes/(app)/settings/+page.svelte
@@ -1,6 +1,214 @@
-
-
+
+
{m.setting_appearance()}
+
+
+
+
{m.setting_mode()}
+ setMode(value as "dark" | "light" | "system")}
+ >
+ {modeTranslation(mode.current ?? data.theme)}
+
+
+ {m.setting_mode()}
+ {#each modes as mode (mode)}
+
+ {/each}
+
+
+
+
+
+
{m.setting_notification()}
+
+
-
-
diff --git a/src/routes/(app)/shop/cart/+page.svelte b/src/routes/(app)/shop/cart/+page.svelte
index a59f2ba61..0a8eebb03 100644
--- a/src/routes/(app)/shop/cart/+page.svelte
+++ b/src/routes/(app)/shop/cart/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(app)/shop/inventory/+page.svelte b/src/routes/(app)/shop/inventory/+page.svelte
index aa83c4aeb..0a8eebb03 100644
--- a/src/routes/(app)/shop/inventory/+page.svelte
+++ b/src/routes/(app)/shop/inventory/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(app)/shop/inventory/[id]/+page@(app).svelte b/src/routes/(app)/shop/inventory/[id]/+page@(app).svelte
deleted file mode 100644
index b39da40d8..000000000
--- a/src/routes/(app)/shop/inventory/[id]/+page@(app).svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/shop/success/+page.svelte b/src/routes/(app)/shop/success/+page.svelte
index 3451f9ac2..0a8eebb03 100644
--- a/src/routes/(app)/shop/success/+page.svelte
+++ b/src/routes/(app)/shop/success/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(app)/shop/tickets/+page.svelte b/src/routes/(app)/shop/tickets/+page.svelte
index 85d004d92..0a8eebb03 100644
--- a/src/routes/(app)/shop/tickets/+page.svelte
+++ b/src/routes/(app)/shop/tickets/+page.svelte
@@ -1,72 +1,5 @@
-
-
-
-
-
-
- {#if $page.data.isApp}
-
- {/if}
-
-
-
-
-
+
diff --git a/src/routes/(app)/shop/tickets/TicketCard/TicketActions.svelte b/src/routes/(app)/shop/tickets/TicketCard/TicketActions.svelte
deleted file mode 100644
index 23199df38..000000000
--- a/src/routes/(app)/shop/tickets/TicketCard/TicketActions.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/shop/tickets/TicketCard/TicketCard.svelte b/src/routes/(app)/shop/tickets/TicketCard/TicketCard.svelte
deleted file mode 100644
index 36a525ad8..000000000
--- a/src/routes/(app)/shop/tickets/TicketCard/TicketCard.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
- {ticket.title}
-
-
-
- {#if ticket.ticketsLeft < 10 && ticket.ticketsLeft > 0}
-
- {m.tickets_card_stockLeft({ stock: ticket.ticketsLeft })}
-
- {/if}
-
-
- {#if ticket.description}
-
{ticket.description}
- {/if}
-
-
-
-
{event.title}
-
- {#if date.year() === new Date().getFullYear()}
- {date.format("dddd Do MMM")}
- {:else}
- {date.format("dddd Do MMM, YYYY")}
- {/if}
-
- {event.shortDescription}
-
- {event.organizer}
- {event.location}
-
-
diff --git a/src/routes/(app)/shop/tickets/TicketSection.svelte b/src/routes/(app)/shop/tickets/TicketSection.svelte
deleted file mode 100644
index 5bd8d5447..000000000
--- a/src/routes/(app)/shop/tickets/TicketSection.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-{#if tickets.length > 0}
-
- {title}
-
- {#each tickets as ticket (ticket.id)}
-
- {/each}
-
-
-{/if}
diff --git a/src/routes/(app)/shop/tickets/[slug]/+page@(app).svelte b/src/routes/(app)/shop/tickets/[slug]/+page@(app).svelte
deleted file mode 100644
index 45cc8872b..000000000
--- a/src/routes/(app)/shop/tickets/[slug]/+page@(app).svelte
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {ticket.title}
-
-
-
-
-
-
- {event.title}
-
-
-
-
- {dayjs(event.startDatetime).format(
- "dddd Do MMM",
- )}
-
-
- {#if event.location}
-
-
-
- {event.location}
-
-
- {/if}
-
{ticket.description}
- {/if}
-
- {#if ticket.authorId == data.member?.id || isAuthorized(apiNames.WEBSHOP.MANAGE, data.user)}
-
- {/if}
-
-
-
-
{ticket.description}
-{/if}
-
-{#if ticket.questions.length > 0}
-
-
Frågor
-
- {#each ticket.questions as question}
- -
-
- {question.title}
- {#if question.removedAt !== null}(borttagen){/if}
-
- {question.description}
-
- {/each}
-
-
- {data.purchasedConsumables.length} köpta
- {#if data.consumablesInCart.length > 0}
- {#if data.consumablesInCart.length > 1}
- {data.consumablesInCart.length} i kundvagner
- {:else}
- 1 i kundvagn
- {/if}
- {/if}
- {#if data.reservations.length > 0}
- {#if data.reservations.length > 1}
- {data.reservations.length} reservationer
- {:else}
- 1 reservation
- {/if}
- {/if}
-
- Ladda ner CSV
-
-
-
-{#if data.consumablesInCart.length > 0}
-
-{/if}
-
-{#if data.reservations.length > 0}
-
-{/if}
+
diff --git a/src/routes/(app)/shop/tickets/[slug]/manage/ConsumableRow.svelte b/src/routes/(app)/shop/tickets/[slug]/manage/ConsumableRow.svelte
deleted file mode 100644
index 8124cb727..000000000
--- a/src/routes/(app)/shop/tickets/[slug]/manage/ConsumableRow.svelte
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
- {member ? getFullName(member) : "Icke inloggad"}
-
- {#if item.externalCustomerEmail}
-
- {item.externalCustomerEmail}
-
- {/if}
-
- |
-
-
- {#if consumable !== null}
- {@const phadderGroup = consumable.member?.phadderGroup}
-
- {/if}
-
-
-
- {#each questions as question}
- {#if consumable}
- {@const response = consumable.questionResponses.find(
- (r) => r.questionId === question.id,
- )}
-
- {:else}
-
- {/if}
- {/each}
-
- {#if consumable?.consumedAt === null}
-
-
-
- {:else if consumable}
-
-
-
- {:else}
- N/A
- {/if}
- |
-
- {#if consumable}
-
-
-
- {/if}
- |
-
diff --git a/src/routes/(app)/shop/tickets/[slug]/manage/ConsumablesTable.svelte b/src/routes/(app)/shop/tickets/[slug]/manage/ConsumablesTable.svelte
deleted file mode 100644
index d11ba0063..000000000
--- a/src/routes/(app)/shop/tickets/[slug]/manage/ConsumablesTable.svelte
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- {#if title}
- | {title} |
|---|
- {/if}
-
- | Person |
- Preferens |
- Köptes |
- Phaddergrupp |
- Konsumerades |
- Betalat |
- Stripeköp ID |
- {#each questions as question}
-
-
-
- {question.title}
-
- |
- {/each}
- Konsumera |
- Återbetala |
-
-
-
- {#if consumables.length > 0}
- {#each consumables as consumable (consumable.id)}
-
-
- {/each}
- {:else}
-
- | Inga biljetter |
-
- {/if}
-
-
-
-
- |
diff --git a/src/routes/(app)/shop/tickets/create/+page.server.ts b/src/routes/(app)/shop/tickets/create/+page.server.ts
index b7ead2724..162186a86 100644
--- a/src/routes/(app)/shop/tickets/create/+page.server.ts
+++ b/src/routes/(app)/shop/tickets/create/+page.server.ts
@@ -1,10 +1,10 @@
import apiNames from "$lib/utils/apiNames";
import { authorize } from "$lib/utils/authorization";
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "sveltekit-flash-message/server";
import { fail } from "@sveltejs/kit";
import dayjs from "dayjs";
import { message, superValidate } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { createTicket } from "$lib/server/shop/tickets/mutations";
import { ticketSchema } from "$lib/utils/shop/types";
@@ -25,7 +25,7 @@ export const load = async ({ locals }) => {
stock: 0,
price: 0,
},
- zod(ticketSchema),
+ zod4(ticketSchema),
{ errors: false },
),
};
@@ -35,7 +35,7 @@ export const actions = {
default: async (event) => {
const { locals, request } = event;
const { prisma, user, member } = locals;
- const form = await superValidate(request, zod(ticketSchema));
+ const form = await superValidate(request, zod4(ticketSchema));
if (!form.valid) return fail(400, { form });
authorize(apiNames.WEBSHOP.CREATE, user);
if (!member) {
diff --git a/src/routes/(app)/shop/tickets/create/+page.svelte b/src/routes/(app)/shop/tickets/create/+page.svelte
index 81f3e7aad..0a8eebb03 100644
--- a/src/routes/(app)/shop/tickets/create/+page.svelte
+++ b/src/routes/(app)/shop/tickets/create/+page.svelte
@@ -1,10 +1,5 @@
-
-
-
-
+
diff --git a/src/routes/(app)/shop/tickets/manage/+page.svelte b/src/routes/(app)/shop/tickets/manage/+page.svelte
index d24bfdad6..0a8eebb03 100644
--- a/src/routes/(app)/shop/tickets/manage/+page.svelte
+++ b/src/routes/(app)/shop/tickets/manage/+page.svelte
@@ -1,24 +1,5 @@
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/songbook/+layout.svelte b/src/routes/(app)/songbook/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/songbook/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/songbook/+page.svelte b/src/routes/(app)/songbook/+page.svelte
index 43d90a258..0a8eebb03 100644
--- a/src/routes/(app)/songbook/+page.svelte
+++ b/src/routes/(app)/songbook/+page.svelte
@@ -1,83 +1,5 @@
-
-
-
- {#if isAuthorized(apiNames.SONG.CREATE, data.user)}
-
- {/if}
-
- {m.songbook_hereYoullFind()}
-
-
-
-
-
-{#each data.songs as song}
-
-{/each}
-
-
+
diff --git a/src/routes/(app)/songbook/Disclaimer.svelte b/src/routes/(app)/songbook/Disclaimer.svelte
deleted file mode 100644
index 91acce470..000000000
--- a/src/routes/(app)/songbook/Disclaimer.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- {m.songbook_disclaimer()}
-
diff --git a/src/routes/(app)/songbook/SongElement.svelte b/src/routes/(app)/songbook/SongElement.svelte
deleted file mode 100644
index 12b9a590d..000000000
--- a/src/routes/(app)/songbook/SongElement.svelte
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
- {#if isAuthorized(apiNames.SONG.DELETE, $page.data.user) && song.deletedAt != null}
- {m.songbook_deleted()}
-
- {m.songbook_deletedExplanation()}
-
- {/if}
-
-
-
-
- {@html song.title}
-
-
-
- {song.createdAt?.toLocaleDateString([languageTag()]) ?? ""}
- {song.createdAt?.toLocaleTimeString([languageTag()], {
- hour: "2-digit",
- minute: "2-digit",
- }) ?? ""}
-
-
- {#if song.category}
- {song.category}
- {:else}
- {m.songbook_missingCategory()}
- {/if}
-
-
- {m.songbook_melody()}: {song.melody}
-
-
- {@html song.lyrics}
-
-
diff --git a/src/routes/(app)/songbook/[slug]/+layout.server.ts b/src/routes/(app)/songbook/[slug]/+layout.server.ts
index c6e84b6da..76082921b 100644
--- a/src/routes/(app)/songbook/[slug]/+layout.server.ts
+++ b/src/routes/(app)/songbook/[slug]/+layout.server.ts
@@ -1,6 +1,6 @@
import * as m from "$paraglide/messages";
import { error } from "@sveltejs/kit";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { superValidate } from "sveltekit-superforms/server";
import {
canAccessDeletedSongs,
@@ -40,7 +40,7 @@ export const load: LayoutServerLoad = async ({ locals, params }) => {
),
]);
- const form = await superValidate(song, zod(updateSongSchema));
+ const form = await superValidate(song, zod4(updateSongSchema));
return {
song: {
diff --git a/src/routes/(app)/songbook/[slug]/+page.svelte b/src/routes/(app)/songbook/[slug]/+page.svelte
index 93a6d287f..0a8eebb03 100644
--- a/src/routes/(app)/songbook/[slug]/+page.svelte
+++ b/src/routes/(app)/songbook/[slug]/+page.svelte
@@ -1,41 +1,5 @@
-
-
-
-
-
-
-
-
-{#if data.song.video !== null && mayWatchVideos(data.user)}
-
-{/if}
-
-
-
-{#if isAuthorized(apiNames.SONG.UPDATE, data.user)}
-
-{/if}
+
diff --git a/src/routes/(app)/songbook/[slug]/edit/+page.server.ts b/src/routes/(app)/songbook/[slug]/edit/+page.server.ts
index 4e0615213..4f784774d 100644
--- a/src/routes/(app)/songbook/[slug]/edit/+page.server.ts
+++ b/src/routes/(app)/songbook/[slug]/edit/+page.server.ts
@@ -1,14 +1,14 @@
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "sveltekit-flash-message/server";
import * as m from "$paraglide/messages";
import { error, fail } from "@sveltejs/kit";
import DOMPurify from "isomorphic-dompurify";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { setError, superValidate } from "sveltekit-superforms/server";
import { updateSongSchema } from "../../schema";
import type { Actions, PageServerLoad } from "./$types";
export const load: PageServerLoad = async () => {
- const form = await superValidate(zod(updateSongSchema));
+ const form = await superValidate(zod4(updateSongSchema));
return { form };
};
@@ -17,7 +17,7 @@ export const actions: Actions = {
const { request, locals } = event;
const { prisma } = locals;
const formData = await request.formData();
- const form = await superValidate(formData, zod(updateSongSchema));
+ const form = await superValidate(formData, zod4(updateSongSchema));
if (!form.valid) return fail(400, { form });
const data = form.data;
if (data.title == null) {
diff --git a/src/routes/(app)/songbook/[slug]/edit/+page.svelte b/src/routes/(app)/songbook/[slug]/edit/+page.svelte
index 71daa9aa1..0a8eebb03 100644
--- a/src/routes/(app)/songbook/[slug]/edit/+page.svelte
+++ b/src/routes/(app)/songbook/[slug]/edit/+page.svelte
@@ -1,144 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/songbook/create/+page.server.ts b/src/routes/(app)/songbook/create/+page.server.ts
index 962df8a93..5ac394a7e 100644
--- a/src/routes/(app)/songbook/create/+page.server.ts
+++ b/src/routes/(app)/songbook/create/+page.server.ts
@@ -1,8 +1,7 @@
import apiNames from "$lib/utils/apiNames";
import { fail } from "@sveltejs/kit";
-import { redirect } from "$lib/utils/redirect";
import { superValidate } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { createSongSchema } from "../schema";
import type { PageServerLoad, Actions } from "./$types";
import { slugifySongTitle } from "./helpers";
@@ -10,6 +9,7 @@ import { getExistingCategories, getExistingMelodies } from "../helpers";
import { authorize } from "$lib/utils/authorization";
import * as m from "$paraglide/messages";
import DOMPurify from "isomorphic-dompurify";
+import { redirect } from "sveltekit-flash-message/server";
export const load: PageServerLoad = async ({ locals }) => {
const { prisma, user } = locals;
@@ -20,7 +20,7 @@ export const load: PageServerLoad = async ({ locals }) => {
getExistingMelodies(prisma),
]);
return {
- form: await superValidate(zod(createSongSchema)),
+ form: await superValidate(zod4(createSongSchema)),
existingCategories,
existingMelodies,
};
@@ -30,7 +30,7 @@ export const actions: Actions = {
create: async (event) => {
const { request, locals } = event;
const { prisma } = locals;
- const form = await superValidate(request, zod(createSongSchema));
+ const form = await superValidate(request, zod4(createSongSchema));
if (!form.valid) return fail(400, { form });
const { title, melody, category, lyrics } = form.data;
const now = new Date();
diff --git a/src/routes/(app)/songbook/create/+page.svelte b/src/routes/(app)/songbook/create/+page.svelte
index 3782182e9..0a8eebb03 100644
--- a/src/routes/(app)/songbook/create/+page.svelte
+++ b/src/routes/(app)/songbook/create/+page.svelte
@@ -1,72 +1,5 @@
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/yrka/+layout.svelte b/src/routes/(app)/yrka/+layout.svelte
deleted file mode 100644
index 6e6a3054f..000000000
--- a/src/routes/(app)/yrka/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/yrka/+page.server.ts b/src/routes/(app)/yrka/+page.server.ts
index 93e9f165f..f184166e6 100644
--- a/src/routes/(app)/yrka/+page.server.ts
+++ b/src/routes/(app)/yrka/+page.server.ts
@@ -1,7 +1,7 @@
import apiNames from "$lib/utils/apiNames";
import { fail } from "@sveltejs/kit";
import { message, superValidate } from "sveltekit-superforms/server";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
import { z } from "zod";
import type { Actions, PageServerLoad } from "./$types";
import { getFullName } from "$lib/utils/client/member";
@@ -23,7 +23,7 @@ export const load: PageServerLoad = async ({ locals }) => {
const { user } = locals;
authorize(apiNames.YRKA.SEND, user);
return {
- form: await superValidate(zod(createSchema)),
+ form: await superValidate(zod4(createSchema)),
};
};
@@ -34,7 +34,7 @@ const createSchema = z.object({
export const actions: Actions = {
default: async ({ request, locals }) => {
const { member } = locals;
- const form = await superValidate(request, zod(createSchema));
+ const form = await superValidate(request, zod4(createSchema));
if (!form) return fail(400, { form });
const name = member ? getFullName(member) : "Anonym";
const { title, content } = form.data;
diff --git a/src/routes/(app)/yrka/+page.svelte b/src/routes/(app)/yrka/+page.svelte
index 774286633..0a8eebb03 100644
--- a/src/routes/(app)/yrka/+page.svelte
+++ b/src/routes/(app)/yrka/+page.svelte
@@ -1,47 +1,5 @@
-
-
-
+
diff --git a/src/routes/(nollning)/nolla/(index)/+page.svelte b/src/routes/(nollning)/nolla/(index)/+page.svelte
index ce97daf1b..0a8eebb03 100644
--- a/src/routes/(nollning)/nolla/(index)/+page.svelte
+++ b/src/routes/(nollning)/nolla/(index)/+page.svelte
@@ -1,54 +1,5 @@
-
-
-
-
-
{m.nolla_start_welcome()}
- {m.nolla_start_to()}
- {m.nolla_start_dguild()}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {@html m.nolla_nollning_header()}
-
-
-
-
-
- {@html m.nolla_nollning_what()}
-
- {@html m.nolla_nollning_whatText()}
-
-
-
-
- {@html m.nolla_nollning_firstDay()}
-
- {@html m.nolla_nollning_firstDayText()}
-
-
-
-
-
-
-
-
-
-
- {@html m.nolla_nollning_group()}
-
- {@html m.nolla_nollning_groupText()}
-
-
-
-
-
-
- {#each navItems as navItem (navItem.link)}
-
- {navItem.text}
-
- {/each}
-
-
- {@html m.nolla_packing_header()}
-
-
-
-
-
- {@html m.nolla_packing_description()}
-
-
- -
-
-
-
{@html m.nolla_packing_bike()}
-
{@html m.nolla_packing_bike_description()}
-
- -
-
-
-
{@html m.nolla_packing_robust_clothing()}
-
- {@html m.nolla_packing_robust_clothing_description()}
-
-
- -
-
-
-
{@html m.nolla_packing_theme_outfits()}
-
- {@html m.nolla_packing_theme_outfits_description()}
-
-
- -
-
-
-
{@html m.nolla_packing_fancy_clothing()}
-
- {@html m.nolla_packing_fancy_clothing_description()}
-
-
- -
-
-
-
{@html m.nolla_packing_needle()}
-
- {@html m.nolla_packing_needle_description()}
-
-
- -
-
-
-
{@html m.nolla_packing_money()}
-
- {@html m.nolla_packing_money_description()}
-
-
- -
-
-
-
{@html m.nolla_packing_happy_mood()}
-
:)
-
-
-
-
-
-
- {@html m.nollning_wikia_dressCodes()}
-
-
- -
-
- {@html m.nolla_packing_slasque()}
-
- {@html m.nolla_packing_slasque_description()}
-
-
- -
-
- {@html m.nolla_packing_mixed_suit()}
-
- {@html m.nolla_packing_mixed_suit_description()}
-
-
- -
-
- {@html m.nolla_packing_dark_suit()}
-
- {@html m.nolla_packing_dark_suit_description()}
-
-
- -
-
- {@html m.nolla_packing_frack()}
- {@html m.nolla_packing_frack_description()}
-
-
-
+
diff --git a/src/routes/(nollning)/nolla/sektionen/+page.svelte b/src/routes/(nollning)/nolla/sektionen/+page.svelte
index 757e7ce21..0a8eebb03 100644
--- a/src/routes/(nollning)/nolla/sektionen/+page.svelte
+++ b/src/routes/(nollning)/nolla/sektionen/+page.svelte
@@ -1,154 +1,5 @@
-
-
-
-
- {@html m.nolla_guild_header()}
-
-
- {@html m.nolla_guild_tagline()}
-
-
-
-
-
-
-
-
- {@html m.nolla_guild_title()}
-
-
- {@html m.nolla_guild_description()}
-
- dsek.se
-
-
-
-
-
-
-
-
-
-
- -
- {@html m.nolla_guild_board_president()}
- {@html m.nolla_guild_board_president_description()}
-
- -
- {@html m.nolla_guild_board_vice_president()}
- {@html m.nolla_guild_board_vice_president_description()}
-
- -
- {@html m.nolla_guild_board_treasurer()}
- {@html m.nolla_guild_board_treasurer_description()}
-
- -
- {@html m.nolla_guild_board_study_president()}
- {@html m.nolla_guild_board_study_president_description()}
-
- -
- {@html m.nolla_guild_board_information()}
- {@html m.nolla_guild_board_information_description()}
-
- -
- {@html m.nolla_guild_board_cafe()}
- {@html m.nolla_guild_board_cafe_description()}.
-
- -
- {@html m.nolla_guild_board_sex()}
- {@html m.nolla_guild_board_sex_description()}
-
- -
- {@html m.nolla_guild_board_kallarm()}
- {@html m.nolla_guild_board_kallarm_description()}
-
- -
- {@html m.nolla_guild_board_corporate_relations()}
- {@html m.nolla_guild_board_corporate_relations_description()}
-
- -
- {@html m.nolla_guild_board_activities()}
- {@html m.nolla_guild_board_activities_description()}
-
-
-
-
-
-
-
-
- 
-
-
- {@html m.nolla_todo_header()}
-
-
-
-
-
- 
-
-
-
-
-
-
- 
-
-
-
- 
-
-
-
-
+
diff --git a/src/routes/(nollning)/nolla/wellbeing/+page.svelte b/src/routes/(nollning)/nolla/wellbeing/+page.svelte
index 2d1ccc89d..0a8eebb03 100644
--- a/src/routes/(nollning)/nolla/wellbeing/+page.svelte
+++ b/src/routes/(nollning)/nolla/wellbeing/+page.svelte
@@ -1,43 +1,5 @@
-
-
-
-
- {@html m.nolla_wellbeing_header()}
-
-
-
-
-
- {@html m.nolla_wellbeing_description()}
-
-
- 
-
-
- {@html m.nolla_wellbeing_trivsel_description()}
-
-
- {m.nolla_wellbeing_contact_trivsel()}
-
-
- {@html m.nolla_wellbeing_student_health()}
-
-
-
- {m.nolla_wellbeing_contact_student_health()}
-
-
+
diff --git a/src/routes/(nollning)/nolla/wordlist/+page.svelte b/src/routes/(nollning)/nolla/wordlist/+page.svelte
index a4a67fb20..0a8eebb03 100644
--- a/src/routes/(nollning)/nolla/wordlist/+page.svelte
+++ b/src/routes/(nollning)/nolla/wordlist/+page.svelte
@@ -1,37 +1,5 @@
-
-
-
- {m.nolla_wordlist_header()}
-
-
-
-
- {#each wordList as word}
- -
-
- {word.definition} - {@html word.description}
-
- {/each}
-
-
+
diff --git a/src/routes/(nollning)/nollning/+error.svelte b/src/routes/(nollning)/nollning/+error.svelte
deleted file mode 100644
index 270be9eec..000000000
--- a/src/routes/(nollning)/nollning/+error.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/src/routes/(nollning)/nollning/+layout.server.ts b/src/routes/(nollning)/nollning/+layout.server.ts
index ceee5aee5..2384a5ce4 100644
--- a/src/routes/(nollning)/nollning/+layout.server.ts
+++ b/src/routes/(nollning)/nollning/+layout.server.ts
@@ -7,7 +7,7 @@ import { getNollaGroupedNotifications } from "$lib/utils/notifications/nollaNoti
import type { Theme } from "$lib/utils/themes";
import { notificationSchema } from "$lib/zod/schemas";
import { superValidate } from "sveltekit-superforms";
-import { zod } from "sveltekit-superforms/adapters";
+import { zod4 } from "sveltekit-superforms/adapters";
const afterNollning = new Date("2025-10-06");
export const load = async ({ locals, cookies }) => {
@@ -37,7 +37,7 @@ export const load = async ({ locals, cookies }) => {
return {
revealTheme,
notificationsPromise,
- mutateNotificationForm: await superValidate(zod(notificationSchema)),
+ mutateNotificationForm: await superValidate(zod4(notificationSchema)),
paths: {
cart: `${POST_REVEAL_PREFIX}/shop/cart`,
purchaseRedirect: `${POST_REVEAL_PREFIX}/shop/success`,
diff --git a/src/routes/(nollning)/nollning/+layout.svelte b/src/routes/(nollning)/nollning/+layout.svelte
deleted file mode 100644
index 1664c442e..000000000
--- a/src/routes/(nollning)/nollning/+layout.svelte
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- {#if data.revealTheme}
-
- {/if}
-
-
-
-
- {#if !data.isApp}
-
-
-
- {:else}
- {#await data.notificationsPromise then notifications}
-
- {/await}
-
-
-
-
-
-
-
-
-
- {/if}
-
-
- {#if !data.isApp}
-
- {:else}
-
-
-
- {/if}
-
-
- {#if data.revealTheme}
-
-
-
- {/if}
-
-
-
-
-
-
-
-
- {@html m.nollning_title().replace("\n", " ")}
-
-
-
- {@html m.nollning_title().replace("\n", "
")}
-
-
-
-
-
- {m.nollning_landing_hello_title()}
-
-
-
- {@html m.nollning_landing_hello_body()}
-
-
-
-
-
- {m.nollning_landing_policy_header()}
-
-
- {m.nollning_landing_policy_subtitle()}
-
-
- - {m.nollning_landing_policy_lines_1()}
- - {m.nollning_landing_policy_lines_2()}
- - {m.nollning_landing_policy_lines_3()}
- -
- {m.nollning_landing_policy_lines_4()}
-
-
-
- {m.nollning_landing_policy_readMore()}
-
-
-
- {#if data.revealTheme}
-
-
-
-
-
-
-
- {m.nollning_landing_lore_title()}
-
-
- {m.nollning_landing_lore_body()}
-
-
-
-
-
- {/if}
-
-
- {#if data.revealTheme}
-
- {/if}
-
-
- {m.phadderGroups()}
-
-
-
-
-
-
diff --git a/src/routes/(nollning)/nollning/PostRevealBottomNav.svelte b/src/routes/(nollning)/nollning/PostRevealBottomNav.svelte
deleted file mode 100644
index 5c955e348..000000000
--- a/src/routes/(nollning)/nollning/PostRevealBottomNav.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
diff --git a/src/routes/(nollning)/nollning/PostRevealDesktopLeftNavbar.svelte b/src/routes/(nollning)/nollning/PostRevealDesktopLeftNavbar.svelte
deleted file mode 100644
index 332e7743b..000000000
--- a/src/routes/(nollning)/nollning/PostRevealDesktopLeftNavbar.svelte
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
- {#if $page.data.user && $page.data.member}
- {#if notificationsPromise !== null}
-
-
-
-
- {#if unreadCount > 0}
-
- {/if}
-
-
-
-
- {/if}
-
- {:else}
-
signIn()}>
-
-
- {/if}
-
-
-
-
-
{
- if (event.target instanceof HTMLDetailsElement && event.target.open) {
- navigator.clipboard.writeText(eventsSubscribeUrl);
- toast(m.events_calendar_subscribe_copyToClipboard(), "success");
- }
- }}
- >
- {m.events_calendar_subscribe()}
-
-
-
-
- {m.events_calendar_subscribe_details()}
-
-
- {eventsSubscribeUrl}
-
-
-
-
-
-
-
- {#if events.length > 0}
- {#each events as event (event.id)}
-
- {/each}
- {:else}
- 🤫
- {/if}
-
-
-
-
-
-
{dayjs(event.startDatetime).format("dddd HH:mm")} - {dayjs(
- event.endDatetime,
- ).format("HH:mm")}
-
{event.title}
- {#if event.location}
-
{event.location}
- {/if}
-
- {#each event.tags as tag}
- {#if !tag.name.startsWith(NOLLNING_TAG_PREFIX)}
-
- {/if}
- {/each}
-
-
-
- {#if event.shortDescription}
-
- {/if}
-
-
- {#if event.link}
-
- {m.nollning_events_ticketCTA()}
-
- {/if}
- {#if isAuthorized(apiNames.EVENT.UPDATE, $page.data.user)}
-
-
-
-
- {/if}
-
-
-
-
- {title}
-
-
-
-
-
-
-
- {#each messages as message}
-
- {/each}
-
+
diff --git a/src/routes/(nollning)/nollning/messages/Message.svelte b/src/routes/(nollning)/nollning/messages/Message.svelte
deleted file mode 100644
index 4fe4b6b6a..000000000
--- a/src/routes/(nollning)/nollning/messages/Message.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- {dayjs(new Date(message.publishedAt ?? message.createdAt)).fromNow()}
-
-
-
-
{message.header}
- {authorName}
-
-
-
diff --git a/src/routes/(nollning)/nollning/postReveal.css b/src/routes/(nollning)/nollning/postReveal.css
index 766ffdbc0..5977595f5 100644
--- a/src/routes/(nollning)/nollning/postReveal.css
+++ b/src/routes/(nollning)/nollning/postReveal.css
@@ -1,62 +1,125 @@
-/* Here you will find styles that are specific to the /nolla pages. */
-@import "../../../app.css";
/* We need to import app.css, because if we don't then we can't use layers */
/* And if we add our own @tailwind utilities; etc then the CSS will stop functioning/act weird due to everything being declared twice, in the wrong order. */
/* This is how tailwind recommends doing it if you have multiple files. */
-@layer utilities {
-}
-@layer components {
- .post-reveal {
+@utility post-reveal {
+ scroll-behavior: smooth;
+ @apply font-nolla-post-reveal;
+ font-display: auto;
+ & * {
scroll-behavior: smooth;
- @apply font-nolla-post-reveal;
- font-display: auto;
}
- .post-reveal * {
- scroll-behavior: smooth;
+ @apply font-nolla-post-reveal text-sm leading-tight md:text-base;
+ & .page-title {
+ /* figma: page title */
+ @apply text-xl font-medium tracking-wider;
+ }
+
+ & .nolla-list-item {
+ @apply text-base;
+ }
+
+ & .btn {
+ /* text button */
+ @apply text-base-content h-auto min-h-0 px-4 py-2 font-medium;
+ }
+
+ & .btn.btn-secondary-beige {
+ /* secondary bg, beige text */
+ @apply btn-secondary text-base-100;
+ }
+
+ & .btn.btn-primary-dark {
+ /* secondary bg, beige text */
+ @apply btn-primary text-base-100;
+ }
+
+ & .btn.btn-base-content {
+ /* base bg, content text */
+ @apply text-base-content bg-transparent;
+ }
+ & .btn-outline {
+ /* transparent bg, text otherwise */
+ @apply hover:text-base-100;
}
- .post-reveal {
- @apply font-nolla-post-reveal text-sm leading-tight md:text-base;
+ & .nolla-prose {
+ @apply my-4;
}
- .post-reveal .page-title {
+}
+
+@utility page-title {
+ .post-reveal & {
/* figma: page title */
@apply text-xl font-medium tracking-wider;
}
+}
- .post-reveal .nolla-list-item {
+@utility nolla-list-item {
+ .post-reveal & {
@apply text-base;
}
+}
- .post-reveal .btn {
+@utility btn {
+ .post-reveal & {
/* text button */
- @apply h-auto min-h-0 px-4 py-2 font-medium text-base-content;
+ @apply text-base-content h-auto min-h-0 px-4 py-2 font-medium;
+ }
+
+ .post-reveal &.btn-secondary-beige {
+ /* secondary bg, beige text */
+ @apply btn-secondary text-base-100;
+ }
+
+ .post-reveal &.btn-primary-dark {
+ /* secondary bg, beige text */
+ @apply btn-primary text-base-100;
}
- .post-reveal .btn.btn-secondary-beige {
+ .post-reveal &.btn-base-content {
+ /* base bg, content text */
+ @apply text-base-content bg-transparent;
+ }
+}
+
+@utility btn-secondary-beige {
+ .post-reveal &.btn {
/* secondary bg, beige text */
@apply btn-secondary text-base-100;
}
+}
- .post-reveal .btn.btn-primary-dark {
+@utility btn-primary-dark {
+ .post-reveal &.btn {
/* secondary bg, beige text */
@apply btn-primary text-base-100;
}
+}
- .post-reveal .btn.btn-base-content {
+@utility btn-base-content {
+ .post-reveal &.btn {
/* base bg, content text */
- @apply bg-transparent text-base-content;
+ @apply text-base-content bg-transparent;
}
- .post-reveal .btn-outline {
+}
+
+@utility btn-outline {
+ .post-reveal & {
/* transparent bg, text otherwise */
@apply hover:text-base-100;
}
+}
- .post-reveal .nolla-prose {
+@utility nolla-prose {
+ .post-reveal & {
@apply my-4;
}
}
+/* Here you will find styles that are specific to the /nolla pages. */
+@reference "../../../app.css";
+
[data-theme="nollningPostReveal"] {
scroll-behavior: smooth;
@apply font-nolla-post-reveal;
diff --git a/src/routes/(nollning)/nollning/routes.ts b/src/routes/(nollning)/nollning/routes.ts
index 249513499..62ebdbc37 100644
--- a/src/routes/(nollning)/nollning/routes.ts
+++ b/src/routes/(nollning)/nollning/routes.ts
@@ -1,7 +1,7 @@
import { POST_REVEAL_PREFIX } from "$lib/components/postReveal/types";
-import apiNames from "$lib/utils/apiNames";
+// import apiNames from "$lib/utils/apiNames";
import type { Route } from "../../routes";
-import * as m from "$paraglide/messages";
+// import * as m from "$paraglide/messages";
export const getPostRevealRoute = (pathname: string) => {
if (pathname.startsWith(POST_REVEAL_PREFIX)) {
if (pathname === POST_REVEAL_PREFIX) {
@@ -13,6 +13,7 @@ export const getPostRevealRoute = (pathname: string) => {
};
export const getRoutes = (): Route[] =>
[
+ /*
{
title: "Nollning",
path: "/",
@@ -45,6 +46,7 @@ export const getRoutes = (): Route[] =>
return currentPathname.startsWith("/wikia");
},
},
+ */
] as const;
export const appBottomNavRoutes = (routes: Route[]): Route[] =>
diff --git a/src/routes/(nollning)/nollning/settings/+page.svelte b/src/routes/(nollning)/nollning/settings/+page.svelte
index 7b6444f93..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/settings/+page.svelte
+++ b/src/routes/(nollning)/nollning/settings/+page.svelte
@@ -1,6 +1,5 @@
-
+
diff --git a/src/routes/(nollning)/nollning/shop/+layout.svelte b/src/routes/(nollning)/nollning/shop/+layout.svelte
deleted file mode 100644
index 5c842f3a6..000000000
--- a/src/routes/(nollning)/nollning/shop/+layout.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/routes/(nollning)/nollning/shop/cart/+page.svelte b/src/routes/(nollning)/nollning/shop/cart/+page.svelte
index a59f2ba61..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/shop/cart/+page.svelte
+++ b/src/routes/(nollning)/nollning/shop/cart/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(nollning)/nollning/shop/inventory/+page.svelte b/src/routes/(nollning)/nollning/shop/inventory/+page.svelte
index aa83c4aeb..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/shop/inventory/+page.svelte
+++ b/src/routes/(nollning)/nollning/shop/inventory/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(nollning)/nollning/shop/inventory/[id]/+page.svelte b/src/routes/(nollning)/nollning/shop/inventory/[id]/+page.svelte
index b39da40d8..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/shop/inventory/[id]/+page.svelte
+++ b/src/routes/(nollning)/nollning/shop/inventory/[id]/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(nollning)/nollning/shop/success/+page.svelte b/src/routes/(nollning)/nollning/shop/success/+page.svelte
index 3451f9ac2..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/shop/success/+page.svelte
+++ b/src/routes/(nollning)/nollning/shop/success/+page.svelte
@@ -1,7 +1,5 @@
-
-
+
diff --git a/src/routes/(nollning)/nollning/wikia/+layout.svelte b/src/routes/(nollning)/nollning/wikia/+layout.svelte
deleted file mode 100644
index 4de6b67e5..000000000
--- a/src/routes/(nollning)/nollning/wikia/+layout.svelte
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/routes/(nollning)/nollning/wikia/+page.server.ts b/src/routes/(nollning)/nollning/wikia/+page.server.ts
index 31fca54b8..ca6cb44f6 100644
--- a/src/routes/(nollning)/nollning/wikia/+page.server.ts
+++ b/src/routes/(nollning)/nollning/wikia/+page.server.ts
@@ -1,4 +1,4 @@
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "@sveltejs/kit";
import { POST_REVEAL_PREFIX } from "$lib/components/postReveal/types";
export const load = async () => {
diff --git a/src/routes/(nollning)/nollning/wikia/[...path]/+page.svelte b/src/routes/(nollning)/nollning/wikia/[...path]/+page.svelte
index 0e1c9715d..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/wikia/[...path]/+page.svelte
+++ b/src/routes/(nollning)/nollning/wikia/[...path]/+page.svelte
@@ -1,4 +1,5 @@
-
- 404
- Wikia entry not found
-
+
+
+
diff --git a/src/routes/(nollning)/nollning/wikia/dress-codes/+page.svelte b/src/routes/(nollning)/nollning/wikia/dress-codes/+page.svelte
index e094ac45b..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/wikia/dress-codes/+page.svelte
+++ b/src/routes/(nollning)/nollning/wikia/dress-codes/+page.svelte
@@ -1,41 +1,5 @@
-
-
-
-
- -
-
-
{@html m.nolla_packing_slasque()}
-
- {@html m.nolla_packing_slasque_description()}
-
-
- -
-
-
{@html m.nolla_packing_mixed_suit()}
-
- {@html m.nolla_packing_mixed_suit_description()}
-
-
- -
-
-
{@html m.nolla_packing_dark_suit()}
-
- {@html m.nolla_packing_dark_suit_description()}
-
-
- -
-
-
{@html m.nolla_packing_frack()}
- {@html m.nolla_packing_frack_description()}
-
-
-
+
diff --git a/src/routes/(nollning)/nollning/wikia/faq/+page.svelte b/src/routes/(nollning)/nollning/wikia/faq/+page.svelte
index 2e2f0a59f..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/wikia/faq/+page.svelte
+++ b/src/routes/(nollning)/nollning/wikia/faq/+page.svelte
@@ -1,76 +1,5 @@
-
-
-
-
-
- {#each questions as question}
-
- {/each}
-
-
+
diff --git a/src/routes/(nollning)/nollning/wikia/faq/FAQuestion.svelte b/src/routes/(nollning)/nollning/wikia/faq/FAQuestion.svelte
deleted file mode 100644
index 93351312b..000000000
--- a/src/routes/(nollning)/nollning/wikia/faq/FAQuestion.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/src/routes/(nollning)/nollning/wikia/guild-songs/+page.svelte b/src/routes/(nollning)/nollning/wikia/guild-songs/+page.svelte
index cb08f9709..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/wikia/guild-songs/+page.svelte
+++ b/src/routes/(nollning)/nollning/wikia/guild-songs/+page.svelte
@@ -1,185 +1,5 @@
-
-
- {#if $page.data["revealTheme"]}
- -
-
N0llevisan
-
-Jag är en nolla som ingenting vet,
-ingenting kan, men har ändå roligt!
-Tänker det gör jag nog ingenting alls,
-hoppas jag en dag kan bli något stort
-Nolla, nolla, nolla, nolla, nolla (x3)
-Nolla, nolla, nolla FÄLADEN!
-
-
- {/if}
- -
-
D
-
- -
-
Størst och bäst
-
-Mel: Who's That Lying on the Runway
-||: Vem e størst och bäst i Skåne?
-Vem e kung på LTH? (på LTH)
-Ja det e Data InfoCom
-Som hela festen drar igång
-Tacka gud før Data InfoCom! :||
-
-
- -
-
D-sektionen
-
-Mel: Rule Britannia
-||: D-sektionen
-Vi gömmer oss för solen
-D-sek har källarfest
-Ja D-sek är bäst! :||
-
-
- -
-
Skär och gredelin
-
-Mel: When the Saints Go Marching In
-Jag vill va skär, och gredelin,
-det får man inte på Maskin
-Där ska man dricka stora mängder alkohol,
-och vara jävligt maskulin
-
-
-
-
- -
-
F - Vi går på F-sek
-
-||: Vi går på F-sek F-sek! Vi går på F-sek!
-Derivera sin(x) så får du cos(x)
-Cos-ex cos-ex vi vill ha kosex!
-Vill vi? NEJ! :||
-Vi vill ha älgsex. Också!
-
-
- -
-
E - E-sektionen
-
-||: Everywhere we go :||
-||: People wanna know :||
-||: Who we are :||
-||: So we tell them :||
-||: We are the E-sek :||
-||: Mighty mighty E-sek :||
-OH AH ÅH E-SEK
-OH AH ÅH E-SEK
-
-
- -
-
M - Vår färg är rød
-
-Mel: When the Saints Go Marching In
-Vår färg är röd, vår färg är fin,
-för det är vi som går Maskin
-Och vi har kommit för att dricka alkohol,
-för det är vi som går Maskin
-
-
- -
-
V - Å när dom blå
-
-Mel: When the Saints Go Marching In
-Å när dom blå!
-Å när dom blå marscherar in,
-då blir det fest, då blir det jubel
-Å när dom blå marscherar in!
-
-
- -
-
A - A-sektionen
-
-Mel: Rule Britannia
-||: A-sektionen
-Den skiner så som sooolen
-A-sek är grym på fest
-Ja A-sek är bäst! :||
-
-
- -
-
K - KK
-
-Vilka har den starka rösten
-Vilka har de största brösten
-Vilka ger er alltid trösten
-När ert lag förlorar
-KK
-Vi alla gillar
-KK
-Har faktiskt killar
-KK
-Som gärna pillar
-Med sin labbutrustning
-
-
- -
-
ING - ING-sektionen
-
-För vi är ING från sundets pärla
-Och det är fest idag igen
-Och vi ska supa hela natten lång
-Och sjunga denna sång
-Schalalalalalalalala schalalalalalalala
-Schalalalalalalalalala schalalalalala
-
-
- -
-
W - Turkosa samban
-
-Mel: Samba de Janeiro
-||: Turkos-turkos, här gör vi entré
-Vi bränner sprit uti KC:G
-Turkos-turkos, så gør dubbel v
-Mitt glas e två för att jag e sne :|| x2
-||: Simma si, a simma, a simma simma simma :|| x4
-
-
- -
-
I - I-sektionen
-
-Mel: Millennium 2
-Åh, i Ouverall på elitnivå
-Top of the line på LTH
-Vi spårar som få
-När i-tåget köttar på (köttar på, köttar på)
-
-
-
-
-
+
diff --git a/src/routes/(nollning)/nollning/wikia/literature/+page.svelte b/src/routes/(nollning)/nollning/wikia/literature/+page.svelte
index f771cf9c8..0a8eebb03 100644
--- a/src/routes/(nollning)/nollning/wikia/literature/+page.svelte
+++ b/src/routes/(nollning)/nollning/wikia/literature/+page.svelte
@@ -1,19 +1,5 @@
-
-
-
- {m.nollning_wikia_literature()}
-
- {m.nollning_wikia_literature_body()}
-
- Facebook
-
-
-
-
-
-
-
{m.nollning_wikia_map_cellar()}
-
-
-
-
{m.nollning_wikia_floor()} 1
-
-
-
-
{m.nollning_wikia_floor()} 2
-
-
-
-
{m.nollning_wikia_floor()} 3
-
-
-
-
{m.nollning_wikia_floor()} 4
-
-
-
-
-
- {m.nolla_guild_header()}
-
- {m.nollning_wikia_guild_body()}
-
- dsek.se
-
-
-
- {m.theBoard()}
- 
-
- {m.nollning_wikia_board_body()}
- {m.nolla_readMore()}!
-
-
- -
- {m.nolla_guild_board_president()}
- {m.nolla_guild_board_president_description()}
-
- -
- {m.nolla_guild_board_vice_president()}
- {m.nolla_guild_board_vice_president_description()}
-
- -
- {m.nolla_guild_board_treasurer()}
- {m.nolla_guild_board_treasurer_description()}
-
- -
- {m.nolla_guild_board_study_president()}
- {m.nolla_guild_board_study_president_description()}
-
- -
- {m.nolla_guild_board_information()}
- {m.nolla_guild_board_information_description()}
-
- -
- {m.nolla_guild_board_cafe()}
- {m.nolla_guild_board_cafe_description()}.
-
- -
- {m.nolla_guild_board_sex()}
- {m.nolla_guild_board_sex_description()}
-
- -
- {m.nolla_guild_board_kallarm()}
- {m.nolla_guild_board_kallarm_description()}
-
- -
- {m.nolla_guild_board_corporate_relations()}
- {m.nolla_guild_board_corporate_relations_description()}
-
- -
- {m.nolla_guild_board_activities()}
- {m.nolla_guild_board_activities_description()}
-
-
-
-
-
- {m.landing_dchip_title()}
- 
-
- {m.landing_dchip_description()}
-
- {m.website()}
-
-
-
-
-
-
-
-
- {m.nollning_wikia_studentHealth_studentHealth_header()}
-
-
- {m.nollning_wikia_studentHealth_studentHealth_body()}
- Tel:
-
- 046-222 43 77
-
- {m.website()}
-
-
-
-
- {m.nollning_wikia_studentHealth_youngAdults_title()}
-
-
- {m.nollning_wikia_studentHealth_youngAdults_body()}
- Tel:
-
- 046-359 80 93
-
- {m.website()}
-
-
-
-
- {#each wordList as word}
- -
-
- {word.definition} - {@html word.description}
-
- {/each}
-
-
+
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
deleted file mode 100644
index 270be9eec..000000000
--- a/src/routes/+error.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index feace7b15..00bbed0a8 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,30 +1,34 @@
+
{#if data.isApp}
{/if}
-
-
-
+{@render children?.()}
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index b8d01adc7..88a449a98 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,4 +1,4 @@
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "@sveltejs/kit";
import type { PageServerLoad } from "./$types";
export const load: PageServerLoad = async ({ locals }) => {
const { user, isApp } = locals;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 4fde23707..6d79e1b9e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,490 +1,198 @@
-
-
-
-
-
-
-
+
+
+
+ {m.dsektionen()}
+
+
+ {m.landing_intro()}
+
+
+
+
+
+
+
+
+
+ {#each SECTIONS as section, i (section.title)}
+
-
-
- {m.dsektionen()}
+
+
+ {#each section.images as image, i (i)}
+
+ })
+
+ {/each}
+
+
+
+
+
+
+
+ {section.title}
-
- {m.landing_intro()}
+
+ {section.description}
-
-
+
+
+ {#each ARTICLES as article, i (i)}
+
+
- {#each section.images as image, i}
-
-
-
- {/each}
-
-
- {section.title}
-
-
- {section.slogan}
-
-
- {section.description}
+
{article.title}
+
+ {article.description}
-
-
-
-
-
-
- {m.landing_community_title()}
-
-
- {#each ARTICLES as article}
-
+
-
- {article.title}
-
-
- {article.description}
-
-
- {/each}
-
-
-
+
{/each}
-
-
-
- {m.navbar_register()}
-
-
-
- invalidateAll()}
- >
- SV
-
- invalidateAll()}
- >
- EN
-
-
-
-
-
-
+
diff --git a/src/routes/AppBottomNav.svelte b/src/routes/AppBottomNav.svelte
deleted file mode 100644
index fdeadd789..000000000
--- a/src/routes/AppBottomNav.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
diff --git a/src/routes/AppHeader.svelte b/src/routes/AppHeader.svelte
deleted file mode 100644
index 51f1375fe..000000000
--- a/src/routes/AppHeader.svelte
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-{#if notificationsPromise !== null && mutateNotificationForm !== null}
-
-{/if}
diff --git a/src/routes/DarkLightToggle.svelte b/src/routes/DarkLightToggle.svelte
deleted file mode 100644
index 99a659aa3..000000000
--- a/src/routes/DarkLightToggle.svelte
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
diff --git a/src/routes/Drawer.svelte b/src/routes/Drawer.svelte
deleted file mode 100644
index 185911598..000000000
--- a/src/routes/Drawer.svelte
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/routes/Footer.svelte b/src/routes/Footer.svelte
deleted file mode 100644
index 6f2e6c2c0..000000000
--- a/src/routes/Footer.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
diff --git a/src/routes/LanguageSwitcher.svelte b/src/routes/LanguageSwitcher.svelte
deleted file mode 100644
index f218e7fba..000000000
--- a/src/routes/LanguageSwitcher.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- {languageTag() === "sv" ? "EN" : "SV"}
-
-
diff --git a/src/routes/Navbar.svelte b/src/routes/Navbar.svelte
deleted file mode 100644
index 0a81df9c1..000000000
--- a/src/routes/Navbar.svelte
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {#each routes as route (route.title)}
- {#if !route.accessRequired || isAuthorized(route.accessRequired, $page.data.user)}
- {#if route?.children?.length}
-
-
-
-
-
- {#each route.children as child (child.title)}
- {#if !child.accessRequired || isAuthorized(child.accessRequired, $page.data.user)}
- -
-
-
- {child.title}
-
- {/if}
- {/each}
-
-
- {:else}
-
-
- {route.title}
-
- {/if}
- {/if}
- {/each}
-
-
-
-
-
-
-
-
-
- {#if notificationsPromise !== null}
-
- {/if}
- {#if $page.data.user && $page.data.member}
-
- {:else}
-
signIn()}>
- {m.navbar_logIn()}
-
- {/if}
-
-
-
diff --git a/src/routes/NotificationBell.svelte b/src/routes/NotificationBell.svelte
deleted file mode 100644
index 19b085a40..000000000
--- a/src/routes/NotificationBell.svelte
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-
-
- {#if !externalModal && useModalInstead}
-
- {:else if !externalModal}
-
-
- {#if notifications !== undefined}
-
- {:else}
- {#await notificationsPromise}
-
- {/await}
- {/if}
-
- {/if}
-
diff --git a/src/routes/NotificationBellContent.svelte b/src/routes/NotificationBellContent.svelte
deleted file mode 100644
index a753b10ca..000000000
--- a/src/routes/NotificationBellContent.svelte
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-{#if notifications.length > 0}
-
- {#each notifications as notification (notification.id)}
-
- {#if postReveal}
-
- {:else}
- onRead(notification.id)} />
- {/if}
-
- {/each}
-
-
- {#if notifications?.filter((n) => n.readAt === null)?.length > 0}
-
- {/if}
-
- {#if notifications?.flatMap((n) => n.individualIds).length > 0}
-
- {/if}
-{:else}
-
- {m.navbar_bell_noNotifications()}
-
-{/if}
diff --git a/src/routes/Toast.svelte b/src/routes/Toast.svelte
index f5669f895..250c122aa 100644
--- a/src/routes/Toast.svelte
+++ b/src/routes/Toast.svelte
@@ -1,54 +1,72 @@
+{#snippet icon(
+ type: "hidden" | "error" | "success" | "info" | "warning" | "primary",
+)}
+ {#if type == "success"}
+
+ {:else if type == "error"}
+
+ {:else if type == "info"}
+
+ {:else if type == "warning"}
+
+ {/if}
+{/snippet}
+
{#if $toasts.length > 0}
- {#each $toasts as toast (toast.id)}
-
-
- {toast.message}
-
+ {#each $toasts as t (t.id)}
+
+
+ {@render icon(t.type)}{t.type.charAt(0).toUpperCase() +
+ t.type.slice(1)}
+ {t.message}
+
{/each}
{/if}
+
+
diff --git a/src/routes/UserMenu.svelte b/src/routes/UserMenu.svelte
deleted file mode 100644
index b2ad548a6..000000000
--- a/src/routes/UserMenu.svelte
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
{m.navbar_userMenu_loggedInAs()}
-
-
- {getFullName(member)}
-
-
-
({user?.studentId})
-
-
-
-
-
signOut()}
- >
-
- {m.navbar_userMenu_logOut()}
-
-
-
-
diff --git a/src/routes/metrics/+server.ts b/src/routes/metrics/+server.ts
new file mode 100644
index 000000000..b3bc3aa16
--- /dev/null
+++ b/src/routes/metrics/+server.ts
@@ -0,0 +1,12 @@
+import type { RequestHandler } from "@sveltejs/kit";
+import { registerMetrics } from "$lib/server/metrics";
+
+export const GET: RequestHandler = async () => {
+ const registry = registerMetrics();
+ const metrics = await registry.metrics();
+
+ return new Response(metrics, {
+ status: 200,
+ headers: { "Content-Type": registry.contentType },
+ });
+};
diff --git a/src/routes/native-app-router/+page.server.ts b/src/routes/native-app-router/+page.server.ts
index 6bfff5526..b2eb5e412 100644
--- a/src/routes/native-app-router/+page.server.ts
+++ b/src/routes/native-app-router/+page.server.ts
@@ -2,7 +2,7 @@
// What it does is handles which version of the app is "saved", ie when I open the app, should I go to /nollning or /home
import { APP_PREFERRED_PAGE_COOKIE } from "$lib/components/postReveal/types";
-import { redirect } from "$lib/utils/redirect";
+import { redirect } from "@sveltejs/kit";
export const load = async ({ locals, cookies }) => {
if (!locals.isApp) {
diff --git a/src/routes/native-app-router/+page.svelte b/src/routes/native-app-router/+page.svelte
index 120968227..2b2952567 100644
--- a/src/routes/native-app-router/+page.svelte
+++ b/src/routes/native-app-router/+page.svelte
@@ -1,16 +1,17 @@
![Stripe payment platform logo]({"https://images.ctfassets.net/fzn2n1nzq965/HTTOloNPhisV9P4hlMPNA/cacf1bb88b9fc492dfad34378d844280/Stripe_icon_-_square.svg?q=80&w=1082"}){kind=icon}
- 
+ 
+