From 494d81a284b8dbce49247ee9d89b761957e45e73 Mon Sep 17 00:00:00 2001
From: florimondmanca <florimond.manca@gmail.com>
Date: Thu, 20 Sep 2018 18:03:09 +0200
Subject: [PATCH] small improvements to student home page

---
 src/app/members/members-routing.module.ts       |  3 ++-
 src/app/members/members.component.ts            |  6 +++---
 .../projects-overview.component.html            |  8 ++++----
 .../student-home/student-home-routing.module.ts | 17 -----------------
 .../student-home/student-home.component.html    | 13 +++++++++----
 .../student-home/student-home.component.ts      | 12 +++++++++++-
 .../members/student-home/student-home.module.ts |  8 +++++---
 .../visits-overview.component.html              | 16 +++++++++-------
 8 files changed, 43 insertions(+), 40 deletions(-)
 delete mode 100644 src/app/members/student-home/student-home-routing.module.ts

diff --git a/src/app/members/members-routing.module.ts b/src/app/members/members-routing.module.ts
index 61962e0..8f94e22 100644
--- a/src/app/members/members-routing.module.ts
+++ b/src/app/members/members-routing.module.ts
@@ -3,6 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { AuthGuard, MapsAPIResolver } from 'app/core';
 
 import { MembersComponent } from './members.component';
