commit to merge

src/app/app.module.ts

@@ -36,15 +36,11 @@ import { HttpClientModule } from '@angular/common/http';
 import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout-contact.component';
 import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
 import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component';
-<<<<<<< HEAD
-import { PageTestFormComponent } from './pages/page-test-form/page-test-form.component';
-=======
 import { AutofocusFixModule  } from 'ngx-autofocus-fix';
+import { EmoticonComponent } from './emoticon/emoticon.component';
 
 
 
->>>>>>> 5c7e4662b2e3c8af6778c79d1b56aa66a0fdf0a1
-
 @NgModule({
   declarations: [
     AppComponent,
@@ -79,11 +75,7 @@ import { AutofocusFixModule  } from 'ngx-autofocus-fix';
     PageAjoutContactComponent,
     PageModifierContactComponent,
     PageCreationTeamComponent,
-<<<<<<< HEAD
-    PageTestFormComponent,
-=======
-
->>>>>>> 5c7e4662b2e3c8af6778c79d1b56aa66a0fdf0a1
+    EmoticonComponent,
   ],
   imports: [
     BrowserModule,

src/app/components/fiche-contact/fiche-contact.component.html

@@ -6,7 +6,7 @@
             </button>
         </div>
         <div class="col-sm">
-            <button class="w-100 btn btn-lg btn-rounded btn-secondary">
+            <button class="w-100 btn btn-lg btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
                 Supprimer
             </button>
         </div>

src/app/components/fiche-contact/fiche-contact.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
   selector: 'app-fiche-contact',
@@ -7,8 +7,13 @@ import { Component, Input, OnInit } from '@angular/core';
 })
 export class FicheContactComponent implements OnInit {
   @Input() personne: any;
+  @Output() clickDelete = new EventEmitter();
 
   constructor() {}
 
   ngOnInit(): void {}
+
+  onClickDelete(numPerson: number){
+    this.clickDelete.emit(numPerson);
+  }
 }

src/app/components/humeur/humeur.component.html

@@ -1 +1,6 @@
-<p>humeur works!</p>
+<p>Mon humeur est :</p>
+
+<p>Affichage des items du tableau des humeurs</p>
+
+<app-emoticon> *ngFor ="let tabHumeur of tabHumeur" 
+    [tabHumeur]="tabHumeur"></app-emoticon>

src/app/components/humeur/humeur.component.ts

@@ -7,9 +7,23 @@ import { Component, OnInit } from '@angular/core';
 })
 export class HumeurComponent implements OnInit {
 
-  constructor() { }
+
+
+
+
+
+  constructor() {
+    
+   
+    
+
+   }
 
   ngOnInit(): void {
+
+
+
+
   }
 
 }

src/app/components/meteo/meteo.component.html

@@ -1,7 +1,4 @@
 <div class="meteo">
-  <input type="text" id="ville">
-  <label for="ville">Entrez votre code postal</label>
-  <button id="meteo-button">Ok !</button>
-  <iframe id="widget_autocomplete_preview" width="150" height="300" frameborder="0"
+  <iframe id="widget_autocomplete_preview" width="400" height="150" frameborder="1" border-radius="5"
     src="https://meteofrance.com/widget/prevision/751010"> </iframe>
 </div>

src/app/components/meteo/meteo.component.scss

@@ -0,0 +1 @@
+

src/app/emoticon/emoticon.component.html

@@ -0,0 +1,6 @@
+<p>emoticon des humeurs</p>
+<div *ngFor="let humor of tabHumeur">{{humor.title}}</div>
+<div *ngFor="let humor of tabHumeur"> <img src="{{humor.lien}}" alt="{{humor.title}}"></div>
+
+
+

src/app/emoticon/emoticon.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EmoticonComponent } from './emoticon.component';
+
+describe('EmoticonComponent', () => {
+  let component: EmoticonComponent;
+  let fixture: ComponentFixture<EmoticonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ EmoticonComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EmoticonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/emoticon/emoticon.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-emoticon',
+  templateUrl: './emoticon.component.html',
+  styleUrls: ['./emoticon.component.scss']
+})
+export class EmoticonComponent implements OnInit {
+
+     //declaration du tableau
+     tabHumeur= [
+      { title : "Je pleure", lien : "../../../assets/images/emoticon-pleurer.png"},
+      { title : "Je suis en colère", lien : "../../../assets/images/emoticon-insulter.png"},
+      { title : "Je suis malade", lien : "../../../assets/images/emoticon-vomir.png"}
+    ]
+
+
+  constructor() { }
+
+  ngOnInit(): void {
+
+
+console.log("tab humeurs ==>", this.tabHumeur)
+  }
+
+}

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

@@ -1,5 +1,8 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
+<div class="meteo">
+<app-meteo></app-meteo>
+</div>
 <div class="d-flex justify-content-center">
   <button button type="button" class="btn btn-primary btn-lg"
           routerLink="../creation-team"

src/app/pages/page-account/page-account.component.scss

@@ -0,0 +1,5 @@
+.meteo {
+  display: flex;
+  margin-left: 300px;
+  margin-top: -60px;
+}

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

@@ -1,5 +1,6 @@
 <app-header></app-header>
 <body>
+  <div class="container">
 <div class="bienvenue">
   <h2 class="titre">BIENVENUE</h2>
 <p>
@@ -13,6 +14,7 @@ lu, nous sommes là pour vous aider !</p>
 <div class="connexion">
 <app-signin></app-signin>
 </div>
+</div>
 <div class="pub">
   <img src="../../../assets/images/menu.png" />
   <img src="../../../assets/images/repertoire.png" />

src/app/pages/page-accueil/page-accueil.component.scss

@@ -1,10 +1,15 @@
+.container {
+  display: flex;
+}
+
 .bienvenue {
   float: left;
-  display: inline;
+  // display: inline-block;
+  // height: 300px;
   border: 4px solid #5d5fef;
   border-radius: 10px;
   margin-top: 50px;
-  margin-left: 200px;
+  // margin-left: 200px;
   padding-right: 10px;
   padding-left: 10px;
 }
@@ -18,17 +23,20 @@ p {
   line-height: 2em;
 }
 .connexion {
-  float: right;
+  // float: right;
+  height: 350px;
   display: inline;
   margin-top: -40px;
-  margin-right: 200px;
+  margin-left: 10px;
+  // margin-right: 200px;
 }
 
 .pub {
-  padding-top: 100px;
-  padding-right: 100px;
-  padding-left: 200px;
   display: flex;
+  flex-wrap: wrap;
+  padding-top: 100px;
+  padding-right: 200px;
+  padding-left: 200px;
   justify-content: space-between;
 }
 

src/app/pages/page-forgot-password/page-forgot-password.component.html

@@ -13,10 +13,10 @@
         routerLinkActive="active-custom">Ré-initialiser mon mot de passe</button>
 
     </form>
-
+<!--
     <div *ngIf="errorForm">
       <p class="text-danger">Il manque des informations dans le formulaire...</p>
-    </div>
+    </div> -->
   </main>
 </div>
 

src/app/pages/page-forgot-password/page-forgot-password.component.ts

@@ -14,25 +14,20 @@ import {
   styleUrls: ['./page-forgot-password.component.scss']
 })
 export class PageForgotPasswordComponent implements OnInit {
-public errorForm: boolean;
   constructor(private authService: AuthService, private router: Router) {
-     this.errorForm = false;
+
   }
 
   ngOnInit(): void {}
-  public onSubmit(submittedForm: any): void {
+
+    public onSubmit(submittedForm: any): void {
     console.log(submittedForm.form.value);
-    const email = submittedForm.form.value['email'];
-    if (email !== '') {
-      this.authService.forgotPassword(email).subscribe((resp) => {
-        console.log('Component : PageForgotPassword ', resp);
-        this.router.navigate(['reinitialisation-password']);
-      });
-    } else {
-      // afficher une erreur à l'utilisateur
-      this.errorForm = true;
-    }
+
+    // const email = submittedForm.form.value['email'];
+    // console.log(email);
+      window.alert("Vous allez recevoir un email pour re-initialiser votre mot de passe !")
+      // this.router.navigate(['reinitialisation-password']);
+
+  }
   }
 
-
-}

src/app/pages/page-not-found/page-not-found.component.html

@@ -2,11 +2,15 @@
 
 <div>
 
-<p> Page introuvable</p>
-<a routerLink="" routerLinkActive="!active"><br><br>
-    Je retourne à l'accueil<br><br><br><br><br><br><br><br><br><br><br><br></a>
+  <div class="ctn-link min-vh-100">
+ <div class="text-center">
+ <p> Page introuvable</p>
 
 
+      <a routerLink="" routerLinkActive="!active">Je retourne à l'accueil</a>
+    </div>
+    
+  </div>
+
 </div>
 
-

src/app/pages/page-not-found/page-not-found.component.scss

@@ -1,25 +1,16 @@
-a.hover {
-  color: rgb(219, 200, 28);
+p{
+    color: black;
+    text-align: center;
 }
 
-a {
-  color: rgb(32, 114, 45);
+
+.ctn-link > div {
+    padding-top: 7em;
 }
 
-div {
-  text-align: center;
-  font-weight: bold;
 
-  // si on préfère une image en fond
-  // background-image: url("../../../assets/images/404.jpg");
-  // background-size: cover;
-
-  background-image: linear-gradient(
-    to left top,
-    #051937,
-    #004d7a,
-    #008793,
-    #e2ebe7,
-    #f8faf5
-  );
+.min-vh-100  {
+    font-weight: bold;
+    background-image: linear-gradient(to left top, #051937, #004d7a, #008793, #e2ebe7, #f8faf5);
+    //max-width: max-content;
 }

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

@@ -26,6 +26,6 @@
         <img style="max-height: 12% ; max-width: 12%" src="../../../assets/images/contact-1.png"/>
         <p class="fiche-contact" >{{ personne.prenom }} {{ personne.nom }}</p>
     </div>
-<div *ngIf="openDetails"><app-fiche-contact [personne]="openDetails"></app-fiche-contact></div>
+<div *ngIf="openDetails"><app-fiche-contact [personne]="openDetails" (clickDelete)="onClickDelete($event)"></app-fiche-contact></div>
     
 </div>

src/app/pages/page-repertoire/page-repertoire.component.ts

@@ -69,7 +69,10 @@ export class PageRepertoireComponent implements OnInit {
     this.openDetails = personne;
   }
 
-  // this.repertoireService.deleteContact(contact).subscribe((resp) => {
-  //   this.router.navigate(['repertoire/']);
-  // });
+
+  onClickDelete(contact: Contact){
+    this.repertoireService.deleteContact(contact).subscribe((resp) => {
+      this.router.navigate(['repertoire/']);
+    });
+  }
 }