Skip to content
Snippets Groups Projects
Unverified Commit 9ca58cc1 authored by AurianeStrasser2's avatar AurianeStrasser2 Committed by GitHub
Browse files

Merge pull request #28 from oser-cs/remise_sorties

Remise sorties
parents e25197b3 fc74ad4a
Branches
No related tags found
10 merge requests!61adds info on phone number format,!60adds message for the format of phone number,!57Validated signup file display,!56adds status for validation of signup file,!41Supprime ggform,!31Password reset feature,!36Modify inscription page,!35Release,!39Change form link,!37Modify inscription page
<app-two-panes> <div id="page">
<!--app-two-panes>
<app-pane id="open-registrations"> <app-pane id="open-registrations">
<app-open-registrations [editions]="editions"></app-open-registrations> <app-open-registrations [editions]="editions"></app-open-registrations>
</app-pane> </app-pane>
<app-pane id="my-participations"> <app-pane id="my-participations">
<app-my-participations-overview [participations]="participations"></app-my-participations-overview> <app-my-participations-overview [participations]="participations"></app-my-participations-overview>
</app-pane> </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>
@import '~sass/variables'; @import '~sass/variables';
@import '~app/showcase-site/sass/mixins';
#open-registrations { #open-registrations {
background: $color-light-blue; background: $color-light-blue;
...@@ -7,3 +8,7 @@ ...@@ -7,3 +8,7 @@
#my-participations { #my-participations {
background: $color-purple-lighter; background: $color-purple-lighter;
} }
#page {
@include margin-page;
}
\ No newline at end of file
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { ProjectsComponent } from './projects.component'; import { ProjectsComponent } from './projects.component';
import { ProjectListComponent } from './project-list/project-list.component';
import { ProjectDetailComponent } from './project-detail/project-detail.component'; import { ProjectDetailComponent } from './project-detail/project-detail.component';
import { RegisterWizardComponent } from './register-wizard/register-wizard.component'; import { RegisterWizardComponent } from './register-wizard/register-wizard.component';
import { OverviewComponent } from './overview/overview.component'; import { OverviewComponent } from './overview/overview.component';
import { MyParticipationsComponent } from './my-participations/my-participations.component'; import { MyParticipationsComponent } from './my-participations/my-participations.component';
import { import {
ProjectResolver, ProjectListResolver, ProjectResolver, ProjectListResolver,
EditionResolver, EditionOpenRegistrationListResolver, EditionOpenRegistrationListResolver,
UserPendingParticipationListResolver, UserPendingParticipationListResolver,
UserParticipationListResolver, UserParticipationListResolver,
} from './core'; } from './core';
...@@ -26,7 +25,7 @@ const routes: Routes = [ ...@@ -26,7 +25,7 @@ const routes: Routes = [
editions: EditionOpenRegistrationListResolver, editions: EditionOpenRegistrationListResolver,
participations: UserPendingParticipationListResolver, participations: UserPendingParticipationListResolver,
}, },
}, },/*
{ {
path: 'inscription', path: 'inscription',
component: RegisterWizardComponent, component: RegisterWizardComponent,
...@@ -41,7 +40,7 @@ const routes: Routes = [ ...@@ -41,7 +40,7 @@ const routes: Routes = [
path: ':projectId', path: ':projectId',
component: ProjectDetailComponent, component: ProjectDetailComponent,
resolve: { project: ProjectResolver }, resolve: { project: ProjectResolver },
}, },*/
] ]
}, },
]; ];
......
<div class="material-theme"> <div class="material-theme">
<h1 class="text-center">Projets</h1> <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> <router-outlet></router-outlet>
</div> </div>
<div id="page"> <div id="page">
<h1 class="text-center">Sorties</h1>
<ul class="tabs"> <ul class="tabs">
<li [ngClass]="{active: !passed}" (click)="passed = false"> <li [ngClass]="{active: !passed}" (click)="passed = false">
Sorties à venir Sorties à venir
...@@ -21,4 +20,6 @@ ...@@ -21,4 +20,6 @@
<ng-template #loading> <ng-template #loading>
<app-load-spinner></app-load-spinner> <app-load-spinner></app-load-spinner>
</ng-template> </ng-template>
<!-- h2>On y travaille…</h2>
<p>Nos tuteurs t'informeront lors des premières inscriptions aux sorties !</p-->
</div> </div>
<h1 class="text-center">Sorties</h1>
<messages></messages> <messages></messages>
<router-outlet></router-outlet> <router-outlet></router-outlet>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment