resolve conflicts

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

@@ -42,6 +42,7 @@ import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
 import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
 import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
+import { HumeurComponent } from './components/humeur/humeur.component';
 registerLocaleData(localeFr)
 
 @NgModule({
@@ -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-dashboard/page-dashboard.component.html

@@ -1,6 +1,6 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<app-humeur></app-humeur>
+
 
 <app-deconnexion></app-deconnexion>
 
@@ -19,14 +19,7 @@
 
       <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>