+import { StudentHomeComponent } from './student-home/student-home.component';
 
 const routes: Routes = [
   {
@@ -13,7 +14,7 @@ const routes: Routes = [
       {
         path: '',
         data: { title: 'Accueil' },
-        loadChildren: './student-home/student-home.module#StudentHomeModule',
+        component: StudentHomeComponent,
       },
       {
         path: 'sorties',
diff --git a/src/app/members/members.component.ts b/src/app/members/members.component.ts
index edc22b1..18629a4 100644
--- a/src/app/members/members.component.ts
+++ b/src/app/members/members.component.ts
@@ -16,9 +16,9 @@ export class MembersComponent {
   ) { }
 
   navLinks: Link[] = [
-    { href: '/membres', text: 'Mon espace membre' },
-    { href: '/membres/projets', text: 'Nos projets' },
-    { href: '/membres/sorties', text: 'Nos sorties' },
+    { href: './', text: 'Mon espace' },
+    { href: './projets', text: 'Nos projets' },
+    { href: './sorties', text: 'Nos sorties' },
     { text: 'Déconnexion', action: () => this.logout() },
   ];
 
diff --git a/src/app/members/student-home/projects-overview/projects-overview.component.html b/src/app/members/student-home/projects-overview/projects-overview.component.html
index 4d3eaf3..9d4fae0 100644
--- a/src/app/members/student-home/projects-overview/projects-overview.component.html
+++ b/src/app/members/student-home/projects-overview/projects-overview.component.html
@@ -1,11 +1,11 @@
 <div class="container">
   <h2 id="title">Projets</h2>
-  
+
   <p>
     Retrouve les descriptions des projets que le secteur Projets te propose, et inscris-toi à tes projets préférés.
-    <br><br><a routerLink="projets">
-      Voir
-    </a> 
   </p>
+  <a mat-raised-button color="accent" routerLink="projets">
+    Voir les projets
+  </a>
 
 </div>
diff --git a/src/app/members/student-home/student-home-routing.module.ts b/src/app/members/student-home/student-home-routing.module.ts
deleted file mode 100644
index f90b00e..0000000
--- a/src/app/members/student-home/student-home-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { StudentHomeComponent } from './student-home.component';
-
-
-const routes: Routes = [
-  {
-    path: '',
-    component: StudentHomeComponent,
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class StudentHomeRoutingModule { }
diff --git a/src/app/members/student-home/student-home.component.html b/src/app/members/student-home/student-home.component.html
index e396bdf..acbf72e 100644
--- a/src/app/members/student-home/student-home.component.html
+++ b/src/app/members/student-home/student-home.component.html
@@ -1,11 +1,16 @@
-<h1 class="text-center">Mon espace membre</h1>
+<h1 class="text-center">Mon espace</h1>
 
 <app-two-panes>
   <visits-overview pane="left"></visits-overview>
   <projects-overview pane="right"></projects-overview>
 </app-two-panes>
+
 <div class="container">
-  <h2>Notifications par mail</h2>
-  <p>Pour toute nouvelle information importante concernant ton inscription aux sorties et projets, l'état d'avancement du dossier etc., un mail automatique te sera envoyé à l'adresse que tu nous as fournie !</p>
+  <h2>
+    Notifications
+  </h2>
+  <p>
+    Les informations importantes concernant ton  <strong>inscription aux sorties et projets</strong> te seront envoyées par email à l'adresse que tu nous as fournie
+    ({{ userEmail }}).
+  </p>
 </div>
-<router-outlet></router-outlet>
diff --git a/src/app/members/student-home/student-home.component.ts b/src/app/members/student-home/student-home.component.ts
index 78a42b5..50d2ff5 100644
--- a/src/app/members/student-home/student-home.component.ts
+++ b/src/app/members/student-home/student-home.component.ts
@@ -1,8 +1,18 @@
 import { Component } from '@angular/core';
+import { AuthService } from 'app/core';
+
 @Component({
   selector: 'student-home',
   templateUrl: './student-home.component.html',
   styleUrls: ['./student-home.component.scss']
 })
-export class StudentHomeComponent {}
+export class StudentHomeComponent {
+
+  userEmail: string;
+
+  constructor(private auth: AuthService) { }
 
+  ngOnInit() {
+    this.userEmail = this.auth.getUserSnapshot().email;
+  }
+}
diff --git a/src/app/members/student-home/student-home.module.ts b/src/app/members/student-home/student-home.module.ts
index 65fee95..bc853c8 100644
--- a/src/app/members/student-home/student-home.module.ts
+++ b/src/app/members/student-home/student-home.module.ts
@@ -4,7 +4,9 @@ import { RouterModule } from '@angular/router';
 import { CoreModule } from 'app/core';
 import { SharedModule } from 'app/shared';
 import { PanesModule } from 'app/panes';
-import { StudentHomeRoutingModule } from './student-home-routing.module';
+import {
+  MatButtonModule,
+} from '@angular/material';
 
 // Components
 import { StudentHomeComponent } from './student-home.component';
@@ -18,7 +20,7 @@ import { VisitsOverviewComponent } from './visits-overview/visits-overview.compo
     CoreModule,
     PanesModule,
     SharedModule,
-    StudentHomeRoutingModule,
+    MatButtonModule,
   ],
   declarations: [
     StudentHomeComponent,
@@ -27,4 +29,4 @@ import { VisitsOverviewComponent } from './visits-overview/visits-overview.compo
   ]
 })
 
-export class StudentHomeModule { }
\ No newline at end of file
+export class StudentHomeModule { }
diff --git a/src/app/members/student-home/visits-overview/visits-overview.component.html b/src/app/members/student-home/visits-overview/visits-overview.component.html
index 16187bc..41fe659 100644
--- a/src/app/members/student-home/visits-overview/visits-overview.component.html
+++ b/src/app/members/student-home/visits-overview/visits-overview.component.html
@@ -1,10 +1,12 @@
 <div class="container">
   <h2 id="title">Sorties</h2>
-    <p>
-        Retrouve toutes les informations concernant les prochanes sorties que le secteur Sorties a concocté pour toi !
-        <br><br> Dates, lieux et horaires, formulaires d'inscription, tout est disponible ici. 
-        <br><br><a routerLink="sorties">
-          Voir
-        </a>
-    </p>
+  <p>
+    Retrouve toutes les informations concernant les prochanes sorties que le secteur Sorties a concocté pour toi !
+  </p>
+  <p>
+    Dates, lieux et horaires, formulaires d'inscription, tout est disponible ici.
+  </p>
+  <a mat-raised-button color="accent" routerLink="sorties">
+    Voir les dernières sorties
+  </a>
 </div>
-- 
GitLab