From 42dea977637fbd5a545efee864f49d731a5ab59f Mon Sep 17 00:00:00 2001
From: Arthur Wambst <wambst.arthur2@gmail.com>
Date: Thu, 16 Oct 2025 03:24:01 +0200
Subject: [PATCH] front

---
 src/component/Navigation/Navigation.tsx |  2 +-
 src/pages/Dashboard.tsx                 | 82 +++++++++++++++++--------
 src/pages/Login.tsx                     |  2 +-
 src/type/Dashboard.ts                   |  9 +--
 src/type/InstanceType.ts                |  2 +-
 src/type/JiType.ts                      | 12 ++++
 src/type/SujetType.ts                   |  7 +++
 src/type/TpType.ts                      | 11 ----
 8 files changed, 83 insertions(+), 44 deletions(-)
 create mode 100644 src/type/JiType.ts
 create mode 100644 src/type/SujetType.ts
 delete mode 100644 src/type/TpType.ts

diff --git a/src/component/Navigation/Navigation.tsx b/src/component/Navigation/Navigation.tsx
index 114416d..6487e90 100644
--- a/src/component/Navigation/Navigation.tsx
+++ b/src/component/Navigation/Navigation.tsx
@@ -41,7 +41,7 @@ const Navigation: React.FC<NavigationProps> = ({
   };
 
   useEffect(() => {
-    axios.get("/api/users/me").then((res) => {
+    axios.get("/api/user/me").then((res) => {
       if (res.data.username.trim() === "") {
         navigate("/login");
       }
diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
index a3839a6..7a9cd86 100644
--- a/src/pages/Dashboard.tsx
+++ b/src/pages/Dashboard.tsx
@@ -1,12 +1,13 @@
 import { useEffect, useState } from "react";
 import axios from "axios";
 import { Link } from "react-router-dom";
-import { Tp } from "../type/TpType";
+import { Sujet } from "../type/SujetType";
+import { Ji } from "../type/JiType";
 import { DashboardType } from "../type/Dashboard";
 
 function Dashboard() {
   const [dashboard, setDashboard] = useState<DashboardType | null>(null);
-  const username = localStorage.getItem("username");
+  const username = localStorage.getItem("name");
   useEffect(() => {
     axios.get("/api/dashboard").then((res) => {
       setDashboard(res.data);
@@ -27,60 +28,61 @@ function Dashboard() {
       </section>
       {dashboard && (
         <>
+                    { dashboard.jiRespo.length !== 0 && (
           <section className="py-16">
             <div className="container mx-auto">
               <h3 className="text-2xl font-bold text-center mb-6">
-                Practicals
+                Immersions - Respo
               </h3>
-              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-                {dashboard.tps.map((tp: Tp) => (
+              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 xl:grid-cols-6 gap-6">
+                {dashboard.jiRespo.map((jiRespo: Ji) => (
                   <div
-                    key={tp.id}
+                    key={jiRespo.id}
                     className="card card-compact bg-base-200 shadow-lg p-4"
                   >
                     <div className="card-body">
-                      <h2 className="card-title">{tp.name}</h2>
-                      <p>{tp.description}</p>
+                      <h2 className="card-title">{jiRespo.name}</h2>
+                      <p>{jiRespo.description}</p>
                       <div className="card-actions justify-end">
-                        <Link to={`/tps/${tp.id}`} className="btn btn-primary">
-                          Learn More
+                        <Link to={`/immersion/${jiRespo.id}`} className="btn btn-primary btn-sm">
+                          GO
                         </Link>
                       </div>
                     </div>
                   </div>
                 ))}
               </div>
-              {dashboard.tps.length === 0 && (
-                <h1 className="text-xl">You have no tps</h1>
-              )}
+            
             </div>
           </section>
+                    )}
+                    { dashboard.sujetRespo.length !== 0 && (
           <section className="py-8">
             <div className="container mx-auto">
-              <h3 className="text-2xl font-bold text-center mb-6">Instances</h3>
+              <h3 className="text-2xl font-bold text-center mb-6">Sujets - Respo</h3>
               <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-                {dashboard.instances.map((instance) => (
+                {dashboard.sujetRespo.map((sujet: Sujet) => (
                   <div
-                    key={instance.id}
+                    key={sujetRespo.id}
                     className="card card-compact bg-base-200 shadow-lg p-4"
                   >
                     <div className="card-body">
-                      <h2 className="card-title">{instance.name}</h2>
-                      {instance.tp && (
-                        <p className="text-lg">Linked to: {instance.tp.name}</p>
+                      <h2 className="card-title">{sujetRespo.name}</h2>
+                      {sujetRespo && (
+                        <p className="text-lg">Linked to: {sujetRespo.name}</p>
                       )}
                       <div className="card-actions justify-end">
                         {false && (
                           <Link
-                            to={`/instances/${instance.id}`}
+                            to={`/subject/${sujetRespo.id}`}
                             className="btn btn-primary"
                           >
                             Learn More
                           </Link>
                         )}
-                        {instance.tp && (
+                        {sujetRespo && (
                           <Link
-                            to={`/tps/${instance.tp.id}`}
+                            to={`/subject/${sujetRespo.id}`}
                             className="btn btn-primary"
                           >
                             See TP
@@ -90,13 +92,41 @@ function Dashboard() {
                     </div>
                   </div>
                 ))}
-                {dashboard.instances.length === 0 && (
-                  <h1 className="text-xl">You have no instances</h1>
-                )}
               </div>
             </div>
           </section>
-          <section className="py-8">
+          )}
+          <section className="py-16">
+            <div className="container mx-auto">
+              <h3 className="text-2xl font-bold text-center mb-6">
+                Immersions - Activites
+              </h3>
+              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+                {dashboard.jiParticipant.map((jiParticipant: Ji) => (
+                  <div
+                    key={jiParticipant.id}
+                    className="card card-compact bg-base-200 shadow-lg p-4"
+                  >
+                    <div className="card-body">
+                      <h2 className="card-title">{jiParticipant.name}</h2>
+                      <p>{jiParticipant.description}</p>
+                      <div className="card-actions justify-end">
+                        <Link to={`/immersion/${jiParticipant.id}`} className="btn btn-primary">
+                          Learn More
+                        </Link>
+                      </div>
+                    </div>
+                  </div>
+                ))}
+              </div>
+              {dashboard.jiParticipant.length === 0 && (
+                            <div className="container mx-auto text-center">
+                                <h1 className="text-xl">You are not registered on any activities.</h1>
+                            </div>
+              )}
+            </div>
+          </section>
+                    <section className="py-8">
             <div className="container mx-auto text-center">
               <h4 className="text-2xl font-semibold">Messages</h4>
               <p className="mt-4 text-gray-700">You have no messages</p>
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 276a407..cc79e7c 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -24,7 +24,7 @@ const LoginPage: React.FC = () => {
         if (response.status === 200) {
           axios.get("/api/users/me").then((res) => {
             localStorage.setItem("username", res.data.username);
-            if (res.data.roles.includes("root")) {
+            if (res.data.roles.includes("ROOT")) {
               localStorage.setItem("root", "true");
             } else {
               localStorage.removeItem("root");
diff --git a/src/type/Dashboard.ts b/src/type/Dashboard.ts
index 18c3925..2abf5e0 100644
--- a/src/type/Dashboard.ts
+++ b/src/type/Dashboard.ts
@@ -1,7 +1,8 @@
-import { Instance } from "./InstanceType";
-import { Tp } from "./TpType";
+import { Ji } from "./JiType";
+import { Sujet } from "./SujetType";
 
 export interface DashboardType {
-    tps: Tp[];
-    instances: Instance[];
+    jiRespo: Ji[];
+    jiParticipant: Ji[];
+    sujetRespo: Sujet[];
 }
diff --git a/src/type/InstanceType.ts b/src/type/InstanceType.ts
index 2de6819..9e35263 100644
--- a/src/type/InstanceType.ts
+++ b/src/type/InstanceType.ts
@@ -1,4 +1,4 @@
-import { Tp } from "./TpType";
+import { Ji } from "./JiType";
 import { User } from "./UserType";
 
 export interface Instance {
diff --git a/src/type/JiType.ts b/src/type/JiType.ts
new file mode 100644
index 0000000..cc9de2c
--- /dev/null
+++ b/src/type/JiType.ts
@@ -0,0 +1,12 @@
+import { Sujet } from "./SujetType";
+import { User } from "./UserType";
+
+export interface Ji {
+    name: string;
+    description: string;
+    respos: User[];
+    date: string;
+    site: Site;
+    participants: User[];
+    //instances: Instances[];
+}
diff --git a/src/type/SujetType.ts b/src/type/SujetType.ts
new file mode 100644
index 0000000..0f404ad
--- /dev/null
+++ b/src/type/SujetType.ts
@@ -0,0 +1,7 @@
+export interface Sujet {
+    id: number;
+    name: string;
+    description: string;
+    pdfLink: string;
+    respos: string;
+}
diff --git a/src/type/TpType.ts b/src/type/TpType.ts
deleted file mode 100644
index 568d5f7..0000000
--- a/src/type/TpType.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export interface Tp {
-    id: number;
-    name: string;
-    description: string;
-    pdfLink: string;
-    respo: string;
-    date: string;
-    ssh: string;
-    port: string;
-    pwd: string;
-}