Merge branch 'dev' into KB-225-Block-campus-functionality-if-student-…

…not-signed-Code-of-Honor

# Conflicts:
#	src/app/[locale]/(private)/profile/profile.tsx

src/actions/announcement.actions.ts

@@ -0,0 +1,18 @@
+'use server';
+
+import { campusFetch } from '@/lib/client';
+import { Announcement } from '@/types/announcement';
+
+export const getAnnouncements = async () => {
+  try {
+    const response = await campusFetch<Announcement[]>('announcements');
+
+    if (!response.ok) {
+      return [];
+    }
+
+    return response.json();
+  } catch (error) {
+    return [];
+  }
+};

src/actions/auth.actions.ts

@@ -6,6 +6,7 @@ import { cookies } from 'next/headers';
 import { redirect } from 'next/navigation';
 import { campusFetch } from '@/lib/client';
 import { User } from '@/types/user';
+import { AuthResponse } from '@/types/auth-response';
 
 const COOKIE_DOMAIN = process.env.COOKIE_DOMAIN;
 const OLD_CAMPUS_URL = process.env.OLD_CAMPUS_URL;
@@ -18,7 +19,7 @@ export async function loginWithCredentials(username: string, password: string, r
       grant_type: 'password',
     };
 
-    const response = await campusFetch('oauth/token', {
+    const response = await campusFetch<AuthResponse>('oauth/token', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -36,8 +37,7 @@ export async function loginWithCredentials(username: string, password: string, r
       return null;
     }
 
-    const userResponse = await campusFetch('profile', {
-      method: 'GET',
+    const userResponse = await campusFetch<User>('profile', {
       headers: {
         Authorization: `Bearer ${jsonResponse.access_token}`,
       },
@@ -52,7 +52,7 @@ export async function loginWithCredentials(username: string, password: string, r
     const token = JWT.decode(access_token) as { exp: number };
     const tokenExpiresAt = new Date(token.exp * 1000);
 
-    const user: User = await userResponse.json();
+    const user = await userResponse.json();
 
     const expires = rememberMe ? tokenExpiresAt : undefined;
 
@@ -94,10 +94,8 @@ export async function resetPassword(username: string, recaptchaToken: string) {
   }
 }
 
-export async function getUserDetails(): Promise<User | null> {
-  const userResponse = await campusFetch('profile', {
-    method: 'GET',
-  });
+export async function getUserDetails() {
+  const userResponse = await campusFetch<User>('profile');
 
   if (!userResponse.ok) {
     return null;

src/actions/group.actions.ts

@@ -4,13 +4,11 @@ import { campusFetch } from '@/lib/client';
 import { Group } from '@/types/group';
 import queryString from 'query-string';
 
-export async function searchByGroupName(search: string): Promise<Group[]> {
+export async function searchByGroupName(search: string) {
   try {
     const query = queryString.stringify({ name: search });
 
-    const response = await campusFetch(`group/find?${query}`, {
-      method: 'GET',
-    });
+    const response = await campusFetch<Group[]>(`group/find?${query}`);
 
     if (response.status < 200 || response.status >= 300) {
       return [];

src/actions/profile.actions.ts

@@ -5,19 +5,19 @@ import { campusFetch } from '@/lib/client';
 import { revalidatePath } from 'next/cache';
 import { getUserDetails } from '@/actions/auth.actions';
 
-export async function getContacts(): Promise<Contact[]> {
+export async function getContacts() {
   try {
-    const response = await campusFetch('profile/contacts');
+    const response = await campusFetch<Contact[]>('profile/contacts');
 
     return response.json();
   } catch (error) {
     return [];
   }
 }
 
-export async function getContactTypes(): Promise<ContactType[]> {
+export async function getContactTypes() {
   try {
-    const response = await campusFetch('profile/contacts/types');
+    const response = await campusFetch<ContactType[]>('profile/contacts/types');
 
     return response.json();
   } catch (error) {

src/app/[locale]/(private)/accept-honor/page.tsx

@@ -40,7 +40,7 @@ export default function CodeOfHonorAlert() {
 
   return (
     <AlertDialog defaultOpen={true}>
-      <AlertDialogContent closable={false}>
+      <AlertDialogContent className="w-[340px] rounded-[12px] sm:w-full" closable={false}>
         <AlertDialogHeader>
           <AlertDialogTitle>{t('codeOfHonor.title')}</AlertDialogTitle>
           <AlertDialogDescription>
@@ -51,7 +51,9 @@ export default function CodeOfHonorAlert() {
           </AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter>
-          <AlertDialogAction onClick={handleAcceptCodeOfHonor}>{t('button.agree')}</AlertDialogAction>
+          <AlertDialogAction className="w-full md:w-fit" onClick={handleAcceptCodeOfHonor}>
+            {t('button.agree')}
+          </AlertDialogAction>
         </AlertDialogFooter>
       </AlertDialogContent>
     </AlertDialog>

src/app/[locale]/(private)/cards/announcements-card/announcement-slide.tsx

@@ -0,0 +1,49 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
+import Link from 'next/link';
+import { Heading3 } from '@/components/typography/headers';
+import { Paragraph } from '@/components/typography/paragraph';
+import { AspectRatio } from '@/components/ui/aspect-ratio';
+import { Button } from '@/components/ui/button';
+import { cn } from '@/lib/utils';
+
+interface AnnouncementSlideProps {
+  title: React.ReactNode;
+  description: React.ReactNode;
+  link?: string;
+  linkTitle?: string;
+  image?: string;
+}
+
+export const AnnouncementSlide = ({ title, description, link, linkTitle, image }: AnnouncementSlideProps) => {
+  const t = useTranslations('private.main.cards.carousel');
+
+  return (
+    <div className="flex flex-col gap-8 lg:flex-row">
+      <div className="mb-4 max-w-full grow overflow-y-hidden">
+        <Heading3>{title}</Heading3>
+        <Paragraph
+          className={cn('mb-0 grow', {
+            'line-clamp-[6] lg:line-clamp-[6] xl:line-clamp-[8]': !!link,
+            'line-clamp-[8] lg:line-clamp-[7] xl:line-clamp-[9]': !link,
+          })}
+        >
+          {description}
+        </Paragraph>
+        {link && (
+          <Button variant="secondary" className="mt-4" asChild>
+            <Link href={link} target="_blank" rel="noopener noreferrer">
+              {linkTitle || t('default-link-title')}
+            </Link>
+          </Button>
+        )}
+      </div>
+      <div className={cn('hidden min-w-[300px] basis-[300px] lg:block xl:min-w-[400px] xl:basis-[400px]')}>
+        <AspectRatio ratio={4 / 3.5}>
+          {image && <img src={image} alt={title as string} className="h-full w-full rounded-md object-cover" />}
+        </AspectRatio>
+      </div>
+    </div>
+  );
+};

src/app/[locale]/(private)/cards/announcements-card/announcements-card.tsx

@@ -0,0 +1,20 @@
+import { getAnnouncements } from '@/actions/announcement.actions';
+import { AnnouncementsCarousel } from './announcements-carousel';
+import { Card, CardContent } from '@/components/ui/card';
+import { cn } from '@/lib/utils';
+
+interface AnnouncementsCardProps {
+  className?: string;
+}
+
+export const AnnouncementsCard = async ({ className }: AnnouncementsCardProps) => {
+  const announcements = await getAnnouncements();
+
+  return (
+    <Card className={cn(className)}>
+      <CardContent className="flex h-full gap-8 space-y-1.5 p-10">
+        <AnnouncementsCarousel announcements={announcements} />
+      </CardContent>
+    </Card>
+  );
+};

src/app/[locale]/(private)/cards/announcements-card/announcements-carousel.tsx

@@ -0,0 +1,54 @@
+'use client';
+
+import { Carousel, CarouselApi, CarouselContent, CarouselItem } from '@/components/ui/carousel';
+
+import Autoplay from 'embla-carousel-autoplay';
+import { AnnouncementSlide } from './announcement-slide';
+import { Announcement } from '@/types/announcement';
+import { DotButton } from './dot-button';
+import { useState } from 'react';
+import { useDotButton } from './use-dot-button';
+import { DefaultAnnouncementSlide } from './default-announcement-slide';
+
+const AUTOPLAY_DELAY = 10_000; // 10 seconds
+
+interface AnnouncementsCarouselProps {
+  announcements: Announcement[];
+}
+
+const Slide = ({ children }: { children: React.ReactNode }) => <CarouselItem className="pl-4">{children}</CarouselItem>;
+
+export const AnnouncementsCarousel = ({ announcements }: AnnouncementsCarouselProps) => {
+  const [api, setApi] = useState<CarouselApi>();
+  const { selectedIndex, scrollSnaps, onDotButtonClick } = useDotButton(api);
+
+  return (
+    <Carousel
+      opts={{ loop: true, align: 'center' }}
+      plugins={[Autoplay({ delay: AUTOPLAY_DELAY })]}
+      className="w-full"
+      setApi={setApi}
+    >
+      <CarouselContent className="-ml-4 mb-4">
+        <Slide>
+          <DefaultAnnouncementSlide />
+        </Slide>
+        {announcements.map((announcement) => (
+          <Slide key={announcement.id}>
+            <AnnouncementSlide
+              title={announcement.title}
+              description={announcement.description}
+              link={announcement.link}
+              image={announcement.image}
+            />
+          </Slide>
+        ))}
+      </CarouselContent>
+      <div className="absolute -bottom-4 -left-4 flex gap-[8px]">
+        {scrollSnaps.map((_, index) => (
+          <DotButton key={index} onClick={() => onDotButtonClick(index)} selected={selectedIndex === index} />
+        ))}
+      </div>
+    </Carousel>
+  );
+};