Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev
This commit is contained in:
commit
334f799c60
@ -1,4 +1,4 @@
|
|||||||
<app-search-bar></app-search-bar>
|
<app-search-bar *ngIf="dontShow"></app-search-bar>
|
||||||
<app-nav-bar></app-nav-bar>
|
<app-nav-bar *ngIf="dontShow"></app-nav-bar>
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
<app-footer></app-footer>
|
<app-footer *ngIf="dontShow"></app-footer>
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
|
import { NavigationEnd, Router } from '@angular/router';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
@ -7,4 +8,19 @@ import { Component } from '@angular/core';
|
|||||||
})
|
})
|
||||||
export class AppComponent {
|
export class AppComponent {
|
||||||
title = 'simpleat';
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -68,8 +68,8 @@
|
|||||||
></app-icon>
|
></app-icon>
|
||||||
<span class="a-emporter pe-2 ps-4 " style="color:#545454">A emporter :</span>
|
<span class="a-emporter pe-2 ps-4 " style="color:#545454">A emporter :</span>
|
||||||
<app-icon
|
<app-icon
|
||||||
[iconName]="restaurant.emporter ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1'"
|
[iconName]="restaurant.aEmporter ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1'"
|
||||||
[iconColor]="restaurant.emporter ? '#4ECB71' : '#ED2F2F'"
|
[iconColor]="restaurant.aEmporter ? '#4ECB71' : '#ED2F2F'"
|
||||||
></app-icon>
|
></app-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="trait-rouge pt-3"></div>
|
<div class="trait-rouge pt-3"></div>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<footer class="d-flex">
|
<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">
|
<img src="../../assets/Logo_footer.png">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div class="signin-form text-center">
|
<div class="signin-form text-center">
|
||||||
<main class="form-signin">
|
<main class="form-signin d-inline-flex">
|
||||||
<form (ngSubmit)="onSubmit(signinForm)" #signinForm="ngForm">
|
<form (ngSubmit)="onSubmit(signinForm)" #signinForm="ngForm">
|
||||||
<h5>Merci de vous connecter</h5>
|
<h5>Merci de vous connecter</h5>
|
||||||
<img src="../../../assets/images-header/logo.png"><br>
|
<img src="../../../assets/images-header/logo.png"><br>
|
||||||
@ -32,12 +32,12 @@
|
|||||||
<button class="w-100 btn btn-lg btn-danger"
|
<button class="w-100 btn btn-lg btn-danger"
|
||||||
type="submit"
|
type="submit"
|
||||||
[disabled]="signinForm.invalid">Je me connecte !</button>
|
[disabled]="signinForm.invalid">Je me connecte !</button>
|
||||||
<p>
|
<!--<p>
|
||||||
Form is dirty : {{ signinForm.form.dirty }}
|
Form is dirty : {{ signinForm.form.dirty }}
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Form is touched : {{ signinForm.form.touched }}
|
Form is touched : {{ signinForm.form.touched }}
|
||||||
</p>
|
</p>-->
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div *ngIf="errorForm">
|
<div *ngIf="errorForm">
|
||||||
|
@ -1,19 +1,18 @@
|
|||||||
.signin-form {
|
.signin-form {
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
padding-top: 40px;
|
padding-top: 40px;
|
||||||
background-image: url(../../../assets/fond_signin.png);
|
background-image: url(../../../assets/fond-signin.png);
|
||||||
background-position: center;
|
background-position: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-signin {
|
.form-signin {
|
||||||
width: 500px;
|
max-width: 500px;
|
||||||
//max-width: 330px;
|
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
|
margin-top: 20vh;
|
||||||
background-color: #f0f0f0;
|
background-color: #f0f0f0;
|
||||||
border-radius: 15px;
|
border-radius: 15px;
|
||||||
box-shadow: 10px 10px 10px grey;
|
box-shadow: 10px 10px 10px grey;
|
||||||
margin-top: 25vh;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-floating:focus-within {
|
.form-floating:focus-within {
|
||||||
|
BIN
src/assets/fond-signin.png
Normal file
BIN
src/assets/fond-signin.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 681 KiB |
Loading…
Reference in New Issue
Block a user