diff --git a/src/app/members/projects/overview/overview.component.html b/src/app/members/projects/overview/overview.component.html index dbc6a42c131af4b11d0018ab78aa767063856826..7a1503b741a05a63393ba75c8d7fd50a015c09de 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>On y travaille…</h2> + <p>Nos tuteurs t'informeront lors des premières inscriptions aux projets !</p> +</div> diff --git a/src/app/members/projects/overview/overview.component.scss b/src/app/members/projects/overview/overview.component.scss index 88637018a404c3bb465edb0e170c4e200044d511..1fe80a21edceac227f4c8250e2d35442b47a1b8e 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: $color-purple-lighter; } + +#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 aef5d15a8e13e444d3e574151e41ac23b0d65aa5..1f03a2efd8085f9f899ee506579b57967b0134ec 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'; @@ -26,7 +25,7 @@ const routes: Routes = [ editions: EditionOpenRegistrationListResolver, participations: UserPendingParticipationListResolver, }, - }, + },/* { path: 'inscription', component: RegisterWizardComponent, @@ -41,7 +40,7 @@ const routes: Routes = [ path: ':projectId', component: ProjectDetailComponent, resolve: { project: ProjectResolver }, - }, + },*/ ] }, ]; diff --git a/src/app/members/projects/projects.component.html b/src/app/members/projects/projects.component.html index 386780532e8207093071c24199e845a6aea3f9ec..c4bc3d7bb19aedf0292fccbbfe49063b7e4cc69c 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 2de0c8ad9551369b9869204bcc9061d80ab6187f..e02367bc3f393710fbe067581abc3f1b250bb8c9 100644 --- a/src/app/members/visits/visits-list/visits-list.component.html +++ b/src/app/members/visits/visits-list/visits-list.component.html @@ -1,5 +1,4 @@ <div id="page"> - <h1 class="text-center">Sorties</h1> <ul class="tabs"> <li [ngClass]="{active: !passed}" (click)="passed = false"> Sorties à venir @@ -21,4 +20,6 @@ <ng-template #loading> <app-load-spinner></app-load-spinner> </ng-template> +<!-- h2>On y travaille…</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 23c2829a01e4aba249eb7278af4a492ab0c84e2e..e164c363d679af8981e4a54c53f997b0fb5c0c13 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>