Merge remote-tracking branch 'origin/main' into studio->root

# Conflicts:
#	pnpm-lock.yaml

Author: emberal

app/(root)/arrangement/eventCardPaginated.tsx

@@ -88,7 +88,7 @@ const ButtonAndProgress: Component<{ loading: boolean; onClick: VoidFunction }>
         return <CircularProgressIndicator aria-label={"Laster inn flere arrangementer"} />
     }
     return (
-        <Button className={"mx-auto w-min"} onClick={onClick}>
+        <Button className={"w-fit"} onClick={onClick}>
             Se mer
         </Button>
     )

components/cards/eventCard.tsx

@@ -27,7 +27,7 @@ const EventCard: Component<EventCardProps> = ({
         bottom={
             <LinkButton
                 href={"arrangement"}
-                className={"mx-auto w-fit"}
+                className={"w-fit"}
                 aria-label={"Vis flere arrangementer"}>
                 Vis mer
             </LinkButton>

components/cards/infoCard.tsx

@@ -29,7 +29,7 @@ const InfoCard: Component<EventCardProps> = ({
             <div>{children}</div>
         </div>
 
-        <div>{bottom}</div>
+        <div className={"flex justify-center"}>{bottom}</div>
     </div>
 )
 

components/footer.tsx

@@ -1,5 +1,5 @@
 import { ExternalLink, MailLink } from "@/components/link"
-import { Facebook, GitHub, Instagram, LinkedIn } from "@/components/icons/socials"
+import { Facebook, GitHub, Instagram, LinkedIn, Discord } from "@/components/icons/socials"
 import { Divider } from "@/components/divider"
 import { bigIconSize, defaultIconSize, FlexIcon } from "@/components/icons/icon"
 import { BugAntIcon, ChatBubbleLeftEllipsisIcon, LinkIcon } from "@heroicons/react/24/outline"
@@ -78,6 +78,13 @@ const Socials: Component = ({ className }) => (
             <Instagram width={bigIconSize} />
         </ExternalLink>
 
+        <ExternalLink
+            title={"Discord"}
+            className={className}
+            href={"https://discord.gg/RVkj2Xyt92"}>
+            <Discord width={bigIconSize} />
+        </ExternalLink>
+
         <ExternalLink
             title={"LinkedIn"}
             className={className}

components/icons/socials.tsx

@@ -26,6 +26,16 @@ export const Instagram: Component<SVGProps> = props => (
     </svg>
 )
 
+export const Discord: Component<SVGProps> = props => (
+    <svg 
+        xmlns="http://www.w3.org/2000/svg" 
+        viewBox="0 0 48 48"
+        aria-label={"Discord logo"}
+        {...props}>
+        <path fill="#536dfe" d="M39.248,10.177c-2.804-1.287-5.812-2.235-8.956-2.778c-0.057-0.01-0.114,0.016-0.144,0.068	c-0.387,0.688-0.815,1.585-1.115,2.291c-3.382-0.506-6.747-0.506-10.059,0c-0.3-0.721-0.744-1.603-1.133-2.291	c-0.03-0.051-0.087-0.077-0.144-0.068c-3.143,0.541-6.15,1.489-8.956,2.778c-0.024,0.01-0.045,0.028-0.059,0.051	c-5.704,8.522-7.267,16.835-6.5,25.044c0.003,0.04,0.026,0.079,0.057,0.103c3.763,2.764,7.409,4.442,10.987,5.554	c0.057,0.017,0.118-0.003,0.154-0.051c0.846-1.156,1.601-2.374,2.248-3.656c0.038-0.075,0.002-0.164-0.076-0.194	c-1.197-0.454-2.336-1.007-3.432-1.636c-0.087-0.051-0.094-0.175-0.014-0.234c0.231-0.173,0.461-0.353,0.682-0.534	c0.04-0.033,0.095-0.04,0.142-0.019c7.201,3.288,14.997,3.288,22.113,0c0.047-0.023,0.102-0.016,0.144,0.017	c0.22,0.182,0.451,0.363,0.683,0.536c0.08,0.059,0.075,0.183-0.012,0.234c-1.096,0.641-2.236,1.182-3.434,1.634	c-0.078,0.03-0.113,0.12-0.075,0.196c0.661,1.28,1.415,2.498,2.246,3.654c0.035,0.049,0.097,0.07,0.154,0.052	c3.595-1.112,7.241-2.79,11.004-5.554c0.033-0.024,0.054-0.061,0.057-0.101c0.917-9.491-1.537-17.735-6.505-25.044	C39.293,10.205,39.272,10.187,39.248,10.177z M16.703,30.273c-2.168,0-3.954-1.99-3.954-4.435s1.752-4.435,3.954-4.435	c2.22,0,3.989,2.008,3.954,4.435C20.658,28.282,18.906,30.273,16.703,30.273z M31.324,30.273c-2.168,0-3.954-1.99-3.954-4.435	s1.752-4.435,3.954-4.435c2.22,0,3.989,2.008,3.954,4.435C35.278,28.282,33.544,30.273,31.324,30.273z"></path>
+    </svg>
+)
+
 export const GitHub: Component<SVGProps> = props => (
     <svg
         xmlns="http://www.w3.org/2000/svg"

package.json

@@ -22,7 +22,7 @@
         "framer-motion": "^11.0.3",
         "groq": "^3.19.2",
         "ics": "^3.7.2",
-        "next": "^14.1.0",
+        "next": "^14.1.1",
         "next-sanity": "^6.0.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",