diff --git a/src/app/core/user/user.service.ts b/src/app/core/user/user.service.ts
index e118f83..9ae78fc 100644
--- a/src/app/core/user/user.service.ts
+++ b/src/app/core/user/user.service.ts
@@ -51,6 +51,8 @@ export class UserService {
         return this._httpClient.get<User>(`${this._baseUrl}/user/${localStorage.getItem("userId")}`).pipe(
             tap((user) => {
                 this._user.next(user);
+                console.log(user, "user logged in");
+
             })
         );
     }
diff --git a/src/app/layout/common/notifications/notifications.component.html b/src/app/layout/common/notifications/notifications.component.html
index bb6f16d..be23e59 100644
--- a/src/app/layout/common/notifications/notifications.component.html
+++ b/src/app/layout/common/notifications/notifications.component.html
@@ -38,7 +38,7 @@
                     (click)="markAllAsRead()">
                     <mat-icon
                         class="icon-size-5 text-current"
-                        [svgIcon]="'heroicons_solid:mail-open'"></mat-icon>
+                        [svgIcon]="'heroicons_solid:bell'"></mat-icon>
                 </button>
             </div>
         </div>
@@ -48,7 +48,7 @@
             <!-- Notifications -->
             <ng-container *ngFor="let notification of notifications; trackBy: trackByFn">
                 <div class="flex group hover:bg-gray-50 dark:hover:bg-black dark:hover:bg-opacity-5 unread">
-                    <ng-container *ngIf="notification.useRouter">
+                    <ng-container>
                         <a class="flex flex-auto py-5 pl-6 cursor-pointer">
                             <ng-container *ngTemplateOutlet="notificationContent"></ng-container>
                         </a>
@@ -58,35 +58,33 @@
                 <!-- Notification content template -->
                 <ng-template #notificationContent>
                     <!-- Icon -->
-                    <ng-container *ngIf="notification.icon && !notification.image">
+                    <!-- <ng-container *ngIf="notification.icon && !notification.image"> -->
                         <div class="flex flex-shrink-0 items-center justify-center w-8 h-8 mr-4 rounded-full bg-gray-100 dark:bg-gray-700">
                             <mat-icon
                                 class="icon-size-5"
-                                [svgIcon]="notification.icon">
+                                [svgIcon]="'heroicons_outline:bell'">
                             </mat-icon>
                         </div>
-                    </ng-container>
+                    <!-- </ng-container> -->
                     <!-- Image -->
-                    <ng-container *ngIf="notification.image">
+                    <!-- <ng-container *ngIf="notification.image">
                         <img
                             class="flex-shrink-0 w-8 h-8 mr-4 rounded-full overflow-hidden object-cover object-center"
                             [src]="notification.image"
                             [alt]="'Notification image'">
-                    </ng-container>
+                    </ng-container> -->
                     <!-- Title, description & time -->
                     <div class="flex flex-col flex-auto">
-                        <ng-container *ngIf="notification.title">
-                            <div
-                                class="font-semibold line-clamp-1"
-                                [innerHTML]="notification.title"></div>
+                        <ng-container *ngIf="notification.name">
+                            <div class="font-semibold line-clamp-1" [innerHTML]="notification.name"></div>
                         </ng-container>
-                        <ng-container *ngIf="notification.description">
+                        <ng-container *ngIf="notification.Description">
                             <div
                                 class="line-clamp-2"
-                                [innerHTML]="notification.description"></div>
+                                [innerHTML]="notification.Description"></div>
                         </ng-container>
                         <div class="mt-2 text-sm leading-none text-secondary">
-                            {{notification.time | date:'MMM dd, h:mm a'}}
+                            {{notification.Date}}
                         </div>
                     </div>
                 </ng-template>
