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

Merge branch 'dev' into isa2

Browse Source
This commit is contained in:
HarmandI 2022-02-28 08:34:43 +01:00
commit de3fbc6fda
17 changed files with 263 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app-routing.module.ts
View File

@ -36,7 +36,7 @@ const routes: Routes = [
{ path: 'password-oublie', component: PageForgotPasswordComponent },
{ path: 'menu', canActivate: [AuthGuard], component: PageMenuSemaineComponent },
{ path: 'repertoire', canActivate: [AuthGuard], component: PageRepertoireComponent },
{ path: 'reinitialisation-password', component: PageResetPasswordComponent },
{ path: 'reinitialisation-password/:uuid', component: PageResetPasswordComponent },
{ path: 'creation-compte', component: PageSignupComponent },
{ path: 'page-support', component: PageSupportComponent},
{ path: 'to-do-list', canActivate: [AuthGuard], component: PageToDoListComponent },

8
src/app/components/fiche-contact/fiche-contact.component.html
View File

@ -4,13 +4,17 @@
<div class="couleur col-7" [style.background-color]="personne.couleur"></div>
<div class="col-5">
<div class="col">
<button routerLink="../modifier-contact/{{personne.id}}"
<button
*ngIf="parent"
routerLink="../modifier-contact/{{personne.id}}"
class=" btn btn-sm btn-rounded btn-secondary mb-2">
Modifier
</button>
</div>
<div class="col">
<button class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
<button
*ngIf="parent"
class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
Supprimer
</button>
</div>

15
src/app/components/fiche-contact/fiche-contact.component.ts
View File

@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { TokenService } from 'src/app/services/token.service';
@Component({
selector: 'app-fiche-contact',
@ -8,10 +9,20 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
export class FicheContactComponent implements OnInit {
@Input() personne: any;
@Output() clickDelete = new EventEmitter();
parent: boolean;
constructor() {}
ngOnInit(): void {}
constructor(private tokenService: TokenService) {
this.parent = false;
}
ngOnInit(): void {
const roleUser = this.tokenService.getRole();
if(roleUser == "ROLE_PARENT"){
this.parent = true;
}
}
onClickDelete(numPerson: number){
window.alert("Le contact à bien été supprimé!")

9
src/app/components/signin/signin.component.html
View File

@ -23,9 +23,14 @@
routerLinkActive="active-custom">S'inscrire</button>
</form>
<div *ngIf="errorForm">
<a routerLink="/password-oublie" routerLinkActive="active-custom" class="nav-link">password perdu ?</a>
<!-- <div *ngIf="errorForm">
<p class="text-danger">Il manque des informations dans le formulaire...</p>
</div> -->
<div *ngIf="isShow">
<div class="alert alert-{{alert.type}}" role="alert">
{{alert.content}}
</div>
</div>
</main>
</div>

28
src/app/components/signin/signin.component.ts
View File

@ -14,9 +14,10 @@ import {
styleUrls: ['./signin.component.scss'],
})
export class SigninComponent implements OnInit {
public errorForm: boolean;
alert : any;
isShow : boolean;
constructor(private authService: AuthService, private router: Router) {
this.errorForm = false;
this.isShow = false;
}
ngOnInit(): void {}
@ -26,18 +27,21 @@ export class SigninComponent implements OnInit {
const email = submittedForm.form.value['email'];
const password = submittedForm.form.value['password'];
if (email !== '' && password !== '') {
this.authService.signin(email, password).subscribe((resp) => {
console.log('Component Signin: ', resp);
//if(resp == ){
this.router.navigate(['tableau-de-bord']);
//}else{
// window.alert("Votre identifiant/mot de passe est erroné");
//}
console.log('Component Signin: ', resp);
});
this.authService.signin(email, password).subscribe(
{
next: resp => {
this.router.navigate(['tableau-de-bord']);
},
error: err => {
this.alert={"type":"danger", "content":"Le login ou paswword est invalide"};
this.isShow = true;
},
complete: () => console.log('DONE!')
});
} else {
// afficher une erreur à l'utilisateur
this.errorForm = true;
this.alert={"type":"danger", "content":"Le login ou password est invalide"};
this.isShow = true;
}
}
}

11
src/app/pages/page-accueil/page-accueil.component.ts
View File

@ -1,4 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { TokenService } from 'src/app/services/token.service';
@Component({
selector: 'app-page-accueil',
@ -7,9 +10,15 @@ import { Component, OnInit } from '@angular/core';
})
export class PageAccueilComponent implements OnInit {
constructor() { }
constructor(private http: HttpClient, private router: Router, private tokenService: TokenService) {
}
ngOnInit(): void {
const token = this.tokenService.getToken();
if(token){
this.router.navigate(['tableau-de-bord']);
}
}
}

4
src/app/pages/page-agenda/page-agenda.component.ts
View File

@ -188,8 +188,8 @@ export class PageAgendaComponent implements AfterViewInit {
end: args.e.end(),
id: args.e.id(),
barColor: "#555555",
text: args.e.text(),
membre: {id:this.userId},
text: this.rdvSplit(args.e.text()),
membre: {id:args.e.data.tags.membre},
team: {id:this.teamId}
}
this.evenementService.updateEvenements(event).subscribe(

4
src/app/pages/page-dashboard/page-dashboard.component.scss
View File

@ -12,7 +12,7 @@
.container {
display: flex;
padding: 10px;
padding: 20px;
}
@ -26,7 +26,7 @@ button{
#boxFour{
height: 150px;
margin-top: -70px;
margin-top: -99px;
width: fit-content;
}

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

@ -9,10 +9,22 @@
<label for="floatingInput">Adresse email</label>
</div>
<button class="w-100 btn btn-lg btn-success" type="submit" [disabled]="forgotForm.invalid" routerLink="../reinitialisation-password"
routerLinkActive="active-custom">Ré-initialiser mon mot de passe</button>
<!-- <button class="w-100 btn btn-lg btn-success" type="submit" [disabled]="forgotForm.invalid" routerLink="../reinitialisation-password"
routerLinkActive="active-custom">Ré-initialiser mon mot de passe</button> -->
<button
class="w-100 btn btn-lg btn-outline-success"
type="submit"
[disabled]="forgotForm.invalid">
Ré-initialiser mon mot de passe
</button>
</form>
<br/> <br/>
<div *ngIf="isShow">
<div class="alert alert-{{alert.type}}" role="alert">
{{alert.content}}
</div>
</div>
<!--
<div *ngIf="errorForm">
<p class="text-danger">Il manque des informations dans le formulaire...</p>

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

@ -7,6 +7,9 @@ import {
FormGroup,
Validators,
} from '@angular/forms';
import { Membre } from 'src/app/models/membre';
import { MailService } from 'src/app/services/mail.service';
import { Mail } from 'src/app/models/mail';
@Component({
selector: 'app-page-forgot-password',
@ -14,18 +17,76 @@ import {
styleUrls: ['./page-forgot-password.component.scss']
})
export class PageForgotPasswordComponent implements OnInit {
constructor(private authService: AuthService, private router: Router) {
alert : any;
isShow : boolean;
constructor(private authService: AuthService, private router: Router, private mailService: MailService,) {
this.alert = "";
this.isShow = false;
}
ngOnInit(): void {}
public onSubmit(submittedForm: any): void {
console.log(submittedForm.form.value);
const membre: Membre = {
nom: "",
prenom: "",
dateNaissance: new Date(),
email: submittedForm.form.value.email,
password: "",
roleList: ["ROLE_PARENT"],
couleur: "",
passwordConfirm: ""
};
console.log(membre);
// this.authService.forgotPassword(membre).subscribe((resp) => {
// console.log('----'+resp)
// });
this.authService.forgotPassword(membre).subscribe(
{
next: result => {
this.alert={"type":"success", "content":"Un mail à été envoyé !"};
this.isShow = true;
const mail: Mail = {
recipient: submittedForm.form.value.email,
subject: "Votre mot de passe Organizee",
//message: 'Votre mot de passe'
message: `
Bonjour!\n
Vous avez fait une demande de ré-initialisation de mot de passe. \n
Cliquez sur le lien pour définir un nouveau mot de passe: \n
Lien : http://192.168.1.16:4200/reinitialisation-password/${result}`
};
this.mailService.envoiMailText(mail)?.subscribe((respMail) =>{
console.log("Mail envoyé");
})
},
error: err => {
this.alert={"type":"danger", "content":"Le mail a merdé, ou il n'y a personne ds la bdd !"};
this.isShow = true;
},
complete: () => console.log('DONE!')
}
);
// service resetpassword
// creer un random et le mettre dans password
//service envoi de mail // envoyer un lien avec ce random
// nouveau formulaire de reset password
// update du password
// const email = submittedForm.form.value['email'];
// console.log(email);
window.alert("Vous allez recevoir un email pour re-initialiser votre mot de passe !")
//window.alert("Vous allez recevoir un email pour re-initialiser votre mot de passe !")
// this.router.navigate(['reinitialisation-password']);
}

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

@ -7,10 +7,8 @@
<div class="col compte text-center py-3 border">
<div>
<button class="btn btn-sm btn-rounded btn-secondary m-3" type="submit">
Tous les contacts
</button>
<button
*ngIf="parent"
routerLink="/ajouter-contact"
class="btn btn-sm btn-rounded btn-secondary m-3"
>

12
src/app/pages/page-repertoire/page-repertoire.component.ts
View File

@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Contact } from 'src/app/models/contact';
import { RepertoireService } from 'src/app/services/repertoire.service';
import { TokenService } from 'src/app/services/token.service';
@Component({
selector: 'app-page-repertoire',
@ -15,18 +16,27 @@ export class PageRepertoireComponent implements OnInit {
public personneid: any;
keyword: any;
openDetails: any;
parent: boolean;
constructor(
private repertoireService: RepertoireService,
private router: Router,
private route: ActivatedRoute
private route: ActivatedRoute,
private tokenService: TokenService
) {
this.listContact = [];
this.listFull = [];
this.listContactInfo = '';
this.parent = false;
}
ngOnInit(): void {
const roleUser = this.tokenService.getRole();
if(roleUser == "ROLE_PARENT"){
this.parent = true;
}
//récupère tout les contact et leurs info
this.repertoireService.getContact().subscribe((listContact: any[]) => {
console.log(listContact);

44
src/app/pages/page-reset-password/page-reset-password.component.html
View File

@ -1,19 +1,45 @@
<app-header></app-header>
<div class="reset-form text-center">
<main class="form-reset">
<form (ngSubmit)="onSubmit(resetForm)" #resetForm="ngForm">
<form (ngSubmit)="onSubmit()" [formGroup]="resetForm">
<h3>Entrez ici votre email et votre nouveau mot de passe</h3>
<div class="form-floating">
<input type="email" class="form-control" id="floatingEmail" placeholder="" name="email" ngModel required
[ngClass]="{'is-valid': resetForm.form.touched && resetForm.form.value['email'] != '' ,
'is-invalid': resetForm.form.touched && resetForm.form.value['email'] == ''}">
<label for="floatingEmail">Email</label>
<input
type="password"
class="form-control"
id="floatingPassword"
placeholder=""
name="password"
formControlName="passwordFc"
[ngClass]="{
'is-valid':
resetForm.controls['passwordFc'].touched &&
resetForm.controls['passwordFc'].valid,
'is-invalid':
resetForm.controls['passwordFc'].touched &&
!resetForm.controls['passwordFc'].valid
}"
/>
<label for="floatingPassword">MOT DE PASSE</label>
</div>
<div class="form-floating">
<input type="password" class="form-control" id="floatingPassword" placeholder="" name="password" ngModel
required [ngClass]="{'is-valid': resetForm.form.touched && resetForm.form.value['password'] != '' ,
'is-invalid': resetForm.form.touched && resetForm.form.value['password'] == ''}">
<label for="floatingPassword">Mot de passe</label>
<input
type="password"
class="form-control"
id="floatingpasswordConfirm"
placeholder=""
name="passwordConfirm"
formControlName="passwordConfirmFc"
[ngClass]="{
'is-valid':
resetForm.controls['passwordConfirmFc'].touched &&
resetForm.controls['passwordConfirmFc'].valid,
'is-invalid':
resetForm.controls['passwordConfirmFc'].touched &&
!resetForm.controls['passwordConfirmFc'].valid
}"
/>
<label for="floatingPasswordConfirm">CONFIRMEZ VOTRE MOT DE PASSE</label>
</div>
<button class="w-100 btn btn-outline-success" type="submit" [disabled]="resetForm.invalid">Enregistrer</button>

86
src/app/pages/page-reset-password/page-reset-password.component.ts
View File

@ -1,5 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { Membre } from 'src/app/models/membre';
import { AuthService } from 'src/app/services/auth.service';
@ -9,20 +11,80 @@ import { AuthService } from 'src/app/services/auth.service';
styleUrls: ['./page-reset-password.component.scss']
})
export class PageResetPasswordComponent implements OnInit {
public resetForm: FormGroup;
uuid:string;
constructor(private authService: AuthService, private router: Router,private fb: FormBuilder, private activatedRoute: ActivatedRoute) {
this.resetForm = new FormGroup({});
this.uuid = this.activatedRoute.snapshot.params['uuid'];
}
constructor(private authService: AuthService, private router: Router,) { }
ngOnInit(): void {
this.resetForm = this.fb.group(
{
passwordFc: new FormControl('', [
Validators.minLength(8),
Validators.required,
]),
passwordConfirmFc: new FormControl('', [
Validators.minLength(8),
Validators.required,
]),
},
{
validator: this.ConfirmedValidator('passwordFc', 'passwordConfirmFc'),
}
);
}
ngOnInit(): void { }
// public onSubmit(submittedForm: any): void {
// console.log(submittedForm.form.value);
// const password = submittedForm.form.value['password'];
// console.log(email);
// this.authService.resetPassword(email, password).subscribe((resp: any) => {
// window.alert("Votre mot de passe est bien ré-initialisé !")
// this.router.navigate(['accueil']);
public onSubmit(submittedForm: any): void {
console.log(submittedForm.form.value);
const password = submittedForm.form.value['password'];
const email = submittedForm.form.value['email'];
console.log(email);
this.authService.resetPassword(email, password).subscribe((resp: any) => {
window.alert("Votre mot de passe est bien ré-initialisé !")
this.router.navigate(['accueil']);
// });
// }
});
public onSubmit(): void {
console.log('value : ', this.resetForm.value);
console.log('form : ', this.resetForm);
const passwordValue = this.resetForm.value['passwordFc'];
const passwordConfirmValue = this.resetForm.value['passwordConfirmFc'];
const membre: Membre = {
nom: "",
prenom: "",
dateNaissance: new Date(),
email: "",
password: passwordValue,
roleList: ["ROLE_PARENT"],
couleur: "",
passwordConfirm: ""
};
this.authService.resetPassword(membre,this.uuid).subscribe((resp) => {
this.router.navigate(['accueil']);
});
}
ConfirmedValidator(controlName: string, matchingControlName: string) {
return (formGroup: FormGroup) => {
const control = formGroup.controls[controlName];
const matchingControl = formGroup.controls[matchingControlName];
if (
matchingControl.errors &&
!matchingControl.errors['confirmedValidator']
) {
return;
}
if (control.value !== matchingControl.value) {
matchingControl.setErrors({ confirmedValidator: true });
} else {
matchingControl.setErrors(null);
}
};
}
}

14
src/app/services/auth.service.ts
View File

@ -44,17 +44,13 @@ export class AuthService {
}
forgotPassword(email: string): Observable<any> {
const body = {
email: email,
};
return this.http.get(`${this.apiUrl}/membres/forgot-password`);
forgotPassword(membre: Membre): Observable<any> {
return this.http.post(`${this.apiUrl}/membres/forgot-password`, membre, {responseType: "text"});
}
resetPassword(email: string, password: string): Observable<any> {
const body = password;
console.log(password);
return this.http.put(`${this.apiUrl}/membres/reset-password/${email}`, body);
resetPassword(membre: Membre, uuid:string): Observable<any> {
console.log('--'+uuid+' / '+membre);
return this.http.put(`${this.apiUrl}/membres/reset-password/${uuid}`, membre);
}
creationTeam(team: Team): Observable<any> {

2
src/environments/environment.ts
View File

@ -4,7 +4,7 @@
export const environment = {
production: false,
apiUrl: 'http://localhost:8088',
apiUrl: 'http://localhost:8080',
tokenKey: 'TOKEN-ORGANIZEE',
};