Merge pull request #54 from AlineRinquin/blandine

Blandine

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

@@ -7,10 +7,15 @@
     <h3>Ajouter un contact</h3>
     <main class="form-ajoutContact">
       <form (ngSubmit)="onSubmit()" [formGroup]="ajoutContactForm">
-            
         <div class="form-floating">
-            <input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
+          <input
-              formControlName="couleurFc">
+            type="color"
+            class="form-control"
+            id="floatingInputcouleur"
+            placeholder=""
+            name="couleur"
+            formControlName="couleurFc"
+          />
         </div>
 
         <div class="form-floating">
@@ -83,54 +88,60 @@
         </div>
 
         <div class="form-floating">
-                <input type="text" 
+          <input
+            type="text"
             class="form-control"
             id="floatingInputTelephone"
             placeholder=""
             name="telephone"
-                        formControlName="telephoneFc">
+            formControlName="telephoneFc"
+          />
           <label for="floatingInputfirstName">Téléphone</label>
-
-
         </div>
         <div class="form-floating">
-                <input type="email" 
+          <input
+            type="email"
             class="form-control"
             id="floatingInput"
             placeholder=""
             name="email"
-                        formControlName="emailFc">
+            formControlName="emailFc"
+          />
           <label for="floatingInput">Adresse email</label>
         </div>
 
-
         <div class="form-floating">
-                <input type="date" 
+          <input
+            type="date"
             class="form-control"
             id="floatingInputdateNaissance"
             placeholder=""
             name="dateNaissance"
-                        formControlName="dateNaissanceFc">
+            formControlName="dateNaissanceFc"
+          />
           <label for="floatingInputfirstName">Date de naissance</label>
         </div>
 
-
         <div class="form-floating">
-                <input type="text" 
+          <input
+            type="text"
             class="form-control"
             id="floatingInputAdresse"
             placeholder=""
             name="adresse"
-                        formControlName="adresseFc">
+            formControlName="adresseFc"
+          />
           <label for="floatingInputfirstName">Adresse</label>
         </div>
 
-            <button class="w-100 btn btn-lg btn-secondary" 
+        <button
+          class="w-100 btn btn-lg btn-secondary"
           type="submit"
-                    [disabled]="ajoutContactForm.invalid">Valider</button>
+          [disabled]="ajoutContactForm.invalid"
-
+        >
+          Valider
+        </button>
       </form>
     </main>
   </div>
 </div>
-

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,7 +8,6 @@
     <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>
@@ -20,24 +18,17 @@
     <div class="row">
       <div class="col-sm-3 col-xs-6 box border" id="boxFour">
         <div>
-          <p>Humeur en attente component
+          <app-humeur></app-humeur>
-          </p>
-          <p>Humeur en attente component
-          </p>
-          <p>Humeur en attente component
-          </p>
         </div>
       </div>
     </div>
 
     <div class="row avatar">
       <div class="col" *ngFor="let membreData of listMembres">
-          <app-card-avatar [membre]="membreData">
+        <app-card-avatar [membre]="membreData"> </app-card-avatar>
-          </app-card-avatar>
       </div>
     </div>
   </div>
 </div>
 
 <app-footer></app-footer>
-