diff --git a/.editorconfig b/.editorconfig index e89330a6..6d2cb747 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,8 +3,8 @@ root = true [*] charset = utf-8 -indent_style = space -indent_size = 2 +indent_style = tabs +indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 35af062a..b6fda379 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -19,6 +19,7 @@ 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'; +import { CreateOrRetrieveComponent } from './page/create-or-retrieve/create-or-retrieve.component'; @NgModule({ @@ -36,6 +37,7 @@ import { EndConfirmationComponent } from './pages/end-confirmation/end-confirmat PicturesComponent, AnswersComponent, EndConfirmationComponent, + CreateOrRetrieveComponent, ], imports: [ diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index 221e9161..a3329473 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -6,14 +6,18 @@ import {ResumeComponent} from '../pages/resume/resume.component'; import {PicturesComponent} from '../pages/pictures/pictures.component'; import {EndConfirmationComponent} from '../pages/end-confirmation/end-confirmation.component'; import {AnswersComponent} from '../pages/answers/answers.component'; +import {CreateOrRetrieveComponent} from '../page/create-or-retrieve/create-or-retrieve.component'; +import {BaseComponent} from '../pages/base-page/base.component'; /** * each step in the form is a component */ export const Routes = [ - {path: '', component: FormContainerComponent}, + {path: '', component: CreateOrRetrieveComponent}, {path: 'home', component: FormContainerComponent}, + {path: 'base', component: BaseComponent}, + {path: 'step/creation', component: CreateOrRetrieveComponent}, {path: 'step/date', component: DatesComponent}, {path: 'step/kind', component: KindComponent}, {path: 'step/answers', component: AnswersComponent}, diff --git a/src/app/page/create-or-retrieve/create-or-retrieve.component.html b/src/app/page/create-or-retrieve/create-or-retrieve.component.html new file mode 100644 index 00000000..761af1be --- /dev/null +++ b/src/app/page/create-or-retrieve/create-or-retrieve.component.html @@ -0,0 +1,44 @@ +
+

+ Créer un sondage +

+

+ Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des + liens… un sondage quoi ! +

+ + C'est parti + +
+
+

+ Où sont mes sondages ? +

+
+ + + +
+
diff --git a/src/app/page/create-or-retrieve/create-or-retrieve.component.scss b/src/app/page/create-or-retrieve/create-or-retrieve.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/page/create-or-retrieve/create-or-retrieve.component.spec.ts b/src/app/page/create-or-retrieve/create-or-retrieve.component.spec.ts new file mode 100644 index 00000000..e261a564 --- /dev/null +++ b/src/app/page/create-or-retrieve/create-or-retrieve.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateOrRetrieveComponent } from './create-or-retrieve.component'; + +describe('CreateOrRetrieveComponent', () => { + let component: CreateOrRetrieveComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateOrRetrieveComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateOrRetrieveComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/page/create-or-retrieve/create-or-retrieve.component.ts b/src/app/page/create-or-retrieve/create-or-retrieve.component.ts new file mode 100644 index 00000000..74792ab6 --- /dev/null +++ b/src/app/page/create-or-retrieve/create-or-retrieve.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'framadate-create-or-retrieve', + templateUrl: './create-or-retrieve.component.html', + styleUrls: ['./create-or-retrieve.component.scss'] +}) +export class CreateOrRetrieveComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/ui/navigation/navigation.component.html b/src/app/ui/navigation/navigation.component.html index 67a9a8c6..830b9e38 100644 --- a/src/app/ui/navigation/navigation.component.html +++ b/src/app/ui/navigation/navigation.component.html @@ -1,43 +1,56 @@