fix(rename): arrangementer -> skjer (#100)

Co-authored-by: Anton Lilleby <[email protected]>

README.md

@@ -6,7 +6,7 @@ Styling med [Tailwind](https://tailwindcss.com)\
 Hosted hos [Vercel](https://vercel.com/)\
 Innhold og bilder i [Sanity](https://www.sanity.io)
 
-En MVP løsning for administrasjon og visning av både interne og eksterne arrangementer hos Liflig, Fryde og Capra. Dette inkluderer fagsirkler, konferanser, frokostseminarer og sosiale begivenheter. Prosjektet har fått navnet CapraWeb for å inkludere hele nettsiden her i fremtiden. Foreløpig fokuserer vi på arrangementsdelen.
+En løsning for administrasjon og visning av både interne og eksterne arrangementer hos Capra, Fryde og Liflig. Dette inkluderer fagsirkler, konferanser, frokostseminarer og sosiale begivenheter. Prosjektet har fått navnet CapraWeb for å inkludere hele nettsiden her i fremtiden. Foreløpig fokuserer vi på arrangementsdelen, også kalt <strong>skjer</strong>.
 
 Dette er et levende dokument, denne arbeideren 👷 betyr at vi trenger hjelp!
 

app/package.json

@@ -15,8 +15,8 @@
     "@auth/sveltekit": "^1.4.1",
     "@sanity/client": "^6.21.1",
     "@sanity/image-url": "^1.0.2",
-    "@sanity/svelte-loader": "^1.11.32",
-    "@sanity/visual-editing": "^2.1.5",
+    "@sanity/svelte-loader": "^1.11.33",
+    "@sanity/visual-editing": "^2.1.6",
     "@supabase/supabase-js": "^2.44.4",
     "date-fns": "^3.6.0",
     "globals": "^15.8.0",

app/src/components/external/RegistrationFormExternal.svelte

@@ -117,12 +117,12 @@
       >
     </div>
 
-    <div class="flex w-full justify-end">
-      <Button class="mt-4" pill color="dark" type="submit" disabled={$delayed}>
-        <span class="ml-3">Meld meg på</span>
-        <span class="w-3">
+    <div class="flex w-full">
+      <Button class="mt-3" pill color="dark" type="submit" disabled={$delayed}>
+        <span class="ml-2">Meld meg på</span>
+        <span class="w-2">
           {#if $delayed}
-            <Spinner color="gray" class="ml-2 " size="4" />
+            <Spinner color="gray" class="ml-2" size="4" />
           {/if}
         </span>
       </Button>

app/src/components/external/UnregistrationFormExternal.svelte

@@ -23,27 +23,26 @@
       Ønsker du å melde deg av?
     </h2>
 
-    <div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
+    <div class="flex flex-wrap gap-3 sm:flex-nowrap">
       <Input
-        class="bg-white"
+        class=" bg-white"
         type="text"
         placeholder="[email protected]"
         name="email"
         bind:value={$form.email}
       />
-      <div class="flex items-center">
-        <Button pill color="dark" type="submit" disabled={$delayed}>
-          <span class="ml-3">Meld meg av</span>
-          <span class="w-3">
-            {#if $delayed}
-              <Spinner color="gray" class="ml-2 " size="4" />
-            {/if}
-          </span>
-        </Button>
-      </div>
-      {#if $errors.email}
-        <p class="text-xs text-red-600">Fyll inn gyldig epost.</p>
-      {/if}
+      <Button pill color="dark" type="submit" disabled={$delayed} class="w-max whitespace-nowrap">
+        <span class="ml-2">Meld meg av</span>
+        <span class="w-2">
+          {#if $delayed}
+            <Spinner color="gray" class="ml-2" size="4" />
+          {/if}
+        </span>
+      </Button>
     </div>
+
+    {#if $errors.email}
+      <p class="text-xs text-red-600">Fyll inn gyldig epost.</p>
+    {/if}
   </form>
 {/if}

app/src/components/internal/RegistrationFormInternal.svelte

@@ -59,11 +59,11 @@
       {/if}
 
       <div class="flex w-full">
-        <Button class="mt-4" pill color="dark" type="submit" disabled={$delayed}
-          ><span class="ml-3">Meld meg på</span>
-          <span class="w-3">
+        <Button class="mt-3" pill color="dark" type="submit" disabled={$delayed}
+          ><span class="ml-2">Meld meg på</span>
+          <span class="w-2">
             {#if $delayed}
-              <Spinner color="gray" class="ml-2 " size="4" />
+              <Spinner color="gray" class="ml-2" size="4" />
             {/if}
           </span>
         </Button>

app/src/components/internal/UnregistrationFormInternal.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { dateHasPassed } from "$lib/utils/date.util";
   import type { Event } from "$models/sanity.model";
-  import { Badge, Button, Spinner } from "flowbite-svelte";
+  import { Button, Spinner } from "flowbite-svelte";
 
   export let event: Event;
   export let enhance;
@@ -10,26 +10,19 @@
 </script>
 
 {#if isAttending}
-  <h2 class="pb-4 text-base font-bold sm:text-xl">Avmelding:</h2>
+  <h2 id="unregistration" class="pb-4 text-base font-bold sm:text-xl">Ønsker du å melde deg av?</h2>
   {#if dateHasPassed(event.deadline)}
     <p>Det er ikke lenger mulig å melde seg av dette arrangementet 😢</p>
   {:else}
-    <form
-      class="flex flex-col gap-4"
-      method="POST"
-      action="?/submitUnregistrationInternal"
-      use:enhance
-    >
-      <div class="flex w-full">
-        <Button pill color="dark" type="submit" disabled={$delayed}>
-          <span class="ml-3">Meld meg av</span>
-          <span class="w-3">
-            {#if $delayed}
-              <Spinner color="gray" class="ml-2 " size="4" />
-            {/if}
-          </span>
-        </Button>
-      </div>
+    <form method="POST" action="?/submitUnregistrationInternal" use:enhance>
+      <Button pill color="dark" type="submit" disabled={$delayed}>
+        <span class="ml-2">Meld meg av</span>
+        <span class="w-2">
+          {#if $delayed}
+            <Spinner color="gray" class="ml-1 " size="4" />
+          {/if}
+        </span>
+      </Button>
     </form>
   {/if}
 {/if}

app/src/routes/+layout.svelte

@@ -12,15 +12,15 @@
 {#if $isPreviewing}
   <a
     href={`/preview/disable?redirect=${$page.url.pathname}`}
-    class="box-shadow group fixed bottom-14 right-4 z-50 block rounded bg-white px-3 py-2 text-center text-xs font-medium leading-4 shadow hover:bg-red-500 hover:text-white dark:text-gray-800"
+    class="box-shadow group fixed bottom-4 right-4 z-50 block rounded bg-white px-3 py-2 text-center text-xs font-medium leading-4 shadow hover:bg-red-500 hover:text-white dark:text-gray-800"
   >
     <span class="block group-hover:hidden">Forhåndsvisning på</span>
     <span class="hidden group-hover:block">Forhåndsvisning av</span>
   </a>
   <span
-    class="box-shadow group fixed bottom-4 right-4 z-50 block rounded bg-black px-3 py-2 text-center text-xs font-medium leading-4 text-white shadow"
+    class="box-shadow group fixed bottom-14 right-4 z-50 block rounded bg-black px-3 py-2 text-center text-xs font-medium leading-4 text-white shadow"
   >
-    <span>For å se forhåndsvisning må arrangementet være publisert</span>
+    <span> For å se forhåndsvisning må arrangementet være publisert</span>
   </span>
 {/if}
 

app/src/routes/+page.svelte

@@ -14,7 +14,7 @@
 </script>
 
 <svelte:head>
-  <title>Arrangementer | Capra Liflig Fryde</title>
+  <title>Skjer | Capra Liflig Fryde</title>
 </svelte:head>
 
 <section class="pb-8">

studio/components/event/EventFoodPreference.tsx

@@ -38,7 +38,7 @@ export default function EventFoodPreference({ documentId }: { documentId: string
           Arrangement
         </Text>
         <Heading as={"h2"} size={4} style={{ paddingTop: "3.5px" }}>
-          Ingen allergier/matpreferanser
+          Ingen matpreferanser/allergier
         </Heading>
       </Grid>
     );
@@ -51,7 +51,7 @@ export default function EventFoodPreference({ documentId }: { documentId: string
           Arrangement
         </Text>
         <Heading as={"h2"} size={4} style={{ paddingTop: "3.5px" }}>
-          Allergier/matpreferanser ({data.length})
+          Matpreferanser/allergier ({data.length})
         </Heading>
       </Grid>
 

studio/config/structure.tsx

@@ -14,6 +14,15 @@ export const getDefaultDocumentNode = (
   if (options.schemaType === "event") {
     return S.document().views([
       S.view.form(),
+      S.view
+        .component(({ documentId }: { documentId: string }) => {
+          return (
+            <EventLayout queryClient={queryClient}>
+              <EventInvitation documentId={documentId} />
+            </EventLayout>
+          );
+        })
+        .title("Invitasjoner"),
       S.view
         .component((props) => {
           return (
@@ -36,16 +45,7 @@ export const getDefaultDocumentNode = (
             </EventLayout>
           );
         })
-        .title("Allergier/matpreferanser"),
-      S.view
-        .component(({ documentId }: { documentId: string }) => {
-          return (
-            <EventLayout queryClient={queryClient}>
-              <EventInvitation documentId={documentId} />
-            </EventLayout>
-          );
-        })
-        .title("Invitasjoner"),
+        .title("Matpreferanser/allergier"),
     ]);
   }
   return S.document().views([S.view.form()]);

studio/package.json

@@ -19,28 +19,28 @@
     "@sanity/client": "^6.21.1",
     "@sanity/code-input": "^4.1.4",
     "@sanity/dashboard": "^4.0.0",
-    "@sanity/icons": "^3.2.0",
+    "@sanity/icons": "^3.3.1",
     "@sanity/image-url": "^1.0.2",
-    "@sanity/locale-nb-no": "^1.1.10",
+    "@sanity/locale-nb-no": "^1.1.11",
     "@sanity/ui": "^2.8.8",
-    "@sanity/vision": "^3.52.2",
-    "@supabase/supabase-js": "^2.44.1",
-    "@tanstack/react-query": "^5.48.0",
+    "@sanity/vision": "^3.52.4",
+    "@supabase/supabase-js": "^2.45.0",
+    "@tanstack/react-query": "^5.51.16",
     "file-saver": "^2.0.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-is": "^18.3.1",
-    "sanity": "^3.52.2",
-    "styled-components": "^6.1.11",
+    "sanity": "^3.52.4",
+    "styled-components": "^6.1.12",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@sanity/eslint-config-studio": "^3.0.1",
     "@types/file-saver": "^2.0.7",
     "@types/node": "^18.19.23",
-    "@types/react": "^18.2.73",
+    "@types/react": "^18.3.3",
     "eslint": "^8.57.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "typescript": "^5.5.2"
   },
   "packageManager": "[email protected]",