feat: add Room component and refactor Conference components, implement custom scrollbar styles and smooth

This commit is contained in:
Rémi 2025-01-03 02:19:20 +01:00
parent 37a34dc004
commit f9aef69cfa
9 changed files with 322 additions and 246 deletions

5
.prettierrc Normal file
View File

@ -0,0 +1,5 @@
{
"tabWidth": 4,
"useTabs": true,
"semi": true
}

View File

@ -1,24 +0,0 @@
"use client"
import { ConferenceCard } from "./Card";
import { Room } from "./Conference";
export const ConferenceList = ({
rooms,
}: {
rooms: Room[];
}) => {
return (
<div className="flex gap-2">
{rooms.map((room) => (
<ConferenceCard
key={room.id}
id={room.id}
name={room.name}
date={room.date}
Presentator={room.Presentator}
Times={room.Times}
/>
))}
</div>
);
};

View File

@ -1,3 +1,4 @@
'use client'
import {
Avatar,
Button,
@ -8,85 +9,79 @@ import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
} from "@nextui-org/react";
import { useSession } from "next-auth/react";
import { ThemeSwitcher } from "../ThemeSwitcher/ThemeSwitcher";
import { axiosInstance } from "@/app/lib/axios";
import { useEffect, useState } from "react";
import { useRouter } from "next/navigation";
NavbarItem
} from '@nextui-org/react'
import { useSession } from 'next-auth/react'
import { ThemeSwitcher } from '../ThemeSwitcher/ThemeSwitcher'
import { axiosInstance } from '@/app/lib/axios'
import { useEffect, useState } from 'react'
import { useRouter } from 'next/navigation'
const getInitials = (name: string) => {
if (!name) return "";
if (!name) return ''
const nameParts = name.split(" ");
const nameParts = name.split(' ')
if (nameParts.length === 1) {
return name;
return name
}
const firstInitial = nameParts[0]?.[0] || "";
const secondInitial = nameParts[1]?.[0] || nameParts[0]?.[1] || "";
const firstInitial = nameParts[0]?.[0] || ''
const secondInitial = nameParts[1]?.[0] || nameParts[0]?.[1] || ''
return firstInitial + secondInitial;
};
return firstInitial + secondInitial
}
export const Header = () => {
const { data: session } = useSession();
const router = useRouter();
const { data: session } = useSession()
const router = useRouter()
const [userProfile, setUserProfile] = useState<{
id: string;
username: string;
role: "ADMIN" | "STUDENT";
}>();
id: string
username: string
role: 'ADMIN' | 'STUDENT'
}>()
const initials = session?.user?.name ? getInitials(session.user.name) : "";
const initials = session?.user?.name ? getInitials(session.user.name) : ''
const fetchUserProfile = async () => {
return await axiosInstance<{
id: string;
username: string;
role: "ADMIN" | "STUDENT";
}>("/@me");
id: string
username: string
role: 'ADMIN' | 'STUDENT'
}>('/@me')
}
useEffect(() => {
fetchUserProfile().then(r => {
setUserProfile(r.data);
});
}, []);
setUserProfile(r.data)
})
}, [])
return (
<Navbar className="mb-2">
<Navbar className='mb-2'>
<NavbarBrand>
<p className="font-bold text-inherit">Toogether</p>
<p className='font-bold text-inherit'>Toogether</p>
</NavbarBrand>
<NavbarContent as="div" justify="end">
<Dropdown placement="bottom-end">
<NavbarContent as='div' justify='end'>
<Dropdown placement='bottom-end'>
<DropdownTrigger>
<Avatar
isBordered
as="button"
className="transition-transform"
color="secondary"
as='button'
className='transition-transform'
color='secondary'
name={initials}
size="sm"
size='sm'
/>
</DropdownTrigger>
<DropdownMenu aria-label="Profile Actions" variant="flat">
<DropdownItem key="profile" className="h-14 gap-2">
<DropdownMenu aria-label='Profile Actions' variant='flat'>
<DropdownItem key='profile' className='h-14 gap-2'>
<p>Signed in as</p>
<p className="font-semibold">
{session?.user?.name}
</p>
<p className='font-semibold'>{session?.user?.name}</p>
</DropdownItem>
<DropdownItem key="settings">Settings</DropdownItem>
<DropdownItem
key="logout"
color="danger"
href="/auth/logout"
>
<DropdownItem key='settings'>Settings</DropdownItem>
<DropdownItem key='logout' color='danger' href='/auth/logout'>
Logout
</DropdownItem>
</DropdownMenu>
@ -94,18 +89,12 @@ export const Header = () => {
<NavbarItem>
<ThemeSwitcher />
</NavbarItem>
{
userProfile?.role === "ADMIN" ? (
<NavbarItem>
<Button
onPress={() => router.push("/admin")}
>
🔧
</Button>
</NavbarItem>
) : null
}
{userProfile?.role === 'ADMIN' ? (
<NavbarItem>
<Button onPress={() => router.push('/admin')}>🔧</Button>
</NavbarItem>
) : null}
</NavbarContent>
</Navbar>
);
};
)
}

