Skip to content

Commit afefc26

Browse files
authored
Merge pull request #67 from ungdev/bouffe-test
Bouffe test
2 parents c83972d + 8bd1de1 commit afefc26

File tree

2 files changed

+52
-32
lines changed

2 files changed

+52
-32
lines changed

frontend/src/App.tsx

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,36 @@
22
import React from 'react';
33
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
44

5-
import LoginPage from './pages/auth';
6-
import { HomePage } from './pages/home';
7-
import { ProfilPage } from './pages/profil';
8-
import { ShotgunPage } from './pages/shotgun';
9-
import { AdminPageRole,
10-
AdminPageTeam,
11-
AdminPageEvents,
12-
AdminPageExport,
13-
AdminPageFaction,
14-
AdminPagePerm,
15-
AdminPageChall,
16-
AdminPageEmail,
17-
AdminPageUser,
18-
AdminPageNews,
19-
AdminPageGames,
20-
AdminPageTent} from './pages/admin';
5+
import LoginPage from './pages/Auth';
6+
import { HomePage } from './pages/Home';
7+
import { ProfilPage } from './pages/Profil';
8+
import { ShotgunPage } from './pages/Shotgun';
9+
import {
10+
AdminPageRole,
11+
AdminPageTeam,
12+
AdminPageEvents,
13+
AdminPageExport,
14+
AdminPageFaction,
15+
AdminPagePerm,
16+
AdminPageChall,
17+
AdminPageEmail,
18+
AdminPageUser,
19+
AdminPageNews,
20+
AdminPageGames,
21+
AdminPageTent
22+
} from './pages/Admin';
2123

2224
import ProtectedRoute from './components/utils/protectedroute';
2325
import AdminRoute from './components/utils/adminroute';
24-
import { AvailablePermanencesPage, MyPermanencesPage, RespoCallPage } from './pages/perm';
25-
import { ChallPage } from './pages/challenge';
26-
import { ParrainagePage } from './pages/parrainage';
27-
import { RegisterPage } from './pages/register';
28-
import { ResetPasswordPage } from './pages/resetPassword'
29-
import { WeiPage } from './pages/wei';
30-
import { SdiPage } from './pages/sdi';
31-
import { NewsPage } from './pages/news';
32-
import {DiscordPage} from './pages/discord';
26+
import { AvailablePermanencesPage, MyPermanencesPage, RespoCallPage } from './pages/Perm';
27+
import { ChallPage } from './pages/Challenge';
28+
import { ParrainagePage } from './pages/Parrainage';
29+
import { RegisterPage } from './pages/Register';
30+
import { ResetPasswordPage } from './pages/ResetPassword'
31+
import { WeiPage } from './pages/Wei';
32+
import { SdiPage } from './pages/Sdi';
33+
import { NewsPage } from './pages/News';
34+
import { DiscordPage } from './pages/Discord';
3335
import PrivateRoute from './components/utils/privateroute';
3436
import { GamesPage } from './pages/games';
3537
import { FoodPage } from './pages/food';

frontend/src/components/WEI_SDI_Food/foodSection.tsx

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { useEffect, useState } from "react";
22
import { checkFoodStatus } from "../../services/requests/event.service";
3+
import { getPermission } from "../../services/requests/user.service";
34

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

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

1012
useEffect(() => {
@@ -79,13 +81,29 @@ export const FoodSection = () => {
7981
</p>
8082
</div>
8183
) : (
82-
<div className="bg-white shadow-xl rounded-2xl overflow-hidden">
83-
<iframe
84-
title="Billetterie Nourriture"
85-
src="https://www.billetweb.fr/billetterie-repas-semaine-inte-a25"
86-
className="w-full h-[600px] border-none"
87-
/>
88-
</div>
84+
<>
85+
<div className="bg-white shadow-xl rounded-2xl overflow-hidden">
86+
<iframe
87+
title="Billetterie Nourriture"
88+
src="https://www.billetweb.fr/billetterie-repas-semaine-inte-a25"
89+
className="w-full h-[600px] border-none"
90+
/>
91+
</div>
92+
{(permission === "Student" || permission === "Admin") && (
93+
<div className="bg-white shadow-xl rounded-2xl p-6 space-y-4">
94+
<p className="text-xl text-red-600 font-semibold">
95+
La billetterie du repas test est réservée aux Chefs d'Equipe et Organisateurs de l'Intégration 2025.
96+
</p>
97+
<div className="bg-white shadow-xl rounded-2xl overflow-hidden">
98+
<iframe
99+
title="Billetterie Nourriture Test"
100+
src="https://www.billetweb.fr/billetterie-repas-test-a25"
101+
className="w-full h-[600px] border-none"
102+
/>
103+
</div>
104+
</div>
105+
)}
106+
</>
89107
)}
90108
</div>
91109
</section>

0 commit comments

Comments
 (0)