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 sana

Browse source
This commit is contained in:
Sana EL HIRI 2022-03-02 19:15:48 +01:00
commit 11e4d7321e
14 changed files with 63 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import { TokenService } from 'src/app/services/token.service';
})
export class PageAccueilComponent implements OnInit {
constructor(private http: HttpClient, private router: Router, private tokenService: TokenService) {
constructor(private http: HttpClient, private router: Router, private tokenService: TokenService) {
}

14
src/app/pages/page-agenda/page-agenda.component.ts
View file

@ -54,7 +54,7 @@ export class PageAgendaComponent implements AfterViewInit {
ngAfterViewInit(): void {
}
ngOnInit(): void {
this.userId = this.tokenService.getCurrentMembreId();
this.teamId = this.tokenService.getCurrentTeamId();
@ -92,7 +92,7 @@ export class PageAgendaComponent implements AfterViewInit {
{
next: result => {
this.viewChange();
this.alert={"type":"success", "content":"L'évènement à bien été modifié"};
this.alert={"type":"success", "content":"L'évènement a bien été modifié"};
this.isShow = true;
},
error: err => {
@ -102,11 +102,11 @@ export class PageAgendaComponent implements AfterViewInit {
},
complete: () => console.log('DONE!')
}
);
);
}else{
this.viewChange();
this.alert={"type":"danger", "content":"Vous ne pouvez pas modifié cet évènement !"};
this.isShow = true;
this.alert={"type":"danger", "content":"Vous ne pouvez pas modifier cet évènement !"};
this.isShow = true;
}
},
@ -172,7 +172,7 @@ export class PageAgendaComponent implements AfterViewInit {
}else{
this.viewChange();
this.alert={"type":"danger", "content":"Vous ne pouvez pas suprimé cet évènement !"};
this.isShow = true;
this.isShow = true;
}
},
eventResizeHandling: "Update",
@ -206,7 +206,7 @@ export class PageAgendaComponent implements AfterViewInit {
}else{
this.viewChange();
this.alert={"type":"danger", "content":"Vous ne pouvez pas déplacé cet évènement !"};
this.isShow = true;
this.isShow = true;
}
}
}

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

@ -20,7 +20,7 @@ export class PageForgotPasswordComponent implements OnInit {
alert : any;
isShow : boolean;
constructor(private authService: AuthService, private router: Router, private mailService: MailService,) {
this.alert = "";
this.isShow = false;
@ -41,9 +41,7 @@ export class PageForgotPasswordComponent implements OnInit {
};
console.log(membre);
// this.authService.forgotPassword(membre).subscribe((resp) => {
// console.log('----'+resp)
// });
this.authService.forgotPassword(membre).subscribe(
{
@ -70,7 +68,7 @@ export class PageForgotPasswordComponent implements OnInit {
},
complete: () => console.log('DONE!')
}
);
);

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

@ -11,3 +11,4 @@
</main>
</div>
</div>
<app-footer></app-footer>

10
src/app/pages/page-reset-password/page-reset-password.component.ts
View file

@ -36,16 +36,6 @@ export class PageResetPasswordComponent implements OnInit {
);
}
// 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(): void {
console.log('value : ', this.resetForm.value);