isa44.74
/
organizee-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22 from AlineRinquin/blandine 

Blandine
This commit is contained in:
AlineRinquin 2022-02-14 15:25:20 +01:00 committed by GitHub
parent acfb169715 d89214db19
commit 9fa153da8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/components/meteo/meteo.component.html
View File

@ -1,7 +1,4 @@
<div class="meteo"> <div class="meteo">
<input type="text" id="ville"> <iframe id="widget_autocomplete_preview" width="400" height="150" frameborder="1" border-radius="5"
<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"
src="https://meteofrance.com/widget/prevision/751010"> </iframe> src="https://meteofrance.com/widget/prevision/751010"> </iframe>
</div> </div>

1
src/app/components/meteo/meteo.component.scss
View File

@ -0,0 +1 @@

3
src/app/pages/page-account/page-account.component.html
View File

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

5
src/app/pages/page-account/page-account.component.scss
View File

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

2
src/app/pages/page-accueil/page-accueil.component.html
View File

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

22
src/app/pages/page-accueil/page-accueil.component.scss
View File

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

4
src/app/pages/page-forgot-password/page-forgot-password.component.html
View File

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

21
src/app/pages/page-forgot-password/page-forgot-password.component.ts
View File

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