View File

@ -1,74 +1,74 @@
"use client";
import { parseDate, Time } from "@internationalized/date";
import {
Button,
Card,
CardBody,
CardHeader,
DateInput,
Divider,
TimeInput,
} from "@nextui-org/react";
import { Room } from "./Conference";
import moment from "moment";
import { useRouter } from "next/navigation";
export const ConferenceCard = ({
id,
name,
date,
Times,
Presentator
}: Room) => {
const router = useRouter();
return (
<Card className="max-w-[600px]">
<CardHeader>
<div className="flex flex-col">
<p className="text-md">{name}</p>
<p className="text-small text-default-500">{Presentator.username}</p>
</div>
</CardHeader>
<Divider />
<CardBody>
{Times.map((time) => (
<div className="flex flex-col gap-2" key={`${time.id}`}>
<DateInput isReadOnly label="Date" value={parseDate(moment(date).format("YYYY-MM-DD"))} />
<div className="flex items-center gap-2">
<TimeInput
isReadOnly
label="Start"
hourCycle={24}
value={
new Time(moment(time.startTime).hours(), moment(time.startTime).minutes())
}
/>
<span>-</span>
<TimeInput
isReadOnly
label="End"
hourCycle={24}
value={new Time(moment(time.endTime).hours(), moment(time.endTime).minutes())}
/>
</div>
</div>
))}
</CardBody>
<div className="flex p-2">
<Button
className={"bg-transparent text-foreground border-default-200"}
color="primary"
radius="full"
size="sm"
variant={"bordered"}
onPress={() => {
router.push(`/room/${id}`);
}}
>Join</Button>
</div>
</Card>
);
};
"use client";
import { parseDate, Time } from "@internationalized/date";
import {
Button,
Card,
CardBody,
CardHeader,
DateInput,
Divider,
TimeInput,
} from "@nextui-org/react";
import { Room } from "./Room";
import moment from "moment";
import { useRouter } from "next/navigation";
export const RoomCard = ({
id,
name,
date,
Times,
Presentator
}: Room) => {
const router = useRouter();
return (
<Card className="w-[300px]">
<CardHeader>
<div className="flex flex-col">
<p className="text-md">{name}</p>
<p className="text-small text-default-500">{Presentator.username}</p>
</div>
</CardHeader>
<Divider />
<CardBody>
{Times.map((time) => (
<div className="flex flex-col gap-2" key={`${time.id}`}>
<DateInput isReadOnly label="Date" value={parseDate(moment(date).format("YYYY-MM-DD"))} />
<div className="flex items-center gap-2">
<TimeInput
isReadOnly
label="Start"
hourCycle={24}
value={
new Time(moment(time.startTime).hours(), moment(time.startTime).minutes())
}
/>
<span>-</span>
<TimeInput
isReadOnly
label="End"
hourCycle={24}
value={new Time(moment(time.endTime).hours(), moment(time.endTime).minutes())}
/>
</div>
</div>
))}
</CardBody>
<div className="flex p-2">
<Button
className={"bg-transparent text-foreground border-default-200"}
color="primary"
radius="full"
size="sm"
variant={"bordered"}
onPress={() => {
router.push(`/room/${id}`);
}}
>Join</Button>
</div>
</Card>
);
};

View File

