From 3014c692c6114d131ff36ba6583469675bf7b584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Gu=C3=A9don?= <arthur.guedon@student-cs.fr> Date: Fri, 13 Nov 2020 17:14:38 +0100 Subject: [PATCH] changes member account routing --- src/app/members/account/account-routing.module.ts | 5 +++-- src/app/members/account/account.component.ts | 3 ++- src/app/members/members-routing.module.ts | 1 + .../account-overview/account-overview.component.html | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/members/account/account-routing.module.ts b/src/app/members/account/account-routing.module.ts index 6439045..d1f975c 100644 --- a/src/app/members/account/account-routing.module.ts +++ b/src/app/members/account/account-routing.module.ts @@ -15,6 +15,7 @@ const routes: Routes = [ data: { title: 'Mon Compte' }, component: AccountComponent, children: [ + { path: 'donnees', component: MyDataComponent, @@ -22,13 +23,13 @@ const routes: Routes = [ 'personalData' : PersonalDataResolver }, - }, - { + },{ path: 'modifier_donnees', component: EditDataComponent, resolve : { 'personalData' : PersonalDataResolver }, + }, // { // path: 'mon_dossier', component: MyFileComponent, diff --git a/src/app/members/account/account.component.ts b/src/app/members/account/account.component.ts index 2a41b52..4f438ed 100644 --- a/src/app/members/account/account.component.ts +++ b/src/app/members/account/account.component.ts @@ -16,11 +16,12 @@ export class AccountComponent implements OnInit { navLinks: Link[] = [ { href: './donnees', text: 'Mes données' }, { href: './modifier_donnees', text: 'Modifier mes données' }, + //{ href: './mon_dossier', text: 'Mon dossier' }, ]; ngOnInit() { - this.router.navigate(['./membres/compte/modifier_donnees']) + this.router.navigate(['membres/compte/modifier_donnees']) } } diff --git a/src/app/members/members-routing.module.ts b/src/app/members/members-routing.module.ts index 01addc9..0db2328 100644 --- a/src/app/members/members-routing.module.ts +++ b/src/app/members/members-routing.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AuthGuard, MapsAPIResolver } from 'app/core'; +import { EditDataComponent } from './account/edit-data/edit-data.component'; import { MembersComponent } from './members.component'; import { StudentHomeComponent } from './student-home/student-home.component'; diff --git a/src/app/members/student-home/account-overview/account-overview.component.html b/src/app/members/student-home/account-overview/account-overview.component.html index 674262d..43ad6c9 100644 --- a/src/app/members/student-home/account-overview/account-overview.component.html +++ b/src/app/members/student-home/account-overview/account-overview.component.html @@ -4,7 +4,7 @@ <p> Remplie ou modifie tes données personnelles qui te serviront pour valider ton inscription à Oser. </p> - <a mat-raised-button color="accent" routerLink="compte/donnees"> + <a mat-raised-button color="accent" routerLink="compte/modifier_donnees"> Voir mon compte </a> -- GitLab