Merge v1.2.2 to production

app/(site)/alle-arrangementer/andre-arrangementer/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const OtherEventsPage = () => {
+    return <EventPage eventId='8' />;
+};
+
+export default OtherEventsPage;
+

app/(site)/alle-arrangementer/baerekraftsforedrag/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const SustainabilityTalkEventPage = () => {
+    return <EventPage eventId='3' />;
+};
+
+export default SustainabilityTalkEventPage;
+

app/(site)/alle-arrangementer/bcm/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const BcmEventPage = () => {
+    return <EventPage eventId='1' />;
+};
+
+export default BcmEventPage;
+

app/(site)/alle-arrangementer/blender/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const BlenderEventPage = () => {
+    return <EventPage eventId='2' />;
+};
+
+export default BlenderEventPage;
+

app/(site)/alle-arrangementer/casebreaker/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const CasebreakerEventPage = () => {
+    return <EventPage eventId='4' />;
+};
+
+export default CasebreakerEventPage;
+

app/(site)/alle-arrangementer/hvordan-starte-bedrift-fra-a-til-aa/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const StartABusinessEventPage = () => {
+    return <EventPage eventId='5' />;
+};
+
+export default StartABusinessEventPage;
+

app/(site)/alle-arrangementer/idekonkurranse/page.tsx

@@ -0,0 +1,8 @@
+import EventPage from '@/components/events/eventPage';
+
+const IdeaCompetitionEventPage = () => {
+    return <EventPage eventId='6' />;
+};
+
+export default IdeaCompetitionEventPage;
+

app/(site)/alle-arrangementer/mot-en-grunder/page.tsx

@@ -0,0 +1,7 @@
+import EventPage from '@/components/events/eventPage';
+
+const MeetAFounderEventPage = () => {
+    return <EventPage eventId='7' />;
+};
+
+export default MeetAFounderEventPage;

app/(site)/alle-arrangementer/page.tsx

@@ -0,0 +1,70 @@
+'use client';
+
+import React, { useEffect, useState } from 'react';
+import BackButton from '@/components/UI/backbutton';
+import Footer from '@/components/footer/footer';
+import EventBox from '@/components/events/eventBox';
+import SectionTitle from '@/components/events/sectionTitle';
+import PastEventBox from '@/components/events/pastEventBox';
+import { events } from '@/components/events/eventData';
+import { getPastEventCards } from '@/backend/sanity-utils';
+import { EventCardType } from '@/types/EventCardType';
+
+export default function AllEventsPage() {
+    const [pastEvents, setPastEvents] = useState<EventCardType[]>([]);
+    const [error, setError] = useState<string | null>(null); // Error state
+
+    useEffect(() => {
+        getPastEventCards()
+            .then((data) => {
+                setPastEvents(data);
+                setError(null); // Clear any previous error
+            })
+            .catch((error) => {
+                console.error('Error fetching past events:', error);
+                setError('Failed to load past events. Please try again later.');
+            });
+    }, []);
+
+    return (
+        <main className='bg-gradient-to-r from-gray-800 via-gray-900 to-black min-h-screen flex flex-col items-center justify-start'>
+            <header>
+                <SectionTitle title='Våre arrangementer' />
+            </header>
+
+            <section className='grid md:grid-cols-3 gap-8 my-8 w-full max-w-5xl'>
+                {events.map((event) => (
+                    <EventBox key={event.id} {...event} />
+                ))}
+            </section>
+
+            <section>
+                <SectionTitle title='Tidligere arrangementer' />
+                {/* Change to a single-column grid layout */}
+                <div className='grid grid-cols-1 gap-8 my-8 w-full max-w-5xl'>
+                    {pastEvents.length > 0 ? (
+                        pastEvents.map((event) => (
+                            <PastEventBox
+                                key={event._id}
+                                id={event._id}
+                                title={event.title}
+                                alt={`Image for ${event.title}`}
+                                link={`/arrangementer/${event.slug}`}
+                            />
+                        ))
+                    ) : (
+                        <p className='mt-2 text-center'>Ingen tidligere arrangementer.</p>
+                    )}
+                </div>
+            </section>
+
+            <div className='fixed top-0 right-0 m-4'>
+                <BackButton link='/' text='Tilbake til hovedsiden' />
+            </div>
+
+            <footer className='w-full'>
+                <Footer />
+            </footer>
+        </main>
+    );
+}

app/(site)/arrangementer/[eventPage]/page.tsx

@@ -1,86 +1,79 @@
-"use client"; // Use client to render the page
+'use client'; // Use client to render the page
 