@ -0,0 +1,57 @@
'use client';
import { useEffect, useRef } from 'react';
import { RoomCard } from './Card';
import { Room } from './Room';
export const RoomList = ({ rooms }: { rooms: Room[] }) => {
const scrollContainerRef = useRef<HTMLDivElement>(null);
const handleWheel = (event: WheelEvent) => {
if (event.deltaY === 0) return;
event.preventDefault();
const scrollContainer = scrollContainerRef.current;
if (!scrollContainer) return;
const scrollAmount = 10;
const direction = event.deltaY > 0 ? 1 : -1;
let scrollCount = 0;
const interval = setInterval(() => {
scrollContainer.scrollLeft += scrollAmount * direction;
scrollCount += scrollAmount;
if (scrollCount >= 100) {
clearInterval(interval);
}
}, 10);
};
useEffect(() => {
const scrollContainer = scrollContainerRef.current;
if (!scrollContainer) return;
scrollContainer.addEventListener('wheel', handleWheel);
return () => {
scrollContainer.removeEventListener('wheel', handleWheel);
};
}, []);
return (
<div ref={scrollContainerRef} className='overflow-x-auto scrollbar-hide rounded-xl'>
<ul className='flex gap-2'>
{rooms.map(room => (
<li key={room.id}>
<RoomCard
id={room.id}
name={room.name}
date={room.date}
Presentator={room.Presentator}
Times={room.Times}
/>
</li>
))}
</ul>
</div>
);
};

View File

@ -1,17 +1,17 @@
export interface Room {
id: string;
name: string;
date: string;
Times: {
id: number;
startTime: string;
endTime: string;
roomId: string;
}[];
Presentator: {
id: string;
username: string;
role: string;
createdAt: string;
}
export interface Room {
id: string;
name: string;
date: string;
Times: {
id: number;
startTime: string;
endTime: string;
roomId: string;
}[];
Presentator: {
id: string;
username: string;
role: string;
createdAt: string;
}
}

View File

@ -1,13 +1,21 @@
"use client";
import { Button } from "@nextui-org/react";
import { useTheme } from "next-themes";
'use client'
import { Button } from '@nextui-org/react'
import { useTheme } from 'next-themes'
import { useEffect, useState } from 'react'
export const ThemeSwitcher = () => {
const { theme, setTheme } = useTheme();
const [mounted, setMounted] = useState(false)
const { theme, setTheme } = useTheme()
useEffect(() => {
setMounted(true)
}, [])
if (!mounted) return null
return (
<Button onPress={() => setTheme(theme === "light" ? "dark" : "light")}>
{theme === "light" ? "🌑" : "☀️"}
<Button onPress={() => setTheme(theme === 'light' ? 'dark' : 'light')}>
{theme === 'light' ? '🌑' : '☀️'}
</Button>
);
};
)
}

View File

@ -1,3 +1,19 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind utilities;
@layer utilities {
.scrollbar::-webkit-scrollbar {
height: 10px;
}
.scrollbar::-webkit-scrollbar-track {
border-radius: 100vh;
background: #5a5a5a54;
}
.scrollbar::-webkit-scrollbar-thumb {
background: #414141;
border-radius: 100vh;
}
}

View File

