diff --git a/front_end/src/App.tsx b/front_end/src/App.tsx index c0d42c8..c594761 100644 --- a/front_end/src/App.tsx +++ b/front_end/src/App.tsx @@ -8,6 +8,7 @@ import EDT from './components/edt'; import SwitchThemeColor from './components/SwitchThemeColor'; import CreateSession from './components/createSession' import RessourcePanel from './components/ressourcePanel'; +import TestAPI from './components/test_api'; const keycloakInitOptions = { @@ -29,6 +30,8 @@ function App() { + + diff --git a/front_end/src/classes.tsx b/front_end/src/classes.tsx index c3b8364..180072e 100644 --- a/front_end/src/classes.tsx +++ b/front_end/src/classes.tsx @@ -135,8 +135,8 @@ export function getUserTest():User{ s1.activites.push(act2); s2.activites.push(act3); s2.activites.push(act4); - s3.activites.push(act5); - s3.activites.push(act6); + s2.activites.push(act5); + s2.activites.push(act6); user.sessions.push(s1); user.sessions.push(s2); diff --git a/front_end/src/components/edt_session.tsx b/front_end/src/components/edt_session.tsx index 4b23c40..48e34db 100644 --- a/front_end/src/components/edt_session.tsx +++ b/front_end/src/components/edt_session.tsx @@ -20,6 +20,16 @@ function EdtSession({session}:Props){ setOpen(!open); } + function handleDeleteActivite(): void { + session.activites.pop(); //TODO + } + + function handleAddActivite(): void { + const newActivite = new Activite(); + //TODO + session.activites.push(newActivite); + } + async function updateActivites(){ //TODO await delay(2000); @@ -46,19 +56,27 @@ function EdtSession({session}:Props){
{session.name}
{open && - setOpen(false)}> -
-
{session.name}
-
{hoursToString(sDate)}
-
{dateToString(sDate)}
+ setOpen(false)}> +
+
{session.name}
+
{hoursToString(sDate)}
+
{dateToString(sDate)}
+
+ Activités : +
{session.activites.map((activite,index)=>( -
activite
+
+ {activite.nom} + +
))} + {loading &&
}
- - - } +
+
+
+ }
) } diff --git a/front_end/src/components/style/edt.css b/front_end/src/components/style/edt.css index d715519..0f6b70d 100644 --- a/front_end/src/components/style/edt.css +++ b/front_end/src/components/style/edt.css @@ -98,8 +98,24 @@ .edt_session_modal{ background-color: var(--tint2); - padding: 20px; + padding: 10px; border-radius: 20px; position: relative; } +.ent_activite_list{ + padding: 10px; + background-color: var(--tint3); + border-radius: 10px; +} + +.deleteButton{ + background-color: #FF0000; + border-color: #AA0000; + border-radius: 10px; +} + +.addButton{ + background-color: var(--tint5); + border-radius: 10px; +} \ No newline at end of file diff --git a/front_end/src/components/test_api.tsx b/front_end/src/components/test_api.tsx new file mode 100644 index 0000000..1e39c09 --- /dev/null +++ b/front_end/src/components/test_api.tsx @@ -0,0 +1,16 @@ +import { getUsersAPI } from "../requetes" + +function TestAPI(){ + + function handleGetUsers(): void { + getUsersAPI() + } + + return( +
+ +
+ ) +} + +export default TestAPI diff --git a/front_end/src/requetes.tsx b/front_end/src/requetes.tsx index 7658a0a..626a244 100644 --- a/front_end/src/requetes.tsx +++ b/front_end/src/requetes.tsx @@ -14,7 +14,7 @@ const useAuthHeader = () => { export function delay(ms: number): Promise { return new Promise(resolve => setTimeout(resolve, ms)); } -*/ + //UPDATE ///////////////////////////////////////////////////////// //COACH / ATHLETE