From 616c4fe75813c29d74115deadf985f0d8bcaa9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20Gu=C3=A9don?= <arthur.guedon@student-cs.fr>
Date: Wed, 7 Oct 2020 10:49:21 +0200
Subject: [PATCH] adds message after personnal data modifications
---
.../members/account/edit-data/edit-data.component.html | 1 +
.../members/account/edit-data/edit-data.component.scss | 4 ++++
.../members/account/edit-data/edit-data.component.ts | 10 +++++++++-
.../account-overview/account-overview.component.html | 2 +-
.../members/student-home/student-home.component.html | 4 ++--
src/app/panes/panes.module.ts | 6 +++---
.../three-panes.component.html} | 0
.../three-panes.component.scss} | 0
src/app/panes/three-panes/three-panes.component.ts | 8 ++++++++
src/app/panes/two-panes/two-panes.component.ts | 8 --------
10 files changed, 28 insertions(+), 15 deletions(-)
rename src/app/panes/{two-panes/two-panes.component.html => three-panes/three-panes.component.html} (100%)
rename src/app/panes/{two-panes/two-panes.component.scss => three-panes/three-panes.component.scss} (100%)
create mode 100644 src/app/panes/three-panes/three-panes.component.ts
delete mode 100644 src/app/panes/two-panes/two-panes.component.ts
diff --git a/src/app/members/account/edit-data/edit-data.component.html b/src/app/members/account/edit-data/edit-data.component.html
index 5d8fd82..faf76ca 100644
--- a/src/app/members/account/edit-data/edit-data.component.html
+++ b/src/app/members/account/edit-data/edit-data.component.html
@@ -152,6 +152,7 @@
</button>
</div>
<p class="text-center">{{error}}</p>
+ <p class="text-center post-edit-text">{{postEditMessage}}</p>
</form>
</app-form-page>
<messages></messages>
diff --git a/src/app/members/account/edit-data/edit-data.component.scss b/src/app/members/account/edit-data/edit-data.component.scss
index 94479bb..f99e2b9 100644
--- a/src/app/members/account/edit-data/edit-data.component.scss
+++ b/src/app/members/account/edit-data/edit-data.component.scss
@@ -25,4 +25,8 @@
.checkbox-field {
display: block;
margin: .5em 0;
+ }
+
+ .post-edit-text{
+ color:green;
}
\ No newline at end of file
diff --git a/src/app/members/account/edit-data/edit-data.component.ts b/src/app/members/account/edit-data/edit-data.component.ts
index 465c552..9bd2489 100644
--- a/src/app/members/account/edit-data/edit-data.component.ts
+++ b/src/app/members/account/edit-data/edit-data.component.ts
@@ -20,6 +20,7 @@ export class EditDataComponent implements OnInit {
formGroup : FormGroup;
loading = false;
public error : String = "";
+ public postEditMessage : String = "" ;
public possibleParentsStatus = [
{id:"Mariés",name:"Mariés"},
{id:"Divorcés",name:"Divorcés"},
@@ -118,7 +119,14 @@ export class EditDataComponent implements OnInit {
this.personalDataService.edit(personalData).pipe(
tap(() => this.loading = false),
tap(()=> this.error = ""),
- tap(() => this.router.navigate(['./membres/compte/donnees'])),
+ tap(() => {
+ this.postEditMessage = "Merci d'avoir completé tes données personnelles ! Nous allons t'envoyer un email contenant le lien vers le dossier d'inscription, si tu ne le reçois pas, pense à vérifier tes spams."
+ setTimeout(()=>{
+ this.router.navigate(['./membres/compte/donnees'])
+ this.postEditMessage = ""
+ },7000)
+
+ }),
).subscribe(
() => {},
(error) => {
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 d940ef5..674262d 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
@@ -2,7 +2,7 @@
<h2 id="title">Mon Compte</h2>
<p>
- Retrouve et modifie tes données personnelles que tu as saisies lors de ton inscription.
+ 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">
Voir mon compte
diff --git a/src/app/members/student-home/student-home.component.html b/src/app/members/student-home/student-home.component.html
index a2c967e..540c5f1 100644
--- a/src/app/members/student-home/student-home.component.html
+++ b/src/app/members/student-home/student-home.component.html
@@ -2,7 +2,7 @@
Mon espace
</h1>
-<app-two-panes>
+<app-three-panes>
<app-pane id="visits">
<visits-overview class="pane-content"></visits-overview>
</app-pane>
@@ -12,7 +12,7 @@
<app-pane id="account">
<account-overview class="pane-content"></account-overview>
</app-pane>
-</app-two-panes>
+</app-three-panes>
<div class="container">
<h2>
diff --git a/src/app/panes/panes.module.ts b/src/app/panes/panes.module.ts
index 4318091..b7b7476 100644
--- a/src/app/panes/panes.module.ts
+++ b/src/app/panes/panes.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { TwoPanesComponent } from './two-panes/two-panes.component';
+import { ThreePanesComponent } from './three-panes/three-panes.component';
import { PaneComponent } from './pane/pane.component';
@NgModule({
@@ -9,11 +9,11 @@ import { PaneComponent } from './pane/pane.component';
CommonModule
],
declarations: [
- TwoPanesComponent,
+ ThreePanesComponent,
PaneComponent,
],
exports: [
- TwoPanesComponent,
+ ThreePanesComponent,
PaneComponent,
]
})
diff --git a/src/app/panes/two-panes/two-panes.component.html b/src/app/panes/three-panes/three-panes.component.html
similarity index 100%
rename from src/app/panes/two-panes/two-panes.component.html
rename to src/app/panes/three-panes/three-panes.component.html
diff --git a/src/app/panes/two-panes/two-panes.component.scss b/src/app/panes/three-panes/three-panes.component.scss
similarity index 100%
rename from src/app/panes/two-panes/two-panes.component.scss
rename to src/app/panes/three-panes/three-panes.component.scss
diff --git a/src/app/panes/three-panes/three-panes.component.ts b/src/app/panes/three-panes/three-panes.component.ts
new file mode 100644
index 0000000..4167f75
--- /dev/null
+++ b/src/app/panes/three-panes/three-panes.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-three-panes',
+ templateUrl: './three-panes.component.html',
+ styleUrls: ['./three-panes.component.scss']
+})
+export class ThreePanesComponent {}
diff --git a/src/app/panes/two-panes/two-panes.component.ts b/src/app/panes/two-panes/two-panes.component.ts
deleted file mode 100644
index 5887f6d..0000000
--- a/src/app/panes/two-panes/two-panes.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'app-two-panes',
- templateUrl: './two-panes.component.html',
- styleUrls: ['./two-panes.component.scss']
-})
-export class TwoPanesComponent {}
--
GitLab