@ -1,37 +1,39 @@
"use client";
import { Card, Divider, Skeleton } from "@nextui-org/react";
import moment from "moment";
import { useEffect, useState } from "react";
import { Room } from "./components/Conference/Conference";
import { ConferenceList } from "./components/Conference/List";
import { Header } from "./components/Header";
import { axiosInstance } from "./lib/axios";
'use client';
import { Card, Divider, Skeleton } from '@nextui-org/react';
import moment from 'moment';
import { useEffect, useState } from 'react';
import { Room } from './components/Room/Room';
import { RoomList } from './components/Room/List';
import { Header } from './components/Header';
import { axiosInstance } from './lib/axios';
const SkeletonCard = () => {
return <Card className="w-[200px] space-y-5 p-4" radius="lg">
<div className="flex flex-col gap-2">
<Skeleton className="w-4/5 rounded-lg">
<div className="h-3 w-4/5 rounded-lg bg-default-200" />
return (
<Card className='w-[200px] space-y-5 p-4' radius='lg'>
<div className='flex flex-col gap-2'>
<Skeleton className='w-4/5 rounded-lg'>
<div className='h-3 w-4/5 rounded-lg bg-default-200' />
</Skeleton>
<Skeleton className='w-2/5 rounded-lg'>
<div className='h-3 w-2/5 rounded-lg bg-default-300' />
</Skeleton>
</div>
<Divider />
<Skeleton className='rounded-lg'>
<div className='h-12 rounded-lg bg-default-300' />
</Skeleton>
<Skeleton className="w-2/5 rounded-lg">
<div className="h-3 w-2/5 rounded-lg bg-default-300" />
</Skeleton>
</div>
<Divider />
<Skeleton className="rounded-lg">
<div className="h-12 rounded-lg bg-default-300" />
</Skeleton>
<div className="flex items-center gap-2">
<Skeleton className="rounded-lg w-1/2">
<div className="h-10 rounded-lg bg-default-300" />
</Skeleton>
<span>-</span>
<Skeleton className="rounded-lg w-1/2">
<div className="h-10 rounded-lg bg-default-300" />
</Skeleton>
</div>
</Card>
}
<div className='flex items-center gap-2'>
<Skeleton className='rounded-lg w-1/2'>
<div className='h-10 rounded-lg bg-default-300' />
</Skeleton>
<span>-</span>
<Skeleton className='rounded-lg w-1/2'>
<div className='h-10 rounded-lg bg-default-300' />
</Skeleton>
</div>
</Card>
);
};
const HomePage = () => {
const [roomsLoading, setRoomsLoading] = useState(true);
@ -46,70 +48,93 @@ const HomePage = () => {
});
useEffect(() => {
axiosInstance.get<{ id: string, name: string, createdAt: string }[]>("/@me/class")
.then((classResponse) => {
axiosInstance
.get<{ id: string; name: string; createdAt: string }[]>(
'/@me/class'
)
.then(classResponse => {
if (classResponse.data.length)
axiosInstance.get<Room[]>(`/@me/class/${classResponse.data[0].id}/rooms`)
axiosInstance
.get<Room[]>(
`/@me/class/${classResponse.data[0].id}/rooms`
)
.then(classes => {
// Filter rooms by date, get future, actual and past rooms
const future = classes.data.filter(room => moment(room.date).isAfter(moment(), "day"));
const actual = classes.data.filter(room => moment(room.date).isSame(moment(), "day"));
const past = classes.data.filter(room => moment(room.date).isBefore(moment()));
const future = classes.data.filter(room =>
moment(room.date).isAfter(moment(), 'day')
);
const actual = classes.data.filter(room =>
moment(room.date).isSame(moment(), 'day')
);
const past = classes.data.filter(room =>
moment(room.date).isBefore(moment())
);
setRooms({ future, actual, past });
setRoomsLoading(false);
});
})
});
}, []);
return (
<>
<Header />
<main className="flex flex-col gap-8 p-4">
{roomsLoading
? <>
<section className="flex flex-col gap-2">
<h2 className="font-semibold text-lg">Cours a venir</h2>
<div className="flex gap-4">
<main className='flex flex-col gap-8 p-4'>
{roomsLoading ? (
<>
<section className='flex flex-col gap-2'>
<h2 className='font-semibold text-lg'>
Cours a venir
</h2>
<div className='flex gap-4'>
<SkeletonCard />
<SkeletonCard />
<SkeletonCard />
</div>
</section>
<section className="flex flex-col gap-2">
<h2 className="font-semibold text-lg">Cours actuels</h2>
<div className="flex gap-4">
<section className='flex flex-col gap-2'>
<h2 className='font-semibold text-lg'>
Cours actuels
</h2>
<div className='flex gap-4'>
<SkeletonCard />
<SkeletonCard />
<SkeletonCard />
</div>
</section>
<section className="flex flex-col gap-2">
<h2 className="font-semibold text-lg">Cours passés</h2>
<div className="flex gap-4">
<section className='flex flex-col gap-2'>
<h2 className='font-semibold text-lg'>
Cours passés
</h2>
<div className='flex gap-4'>
<SkeletonCard />
<SkeletonCard />
<SkeletonCard />
</div>
</section>
</>
: <>
<section className="flex flex-col gap-2">
<h2 className="font-semibold text-lg">Cours a venir</h2>
<ConferenceList rooms={rooms.future} />
) : (
<>
<section className='flex flex-col gap-2'>
<h2 className='font-semibold text-lg'>
Cours a venir
</h2>
<RoomList rooms={rooms.future} />
</section>
<section className="flex flex-col gap-2">
<h2 className="font-semibold text-lg">Cours actuels</h2>
<ConferenceList rooms={rooms.actual} />
<section className='flex flex-col gap-2'>
<h2 className='font-semibold text-lg'>
Cours actuels
</h2>
<RoomList rooms={rooms.actual} />
</section>
<section className="flex flex-col gap-2">
<h2 className="font-semibold text-lg">Cours passés</h2>
<ConferenceList rooms={rooms.past} />
<section className='flex flex-col gap-2'>
<h2 className='font-semibold text-lg'>
Cours passés
</h2>
<RoomList rooms={rooms.past} />
</section>
</>
}
)}
</main>
</>
);