fix: merge

front/MyINPulse-front/src/components/LoginComponent.vue

@@ -25,11 +25,11 @@ onMounted(() => {
                 router.push("/admin");
                 return;
             }
-            /*
+            
             if (roles.includes("MyINPulse-entrepreneur")) {
                 router.push("/canvas");
                 return;
-            }*/
+            }
 
             checkPending(
                 (response) => {
@@ -43,7 +43,7 @@ onMounted(() => {
                     }
                 },
                 (error) => {
-                    if (error.response?.status === 404) {
+                    if (error.response?.status === 403) {
                         router.push("/finalize");
                     } else {
                         console.error(

front/MyINPulse-front/src/components/canvas/CanvasItem.vue

@@ -110,7 +110,7 @@ const props = defineProps<{
     isAdmin: boolean;
 }>();
 
-const IS_MOCK_MODE = false;
+const IS_MOCK_MODE = true;
 const IS_ADMIN = props.isAdmin;
 
 const expanded = ref(false);

front/MyINPulse-front/src/views/FinalizeAccount.vue

@@ -2,8 +2,13 @@
     <Header />
     <div class="finalize-page">
         <div class="loader-container">
+            <button class="return-button" @click="store.logout">Logout</button>
             <div class="spinner"></div>
             <p>Finalisation du compte en cours...</p>
+            
+            <button v-if="hasError" @click="retry" class="retry-button">
+            Réessayer
+            </button>
         </div>
     </div>
 </template>
@@ -13,12 +18,13 @@ import { onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { finalizeAccount } from "@/services/Apis/Unauth";
 import Header from "@/components/HeaderComponent.vue";
+import { store } from "@/main.ts";
 const router = useRouter();
 
 onMounted(() => {
     finalizeAccount(
         () => {
-            router.push("/JorCproject");
+            console.log("finalize sended");
         },
         (error) => {
             console.error("Erreur lors de la finalisation :", error);
@@ -55,6 +61,19 @@ onMounted(() => {
     animation: spin 0.8s linear infinite;
 }
 
+.return-button {
+    background-color: #009cde;
+    color: white;
+    border: none;
+    padding: 10px 15px;
+    cursor: pointer;
+    font-size: 14px;
+    border-radius: 5px;
+    text-decoration: none;
+    transition: background-color 0.2s ease;
+    font-family: Arial, sans-serif;
+}
+
 @keyframes spin {
     0% {
         transform: rotate(0deg);

front/MyINPulse-front/src/views/JoinOrCreatProjectForEntrep.vue

@@ -6,6 +6,7 @@
             alt="INPulse Logo"
             class="logo"
         />
+        <button class="return-button" @click="store.logout">Logout</button>
     </header>
 
     <div class="choix-projet">
@@ -50,6 +51,8 @@ import {
 } from "@/services/Apis/Entrepreneurs";
 
 const router = useRouter();
+import { requestProjectCreation } from "@/services/Apis/Entrepreneurs.ts";
+import { store } from "@/main.ts";
 const choix = ref<string | null>(null);
 const nomProjet = ref("");
 
@@ -167,4 +170,17 @@ input {
 .logo {
     height: 50px;
 }
+
+.return-button {
+    background-color: #009cde;
+    color: white;
+    border: none;
+    padding: 10px 15px;
+    cursor: pointer;
+    font-size: 14px;
+    border-radius: 5px;
+    text-decoration: none;
+    transition: background-color 0.2s ease;
+    font-family: Arial, sans-serif;
+}
 </style>