Merge pull request #41 from WildCodeSchool/development

Development

Author: Hrissy-art

src/app/app.routes.ts

@@ -18,6 +18,7 @@ import { CalendarComponent } from './feature/calendars/components/calendar/calen
 import { CrudUserComponent } from './feature/user/page/crud-user/crud-user.component';
 import { AboutUsComponent } from './feature/home/components/about-us/about-us.component';
 import { ContactComponent } from './feature/contact/contact.component';
+import { CguPageComponent } from './feature/legal/cgu-page/cgu-page.component';
 
 export const routes: Routes = [
   {
@@ -54,6 +55,11 @@ export const routes: Routes = [
   },
   { path: 'auth', component: UserConnectionComponent },
 
+  {
+    path: 'conditions-generales',
+    component: CguPageComponent,
+  },
+
   {
     path: 'providers',
     component: ProviderHomeComponent,

src/app/core/components/footer/footer.component.html

@@ -17,7 +17,11 @@
         <h5 class="fw-bold mb-3">HandyApp</h5>
         <ul class="list-unstyled">
           <li><a href="#" class="text-white text-decoration-none d-block mb-2">A propos</a></li>
-          <li><a href="#" class="text-white text-decoration-none d-block mb-2">Nouvelles</a></li>
+          <li>
+            <a href="https://handicap.gouv.fr/les-articles-de-presse-et-les-actualites" class="text-white text-decoration-none d-block mb-2"
+              >Nouvelles</a
+            >
+          </li>
           <li><a href="#" class="text-white text-decoration-none d-block mb-2">Relations</a></li>
           <li><a href="#" class="text-white text-decoration-none d-block mb-2">Rejoignez-nous</a></li>
         </ul>

src/app/core/components/header/header.component.css

@@ -0,0 +1,3 @@
+.logo {
+  max-height: 50px;
+}

src/app/core/components/header/header.component.html

@@ -1,20 +1,27 @@
-<header class="bg-dark text-white py-3">
-  <div class="container d-flex flex-column flex-md-row align-items-center justify-content-center justify-content-md-between">
-    <div class="col-12 col-md-3 mb-4 mb-md-0">
-      <img src="assets/logo.png" alt="Logo Alfred" class="img-fluid" />
-    </div>
-    <span class="header-logo mx-auto mx-md-0 text-center">Handy App</span>
-    <nav class="d-none d-md-flex gap-4">
+<header class="bg-dark text-white py-3 position-relative">
+  <div class="position-absolute start-0 top-50 translate-middle-y ms-3">
+    <a [routerLink]="''">
+      <img src="assets/logo.png" alt="Logo Alfred" class="img-fluid logo" />
+    </a>
+  </div>
+
+  <div class="container px-0 d-flex flex-column flex-md-row align-items-center ustify-content-center position-relative">
+    <nav class="d-none d-md-flex gap-4 mx-auto">
       <a [routerLink]="''" class="nav-link">Accueil</a>
       <a [routerLink]="'/products'" class="nav-link">Services</a>
       <a [routerLink]="'/providers-list'" class="nav-link">Prestataires</a>
       <a [routerLink]="'/contacts'" class="nav-link">Contact</a>
     </nav>
-    @if (isLoggedIn) {
-      <button type="button" class="btn btn-danger d-none d-md-block" (click)="onLogout()">Déconnexion</button>
-    } @else {
-      <button type="button" class="header-button btn btn-success d-none d-md-block" (click)="navigateToSignUpPage()">Se connecter/ s'inscrire</button>
-    }
+    <div class="d-flex align-items-center gap-2">
+      @if (isLoggedIn) {
+        <button type="button" class="btn btn-danger d-none d-md-block me-3" (click)="onLogout()">Déconnexion</button>
+      } @else {
+        <div class="d-flex align-items-center gap-2 d-none d-md-flex">
+          <button type="button" class="header-button btn btn-success d-none d-md-block" (click)="navigateToSignUpPage()">Se connecter</button>
+          <a [routerLink]="'/signup'" class="text-white text-decoration-underline d-none d-md-block"> S'inscrire </a>
+        </div>
+      }
+    </div>
 
     @if (isLoggedIn) {
       @if (isProvider$ | async) {
@@ -37,7 +44,8 @@
       @if (isLoggedIn) {
         <button type="button" class="btn btn-danger mt-3" (click)="onLogout()">Déconnexion</button>
       } @else {
-        <button type="button" class="btn btn-success mt-3" (click)="navigateToSignUpPage()">Se connecter / S'inscrire</button>
+        <button type="button" class="btn btn-success mt-3" (click)="navigateToSignUpPage()">Se connecter</button>
+        <a [routerLink]="'/signup'" class="text-white text-decoration-underline"> S'inscrire </a>
       }
     </nav>
   </div>

src/app/core/components/header/header.component.scss

@@ -0,0 +1,3 @@
+.logo {
+  max-height: 50px;
+}

src/app/core/interceptors/http-error.interceptor.ts

@@ -2,13 +2,17 @@ import { HttpInterceptorFn } from '@angular/common/http';
 import { inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { catchError, throwError } from 'rxjs';
+import { AuthService } from '../services/auth.service';
 
 export const httpErrorInterceptor: HttpInterceptorFn = (req, next) => {
   const router = inject(Router);
+  const authService = inject(AuthService);
 
   return next(req).pipe(
     catchError(err => {
       if (err.status === 401 || err.status === 403) {
+        authService.logout();
+        alert('Votre session a expiré, veuillez vous reconnecter.');
         router.navigate(['/login']);
       }
 

src/app/core/services/auth.service.ts

@@ -116,5 +116,4 @@ export class AuthService {
   getCurrentUserId(): number | null {
     return this._userPayload ? this._userPayload.id : null;
   }
-  
 }

src/app/core/validators/validators.ts

@@ -23,3 +23,8 @@ export function securePasswordValidator(minLength: number = 12): ValidatorFn {
     return passwordValid ? null : { securePassword: true };
   };
 }
+export function termsAcceptedValidator(): ValidatorFn {
+  return (control: AbstractControl): ValidationErrors | null => {
+    return control.value === true ? null : { termsNotAccepted: true };
+  };
+}

src/app/feature/admin/page/admin-home/admin-home.component.html

@@ -1,4 +1,3 @@
-<p>admin-home works!</p>
 <div class="container py-5">
   <h2 class="text-center mb-4">Bienvenue sur le tableau de bord Admin 👑</h2>
   <p>Créér / Modifier / Supprimer et gouverner</p>

src/app/feature/cart/components/create-cart/create-cart.component.html

@@ -26,7 +26,13 @@
 
           @let selectedSlot = selectedSlots[item.userId + '_' + item.provisionId];
           @if (selectedSlot) {
-            <button type="button" (click)="confirmAvailability(item.userId, item.provisionId)" class="btn-confirm">Confirmer le créneau ✅</button>
+            <button
+              type="button"
+              (click)="confirmAvailability(item.userId, item.provisionId)"
+              class="btn-confirm"
+              [disabled]="confirmedSlots[item.userId + '_' + item.provisionId]">
+              Confirmer le créneau ✅
+            </button>
           }
         }
 
@@ -56,6 +62,11 @@ <h4>Total à régler : {{ getTotalCoefficient() }}</h4>
   @if (toastMessage) {
     <div class="toast" [ngClass]="toastType">{{ toastMessage }}</div>
   }
+  @if (successMessageUpdate) {
+    <div class="alert alert-success mt-2" role="alert">
+      {{ successMessageUpdate }}
+    </div>
+  }
   @if (cart.length === 0) {
     <p>Aucun élément dans le panier</p>
   }