diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 54eec0b9..35af062a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -15,6 +15,10 @@ import {CommonModule} from '@angular/common'; import { DatesComponent } from './pages/dates/dates.component'; import { DebuggerComponent } from './debugger/debugger.component'; import { VisibilityComponent } from './pages/visibility/visibility.component'; +import { ResumeComponent } from './pages/resume/resume.component'; +import { PicturesComponent } from './pages/pictures/pictures.component'; +import { AnswersComponent } from './pages/answers/answers.component'; +import { EndConfirmationComponent } from './pages/end-confirmation/end-confirmation.component'; @NgModule({ @@ -28,6 +32,10 @@ import { VisibilityComponent } from './pages/visibility/visibility.component'; DatesComponent, DebuggerComponent, VisibilityComponent, + ResumeComponent, + PicturesComponent, + AnswersComponent, + EndConfirmationComponent, ], imports: [ diff --git a/src/app/config.service.ts b/src/app/config.service.ts index d596952f..8cb4ebdf 100644 --- a/src/app/config.service.ts +++ b/src/app/config.service.ts @@ -1,13 +1,6 @@ import {Injectable} from '@angular/core'; +import {PollConfig} from './config/PollConfig'; -/** - * une option de date dans les sondages spéciaux - */ -export interface DateOption { - text: string; - start?: string; - end?: string; -} /** * le service transverse à chaque page qui permet de syncroniser la configuration de sondage souhaitée @@ -15,16 +8,11 @@ export interface DateOption { @Injectable({ providedIn: 'root' }) -export class ConfigService { - step = 0; - stepMax = 3; - pollType = 'classic'; - title = ''; - description = ''; - allowSeveralHours = false; - dateList: DateOption[] = []; +export class ConfigService extends PollConfig { + constructor() { + super(); } set(key, val) { diff --git a/src/app/config/PollConfig.ts b/src/app/config/PollConfig.ts new file mode 100644 index 00000000..ef6aa1e2 --- /dev/null +++ b/src/app/config/PollConfig.ts @@ -0,0 +1,24 @@ +/** + * une option de date dans les sondages spéciaux + */ +export interface DateOption { + text: string; + start?: string; + end?: string; +} + +/** + * configuration + */ +export class PollConfig { + step = 0; + stepMax = 3; + pollType = 'classic'; + title = ''; + description = ''; + // date specific poll + allowSeveralHours = false; + dateList: DateOption[] = []; + answers: string[] = []; + +} diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index b76c7583..3e4e41d3 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -1,6 +1,10 @@ import {FormContainerComponent} from '../form-container/form-container.component'; import {KindComponent} from '../pages/kind/kind.component'; import {DatesComponent} from '../pages/dates/dates.component'; +import {VisibilityComponent} from '../pages/visibility/visibility.component'; +import {ResumeComponent} from '../pages/resume/resume.component'; +import {PicturesComponent} from '../pages/pictures/pictures.component'; +import {EndConfirmationComponent} from '../pages/end-confirmation/end-confirmation.component'; /** * each step in the form is a component @@ -10,6 +14,10 @@ export const Routes = {path: '', component: FormContainerComponent}, {path: 'home', component: FormContainerComponent}, {path: 'step/date', component: DatesComponent}, - {path: 'step/kind', component: KindComponent} + {path: 'step/kind', component: KindComponent}, + {path: 'step/picture', component: PicturesComponent}, + {path: 'step/visibility', component: VisibilityComponent}, + {path: 'step/recapitulatif', component: ResumeComponent}, + {path: 'step/end', component: EndConfirmationComponent}, ] ; diff --git a/src/app/pages/base-page/base.component.html b/src/app/pages/base-page/base.component.html index 27c6dab0..d0ca5c75 100644 --- a/src/app/pages/base-page/base.component.html +++ b/src/app/pages/base-page/base.component.html @@ -1 +1 @@ -

base-page works!

+

Ce composant est celui de base pour les pages

diff --git a/src/app/pages/visibility/visibility.component.html b/src/app/pages/visibility/visibility.component.html index 1322df18..a8447a60 100644 --- a/src/app/pages/visibility/visibility.component.html +++ b/src/app/pages/visibility/visibility.component.html @@ -1 +1,13 @@ -

visibility works!

+

+ Visibilité des réponses +

+

+ Votes +

+

+ Archivage +

+ +

+ Accès au sondage +