new update

angular-client/src/app/components/admin/admin-login/admin-login.component.scss

@@ -1,5 +1,5 @@
 .navtop{
-    margin-top: 7em;
+    margin-top: 10em;
     margin-bottom: 3em;
   }
  

angular-client/src/app/components/admin/assistance/assistance.component.scss

@@ -1,5 +1,5 @@
 .navtop{
-    margin-top: 7em;
+    margin-top: 14em;
     margin-bottom: 4em;
     min-height: 250px;
   }

angular-client/src/app/components/auth/profil/edit-profil-info-connexion/edit-profil-info-connexion.component.html

@@ -4,18 +4,21 @@
 <div mat-dialog-content class="">
    
     <div class="row">
-        <p class="col-5 col-md-4 font-weight-bold text-lg-right parag">Téléphone :</p>
+        <p class="col-5 col-md-4 font-weight-bold text-lg-right parag">Email:</p>
         <mat-form-field class="col-7 col-md-5" appearance="outline">
-            <input matInput placeholder="" formControlName="phonenumber" required>
-            <mat-error *ngIf="!formGroup.controls['phonenumber'].valid || formGroup.controls['phonenumber'].touched">
-                {{ getErrorPhonenumber() }}
+            <input matInput placeholder="" formControlName="email" required>
+            <mat-error *ngIf="!formGroup.controls['email'].valid || formGroup.controls['email'].touched">
+                {{ getErrorEmail() }}
               </mat-error>
         </mat-form-field>
     </div>
     <div class="row">
-        <p class="col-5 col-md-4 font-weight-bold text-lg-right parag">Adresse :</p>
+        <p class="col-5 col-md-4 font-weight-bold text-lg-right parag">Mot de passe:</p>
         <mat-form-field class="col-7 col-md-5" appearance="outline">
-            <input matInput placeholder="" formControlName="adress" required>
+            <input matInput placeholder="" formControlName="password" required>
+            <mat-error *ngIf="!formGroup.controls['password'].valid || formGroup.controls['password'].touched">
+                {{ getErrorPassword() }}
+              </mat-error>
             
         </mat-form-field>
     </div>

angular-client/src/app/components/auth/profil/edit-profil-info-connexion/edit-profil-info-connexion.component.ts

@@ -17,6 +17,7 @@ export class EditProfilInfoConnexionComponent implements OnInit {
    {}
    formGroup: FormGroup;
    submitted = false;
+   user = this.element
 
 
    ngOnInit(): void {
@@ -28,13 +29,34 @@ export class EditProfilInfoConnexionComponent implements OnInit {
 
   createForm() {
    
-    let phonenumberregex : RegExp = /^(?:(?:\+|00)33|0)\s*[1-9](?:[\s.-]*\d{2}){4}$/;
+    let emailregex: RegExp = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
     this.formGroup = this.formBuilder.group({
-      phonenumber: [Validators.pattern(phonenumberregex)],
-      adress:[]
+      email: [null, [Validators.required, Validators.pattern(emailregex)]],
+      password: [null, [Validators.required, this.checkPassword]]
     });
   }
 
+  
+
+  checkPassword(control) {
+    let enteredPassword = control.value
+    let passwordCheck = /^(?=.*[A-Z])(?=.*[a-z])(?=.{8,})/;
+    return (!passwordCheck.test(enteredPassword) && enteredPassword) ? { 'requirements': true } : null;
+  }
+
+  getErrorEmail() {
+    return this.formGroup.get('email').hasError('required') ? 'Adresse email requise' :
+      this.formGroup.get('email').hasError('pattern') ? 'Adresse email non valide' : '';
+  }
+
+  getErrorPassword() {
+    return this.formGroup.get('password').hasError('required') ? 'Mot de passe requis' :
+      this.formGroup.get('password').hasError('requirements') ? 
+      'Le mot de passe doit comporter au moins 8 caractères, une lettre majuscule,  une lettre majuscule' : '';
+  }
+
+  
+
 
  // login
  updateProfil(){
@@ -58,16 +80,6 @@ export class EditProfilInfoConnexionComponent implements OnInit {
 }
 
 
-
-
-
-getErrorPhonenumber() {
-  return this.formGroup.get('phonenumber').hasError('pattern') ? 'Numéro de téléphone non valide' : '';
-}
-
-
-
-
   
   onConfirm(): void {
     // Close the dialog, return true

angular-client/src/app/components/auth/tirage/tirage.component.scss

@@ -1,3 +1,3 @@
 .navtop{
-    margin-top: 6em;
+    margin-top: 12em;
   }

angular-client/src/app/components/shared/footer/footer.component.html

@@ -9,7 +9,7 @@
           
           <div class="col-12 mb-2 ">
             <a routerLink="/" routerLinkActive="active" class="row justify-content-center" >
-              <img  width="80" height="80" src="assets/img/fatboar.png">
+              <img  width="80" height="80" src="assets/img/logo-fatboar.png">
             </a>
           </div>
 

angular-client/src/app/components/shared/navbar/navbar.component.html

@@ -8,7 +8,7 @@
     </div>
     
     <a  routerLink="/" class="">
-    <span><img  src="assets/img/fatboar.png"  width="50" height="50" class="logo-fatboar"  alt="fatboar"></span>  
+    <span><img  src="assets/img/logo-fatboar.png"  width="50" height="50" class="logo-fatboar"  alt="fatboar"></span>  
       
     </a> 
     <span class="example-spacer"></span>
@@ -22,7 +22,7 @@
       <a class="navbtn" mat-button routerLink="/statistique" [hidden]="!isAdmin">Statistique</a>
       <a class="navbtn" mat-button routerLink="/emailing" [hidden]="!isAdmin">Emailing</a>
       <a class="navbtn" mat-button routerLink="/assistance" [hidden]="!isAdmin">Assistance</a>
-      <a class="navbtn" mat-button routerLink="/users" [hidden]="!isAdmin">Employés</a>
+      <!-- <a class="navbtn" mat-button routerLink="/users" [hidden]="!isAdmin">Employés</a> -->
       <a class="navbtn" mat-button routerLink="/contact" >Contact</a>
       <a class="navbtn" mat-icon-button color="basic" aria-label="" (click)="logOut()" *ngIf="isLogged">
         <mat-icon>power_settings_new</mat-icon>