Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon

front_end/src/components/ressourceList.tsx

@@ -1,4 +1,3 @@
-import ListGroup from "react-bootstrap/ListGroup";
 import { Athlete, Activite } from "../classes";
 
 type Props = {
@@ -9,26 +8,22 @@ type Props = {
 
 function AthleteList({ athletes }: Props) {
     return (
-        <ListGroup>
+        <ul className="AthleteList">
             {athletes.map((athlete) => (
-                <ListGroup.Item key={athlete.id}>
+                <li key={athlete.id}>
-                    <div>
+                    <div><strong>Nom:</strong> {athlete.nom}</div>
-                        <strong>Nom:</strong> {athlete.nom}
+                    <div><strong>Groupe:</strong> {athlete.groupe}</div>
-                    </div>
+                </li>
-                    <div>
-                        <strong>Groupe:</strong> {athlete.groupe}
-                    </div>
-                </ListGroup.Item>
             ))}
-        </ListGroup>
+        </ul>
     );
 }
 
 function ActiviteList({ activites }: Props) {
     return (
-        <ListGroup>
+        <ul className="ActiviteList">
             {activites.map((activite) => (
-                <ListGroup.Item key={activite.id}>
+                <li key={activite.id}>
                     <div>
                         <strong>Nom:</strong> {activite.nom}
                     </div>
@@ -38,9 +33,9 @@ function ActiviteList({ activites }: Props) {
                     <div>
                         <strong>Durée:</strong> {activite.duree} minutes
                     </div>
-                </ListGroup.Item>
+                </li>
             ))}
-        </ListGroup>
+        </ul>
     );
 }
 

front_end/src/components/ressourcePanel.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { useLocalData } from "../context/useLocalData";
 import { AthleteList, ActiviteList } from "./ressourceList";
 import { Activite, Athlete } from "../classes";
-import { Dropdown } from "react-bootstrap";
+// import { Dropdown } from "react-bootstrap"; // not used
 
 export default function RessourcePanel() {
     const { user } = useLocalData();
@@ -34,17 +34,18 @@ export default function RessourcePanel() {
 
     return (
         <div className="ressource_panel">
-            <Dropdown> 
+            <select
-                <Dropdown.Toggle variant="success" >
+                onChange={(e) => {
-                    Sélectionner la ressource
+                    const v = (e.target as HTMLSelectElement).value;
-                </Dropdown.Toggle>
+                    if (v === "athletes") onAthletesClick();
-                <Dropdown.Menu>
+                    else if (v === "activites") onActivitiesClick();
-                    <Dropdown.Item href="#/action-1">Athlètes</Dropdown.Item>
+                    else {setShowAthletes(false); setShowActivites(false);
-                    <Dropdown.Item href="#/action-2">Activités</Dropdown.Item>
+                    }
-                </Dropdown.Menu>
+                }}>
-            </Dropdown>
+                <option>Choissisez la ressource</option>
-
+                <option value="athletes">Athlètes</option>
-            
+                <option value="activites">Activités</option>
+            </select>
 
             {showAthletes && (
                 <div className="edt_athletes_panel">
@@ -52,13 +53,14 @@ export default function RessourcePanel() {
                     <AthleteList athletes={allAthletes} activites={[]}/>
                 </div>
             )}
+
             {showActivites && (
                 <div className="edt_activites_panel">
                     <h3>Liste des activités</h3>
                     <ActiviteList athletes={[]} activites={allActivites} />
                 </div>
             )}
-            
+
         </div>
     );
 }