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

Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine

Browse source
This commit is contained in:
Blandine Bajard 2022-03-01 17:32:23 +01:00
commit 6c489a4fda
29 changed files with 581 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

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

15
src/app/pages/page-add-member/page-add-member.component.ts
View file

@ -1,8 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { Mail } from 'src/app/models/mail';
import { Membre } from 'src/app/models/membre';
import { AuthService } from 'src/app/services/auth.service';
import { MailService } from 'src/app/services/mail.service';
import { MembreService } from 'src/app/services/membre.service';
@Component({
@ -15,6 +17,7 @@ export class PageAddMemberComponent implements OnInit {
public addMemberForm: FormGroup;
constructor(
private membreService: MembreService,
private mailService: MailService,
private authService: AuthService,
private router: Router,
private fb: FormBuilder
@ -75,9 +78,21 @@ export class PageAddMemberComponent implements OnInit {
roleList: [roleValue]
};
const mail: Mail = {
recipient: emailValue,
subject: "Votre mot de passe Organizee",
//message: 'Votre mot de passe'
message: `Bonjour ${firstNameValue}!\n Voici vos identifiants de connexion : \n
Identifiant : ${emailValue}
Mot de passe : ${passwordValue}`
};
if (membre.email !== '' && membre.password !== '') {
this.membreService.addMembre(membre)?.subscribe((resp) => {
this.mailService.envoiMailText(mail)?.subscribe((respMail) =>{
console.log("Mail envoyé");
})
this.router.navigate(['compte']);
});
} else {

2
src/app/pages/page-agenda/page-agenda.component.scss
View file

@ -40,4 +40,4 @@
.fullscreen {
position: absolute; top:90px; left: 0px; right: 0px; bottom: 0px;
}
}

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

27
src/app/pages/page-to-do-list/page-to-do-list.component.html
View file

@ -1,10 +1,27 @@
<app-header></app-header>
<app-side-bar></app-side-bar>
<div class="row">
<div class="col-md-auto">
<app-side-bar></app-side-bar>
</div>
<div class="col menu text-center">
<h2>To-Do-List</h2>
<div class="d-flex align-items-stretch"></div>
<input
type="text"
class="btn btn-outline-success"
placeholder=" Ajouter une To-Do-List"
[(ngModel)]="todoListTitle"
(keyup.enter)="addTodoByTeamId()"
/>
<div class="d-flex align-items-stretch">
<div class="row">
<div class="col" *ngFor="let todos of result">
<app-to-do-list [todo]="todos"> </app-to-do-list>
<div class="d-flex align-items-stretch">
<div class="custom-main container p-3">
<div class="row">
<div class="col" *ngFor="let todos of listTodos">
<app-to-do-list [todo]="todos"> </app-to-do-list>
</div>
</div>
</div>
</div>
</div>
</div>

6
src/app/pages/page-to-do-list/page-to-do-list.component.scss
View file

@ -0,0 +1,6 @@
.btn {
margin-top: 1%;
margin-bottom: 1%;
color: black;
box-shadow: 5px 5px 5px gray;
}

52
src/app/pages/page-to-do-list/page-to-do-list.component.ts
View file

@ -1,26 +1,50 @@
import { Component, OnInit } from '@angular/core';
import { ToDoList } from 'src/app/models/to-do-list';
import { TodoService } from 'src/app/services/todo.service';
import { Team } from 'src/app/models/team';
@Component({
selector: 'app-page-to-do-list',
templateUrl: './page-to-do-list.component.html',
styleUrls: ['./page-to-do-list.component.scss']
styleUrls: ['./page-to-do-list.component.scss'],
})
export class PageToDoListComponent implements OnInit {
public result : any;
constructor(private TodoService : TodoService) { }
ngOnInit(): void {
this.TodoService.getToDoListByTeamId().subscribe((data :any)=>{
this.result = data;
console.log(data);
});
public result: any;
public listTodos: any[];
public todoListTitle: string;
public idTodo: number;
constructor(private TodoService: TodoService) {
this.listTodos = [];
this.todoListTitle = '';
this.idTodo = 0;
}
ngOnInit(): void {
this.TodoService.getToDoListByTeamId()?.subscribe((listTodos: any) => {
console.log(listTodos);
this.listTodos = listTodos;
this.todoListTitle = '';
this.idTodo = 0;
});
}
//Ajouter une todo List
addTodoByTeamId() {
const todoList: ToDoList = {
nom: this.todoListTitle,
taches: [],
id: 0,
};
this.TodoService.addTodoByTeamId(todoList)?.subscribe((resp) => {
console.log(todoList);
window.location.reload();
});
}
deleteTodo(id: number): void {
window.alert('La to-do-List a bien été supprimé!');
this.TodoService.deleteTodoById(id).subscribe((resp) => {
window.location.reload();
});
}
}