From 21f6be36e5873ab012d565d2ad707bb589c3f051 Mon Sep 17 00:00:00 2001
From: an2n <an2n@users.noreply.github.com>
Date: Fri, 28 Jun 2024 12:01:13 +0200
Subject: [PATCH] feat(custom-options): add radio buttons as option (#79)

Co-authored-by: Anton Lilleby <antonlilleby@Anton-sin-MacBook-Pro.local>
---
 README.md                                     | 59 ++++++++++---------
 .../external/EventFormExternal.svelte         |  3 +-
 .../external/RegistrationFormExternal.svelte  |  6 +-
 .../UnregistrationFormExternal.svelte         | 10 ++--
 .../internal/EventFormInternal.svelte         |  1 +
 .../internal/EventParticipantsInternal.svelte |  2 +-
 .../internal/RegistrationFormInternal.svelte  |  8 +--
 .../UnregistrationFormInternal.svelte         |  2 +-
 app/src/components/shared/Deadline.svelte     |  5 +-
 app/src/components/shared/EventSummary.svelte |  4 +-
 .../shared/RegistrationCustomOption.svelte    | 30 +++++++---
 app/src/lib/actions/internal/action.ts        |  4 +-
 app/src/lib/auth/secret.ts                    |  2 +-
 app/src/lib/email/event/registration.ts       | 19 +++++-
 app/src/lib/email/event/unregistration.ts     |  2 +-
 app/src/models/sanity.model.ts                |  6 +-
 .../routes/api/send-event-canceled/+server.ts |  4 +-
 .../routes/api/send-event-update/+server.ts   |  4 +-
 studio/models/sanity.model.ts                 |  6 +-
 studio/schema.json                            | 22 ++++---
 studio/schemas/event.ts                       | 27 +++++----
 21 files changed, 137 insertions(+), 89 deletions(-)

diff --git a/README.md b/README.md
index 11e18a3..8467c5b 100644
--- a/README.md
+++ b/README.md
@@ -62,17 +62,7 @@ Design drodling finner man her: [Nettside design](https://www.figma.com/design/Z
 
 ## Sanity
 
-### Deploy
-
-Sanity Studio blir deployet til [https://capra.sanity.studio/](https://capra.sanity.studio/). Github Actions deploy utløses ved push til main-branch og endring i /studio. Det er også mulig å gjøre det manuelt ved å navigere til /studio og kjøre følgende kommando:
-
-```bash
-sanity deploy
-```
-
-Administrering av Sanity instansen kan gjøres via [https://www.sanity.io/manage/personal/project/<project-id>](https://www.sanity.io/manage/personal/project/<project-id>).
-
-## Bygg
+### Bygg
 
 For å bygge en produksjonsversjon av Sanity studio lokalt, naviger deg til /studio og kjør følgende kommando:
 
@@ -82,21 +72,29 @@ pnpm build
 
 Bygg bør alltid kjøres som en del av vår pull request policy 👷
 
-## Lint
+### Deploy
 
-Sanity/SvelteKit templaten [sanity-template-sveltekit-clean](https://github.com/sanity-io/sanity-template-sveltekit-clean) hadde en broken eslint konfigurasjon. Har derfor prøvd å oppgradere til eslint 9 med flatconfig fra denne [issuen](https://github.com/sveltejs/eslint-plugin-svelte/issues/732). 👷 Det er en del lint-errors som må undersøkes.
+Sanity Studio blir deployet til [https://capra.sanity.studio/](https://capra.sanity.studio).
+GitHub Actions CI/CD deploy kjører automatisk ved push til main-branch og ved endringer i /studio mappen. Alternativt kan deploy også utføres manuelt ved å navigere til /studio-katalogen og kjøre følgende kommando:
 
-## SvelteKit
+```bash
+sanity deploy
+```
 
-### Deploy
+Administrering av Sanity instansen kan gjøres via [https://www.sanity.io/manage/personal/project/<project-id>](https://www.sanity.io/manage/personal/project/<project-id>).
 
-SvelteKit blir foreløpig deployet til [https://capra-web.vercel.app/](https://capra-web.vercel.app/) fra /app med følgenden kommando:
+### TypeScript Generering
 
-```bash
-vercel deploy
+For å generere typer av innholdsskjemaer, kjør følgende kommandoer fra /studio:
+
+```sh
+sanity schema extract --enforce-required-fields
+sanity typegen generate
 ```
 
-👷 Vi er på en Vercel-plan som ikke tillater bygg og deploy i en organisasjon. Må undersøke CI/CD-løsninger på et tidspunkt for å automatisere vår deploy prosess.
+NB: Når sanity.model.ts er generert i /studio/models, skal den også kopieres til /app.
+
+## SvelteKit
 
 ### Bygg
 
@@ -108,16 +106,19 @@ pnpm build
 
 Bygg bør alltid kjøres som en del av vår pull request policy 👷
 
-### TypeScript Generering
+### Deploy
 
-For å generere typer av innholdsskjemaer, kjør følgende kommandoer fra /studio:
+SvelteKit blir foreløpig deployet til [https://capra-web.vercel.app/](https://capra-web.vercel.app/) fra /app med følgenden kommando:
 
-```sh
-sanity schema extract --enforce-required-fields
-sanity typegen generate
+```bash
+vercel deploy
 ```
 
-NB: Når sanity.model.ts er generert i /studio/models, skal den også kopieres til /app.
+👷 Vi er på en Vercel-plan som ikke tillater bygg og deploy i en organisasjon. Må undersøke CI/CD-løsninger på et tidspunkt for å automatisere vår deploy prosess.
+
+### Lint
+
+SvelteKit templaten [sanity-template-sveltekit-clean](https://github.com/sanity-io/sanity-template-sveltekit-clean) hadde en broken eslint konfigurasjon. Har derfor prøvd å oppgradere til eslint 9 med flatconfig fra denne [issuen](https://github.com/sveltejs/eslint-plugin-svelte/issues/732). 👷 Det er en del lint-errors som må undersøkes.
 
 ## Supabase
 
@@ -155,7 +156,7 @@ Vil du klikke deg rundt i browser for å se hva som skjer i testene, sleng på `
 
 Plausible tilbyr en måte å analysere trafikk på nettstedet. Den er fritt for cookies og samler ingen personopplysninger. Vi trenger derfor ingen cookie consent. For å integrere Plausible er det lagt til et sporingsskriptet i HTML-headeren. Sporingen for å måle og analysere besøksstatistikk vises i et Sanity dashboard.
 
-Vi er på en trial versjon foreløpig 👷
+Vi er på en trial-plan foreløpig 👷
 
 ## Slack
 
@@ -165,6 +166,8 @@ Når et arrangement publiseres for første gang, vil det automatisk genereres en
 
 E-post med kalenderinvitasjon (.ics-fil) sendes fra SvelteKit på serversiden. På grunn av manglende tilgang til en server fra Sanity, har vi satt opp et API-endepunkt i SvelteKit som Sanity kan kommunisere med for å sende e-post. Som SMTP host benytter vi oss av [Mandrill](https://mandrillapp.com/). Innlogging skjer via Capra sin Mailchimp bruker siden Mandrill er en underleverandær av dem.
 
+E-post domene for alle selskaper må verifiseres. Vi er på en trial-plan her og 👷
+
 ### Påmelding
 
 Når en bruker melder seg på et arrangement, utløses følgende prosess:
@@ -209,8 +212,8 @@ Ved avlysing av et arrangement i Sanity:
 
 For å teste e-postfunksjonaliteten lokalt:
 
-1. Legg til `localhost` i `Access-Control-Allow-Origin`.
-2. Fjern "development"-sjekker i funksjonskallene for å kjøre i lokalt miljø.
+1. Fjern "development"-sjekker i funksjonskallene for å kjøre i lokalt miljø.
+2. For å teste e-post sendt fra Sanity: Legg til `http://localhost:3333` i `Access-Control-Allow-Origin`.
 
 ### Kalenderinvitasjon 👷
 
diff --git a/app/src/components/external/EventFormExternal.svelte b/app/src/components/external/EventFormExternal.svelte
index 626200d..ecfa459 100644
--- a/app/src/components/external/EventFormExternal.svelte
+++ b/app/src/components/external/EventFormExternal.svelte
@@ -23,6 +23,8 @@
     delayed: registrationDelayed,
     enhance: registrationEnhance,
   } = superForm<RegistrationFormExternalType>(data.registrationForm, {
+    resetForm: false,
+    dataType: "json",
     validators: zod(registrationSchemaExternal),
     delayMs: 500,
     async onSubmit() {
@@ -38,7 +40,6 @@
     enhance: unregistrationEnhance,
   } = superForm<UnregistrationFormExternalType>(data.unregistrationForm, {
     validators: zod(unregistrationSchemaExternal),
-    dataType: "json",
     delayMs: 500,
     async onSubmit() {
       await new Promise((result) => setTimeout(result, 500));
diff --git a/app/src/components/external/RegistrationFormExternal.svelte b/app/src/components/external/RegistrationFormExternal.svelte
index 64be779..8b3fc0c 100644
--- a/app/src/components/external/RegistrationFormExternal.svelte
+++ b/app/src/components/external/RegistrationFormExternal.svelte
@@ -6,7 +6,7 @@
   import Deadline from "$components/shared/Deadline.svelte";
   import RegistrationCustomOption from "$components/shared/RegistrationCustomOption.svelte";
   import { dateHasPassed } from "$lib/utils/date.util";
-  import { vercelStegaCleanAll } from "@sanity/client/stega";
+  import { stegaClean } from "@sanity/client/stega";
 
   export let event: Event;
   export let numberOfParticipants: number;
@@ -97,8 +97,8 @@
       {#each event.customOptions as customOption}
         <RegistrationCustomOption
           {form}
-          inputType={vercelStegaCleanAll(customOption.fieldType)}
-          optionLabel={vercelStegaCleanAll(customOption.fieldOption)}
+          inputType={stegaClean(customOption.fieldType)}
+          optionLabel={stegaClean(customOption.fieldOption)}
         />
       {/each}
       {#if $errors.customOptions}
diff --git a/app/src/components/external/UnregistrationFormExternal.svelte b/app/src/components/external/UnregistrationFormExternal.svelte
index 1f35cd8..633f014 100644
--- a/app/src/components/external/UnregistrationFormExternal.svelte
+++ b/app/src/components/external/UnregistrationFormExternal.svelte
@@ -16,14 +16,14 @@
   <input type="text" name="subject" id="subject" class="hidden" />
 
   <div
-    class="mb-8 flex flex-col items-start justify-center gap-4 rounded-lg border p-4 dark:border-gray-700 dark:bg-gray-800 sm:p-8"
+    class="mb-8 flex flex-col items-start justify-center rounded-lg border p-4 sm:p-8 dark:border-gray-700 dark:bg-gray-800"
   >
     <div class="flex flex-col items-center gap-5">
-      <div class="flex flex-col items-start gap-4">
+      <div class="items-start-4 flex flex-col">
         <h4
-          class="text-2xl font-bold leading-none tracking-tight text-gray-900 dark:text-white sm:text-2xl"
+          class="text-2xl font-bold leading-none tracking-tight text-gray-900 sm:text-2xl dark:text-white"
         >
-          <p class="text-2xl">Ønsker du å melde deg av?</p>
+          <h2 class="pb-4 text-base font-bold sm:text-xl">Ønsker du å melde deg av?</h2>
         </h4>
 
         <ButtonGroup class="w-100">
@@ -34,7 +34,7 @@
             name="email"
             bind:value={$form.email}
           />
-          <Button class="w-48" type="submit" color="alternative" disabled={$delayed}>
+          <Button class="w-48" type="submit" color="light" disabled={$delayed}>
             Meld meg av
             <span class="w-3">
               {#if $delayed}
diff --git a/app/src/components/internal/EventFormInternal.svelte b/app/src/components/internal/EventFormInternal.svelte
index 7ed3d27..8b3656c 100644
--- a/app/src/components/internal/EventFormInternal.svelte
+++ b/app/src/components/internal/EventFormInternal.svelte
@@ -25,6 +25,7 @@
     enhance: registrationEnhance,
   } = superForm<RegistrationFormInternalType>(data.registrationForm, {
     validators: zod(registrationSchemaInternal),
+    resetForm: false,
     dataType: "json",
     delayMs: 500,
     async onSubmit() {
diff --git a/app/src/components/internal/EventParticipantsInternal.svelte b/app/src/components/internal/EventParticipantsInternal.svelte
index 6e3b431..ec4c5b1 100644
--- a/app/src/components/internal/EventParticipantsInternal.svelte
+++ b/app/src/components/internal/EventParticipantsInternal.svelte
@@ -7,7 +7,7 @@
 {#if names.length}
   {#each names as name}
     <span>
-      <Badge rounded class="mr-1 h-6 border border-black bg-transparent dark:bg-zinc-800"
+      <Badge rounded class="mb-1 mr-1 h-6 border border-black bg-transparent dark:bg-zinc-800"
         >{name}</Badge
       >
     </span>
diff --git a/app/src/components/internal/RegistrationFormInternal.svelte b/app/src/components/internal/RegistrationFormInternal.svelte
index adac21e..3a64e01 100644
--- a/app/src/components/internal/RegistrationFormInternal.svelte
+++ b/app/src/components/internal/RegistrationFormInternal.svelte
@@ -6,7 +6,7 @@
   import RegistrationCustomOption from "$components/shared/RegistrationCustomOption.svelte";
   import { dateHasPassed } from "$lib/utils/date.util";
   import Deadline from "$components/shared/Deadline.svelte";
-  import { vercelStegaCleanAll } from "@sanity/client/stega";
+  import { stegaClean } from "@sanity/client/stega";
 
   export let event: Event;
   export let numberOfParticipants: number;
@@ -49,8 +49,8 @@
         {#each event.customOptions as customOption}
           <RegistrationCustomOption
             {form}
-            inputType={vercelStegaCleanAll(customOption.fieldType)}
-            optionLabel={vercelStegaCleanAll(customOption.fieldOption)}
+            inputType={stegaClean(customOption.fieldType)}
+            optionLabel={stegaClean(customOption.fieldOption)}
           />
         {/each}
         {#if $errors.customOptions}
@@ -59,7 +59,7 @@
       {/if}
 
       <div class="flex w-full">
-        <Button pill color="dark" type="submit" disabled={$delayed}
+        <Button class="mt-4" pill color="dark" type="submit" disabled={$delayed}
           ><span class="ml-3">Meld meg på</span>
           <span class="w-3">
             {#if $delayed}
diff --git a/app/src/components/internal/UnregistrationFormInternal.svelte b/app/src/components/internal/UnregistrationFormInternal.svelte
index fbb6ea0..158944f 100644
--- a/app/src/components/internal/UnregistrationFormInternal.svelte
+++ b/app/src/components/internal/UnregistrationFormInternal.svelte
@@ -21,7 +21,7 @@
       use:enhance
     >
       <div class="flex w-full">
-        <Button pill color="alternative" type="submit" disabled={$delayed}>
+        <Button pill color="light" type="submit" disabled={$delayed}>
           <span class="ml-3">Meld meg av</span>
           <span class="w-3">
             {#if $delayed}
diff --git a/app/src/components/shared/Deadline.svelte b/app/src/components/shared/Deadline.svelte
index b0cc816..c5ecd04 100644
--- a/app/src/components/shared/Deadline.svelte
+++ b/app/src/components/shared/Deadline.svelte
@@ -4,6 +4,7 @@
 </script>
 
 <div class="flex gap-1">
-  <p>Fristen for å melde seg på er</p>
-  {formatDateWithWeekDay(deadline)} kl {formatTime(deadline)}
+  <p>
+    Fristen for å melde seg på er {formatDateWithWeekDay(deadline)} kl {formatTime(deadline)}
+  </p>
 </div>
diff --git a/app/src/components/shared/EventSummary.svelte b/app/src/components/shared/EventSummary.svelte
index 20e97b9..8a20b6c 100644
--- a/app/src/components/shared/EventSummary.svelte
+++ b/app/src/components/shared/EventSummary.svelte
@@ -24,7 +24,7 @@
 <h1 class="pb-6 text-3xl font-semibold sm:text-5xl">{event.title}</h1>
 
 {#if event.summary}
-  <p class="pb-6 text-base font-light sm:text-xl">{event.summary}</p>
+  <p class="pb-6 text-base font-light sm:w-[60%] sm:text-xl">{event.summary}</p>
 {/if}
 
 <div class="flex flex-col gap-5 pb-6 sm:h-60 sm:flex-row">
@@ -52,7 +52,7 @@
 </div>
 
 {#if event.body}
-  <div class="flex flex-col gap-4 text-base">
+  <div class="flex flex-col gap-4 text-base sm:w-[60%]">
     <PortableText components={{}} value={event.body} />
   </div>
 {/if}
diff --git a/app/src/components/shared/RegistrationCustomOption.svelte b/app/src/components/shared/RegistrationCustomOption.svelte
index 2ff5790..b2122a7 100644
--- a/app/src/components/shared/RegistrationCustomOption.svelte
+++ b/app/src/components/shared/RegistrationCustomOption.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Checkbox, Textarea } from "flowbite-svelte";
+  import { Checkbox, Radio, Textarea } from "flowbite-svelte";
   import { writable } from "svelte/store";
 
   export let form = writable<FormData>({ customOptions: [] });
@@ -15,6 +15,11 @@
     customOptions: CustomOption[];
   }
 
+  const handleRadioChange = (event: Event) => {
+    const { value } = event.target as HTMLInputElement;
+    updateFormValue(optionLabel, value);
+  };
+
   const handleCheckboxChange = (event: Event) => {
     const { checked } = event.target as HTMLInputElement;
     updateFormValue(optionLabel, checked ? "Ja" : "");
@@ -30,14 +35,14 @@
       const updatedOptions = currentForm.customOptions.filter(
         (customOption) => customOption.option !== option
       );
-
-      if (value) {
-        updatedOptions.push({ option, value });
-      }
-
+      if (value) updatedOptions.push({ option, value });
       return { ...currentForm, customOptions: updatedOptions };
     });
   };
+
+  if (inputType === "radio") {
+    updateFormValue(optionLabel, "Ja");
+  }
 </script>
 
 <div class="flex flex-col gap-1">
@@ -45,7 +50,18 @@
     {optionLabel}
   </span>
   {#if inputType === "checkbox"}
-    <Checkbox name="customOptions" on:change={handleCheckboxChange}>Ja!</Checkbox>
+    <Checkbox name="customOptions" on:change={handleCheckboxChange}>Ja</Checkbox>
+  {:else if inputType === "radio"}
+    <div class="flex gap-6 text-sm">
+      <div class="flex gap-2">
+        <Radio inline name="customOptions" group="Ja" value="Ja" on:change={handleRadioChange}>
+          Ja
+        </Radio>
+      </div>
+      <div class="flex gap-2">
+        <Radio inline name="customOptions" value="Nei" on:change={handleRadioChange}>Nei</Radio>
+      </div>
+    </div>
   {:else}
     <Textarea name="customOptions" class="bg-white" on:input={handleInputChange} />
   {/if}
diff --git a/app/src/lib/actions/internal/action.ts b/app/src/lib/actions/internal/action.ts
index 628c3c7..89fe15e 100644
--- a/app/src/lib/actions/internal/action.ts
+++ b/app/src/lib/actions/internal/action.ts
@@ -63,7 +63,7 @@ export const submitRegistrationInternal: Actions["submitRegistrationInternal"] =
 
   if (await limiter.isLimited(requestEvent)) {
     return message(registrationForm, {
-      text: "Du har nådd grensen for antall påmeldinger. Vennligst vent en stund før du prøver igjen.",
+      text: "Du har nådd grensen for antall forsøk. Vennligst vent en stund før du prøver igjen.",
       error: true,
     });
   }
@@ -224,7 +224,7 @@ export const submitUnregistrationInternal: Actions["submitUnregistrationInternal
 
   if (await limiter.isLimited(requestEvent)) {
     return message(unregistrationForm, {
-      text: "Du har nådd grensen for antall avmeldinger. Vennligst vent en stund før du prøver igjen.",
+      text: "Du har nådd grensen for antall forsøk. Vennligst vent en stund før du prøver igjen.",
       error: true,
     });
   }
diff --git a/app/src/lib/auth/secret.ts b/app/src/lib/auth/secret.ts
index 90e8442..71aa979 100644
--- a/app/src/lib/auth/secret.ts
+++ b/app/src/lib/auth/secret.ts
@@ -2,6 +2,6 @@ import { APP_SECRET } from "$env/static/private";
 import type { TokenData } from "$models/jwt.model";
 
 export const getUnsubscribeSecret = ({ document_id, event_id, email }: TokenData) => {
-  const secret = `${document_id}-${event_id}-${email}-${APP_SECRET}`;
+  const secret = `${document_id}-${String(event_id)}-${email}-${APP_SECRET}`;
   return secret;
 };
diff --git a/app/src/lib/email/event/registration.ts b/app/src/lib/email/event/registration.ts
index 51d9f7d..0308a9d 100644
--- a/app/src/lib/email/event/registration.ts
+++ b/app/src/lib/email/event/registration.ts
@@ -1,5 +1,10 @@
 import { PUBLIC_APP_BASE_URL } from "$env/static/public";
-import ical, { ICalAttendeeRole, ICalAttendeeStatus, ICalCalendarMethod } from "ical-generator";
+import ical, {
+  ICalAlarmType,
+  ICalAttendeeRole,
+  ICalAttendeeStatus,
+  ICalCalendarMethod,
+} from "ical-generator";
 import { sendMail } from "$lib/email/nodemailer";
 
 interface EventProps {
@@ -78,6 +83,18 @@ const createIcsFile = ({
       name: organiser,
       email: "no-reply@capraconsulting.no",
     },
+    alarms: [
+      {
+        type: ICalAlarmType.display,
+        description: "Arrangementet starter straks",
+        relatesTo: "START", // -> 10 minutes before event starts
+      },
+      {
+        type: ICalAlarmType.display,
+        description: "Påminnelse om arrangement i morgen",
+        trigger: 86400, // -> 24 hours before event starts
+      },
+    ],
   });
 
   return Buffer.from(calendar.toString());
diff --git a/app/src/lib/email/event/unregistration.ts b/app/src/lib/email/event/unregistration.ts
index 8e28c9c..7ffe0cf 100644
--- a/app/src/lib/email/event/unregistration.ts
+++ b/app/src/lib/email/event/unregistration.ts
@@ -62,7 +62,7 @@ export const sendConfirmUnregistration = async (props: {
   const html = `<span style="font-family: Roboto, sans-serif;
                              font-style: normal;
                              font-weight: 400;
-                             font-size: 16px;
+                             font-size: 14px;
                              line-height: 20px;
                              letter-spacing: 0.2px;
                              color: #3c4043;">
diff --git a/app/src/models/sanity.model.ts b/app/src/models/sanity.model.ts
index ac1c088..494e521 100644
--- a/app/src/models/sanity.model.ts
+++ b/app/src/models/sanity.model.ts
@@ -95,6 +95,7 @@ export type Event = {
   _createdAt: string;
   _updatedAt: string;
   _rev: string;
+  title: string;
   image: {
     asset?: {
       _ref: string;
@@ -106,12 +107,11 @@ export type Event = {
     crop?: SanityImageCrop;
     _type: "image";
   };
-  title: string;
   summary?: string;
   start: string;
   end: string;
   deadline: string;
-  body: BlockContent;
+  body?: BlockContent;
   maxParticipant?: number;
   category: Category;
   place: string;
@@ -123,7 +123,7 @@ export type Event = {
   food?: string;
   customOptions?: Array<{
     fieldOption: string;
-    fieldType: "checkbox" | "input";
+    fieldType: "radio" | "checkbox" | "input";
     _key: string;
   }>;
 };
diff --git a/app/src/routes/api/send-event-canceled/+server.ts b/app/src/routes/api/send-event-canceled/+server.ts
index a59430e..0e6d4a9 100644
--- a/app/src/routes/api/send-event-canceled/+server.ts
+++ b/app/src/routes/api/send-event-canceled/+server.ts
@@ -26,8 +26,8 @@ export const POST: RequestHandler = async ({ request }) => {
       return json({ error: "Invalid API token" }, { status: 403 });
     }
 
-    const props = (await request.json()) as EventProps;
-    if (!props || !props.id) {
+    const props = (await request.json()) as EventProps | null;
+    if (!props?.id) {
       return json({ error: "Event properties missing or incomplete" }, { status: 400 });
     }
 
diff --git a/app/src/routes/api/send-event-update/+server.ts b/app/src/routes/api/send-event-update/+server.ts
index b92a076..c0297c1 100644
--- a/app/src/routes/api/send-event-update/+server.ts
+++ b/app/src/routes/api/send-event-update/+server.ts
@@ -26,8 +26,8 @@ export const POST: RequestHandler = async ({ request }) => {
       return json({ error: "Invalid API token" }, { status: 403 });
     }
 
-    const props = (await request.json()) as EventProps;
-    if (!props || !props.id) {
+    const props = (await request.json()) as EventProps | null;
+    if (!props?.id) {
       return json({ error: "Event properties missing or incomplete" }, { status: 400 });
     }
 
diff --git a/studio/models/sanity.model.ts b/studio/models/sanity.model.ts
index ac1c088..494e521 100644
--- a/studio/models/sanity.model.ts
+++ b/studio/models/sanity.model.ts
@@ -95,6 +95,7 @@ export type Event = {
   _createdAt: string;
   _updatedAt: string;
   _rev: string;
+  title: string;
   image: {
     asset?: {
       _ref: string;
@@ -106,12 +107,11 @@ export type Event = {
     crop?: SanityImageCrop;
     _type: "image";
   };
-  title: string;
   summary?: string;
   start: string;
   end: string;
   deadline: string;
-  body: BlockContent;
+  body?: BlockContent;
   maxParticipant?: number;
   category: Category;
   place: string;
@@ -123,7 +123,7 @@ export type Event = {
   food?: string;
   customOptions?: Array<{
     fieldOption: string;
-    fieldType: "checkbox" | "input";
+    fieldType: "radio" | "checkbox" | "input";
     _key: string;
   }>;
 };
diff --git a/studio/schema.json b/studio/schema.json
index 054f867..7ae39fa 100644
--- a/studio/schema.json
+++ b/studio/schema.json
@@ -548,6 +548,13 @@
           "type": "string"
         }
       },
+      "title": {
+        "type": "objectAttribute",
+        "value": {
+          "type": "string"
+        },
+        "optional": false
+      },
       "image": {
         "type": "objectAttribute",
         "value": {
@@ -610,13 +617,6 @@
         },
         "optional": false
       },
-      "title": {
-        "type": "objectAttribute",
-        "value": {
-          "type": "string"
-        },
-        "optional": false
-      },
       "summary": {
         "type": "objectAttribute",
         "value": {
@@ -651,7 +651,7 @@
           "type": "inline",
           "name": "blockContent"
         },
-        "optional": false
+        "optional": true
       },
       "maxParticipant": {
         "type": "objectAttribute",
@@ -739,6 +739,10 @@
                 "value": {
                   "type": "union",
                   "of": [
+                    {
+                      "type": "string",
+                      "value": "radio"
+                    },
                     {
                       "type": "string",
                       "value": "checkbox"
@@ -1610,4 +1614,4 @@
       }
     }
   }
-]
+]
\ No newline at end of file
diff --git a/studio/schemas/event.ts b/studio/schemas/event.ts
index d7bb1ea..9c9bcaa 100644
--- a/studio/schemas/event.ts
+++ b/studio/schemas/event.ts
@@ -1,4 +1,4 @@
-import { CheckmarkIcon, TextIcon } from "@sanity/icons";
+import { CheckmarkIcon, CircleIcon, TextIcon } from "@sanity/icons";
 import { defineType, defineField } from "sanity";
 
 export default defineType({
@@ -6,6 +6,12 @@ export default defineType({
   title: "Arrangement",
   type: "document",
   fields: [
+    defineField({
+      name: "title",
+      title: "Tittel",
+      type: "string",
+      validation: (Rule) => Rule.required(),
+    }),
     defineField({
       name: "image",
       title: "Bilde",
@@ -15,12 +21,6 @@ export default defineType({
       },
       validation: (Rule) => Rule.required(),
     }),
-    defineField({
-      name: "title",
-      title: "Tittel",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-    }),
     defineField({
       name: "summary",
       title: "Oppsummering",
@@ -52,7 +52,6 @@ export default defineType({
       type: "blockContent",
       description:
         "Skriv en tekst som beskriver arrangementet i detalj, gjerne inkludert program og all relevant info.",
-      validation: (Rule) => Rule.required(),
     }),
 
     defineField({
@@ -153,7 +152,7 @@ export default defineType({
               name: "fieldOption",
               title: "Label",
               type: "string",
-              description: "Tekst som skal vises over feltet.",
+              description: "Tekst som skal vises over feltet (må være unik).",
               validation: (Rule) => Rule.required(),
             }),
             defineField({
@@ -162,12 +161,13 @@ export default defineType({
               type: "string",
               options: {
                 list: [
+                  { title: "Radioknapper", value: "radio" },
                   { title: "Avkrysningsboks", value: "checkbox" },
                   { title: "Tekstfelt", value: "input" },
                 ],
                 layout: "radio",
               },
-              initialValue: "checkbox",
+              initialValue: "radio",
               validation: (Rule) => Rule.required(),
             }),
           ],
@@ -180,7 +180,12 @@ export default defineType({
             prepare({ title, subtitle }) {
               return {
                 title: title,
-                media: subtitle === "checkbox" ? CheckmarkIcon : TextIcon,
+                media:
+                  subtitle === "radio"
+                    ? CircleIcon
+                    : subtitle === "checkbox"
+                      ? CheckmarkIcon
+                      : TextIcon,
               };
             },
           },