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

Merge branch 'dev' into sana

Browse source
This commit is contained in:
AlineRinquin 2022-02-14 16:38:15 +01:00 • committed by GitHub
commit 42b5ac19ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 11717 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/app/pages/page-account/page-account.component.html
View file

@ -38,4 +38,3 @@
</div>
</main>
</div>
</div>

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

@ -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" />

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

@ -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;
}

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>
</form>
<!--
<div *ngIf="errorForm">
<p class="text-danger">Il manque des informations dans le formulaire...</p>
</div>
</div> -->
</main>
</div>

25
src/app/pages/page-forgot-password/page-forgot-password.component.ts
View file

@ -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']);
}
}
}

12
src/app/pages/page-not-found/page-not-found.component.html
View file

@ -2,11 +2,15 @@
<app-side-bar></app-side-bar>
<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>

29
src/app/pages/page-not-found/page-not-found.component.scss
View file

@ -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;
}

2
src/app/pages/page-repertoire/page-repertoire.component.html
View file

@ -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>

9
src/app/pages/page-repertoire/page-repertoire.component.ts
View file

@ -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/']);
});
}
}