diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7b08fa84..54eec0b9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,8 +4,8 @@ import {NgModule} from '@angular/core'; import {AppRoutingModule} from './app-routing.module'; import {AppComponent} from './app.component'; import {FormContainerComponent} from './form-container/form-container.component'; -import {BasePageComponent} from './pages/base-page/base-page.component'; -import {PageKindComponent} from './pages/page-kind/page-kind.component'; +import {BaseComponent} from './pages/base-page/base.component'; +import {KindComponent} from './pages/kind/kind.component'; import {HeaderComponent} from './header/header.component'; import {FormsModule} from '@angular/forms'; import {NavigationComponent} from './ui/navigation/navigation.component'; @@ -14,18 +14,20 @@ import {Routes} from './config/Routes'; 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'; @NgModule({ declarations: [ AppComponent, FormContainerComponent, - BasePageComponent, - PageKindComponent, + BaseComponent, + KindComponent, HeaderComponent, NavigationComponent, DatesComponent, DebuggerComponent, + VisibilityComponent, ], imports: [ diff --git a/src/app/config.service.ts b/src/app/config.service.ts index dc4cc228..d596952f 100644 --- a/src/app/config.service.ts +++ b/src/app/config.service.ts @@ -21,7 +21,7 @@ export class ConfigService { pollType = 'classic'; title = ''; description = ''; - allowSeveralHours = true; + allowSeveralHours = false; dateList: DateOption[] = []; constructor() { diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index be7f0780..b76c7583 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -1,5 +1,5 @@ import {FormContainerComponent} from '../form-container/form-container.component'; -import {PageKindComponent} from '../pages/page-kind/page-kind.component'; +import {KindComponent} from '../pages/kind/kind.component'; import {DatesComponent} from '../pages/dates/dates.component'; /** @@ -10,6 +10,6 @@ export const Routes = {path: '', component: FormContainerComponent}, {path: 'home', component: FormContainerComponent}, {path: 'step/date', component: DatesComponent}, - {path: 'step/kind', component: PageKindComponent} + {path: 'step/kind', component: KindComponent} ] ; diff --git a/src/app/pages/base-page/base-page.component.html b/src/app/pages/base-page/base.component.html similarity index 100% rename from src/app/pages/base-page/base-page.component.html rename to src/app/pages/base-page/base.component.html diff --git a/src/app/pages/base-page/base-page.component.scss b/src/app/pages/base-page/base.component.scss similarity index 100% rename from src/app/pages/base-page/base-page.component.scss rename to src/app/pages/base-page/base.component.scss diff --git a/src/app/pages/base-page/base-page.component.spec.ts b/src/app/pages/base-page/base.component.spec.ts similarity index 55% rename from src/app/pages/base-page/base-page.component.spec.ts rename to src/app/pages/base-page/base.component.spec.ts index ca3b0897..5fb761d4 100644 --- a/src/app/pages/base-page/base-page.component.spec.ts +++ b/src/app/pages/base-page/base.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { BasePageComponent } from './base-page.component'; +import { BaseComponent } from './base.component'; -describe('BasePageComponent', () => { - let component: BasePageComponent; - let fixture: ComponentFixture; +describe('BaseComponent', () => { + let component: BaseComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ BasePageComponent ] + declarations: [ BaseComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(BasePageComponent); + fixture = TestBed.createComponent(BaseComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/pages/base-page/base-page.component.ts b/src/app/pages/base-page/base.component.ts similarity index 67% rename from src/app/pages/base-page/base-page.component.ts rename to src/app/pages/base-page/base.component.ts index 53dc996b..dc6c6907 100644 --- a/src/app/pages/base-page/base-page.component.ts +++ b/src/app/pages/base-page/base.component.ts @@ -3,13 +3,13 @@ import {ConfigService} from '../../config.service'; @Component({ selector: 'framadate-base-page', - templateUrl: './base-page.component.html', - styleUrls: ['./base-page.component.scss'] + templateUrl: './base.component.html', + styleUrls: ['./base.component.scss'] }) /** * base page is aware of the state of the filling */ -export class BasePageComponent implements OnInit { +export class BaseComponent implements OnInit { constructor(private config: ConfigService) { } diff --git a/src/app/pages/dates/dates.component.html b/src/app/pages/dates/dates.component.html index 4bec61e6..2c6cbd17 100644 --- a/src/app/pages/dates/dates.component.html +++ b/src/app/pages/dates/dates.component.html @@ -4,13 +4,17 @@
-