-
Color
+
{m.calendar_event_color()}
{#each EVENT_COLORS as color}
- Sync to Google Calendar
+ {m.calendar_sync_google()}
{/if}
diff --git a/src/routes/[orgSlug]/events/+page.server.ts b/src/routes/[orgSlug]/events/+page.server.ts
index d117a49..9bed1e5 100644
--- a/src/routes/[orgSlug]/events/+page.server.ts
+++ b/src/routes/[orgSlug]/events/+page.server.ts
@@ -1,21 +1,12 @@
-import { error } from '@sveltejs/kit';
import type { PageServerLoad } from './$types';
+import type { OrgLayoutData } from '$lib/types/layout';
import { fetchEvents } from '$lib/api/events';
import { createLogger } from '$lib/utils/logger';
const log = createLogger('page.events');
-export const load: PageServerLoad = async ({ params, locals, url }) => {
- const { session, user } = await locals.safeGetSession();
- if (!session || !user) error(401, 'Unauthorized');
-
- const { data: org } = await locals.supabase
- .from('organizations')
- .select('id')
- .eq('slug', params.orgSlug)
- .single();
-
- if (!org) error(404, 'Organization not found');
+export const load: PageServerLoad = async ({ parent, locals, url }) => {
+ const { org } = await parent() as OrgLayoutData;
const statusFilter = url.searchParams.get('status') || 'all';
diff --git a/src/routes/[orgSlug]/events/+page.svelte b/src/routes/[orgSlug]/events/+page.svelte
index 59a18d7..f96350c 100644
--- a/src/routes/[orgSlug]/events/+page.svelte
+++ b/src/routes/[orgSlug]/events/+page.svelte
@@ -60,6 +60,7 @@
let newEventEndDate = $state("");
let newEventVenue = $state("");
let newEventVenueAddress = $state("");
+ // svelte-ignore state_referenced_locally
let newEventColor = $state(data.org.default_event_color || "#00A3E0");
let creating = $state(false);
diff --git a/src/routes/[orgSlug]/events/[eventSlug]/+layout.server.ts b/src/routes/[orgSlug]/events/[eventSlug]/+layout.server.ts
index 5fad0d5..c045d27 100644
--- a/src/routes/[orgSlug]/events/[eventSlug]/+layout.server.ts
+++ b/src/routes/[orgSlug]/events/[eventSlug]/+layout.server.ts
@@ -1,16 +1,14 @@
import { error } from '@sveltejs/kit';
import type { LayoutServerLoad } from './$types';
+import type { OrgLayoutData } from '$lib/types/layout';
import { fetchEventBySlug, fetchEventMembers, fetchEventRoles, fetchEventDepartments } from '$lib/api/events';
import { createLogger } from '$lib/utils/logger';
const log = createLogger('page.event-detail');
export const load: LayoutServerLoad = async ({ params, locals, parent }) => {
- const { session, user } = await locals.safeGetSession();
- if (!session || !user) error(401, 'Unauthorized');
-
- const parentData = await parent() as { org: { id: string; name: string; slug: string } };
- const orgId = parentData.org.id;
+ const { org } = await parent() as OrgLayoutData;
+ const orgId = org.id;
try {
const event = await fetchEventBySlug(locals.supabase, orgId, params.eventSlug);
diff --git a/src/routes/[orgSlug]/events/[eventSlug]/contacts/+page.svelte b/src/routes/[orgSlug]/events/[eventSlug]/contacts/+page.svelte
index c071657..f55b289 100644
--- a/src/routes/[orgSlug]/events/[eventSlug]/contacts/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/contacts/+page.svelte
@@ -43,6 +43,7 @@
// Expanded row
let expandedId = $state
(null);
+ // svelte-ignore state_referenced_locally
let contacts = $state(data.orgContacts);
const filteredContacts = $derived(
@@ -224,12 +225,23 @@
class="bg-surface/30 rounded-2xl border border-light/5 overflow-hidden"
>
{#each filteredContacts as contact (contact.id)}
-
+
(expandedId =
expandedId === contact.id ? null : contact.id)}
+ onkeydown={(e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ expandedId =
+ expandedId === contact.id
+ ? null
+ : contact.id;
+ }
+ }}
+ role="button"
+ tabindex="0"
>
@@ -354,16 +366,17 @@
{#if showModal}
-
+
(showModal = false)}
onkeydown={(e) => e.key === "Escape" && (showModal = false)}
>
-
+
e.stopPropagation()}
+ onkeydown={(e) => e.stopPropagation()}
>
{editingContact ? "Edit Contact" : "Add Contact"}
diff --git a/src/routes/[orgSlug]/events/[eventSlug]/dept/[deptId]/+page.server.ts b/src/routes/[orgSlug]/events/[eventSlug]/dept/[deptId]/+page.server.ts
index 1fdde04..8f3f7b6 100644
--- a/src/routes/[orgSlug]/events/[eventSlug]/dept/[deptId]/+page.server.ts
+++ b/src/routes/[orgSlug]/events/[eventSlug]/dept/[deptId]/+page.server.ts
@@ -11,12 +11,9 @@ import { createLogger } from '$lib/utils/logger';
const log = createLogger('page.department-dashboard');
export const load: PageServerLoad = async ({ params, locals, parent }) => {
- const { session, user } = await locals.safeGetSession();
- if (!session || !user) error(401, 'Unauthorized');
-
const parentData = await parent();
- const event = (parentData as any).event;
- const departments = (parentData as any).eventDepartments ?? [];
+ const event = (parentData as Record).event as { id: string };
+ const departments = ((parentData as Record).eventDepartments ?? []) as { id: string; name: string }[];
const department = departments.find((d: any) => d.id === params.deptId);
if (!department) error(404, 'Department not found');
diff --git a/src/routes/[orgSlug]/events/[eventSlug]/finances/+page.svelte b/src/routes/[orgSlug]/events/[eventSlug]/finances/+page.svelte
index 39cb9e7..2839dd4 100644
--- a/src/routes/[orgSlug]/events/[eventSlug]/finances/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/finances/+page.svelte
@@ -938,16 +938,17 @@
{#if showAllocModal}
-
+
(showAllocModal = false)}
onkeydown={(e) => e.key === "Escape" && (showAllocModal = false)}
>
-
+
e.stopPropagation()}
+ onkeydown={(e) => e.stopPropagation()}
>
{editingAllocId ? "Edit Allocation" : "Allocate Sponsor Funds"}
diff --git a/src/routes/[orgSlug]/events/[eventSlug]/sponsors/+page.svelte b/src/routes/[orgSlug]/events/[eventSlug]/sponsors/+page.svelte
index 23a2d10..48733b6 100644
--- a/src/routes/[orgSlug]/events/[eventSlug]/sponsors/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/sponsors/+page.svelte
@@ -53,6 +53,7 @@
let formNotes = $state("");
let saving = $state(false);
+ // svelte-ignore state_referenced_locally
let sponsors = $state(data.sponsors);
const tiers = $derived(data.sponsorTiers);
const departments = $derived(data.departments);
@@ -396,16 +397,17 @@
{#if showModal}
-
+
(showModal = false)}
onkeydown={(e) => e.key === "Escape" && (showModal = false)}
>
-
+
e.stopPropagation()}
+ onkeydown={(e) => e.stopPropagation()}
>
{editingSponsor ? "Edit Sponsor" : "Add Sponsor"}
diff --git a/src/routes/[orgSlug]/events/[eventSlug]/team/+page.server.ts b/src/routes/[orgSlug]/events/[eventSlug]/team/+page.server.ts
index 37b4050..1bee6b9 100644
--- a/src/routes/[orgSlug]/events/[eventSlug]/team/+page.server.ts
+++ b/src/routes/[orgSlug]/events/[eventSlug]/team/+page.server.ts
@@ -1,5 +1,8 @@
import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ parent }) => {
- return await parent();
+ const data = await parent();
+ // Resolve deferred members promise so the page component gets a plain array
+ const members = await data.members;
+ return { ...data, members };
};
diff --git a/src/routes/[orgSlug]/kanban/+page.server.ts b/src/routes/[orgSlug]/kanban/+page.server.ts
index 7e954e2..799f11d 100644
--- a/src/routes/[orgSlug]/kanban/+page.server.ts
+++ b/src/routes/[orgSlug]/kanban/+page.server.ts
@@ -5,20 +5,25 @@ import { createLogger } from '$lib/utils/logger';
const log = createLogger('page.kanban');
export const load: PageServerLoad = async ({ parent, locals }) => {
- const { org } = await parent() as OrgLayoutData;
+ const parentData = await parent() as OrgLayoutData;
+ const { org } = parentData;
const { supabase } = locals;
- const { data: boards, error } = await supabase
- .from('kanban_boards')
- .select('*')
- .eq('org_id', org.id)
- .order('created_at');
+ const [{ data: boards, error }, members] = await Promise.all([
+ supabase
+ .from('kanban_boards')
+ .select('*')
+ .eq('org_id', org.id)
+ .order('created_at'),
+ parentData.members,
+ ]);
if (error) {
log.error('Failed to load kanban boards', { error, data: { orgId: org.id } });
}
return {
- boards: boards ?? []
+ boards: boards ?? [],
+ members,
};
};