Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev

src/app/app.component.html

@@ -1,4 +1,4 @@
-<app-search-bar></app-search-bar>
-<app-nav-bar></app-nav-bar>
+<app-search-bar *ngIf="dontShow"></app-search-bar>
+<app-nav-bar *ngIf="dontShow"></app-nav-bar>
 <router-outlet></router-outlet>
-<app-footer></app-footer>
+<app-footer *ngIf="dontShow"></app-footer>

src/app/app.component.ts

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
 
 @Component({
   selector: 'app-root',
@@ -7,4 +8,19 @@ import { Component } from '@angular/core';
 })
 export class AppComponent {
   title = 'simpleat';
+  dontShow: boolean = false;
+
+  constructor(private router:Router){
+    this.router.events.subscribe(e=>{
+      //console.log(e);
+      if(e instanceof NavigationEnd){
+        console.log(e.url)
+        if (e.url == "/signin") {
+          this.dontShow = false;
+        } else {
+          this.dontShow = true;
+        }
+      }
+    })
+  }
 }

src/app/card-resto/card-resto.component.html

@@ -68,8 +68,8 @@
             ></app-icon>
             <span class="a-emporter pe-2 ps-4 " style="color:#545454">A emporter :</span>
             <app-icon
-              [iconName]="restaurant.emporter ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1'"
-              [iconColor]="restaurant.emporter ? '#4ECB71' : '#ED2F2F'"
+              [iconName]="restaurant.aEmporter ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1'"
+              [iconColor]="restaurant.aEmporter ? '#4ECB71' : '#ED2F2F'"
             ></app-icon>
           </div>
           <div class="trait-rouge pt-3"></div>

src/app/footer/footer.component.html

@@ -1,14 +1,14 @@
 <footer class="d-flex">
 
-<div class = "logo d-inline-flex align-items-center p-4">
+  <div class = "logo d-inline-flex align-items-center">
       <img src="../../assets/Logo_footer.png">
-</div>
+  </div>
 
-<div class="liens d-flex justify-content-end align-items-center">
+  <div class="liens d-flex justify-content-end align-items-center">
       <h5>Aide</h5>
       <h5>Contact</h5>
       <h5>Administrateurs</h5>
       <h5>Mentions legales</h5>
-</div>
+  </div>
 
-</footer>
+  </footer>

src/app/pages/signin/signin.component.html

@@ -1,5 +1,5 @@
 <div class="signin-form text-center">
-  <main class="form-signin">
+  <main class="form-signin d-inline-flex">
       <form (ngSubmit)="onSubmit(signinForm)" #signinForm="ngForm">
       <h5>Merci de vous connecter</h5>
       <img src="../../../assets/images-header/logo.png"><br>
@@ -32,12 +32,12 @@
           <button class="w-100 btn btn-lg btn-danger"
                   type="submit"
                   [disabled]="signinForm.invalid">Je me connecte !</button>
-                  <p>
+                  <!--<p>
                       Form is dirty : {{ signinForm.form.dirty }}
                   </p>
                   <p>
                       Form is touched : {{ signinForm.form.touched }}
-                  </p>
+                  </p>-->
       </form>
 
       <div *ngIf="errorForm">

src/app/pages/signin/signin.component.scss

@@ -1,19 +1,18 @@
 .signin-form {
   height: 100vh;
   padding-top: 40px;
-  background-image: url(../../../assets/fond_signin.png);
+  background-image: url(../../../assets/fond-signin.png);
   background-position: center;
 }
 
 .form-signin {
-  width: 500px;
-  //max-width: 330px;
+  max-width: 500px;
   padding: 15px;
   margin: auto;
+  margin-top: 20vh;
   background-color: #f0f0f0;
   border-radius: 15px;
   box-shadow: 10px 10px 10px grey;
-  margin-top: 25vh;
 }
 
 .form-floating:focus-within {