diff --git a/src/app/layout/common/notifications/notifications.component.ts b/src/app/layout/common/notifications/notifications.component.ts
index bf5346e..3e70f9f 100644
--- a/src/app/layout/common/notifications/notifications.component.ts
+++ b/src/app/layout/common/notifications/notifications.component.ts
@@ -42,20 +42,6 @@ export class NotificationsComponent implements OnInit, OnDestroy {
      * On init
      */
     ngOnInit(): void {
-        // Subscribe to notification changes
-        this._notificationsService.notifications$
-            .pipe(takeUntil(this._unsubscribeAll))
-            .subscribe((notifications: Notification[]) => {
-
-                // Load the notifications
-                this.notifications = [];
-
-                // Calculate the unread count
-                this._calculateUnreadCount();
-
-                // Mark for check
-                this._changeDetectorRef.markForCheck();
-            });
         this.getNotificationsByUserId();
     }
 
@@ -210,7 +196,6 @@ export class NotificationsComponent implements OnInit, OnDestroy {
         this._notificationsService.getNotifications(queryParams).pipe(finalize(() => { })).subscribe((notifications: any) => {
             // Load the notifications
             this.notifications = notifications?.notifications;
-            console.log(notifications?.notifications);
 
             // // Calculate the unread count
             this._calculateUnreadCount();
diff --git a/src/app/layout/layouts/vertical/classy/classy.component.html b/src/app/layout/layouts/vertical/classy/classy.component.html
index 5bc9b77..407456c 100644
--- a/src/app/layout/layouts/vertical/classy/classy.component.html
+++ b/src/app/layout/layouts/vertical/classy/classy.component.html
@@ -19,7 +19,7 @@
             </div>
             <!-- Components -->
             <div class="flex items-center ml-auto">
-                <notifications></notifications>
+                <notifications *ngIf="user.role === 'Client'"></notifications>
                 <user [showAvatar]="false"></user>
             </div>
         </div>
diff --git a/src/app/layout/layouts/vertical/classy/classy.component.ts b/src/app/layout/layouts/vertical/classy/classy.component.ts
index 2fb2bcb..d8771a5 100644
--- a/src/app/layout/layouts/vertical/classy/classy.component.ts
+++ b/src/app/layout/layouts/vertical/classy/classy.component.ts
@@ -63,8 +63,12 @@ export class ClassyLayoutComponent implements OnInit, OnDestroy {
         this._navigationService.navigation$
             .pipe(takeUntil(this._unsubscribeAll))
             .subscribe((navigation: Navigation) => {
-                const filterNavigation = navigation.default[0].children.filter(item => item.accessRole === this.user.role);
+                const filterNavigation = navigation.default[0].children.filter((item) => {
+                    console.log(item.accessRole, this.user.role);
+                    return item.accessRole === this.user.role;
+                });
                 navigation.default[0].children = filterNavigation;
+                console.log(navigation);
                 this.navigation = navigation;
             });
 
diff --git a/src/app/modules/admin/dashboards/finance/finance.component.html b/src/app/modules/admin/dashboards/finance/finance.component.html
index dc20cc8..0c6ce72 100644
--- a/src/app/modules/admin/dashboards/finance/finance.component.html
+++ b/src/app/modules/admin/dashboards/finance/finance.component.html
@@ -209,7 +209,7 @@ <h2 class="text-secondary text-3xl"><strong>Pas d'historiques de rendez-vous</st
                     <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
                     <mat-datepicker #picker1></mat-datepicker>
                     <mat-error *ngIf="rendezForm.get('startDate').hasError('required')">
-                        Start date is required
+                        Le champ dete debut est requis
                     </mat-error>
                 </mat-form-field>
                 <mat-form-field class="flex-auto">
@@ -220,7 +220,7 @@ <h2 class="text-secondary text-3xl"><strong>Pas d'historiques de rendez-vous</st
                     <mat-datepicker-toggle matSuffix [for]="picker2"></mat-datepicker-toggle>
                     <mat-datepicker #picker2></mat-datepicker>
                     <mat-error *ngIf="rendezForm.get('endDate').hasError('required')">
-                        End date is required
+                        Le champ dete fin est requis
                     </mat-error>
                 </mat-form-field>
             </div>
diff --git a/src/app/modules/admin/dashboards/project/project.component.html b/src/app/modules/admin/dashboards/project/project.component.html
index a9586a8..fb6a5b3 100644
--- a/src/app/modules/admin/dashboards/project/project.component.html
+++ b/src/app/modules/admin/dashboards/project/project.component.html
@@ -364,7 +364,7 @@ <h2 class="text-3xl font-semibold tracking-tight leading-8">Services</h2>
                             </div>
                         </div>
 
-                        <div class="grid grid-cols-1 sm:grid-cols-6 gap-6 w-full min-w-0 mt-8">
+                        <div class="grid grid-cols-1 sm:grid-cols-6 gap-6 w-full min-w-0 mt-8" *ngIf="showDefault">
                             <!-- Liste des services -->
                             <div class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden">
                                 <div class="text-lg font-medium tracking-tight leading-6 truncate">Liste des services</div>
@@ -379,6 +379,7 @@ <h2 class="text-3xl font-semibold tracking-tight leading-8">Services</h2>
                                         <h2 class="text-secondary text-3xl"><strong>Aucun service trouvé</strong></h2>
                                     </div>
                                     <table
+                                        *ngIf="!loadingData && services?.rows?.length !== 0"
                                         class="min-w-240 overflow-y-visible"
                                         mat-table
                                         [dataSource]="services.rows">
@@ -413,6 +414,20 @@ <h2 class="text-secondary text-3xl"><strong>Aucun service trouvé</strong></h2>
                                             </td>
                                         </ng-container>
 
+                                        <!-- Prix -->
+                                        <ng-container matColumnDef="commissionPercentage">
+                                            <th
+                                                mat-header-cell
+                                                *matHeaderCellDef>
+                                                Commission
+                                            </th>
+                                            <td
+                                                mat-cell
+                                                *matCellDef="let s">
+                                                {{s.commissionPercentage}}%
+                                            </td>
+                                        </ng-container>
+
                                         <!-- processingTime -->
                                         <ng-container matColumnDef="processingTime">
                                             <th
@@ -455,7 +470,7 @@ <h2 class="text-secondary text-3xl"><strong>Aucun service trouvé</strong></h2>
                                                 Actions
                                             </th>
                                             <td mat-cell *matCellDef="let s" class="flex flex-row justify-end">
-                                                <button mat-icon-button>
+                                                <button mat-icon-button (click)="showDefault = false; isEdit = true; setServiceForm(s)">
                                                     <mat-icon>edit</mat-icon>
                                                 </button>
                                                 <button mat-icon-button>
@@ -474,6 +489,80 @@ <h2 class="text-secondary text-3xl"><strong>Aucun service trouvé</strong></h2>
                                 </div>
                             </div>
                         </div>
+
+                        <form class="xl:col-span-4 flex flex-col flex-auto bg-card shadow rounded-2xl mt-8 overflow-hidden"
+                            [formGroup]="serviceForm"
+                            *ngIf="!showDefault"
+                        >
+                            <!-- Alert -->
+                            <div class="flex flex-col p-8" *ngIf="showAlert">
+                                <fuse-alert
+                                    class="mb-4"
+                                    [appearance]="'outline'"
+                                    [showIcon]="false"
+                                    [type]="alert.type"
+                                    [@shake]="alert.type === 'error'">
+                                    {{alert.message}}
+                                </fuse-alert>
+                            </div>
+
+                            <div class="bg-gray-50 dark:bg-gray-700 p-8 border-b">
+                                <p class="text-lg font-medium">Créer un service</p>
+                                <p class="text-secondary">Ajouter un nouveau service pour les clients</p>
+                            </div>
+                            <div class="flex flex-col p-8">
+                                <mat-form-field class="fuse-mat-dense flex-auto">
+                                    <mat-label>Nom</mat-label>
+                                    <input matInput [formControlName]="'name'">
+                                    <mat-error *ngIf="serviceForm.get('name').hasError('required')">
+                                        Le champ nom est requis
+                                    </mat-error>
+                                </mat-form-field>
+                                <mat-form-field class="fuse-mat-dense flex-auto">
+                                    <mat-label>Prix en ariary</mat-label>
+                                    <input matInput [formControlName]="'price'">
+                                    <mat-error *ngIf="serviceForm.get('price').hasError('required')">
+                                        Le champ prix est requis
+                                    </mat-error>
+                                </mat-form-field>
+                                <mat-form-field class="fuse-mat-dense flex-auto">
+                                    <mat-label>Temps en heure</mat-label>
+                                    <input matInput [formControlName]="'processingTime'">
+                                    <mat-error *ngIf="serviceForm.get('processingTime').hasError('required')">
+                                        Le champ temps est requis
+                                    </mat-error>
+                                </mat-form-field>
+                                <mat-form-field class="fuse-mat-dense flex-auto">
+                                    <mat-label>Pourcentage de commission</mat-label>
+                                    <input matInput [formControlName]="'commissionPercentage'">
+                                    <mat-error *ngIf="serviceForm.get('commissionPercentage').hasError('required')">
+                                        Le champ temps est requis
+                                    </mat-error>
+                                </mat-form-field>
+                            </div>
+
+                            <div class="flex items-center justify-end border-t px-8 py-5 bg-gray-50 dark:bg-gray-700">
+                                <button mat-button (click)="cancel()">
+                                    Annuler
+                                </button>
+                                <button
+                                    class="px-6 ml-3"
+                                    mat-flat-button
+                                    [color]="'primary'"
+                                    [disabled]="serviceForm.disabled"
+                                    (click)="!isEdit ? createService() : updateService()">
+                                    <span *ngIf="!serviceForm.disabled">
+                                        Sauvegarder
+                                    </span>
+                                    <mat-progress-spinner
+                                        *ngIf="serviceForm.disabled"
+                                        [diameter]="24"
+                                        [mode]="'indeterminate'">
+                                    </mat-progress-spinner>
+                                </button>
+                            </div>
+                        </form>
+
                     </ng-template>
                 </mat-tab>
 
diff --git a/src/app/modules/admin/dashboards/project/project.component.ts b/src/app/modules/admin/dashboards/project/project.component.ts
index b25590b..d7f600d 100644
--- a/src/app/modules/admin/dashboards/project/project.component.ts
+++ b/src/app/modules/admin/dashboards/project/project.component.ts
@@ -7,7 +7,7 @@ import { ProjectService } from 'app/modules/admin/dashboards/project/project.ser
 import { UserService } from 'app/core/user/user.service';
 import { User } from 'app/core/user/user.types';
 import { FinanceService } from '../finance/finance.service';
-import { FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FuseAlertType } from '@fuse/components/alert';
 
 @Component({
@@ -23,7 +23,6 @@ export class ProjectComponent implements OnInit, OnDestroy {
     chartMonthlyExpenses: ApexOptions = {};
     chartYearlyExpenses: ApexOptions = {};
     data: any;
-    selectedProject: string = 'ACME Corp. Backend App';
     private _unsubscribeAll: Subject<any> = new Subject<any>();
     user: User;
     employes: any;
@@ -40,7 +39,10 @@ export class ProjectComponent implements OnInit, OnDestroy {
         Client: "/client/rendez-vous",
         Employee: "/employee/calendrier",
         Manager: "/manager/dashboard"
-    }
+    };
+    configForm: FormGroup;
+    isEdit: boolean  = false;
+    service: any;
 
     /**
      * Constructor
@@ -49,7 +51,8 @@ export class ProjectComponent implements OnInit, OnDestroy {
         private _projectService: ProjectService,
         private _userService: UserService,
         private _financeService: FinanceService,
-        private _router: Router
+        private _router: Router,
+        private _formBuilder: FormBuilder,
     ) {
     }
 
@@ -61,6 +64,12 @@ export class ProjectComponent implements OnInit, OnDestroy {
      * On init
      */
     ngOnInit(): void {
+        this.serviceForm = this._formBuilder.group({
+            name: ["", [Validators.required]],
+            price: ["", [Validators.required]],
+            processingTime: ["", [Validators.required]],
+            commissionPercentage: ["", [Validators.required]]
+        });
 
         // Subscribe to the user service
         this._userService.user$
@@ -129,7 +138,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
         this.loadingData = true;
         this._financeService.getAllServices().subscribe((res) => {
             this.services = {
-                columns: ["name", "price", "processingTime", "actions"],
+                columns: ["name", "price", "processingTime", "commissionPercentage", "actions"],
                 rows: res
             };
         });
@@ -144,8 +153,76 @@ export class ProjectComponent implements OnInit, OnDestroy {
         this.showDefault = true;
         this.serviceForm.reset();
         this.showAlert = false;
+        this.isEdit = false;
         this.getAllServices();
     }
+
+    createService(): void {
+        if (this.serviceForm.invalid) {
+            return;
+        }
+
+        this.serviceForm.disable();
+        this.showAlert = false;
+
+        this._projectService.createService(this.serviceForm.value).subscribe(() => {
+            window.scroll(0, 0);
+            this.alert = {
+                type: 'success',
+                message: 'Service créé avec succès'
+            };
+            this.showAlert = true;
+            this.serviceForm.enable();
+            this.serviceForm.reset();
+        }, () => {
+            window.scroll(0, 0);
+            this.serviceForm.enable();
+            this.alert = {
+                type: 'error',
+                message: 'Impossible de créer le service'
+            };
+            this.showAlert = true;
+        });
+    }
+
+    updateService(): void {
+        if (this.serviceForm.invalid) {
+            return;
+        }
+
+        this.serviceForm.disable();
+        this.showAlert = false;
+
+        this._projectService.updateService(this.service._id, this.serviceForm.value).subscribe(() => {
+            window.scroll(0, 0);
+            this.alert = {
+                type: 'success',
+                message: 'Service mis à jour avec succès'
+            };
+            this.showAlert = true;
+            this.serviceForm.enable();
+            this.serviceForm.reset();
+        }, () => {
+            window.scroll(0, 0);
+            this.serviceForm.enable();
+            this.alert = {
+                type: 'error',
+                message: 'Impossible de mettre à jour le service'
+            };
+            this.showAlert = true;
+        });
+    }
+
+    setServiceForm(service: any) {
+        this.service = service;
+        this.serviceForm = this._formBuilder.group({
+            name: [service.name, [Validators.required]],
+            price: [service.price, [Validators.required]],
+            processingTime: [service.processingTime, [Validators.required]],
+            commissionPercentage: [service.commissionPercentage, [Validators.required]]
+        });
+    }
+
     // -----------------------------------------------------------------------------------------------------
     // @ Public methods
     // -----------------------------------------------------------------------------------------------------
diff --git a/src/app/modules/admin/dashboards/project/project.module.ts b/src/app/modules/admin/dashboards/project/project.module.ts
index 734e076..3d316c7 100644
--- a/src/app/modules/admin/dashboards/project/project.module.ts
+++ b/src/app/modules/admin/dashboards/project/project.module.ts
@@ -17,6 +17,13 @@ import { SharedModule } from 'app/shared/shared.module';
 import { ProjectComponent } from 'app/modules/admin/dashboards/project/project.component';
 import { projectRoutes } from 'app/modules/admin/dashboards/project/project.routing';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatRadioModule } from '@angular/material/radio';
+import { MatSelectModule } from '@angular/material/select';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { FuseAlertModule } from '@fuse/components/alert';
 
 @NgModule({
     declarations: [
@@ -38,7 +45,14 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
         NgApexchartsModule,
         TranslocoModule,
         SharedModule,
-        MatProgressSpinnerModule
+        MatProgressSpinnerModule,
+        MatCheckboxModule,
+        MatFormFieldModule,
+        MatInputModule,
+        MatRadioModule,
+        MatSelectModule,
+        MatDatepickerModule,
+        FuseAlertModule
     ]
 })
 export class ProjectModule
diff --git a/src/app/modules/admin/dashboards/project/project.service.ts b/src/app/modules/admin/dashboards/project/project.service.ts
index 3cec81c..5edc757 100644
--- a/src/app/modules/admin/dashboards/project/project.service.ts
+++ b/src/app/modules/admin/dashboards/project/project.service.ts
@@ -2,19 +2,19 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
+import { environment } from 'environments/environment';
 
 @Injectable({
     providedIn: 'root'
 })
-export class ProjectService
-{
+export class ProjectService {
     private _data: BehaviorSubject<any> = new BehaviorSubject(null);
+    public _baseUrl: string = environment.apiUrl;
 
     /**
      * Constructor
      */
-    constructor(private _httpClient: HttpClient)
-    {
+    constructor(private _httpClient: HttpClient) {
     }
 
     // -----------------------------------------------------------------------------------------------------
@@ -24,8 +24,7 @@ export class ProjectService
     /**
      * Getter for data
      */
-    get data$(): Observable<any>
-    {
+    get data$(): Observable<any> {
         return this._data.asObservable();
     }
 
@@ -36,12 +35,19 @@ export class ProjectService
     /**
      * Get data
      */
-    getData(): Observable<any>
-    {
+    getData(): Observable<any> {
         return this._httpClient.get('api/dashboards/project').pipe(
             tap((response: any) => {
                 this._data.next(response);
             })
         );
     }
+
+    createService(data: any): Observable<any> {
+        return this._httpClient.post(`${this._baseUrl}/service`, data);
+    }
+
+    updateService(id: string, data: any): Observable<any> {
+        return this._httpClient.put(`${this._baseUrl}/service/${id}`, data);
+    }
 }
diff --git a/src/app/modules/auth/sign-out/sign-out.component.html b/src/app/modules/auth/sign-out/sign-out.component.html
index c89a67f..c63efb0 100644
--- a/src/app/modules/auth/sign-out/sign-out.component.html
+++ b/src/app/modules/auth/sign-out/sign-out.component.html
@@ -7,25 +7,25 @@
             </div>
 
             <!-- Title -->
-            <div class="mt-8 text-4xl font-extrabold tracking-tight leading-tight text-center">You have signed out!</div>
+            <div class="mt-8 text-4xl font-extrabold tracking-tight leading-tight text-center">Vous avez deconnecté!</div>
             <div class="flex justify-center mt-0.5 font-medium">
                 <!-- Redirect countdown -->
                 <ng-container *ngIf="countdown > 0">
-                    Redirecting in {{countdown | i18nPlural: countdownMapping }}
+                    Redirection dans {{countdown | i18nPlural: countdownMapping }}
                 </ng-container>
 
                 <!-- Redirect message -->
                 <ng-container *ngIf="countdown === 0">
-                    You are now being redirected!
+                    Redirection en cours
                 </ng-container>
             </div>
 
             <!-- Form footer -->
             <div class="mt-8 text-md font-medium text-secondary text-center">
-                <span>Go to</span>
+                <span>Aller à la</span>
                 <a
                     class="ml-1 text-primary-500 hover:underline"
-                    [routerLink]="['/sign-in']">sign in
+                    [routerLink]="['/sign-in']">Page de connexion
                 </a>
             </div>
         </div>