Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@ import LoginPage from './pages/auth';
import { HomePage } from './pages/home';
import { ProfilPage } from './pages/profil';
import { ShotgunPage } from './pages/shotgun';
import { AdminPageRole,
AdminPageTeam,
AdminPageEvents,
AdminPageExport,
AdminPageFaction,
AdminPagePerm,
AdminPageChall,
AdminPageEmail,
AdminPageUser,
AdminPageNews,
AdminPageGames,
AdminPageTent} from './pages/admin';
import {
AdminPageRole,
AdminPageTeam,
AdminPageEvents,
AdminPageExport,
AdminPageFaction,
AdminPagePerm,
AdminPageChall,
AdminPageEmail,
AdminPageUser,
AdminPageNews,
AdminPageGames,
AdminPageTent
} from './pages/admin';

import ProtectedRoute from './components/utils/protectedroute';
import AdminRoute from './components/utils/adminroute';
Expand All @@ -29,7 +31,7 @@ import { ResetPasswordPage } from './pages/resetPassword'
import { WeiPage } from './pages/wei';
import { SdiPage } from './pages/sdi';
import { NewsPage } from './pages/news';
import {DiscordPage} from './pages/discord';
import { DiscordPage } from './pages/discord';
import PrivateRoute from './components/utils/privateroute';
import { GamesPage } from './pages/games';
import { FoodPage } from './pages/food';
Expand Down
92 changes: 67 additions & 25 deletions frontend/src/components/Admin/AdminPerm/adminPermForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,22 @@ const PermanenceForm = ({
}, [editMode, editPermanence]);

const handleSubmit = async () => {
if (!name || !desc || !location || !startAt || !endAt || !capacity || !difficulty) {
if (
!name ||
!desc ||
!location ||
!startAt ||
!endAt ||
!capacity ||
!difficulty
) {
Swal.fire("Erreur", "Veuillez remplir tous les champs", "warning");
return;
}

let respoId = respo && !isNaN(Number(respo.userId)) ? Number(respo.userId) : null;

const respoId =
respo && !isNaN(Number(respo.userId)) ? Number(respo.userId) : null;

try {
const payload = {
name,
Expand All @@ -99,7 +108,7 @@ const PermanenceForm = ({

resetForm();
onRefresh();
} catch(err : any) {
} catch (err: any) {
Swal.fire("Erreur", err.response.data.message, "error");
}
};
Expand All @@ -121,31 +130,61 @@ const PermanenceForm = ({
}));

const selectedRespoOption = respo
? { value: respo.userId, label: `${respo.firstName} ${respo.lastName}` }
: null;


? { value: respo.userId, label: `${respo.firstName} ${respo.lastName}` }
: null;

return (
<Card className="w-full max-w-2xl p-6 shadow-lg rounded-2xl mx-auto">
<div className="flex flex-col gap-4">
<Input placeholder="Nom" value={name} onChange={(e) => setName(e.target.value)} />
<Textarea placeholder="Description" value={desc} onChange={(e) => setDesc(e.target.value)} />
<Input placeholder="Lieu" value={location} onChange={(e) => setLocation(e.target.value)} />
<Input
placeholder="Nom"
value={name}
onChange={(e) => setName(e.target.value)}
/>
<Textarea
placeholder="Description"
value={desc}
onChange={(e) => setDesc(e.target.value)}
/>
<Input
placeholder="Lieu"
value={location}
onChange={(e) => setLocation(e.target.value)}
/>
<label>Début :</label>
<Input type="datetime-local" value={startAt} onChange={(e) => setStartAt(e.target.value)} />
<Input
type="datetime-local"
value={startAt}
onChange={(e) => setStartAt(e.target.value)}
/>
<label>Fin :</label>
<Input type="datetime-local" value={endAt} onChange={(e) => setEndAt(e.target.value)} />
<Input
type="datetime-local"
value={endAt}
onChange={(e) => setEndAt(e.target.value)}
/>
<label>Capacité :</label>
<Input type="number" placeholder="Capacité" value={capacity} onChange={(e) => setCapacity(Number(e.target.value))} />
<Input
type="number"
placeholder="Capacité"
value={capacity}
onChange={(e) => setCapacity(Number(e.target.value))}
/>
<label>Difficulté :</label>
<Input type="number" placeholder="Difficulté" value={difficulty} onChange={(e) => setDifficulty(Number(e.target.value))} />
<Input
type="number"
placeholder="Difficulté"
value={difficulty}
onChange={(e) => setDifficulty(Number(e.target.value))}
/>

{/* Sélection du responsable */}
<Select
value={selectedRespoOption}
onChange={(selectedOption) => {
const selectedUser = users.find((u) => u.userId === selectedOption?.value);
const selectedUser = users.find(
(u) => u.userId === selectedOption?.value
);
setRespo(selectedUser || null);
}}
options={respoOptions}
Expand All @@ -154,25 +193,28 @@ const PermanenceForm = ({
classNamePrefix="select"
/>



<div className="flex gap-2">
<Button onClick={handleSubmit} className="bg-green-600 hover:bg-green-700 text-white">
<Button
onClick={handleSubmit}
className="bg-green-600 hover:bg-green-700 text-white"
>
{editMode ? "✅ Sauvegarder" : "Créer"}
</Button>
{editMode && (
<Button variant="outline" onClick={() => {
resetForm();
onCancelEdit();
}}>
<Button
variant="outline"
onClick={() => {
resetForm();
onCancelEdit();
}}
>
Annuler
</Button>

)}
</div>
</div>
</Card>
);
};

export default PermanenceForm;
export default PermanenceForm;
32 changes: 25 additions & 7 deletions frontend/src/components/WEI_SDI_Food/foodSection.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { useEffect, useState } from "react";
import { checkFoodStatus } from "../../services/requests/event.service";
import { getPermission } from "../../services/requests/user.service";

export const FoodSection = () => {
const [isFoodOpen, setIsFoodOpen] = useState(false);
const [isMenuAvailable, setIsMenuAvailable] = useState(false);

const permission = getPermission();
const menuUrl = "https://integration.utt.fr/api/uploads/foodmenu/FoodMenu.pdf";

useEffect(() => {
Expand Down Expand Up @@ -79,13 +81,29 @@ export const FoodSection = () => {
</p>
</div>
) : (
<div className="bg-white shadow-xl rounded-2xl overflow-hidden">
<iframe
title="Billetterie Nourriture"
src="https://www.billetweb.fr/billetterie-repas-semaine-inte-a25"
className="w-full h-[600px] border-none"
/>
</div>
<>
<div className="bg-white shadow-xl rounded-2xl overflow-hidden">
<iframe
title="Billetterie Nourriture"
src="https://www.billetweb.fr/billetterie-repas-semaine-inte-a25"
className="w-full h-[600px] border-none"
/>
</div>
{(permission === "Student" || permission === "Admin") && (
<div className="bg-white shadow-xl rounded-2xl p-6 space-y-4">
<p className="text-xl text-red-600 font-semibold">
La billetterie du repas test est réservée aux Chefs d'Equipe et Organisateurs de l'Intégration 2025.
</p>
<div className="bg-white shadow-xl rounded-2xl overflow-hidden">
<iframe
title="Billetterie Nourriture Test"
src="https://www.billetweb.fr/billetterie-repas-test-a25"
className="w-full h-[600px] border-none"
/>
</div>
</div>
)}
</>
)}
</div>
</section>
Expand Down