From 80ca5fc805ccc599c6f3c6b7054b7d23e981633b Mon Sep 17 00:00:00 2001 From: AurianeStrasser2 <auriane.strasser@student.ecp.fr> Date: Thu, 20 Sep 2018 22:48:25 +0200 Subject: [PATCH] =?UTF-8?q?pr=C3=AAt=20=C3=A0=20lancer=20le=20site=20pour?= =?UTF-8?q?=20la=20premiere=20inscription?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/members/projects/overview/overview.component.html | 8 ++++++-- src/app/members/projects/overview/overview.component.scss | 5 +++++ src/app/members/projects/projects-routing.module.ts | 3 +-- src/app/members/projects/projects.component.html | 2 +- .../members/visits/visits-list/visits-list.component.html | 7 ++++--- src/app/members/visits/visits.component.html | 1 + 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/app/members/projects/overview/overview.component.html b/src/app/members/projects/overview/overview.component.html index dbc6a42..7e59769 100644 --- a/src/app/members/projects/overview/overview.component.html +++ b/src/app/members/projects/overview/overview.component.html @@ -1,8 +1,12 @@ -<app-two-panes> +<div id="page"> +<!--app-two-panes> <app-pane id="open-registrations"> <app-open-registrations [editions]="editions"></app-open-registrations> </app-pane> <app-pane id="my-participations"> <app-my-participations-overview [participations]="participations"></app-my-participations-overview> </app-pane> -</app-two-panes> +</app-two-panes--> + <h2>Coming soon !</h2> + <p>Nos tuteurs t'informeront lors des premières inscriptions aux projets !</p> +</div> \ No newline at end of file diff --git a/src/app/members/projects/overview/overview.component.scss b/src/app/members/projects/overview/overview.component.scss index 9736f12..b3f2890 100644 --- a/src/app/members/projects/overview/overview.component.scss +++ b/src/app/members/projects/overview/overview.component.scss @@ -1,4 +1,5 @@ @import '~sass/variables'; +@import '~app/showcase-site/sass/mixins'; #open-registrations { background: $color-light-blue; @@ -7,3 +8,7 @@ #my-participations { background: lighten($color-purple-light, 15); } + +#page { + @include margin-page; +} \ No newline at end of file diff --git a/src/app/members/projects/projects-routing.module.ts b/src/app/members/projects/projects-routing.module.ts index aef5d15..975d4ac 100644 --- a/src/app/members/projects/projects-routing.module.ts +++ b/src/app/members/projects/projects-routing.module.ts @@ -1,14 +1,13 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ProjectsComponent } from './projects.component'; -import { ProjectListComponent } from './project-list/project-list.component'; import { ProjectDetailComponent } from './project-detail/project-detail.component'; import { RegisterWizardComponent } from './register-wizard/register-wizard.component'; import { OverviewComponent } from './overview/overview.component'; import { MyParticipationsComponent } from './my-participations/my-participations.component'; import { ProjectResolver, ProjectListResolver, - EditionResolver, EditionOpenRegistrationListResolver, + EditionOpenRegistrationListResolver, UserPendingParticipationListResolver, UserParticipationListResolver, } from './core'; diff --git a/src/app/members/projects/projects.component.html b/src/app/members/projects/projects.component.html index 3867805..c4bc3d7 100644 --- a/src/app/members/projects/projects.component.html +++ b/src/app/members/projects/projects.component.html @@ -1,5 +1,5 @@ <div class="material-theme"> <h1 class="text-center">Projets</h1> - <projects-navbar layout="row" layout-align="center center"></projects-navbar> + <!--projects-navbar layout="row" layout-align="center center"></projects-navbar--> <router-outlet></router-outlet> </div> diff --git a/src/app/members/visits/visits-list/visits-list.component.html b/src/app/members/visits/visits-list/visits-list.component.html index 2de0c8a..6d18ca6 100644 --- a/src/app/members/visits/visits-list/visits-list.component.html +++ b/src/app/members/visits/visits-list/visits-list.component.html @@ -1,6 +1,5 @@ <div id="page"> - <h1 class="text-center">Sorties</h1> - <ul class="tabs"> + <!--ul class="tabs"> <li [ngClass]="{active: !passed}" (click)="passed = false"> Sorties à venir </li> @@ -20,5 +19,7 @@ </div> <ng-template #loading> <app-load-spinner></app-load-spinner> - </ng-template> + </ng-template--> +<h2>Coming soon !</h2> +<p>Nos tuteurs t'informeront lors des premières inscriptions aux sorties !</p> </div> diff --git a/src/app/members/visits/visits.component.html b/src/app/members/visits/visits.component.html index 23c2829..e164c36 100644 --- a/src/app/members/visits/visits.component.html +++ b/src/app/members/visits/visits.component.html @@ -1,2 +1,3 @@ +<h1 class="text-center">Sorties</h1> <messages></messages> <router-outlet></router-outlet> -- GitLab