resoling some mistakes

src/app/app-routing.module.ts

@@ -44,7 +44,6 @@ const routes: Routes = [
   { path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent },
   { path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent },
   { path: 'creation-team', canActivate: [AuthGuard], component: PageCreationTeamComponent },
-  { path: 'humeur', canActivate: [AuthGuard], component: PageHumeurComponent },
   { path: 'footer', component: FooterComponent},
   { path: '**', component: PageNotFoundComponent },
 ];

src/app/app.module.ts

@@ -41,6 +41,7 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
 import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
 import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
+import { HumeurComponent } from './components/humeur/humeur.component';
 import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
 registerLocaleData(localeFr)
 
@@ -69,7 +70,6 @@ registerLocaleData(localeFr)
     CardMemberComponent,
     ToDoListComponent,
     TacheComponent,
-
     CardMenuComponent,
     FicheContactComponent,
     PaginationComponent,
@@ -82,6 +82,7 @@ registerLocaleData(localeFr)
     PageUpdateAccountComponent,
     CardAvatarComponent,
     DeconnexionComponent,
+    HumeurComponent
 
   ],
   imports: [

src/app/pages/page-ajout-contact/page-ajout-contact.component.html

@@ -86,6 +86,7 @@
           />
           <label for="floatingInputfirstName">Adresse</label>
         </div>
+
         <div class="form-floating">
           <input
             type="text"
@@ -109,7 +110,6 @@
           <label for="floatingInput">Adresse email</label>
         </div>
 
-<<<<<<< HEAD
         <div class="form-floating">
           <input
             type="date"
@@ -133,16 +133,6 @@
           />
           <label for="floatingInputfirstName">Adresse</label>
         </div>
-=======
-            <div class="form-floating">
-                <input type="text" 
-                        class="form-control" 
-                        id="floatingInputTelephone" 
-                        placeholder="" 
-                        name="telephone" 
-                        formControlName="telephoneFc">
-                <label for="floatingInputfirstName">Téléphone</label>
->>>>>>> a04bef695410a222414a12ccffad18d2706be72b
 
         <button
           class="w-100 btn btn-lg btn-secondary"

src/app/pages/page-dashboard/page-dashboard.component.html

@@ -1,6 +1,5 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<app-humeur></app-humeur>
 
 <app-deconnexion></app-deconnexion>
 
@@ -9,35 +8,27 @@
     <h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
   </div>
   <div class="row d-flex align-items-center flex-row">
+    <div class="col-sm-3 col-xs-6 box border" id="boxThree">
+      <app-meteo></app-meteo>
+    </div>
+    <div class="col-sm-3 col-xs-6 box border" id="boxTwo">
+      <app-calendrier>A venir</app-calendrier>
+    </div>
 
-      <div class="col-sm-3 col-xs-6 box border" id="boxThree">
-        <app-meteo></app-meteo>
-      </div>
-      <div class="col-sm-3 col-xs-6 box border" id="boxTwo">
-        <app-calendrier>A venir</app-calendrier>
-      </div>
-
-      <div class="row">
+    <div class="row">
       <div class="col-sm-3 col-xs-6 box border" id="boxFour">
         <div>
-          <p>Humeur en attente component
-          </p>
-          <p>Humeur en attente component
-          </p>
-          <p>Humeur en attente component
-          </p>
-        </div>
+          <app-humeur></app-humeur>
         </div>
       </div>
-    
+    </div>
+
     <div class="row avatar">
       <div class="col" *ngFor="let membreData of listMembres">
-          <app-card-avatar [membre]="membreData">
-          </app-card-avatar>
+        <app-card-avatar [membre]="membreData"> </app-card-avatar>
       </div>
     </div>
   </div>
 </div>
 
 <app-footer></app-footer>
-