merge dev into features/notifications

This commit is contained in:
2026-01-12 08:44:18 +01:00
13 changed files with 210 additions and 53 deletions
@@ -21,7 +21,7 @@ function IncompleteEvent() {
<h2>Événements incomplets</h2>
<div className={styles.eventsContainer}>
{incompleteEvents.map((event, index) => (
<div key={index} className={`glassCard ${styles.eventCard}`}>
<div key={index} className={`glassBorder ${styles.eventCard}`}>
<h3>{event.title}</h3>
<ul className={styles.tasksList}>
{event.tasks.map((task, taskIndex) => (
@@ -28,21 +28,7 @@
}
.eventsContainer::-webkit-scrollbar {
height: 8px;
}
.eventsContainer::-webkit-scrollbar-track {
background: rgba(0, 0, 0, 0.1);
border-radius: 10px;
}
.eventsContainer::-webkit-scrollbar-thumb {
background: rgba(30, 96, 249, 0.5);
border-radius: 10px;
}
.eventsContainer::-webkit-scrollbar-thumb:hover {
background: rgba(30, 96, 249, 0.7);
display: none;
}
.eventCard {
@@ -57,7 +43,6 @@
opacity: 0;
transform: translateX(20px);
animation: slideInEvent 1s ease forwards;
flex-shrink: 1;
}
@@ -85,6 +70,10 @@
animation-delay: 0.5s;
}
.eventCard::-webkit-scrollbar {
display: none;
}
.eventCard>h3 {
font-size: 24px;
}
@@ -26,7 +26,7 @@ function pendingMembers() {
<h2>Membres en attente de validation</h2>
<div className={styles.membersContainer}>
{pendingMembers.map((member, index) => (
<div key={index} className={`glassCard ${styles.memberCard}`}>
<div key={index} className={`glassBorder ${styles.memberCard}`}>
<p>{member.name}</p>
<div className={styles.buttonGroup}>
<Button onClick={() => handleValidate(member.name)} variant="primary">
@@ -19,21 +19,7 @@
.membersContainer::-webkit-scrollbar {
width: 8px;
}
.membersContainer::-webkit-scrollbar-track {
background: rgba(0, 0, 0, 0.1);
border-radius: 10px;
}
.membersContainer::-webkit-scrollbar-thumb {
background: rgba(255, 0, 0, 0.5);
border-radius: 10px;
}
.membersContainer::-webkit-scrollbar-thumb:hover {
background: rgba(125, 249, 30, 0.7);
display: none;
}
.memberCard {
+1 -1
View File
@@ -40,7 +40,7 @@ function ParticipationChart() {
return (
<div className={`${styles.leftBlock} glassCard`}>
<div className={styles.participationHeader}>
<div className={`${styles.partiText} glassCard`}>
<div className={`${styles.partiText} glassBorder`}>
<label htmlFor={styles.months}>Taux de participation depuis :</label>
<div className={styles.formControl}>
<FormControl className={styles.formDesign}>
+3 -3
View File
@@ -57,7 +57,7 @@ function Calendar({ events = [] }) {
};
return (
<div className={styles.glassCard}>
<div className={`${styles.glassCard} glassCard`}>
<div className={styles.calendarContainer}>
<div className={styles.calendarHeader}>
@@ -101,7 +101,7 @@ function Calendar({ events = [] }) {
</table>
{selectedDay && (
<div className={styles.eventBox}>
<div className={`${styles.eventBox} glassBorder`}>
<h3>Événements du {formatDateLetterJS(selectedDay.date)}</h3>
{selectedDay.events.length > 0 ? (
@@ -123,4 +123,4 @@ function Calendar({ events = [] }) {
);
}
export default Calendar;
export default Calendar;
+1 -1
View File
@@ -137,7 +137,7 @@
.glassCard {
width: 45%;
max-height: 450px;
max-height: 100%;
margin: 16px 0 16px 0;
padding: 10px 20px 10px 20px;
height: fit-content;
+5 -5
View File
@@ -13,17 +13,17 @@ function EventList({ events }) {
return (
<div className={styles.glassCard}>
<div className={`${styles.glassCard} glassCard`}>
<h2>Liste des événements à venir</h2>
{sortedEvents.length > 0 ? (
<ul className={styles.eventList}>
{sortedEvents.map((eventGroup, index) => (
<li key={index} className={styles.eventGroup}>
{sortedEvents.map((eventGroup) => (
<li key={eventGroup.date} className={`${styles.eventGroup} glassBorder`}>
<div className={styles.eventTitle}>
<p className={styles.title}>{eventGroup.name}</p>
<p>{formatDateLetter(eventGroup.start)} - {formatDateLetter(eventGroup.end)}</p>
<p>{formatDateLetter(eventGroup.start)}</p>
</div>
{/* TODO: Faire une liste déroulante pour ne plus afficher les tache */}
<ul className={styles.eventDetails}>
{eventGroup.tasks.map((task, i) => (
<li key={i} className={styles.eventTasks}>
+2 -2
View File
@@ -1,6 +1,6 @@
.glassCard {
width: 45%;
max-height: 450px;
max-height: 100%;
margin: 16px 0 16px 0;
padding: 10px 20px 10px 20px;
height: fit-content;
@@ -50,7 +50,7 @@ h2{
}
.eventGroup{
margin: 16px 0 16px 0;
margin: 16px 0px 16px 0px;
padding: 10px 20px 10px 20px;
border-radius: 20px;
border: none;