-import { getEventPage } from "@/backend/sanity-utils";
-import BackButton from "@/components/UI/backbutton";
-import RegistrerButton from "@/components/UI/registrerbutton";
-import Footer from "@/components/footer/footer";
-import LoadingPage from "@/components/loadingPage/loadingPage";
-import { EventPageType } from "@/types/EventPageType";
-import getDateTimeFormat from "@/utils/date";
-import { PortableText } from "@portabletext/react";
-import { error } from "console";
-import { redirect, useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
+import { getCurrentEventCards } from '@/backend/sanity-utils';
+import BackButton from '@/components/UI/backbutton';
+import RegistrerButton from '@/components/UI/registrerbutton';
+import Footer from '@/components/footer/footer';
+import LoadingPage from '@/components/loadingPage/loadingPage';
+import { EventPageType } from '@/types/EventPageType';
+import getDateTimeFormat from '@/utils/date';
+import { PortableText } from '@portabletext/react';
+import { error } from 'console';
+import { redirect, useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
 
 // Props for the event page
 type Props = {
-  params: { eventPage: string };
+    params: { eventPage: string };
 };
 
 export default function PageForEvent({ params }: Props) {
-  const [eventPage, setEventPage] = useState<EventPageType | null>(null);
+    const [eventPage, setEventPage] = useState<EventPageType | null>(null);
 
-  const slug = params.eventPage;
-  const router = useRouter();
+    const slug = params.eventPage;
+    const router = useRouter();
+
+    useEffect(() => {
+        if (!slug) router.push('/');
+        if (!eventPage) {
+            getCurrentEventCards(slug)
+                .then((data) => {
+                    if (!data) {
+                        router.push('/feilside');
+                    }
+                    setEventPage(data);
+                })
+                .catch((error) => console.log('Error catches!', error));
+        }
+    }, [slug, eventPage, router]);
 
-  useEffect(() => {
-    if (!slug) router.push("/");
     if (!eventPage) {
-      getEventPage(slug)
-        .then((data) => {
-          if (!data) {
-            router.push("/feilside");
-          }
-          setEventPage(data);
-        })
-        .catch((error) => console.log("Error catches!", error));
+        return <LoadingPage />;
     }
-  }, [slug, eventPage, router]);
-
-  if (!eventPage) {
-    return <LoadingPage />;
-  }
 
-  // Information time and date formatted correctly
-  let { dateFormat, timeFormat } = getDateTimeFormat(eventPage.datetime);
-  let isOver: Boolean = new Date() > new Date(eventPage.datetime);
+    // Information time and date formatted correctly
+    let { dateFormat, timeFormat } = getDateTimeFormat(eventPage.datetime);
+    let isOver: Boolean = new Date() > new Date(eventPage.datetime);
 
-  const EventOverBadge = () => {
-    return isOver ? (
-      <span className="bg-red-100 text-red-800 text-sm font-medium mr-2 px-2.5 py-1.5 rounded ">
-        Påmelding Lukket!
-      </span>
-    ) : null;
-  };
+    const EventOverBadge = () => {
+        return isOver ? <span className='bg-red-100 text-red-800 text-sm font-medium mr-2 px-2.5 py-1.5 rounded '>Påmelding Lukket!</span> : null;
+    };
 
-  return (
-    <div className="flex flex-col min-h-screen bg-gradient-to-tl from-gradient-end via-gradient-mid to-gradient-start">
-      <main className="text-4xl flex justify-center min-h-screen">
-        <div className="bg-slate-100 h-fit w-11/12 mt-2 p-5 md:p-20 md:w-3/4 md:text-6xl">
-          <h1 className=" font-bold text-black">{eventPage.title}</h1>
+    return (
+        <div className='flex flex-col min-h-screen bg-gradient-to-tl from-gradient-end via-gradient-mid to-gradient-start'>
+            <main className='text-4xl flex justify-center min-h-screen'>
+                <div className='bg-slate-100 h-fit w-11/12 mt-2 p-5 md:p-20 md:w-3/4 md:text-6xl'>
+                    <h1 className=' font-bold text-black'>{eventPage.title}</h1>
 
-          <h2 className="text-black text-xl my-2 md:text-2xl md:my-5">
-            {" "}
-            📅 {dateFormat} | 🕕 {timeFormat} <EventOverBadge />{" "}
-          </h2>
+                    <h2 className='text-black text-xl my-2 md:text-2xl md:my-5'>
+                        {' '}
+                        📅 {dateFormat} | 🕕 {timeFormat} <EventOverBadge />{' '}
+                    </h2>
 
-          <hr className="h-1 my-8 border-0 bg-gray-800" />
+                    <hr className='h-1 my-8 border-0 bg-gray-800' />
 
-          <div className="text-lg text-gray-800 mt-5 mx-10">
-            <PortableText value={eventPage.content} />
-          </div>
+                    <div className='text-lg text-gray-800 mt-5 mx-10'>
+                        <PortableText value={eventPage.content} />
+                    </div>
 
-          <div className="flex justify-left gap-2">
-            <RegistrerButton
-              isEventOverBoolean={isOver ? true : false}
-              urlToForm={eventPage.url}
-            />
+                    <div className='flex justify-left gap-2'>
+                        <RegistrerButton isEventOverBoolean={isOver ? true : false} urlToForm={eventPage.url} />
 
-            <BackButton link="/" text="Tilbake" />
-          </div>
+                        <BackButton link='/' text='Tilbake' />
+                    </div>
+                </div>
+            </main>
+            <Footer />
         </div>
-      </main>
-      <Footer />
-    </div>
-  );
+    );
 }

app/(site)/baerekraft/page.tsx

@@ -1,10 +1,15 @@
 import Footer from '@/components/footer/footer';
-import SustainabilityMain from '@/components/jumbotron/sustainabilityMain';
+import Header from '@/components/header/page';
+import CarbonFootprint from '@/components/sustainability/carbonFootprint/carbonFootprint';
+import SustainabilityMain from '@/components/sustainability/sustainabilityMain';
+
 export default function BaerekraftPage() {
     return (
-        <div className='flex flex-col min-h-screen bg-gradient-to-tl from-gradient-end via-gradient-mid to-gradient-start'>
-            <main className='flex justify-center min-h-screen'>
+        <div className='bg-gray-900'>
+            <Header />
+            <main className='mx-auto my-0 max-w-5xl px-4 transition-all md:px-8 min-h-screen'>
                 <SustainabilityMain />
+                <CarbonFootprint />
             </main>
             <Footer />
         </div>

app/(site)/bli-medlem/page.tsx

@@ -1,53 +1,43 @@
-import JoinList from "@/components/JoinList/joinlist";
-import BackButton from "@/components/UI/backbutton";
-import ChecklistItem from "@/components/UI/checklistitem";
-import Footer from "@/components/footer/footer";
+import React from 'react';
+import JoinList from '@/components/JoinList/joinlist';
+import BackButton from '@/components/UI/backbutton';
+import ChecklistItem from '@/components/UI/checklistitem';
+import Footer from '@/components/footer/footer';
+import Header from '@/components/header/page';
 
 export default function JoinPage() {
-
-
     return (
-        <main className="bg-gray-900 min-h-screen">
-
-            <div className="flex justify-center pt-10 px-6">
-                <h1 className="text-4xl md:text-6xl">Bli medlem🚀</h1>
+        <main className='bg-gray-900 min-h-screen'>
+            <div className='flex justify-center pt-10 px-6'>
+                <h1 className='text-4xl md:text-6xl'>Bli medlem🚀</h1>
             </div>
 
-
-            <div className="flex flex-col items-center mt-10 gap-10">
-
-                <section className="px-1">
-                    <h2 className="mb-2 text-lg font-semibold text-white">Hvem burde søke? 🤔</h2>
-                    <ul className="max-w-md space-y-1 list-inside text-gray-400">
-                        <ChecklistItem text="Du er engasjert!" />
-                        <ChecklistItem text="Du liker å ta ansvar!"/>
-                        <ChecklistItem text="Du brenner for innovasjon og entreprenørskap!" />
-                        <ChecklistItem text="Du studerer på NTNU eller Fagskolen i Gjøvik" />
+            <div className='flex flex-col items-center mt-10 gap-10'>
+                <section className='px-1'>
+                    <h2 className='mb-2 text-lg font-semibold text-white'>Hvem burde søke? 🤔</h2>
+                    <ul className='max-w-md space-y-1 list-inside text-gray-400'>
+                        <ChecklistItem text='Du er engasjert!' />
+                        <ChecklistItem text='Du liker å ta ansvar!' />
+                        <ChecklistItem text='Du brenner for innovasjon og entreprenørskap!' />
+                        <ChecklistItem text='Du studerer på NTNU eller Fagskolen i Gjøvik' />
                     </ul>
                 </section>
 
-                <section className="px-1">
-                    <h2 className="mb-2 text-lg font-semibold text-white">Fordeler ✨</h2>
-                    <ul className="max-w-md space-y-1 list-inside text-gray-400">
+                <section className='px-1'>
+                    <h2 className='mb-2 text-lg font-semibold text-white'>Fordeler ✨</h2>
+                    <ul className='max-w-md space-y-1 list-inside text-gray-400'>
                         <ChecklistItem text="Styrk CV'en din 📝" />
-                        <ChecklistItem text="Delta på intern teambuilding!" />
-                        <ChecklistItem text="Bygg et solid nettverk" />
+                        <ChecklistItem text='Delta på intern teambuilding!' />
+                        <ChecklistItem text='Bygg et solid nettverk' />
                     </ul>
                 </section>
 
-
-
                 <JoinList />
 
-                <BackButton link="/" text="Tilbake til hovedsiden"/>
+                <BackButton link='/' text='Tilbake til hovedsiden' />
             </div>
 
-            <Footer/>
-
-
-
-
-
+            <Footer />
         </main>
     );
-}
+}