diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a707f11..1aa7928 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ import {NgModule} from '@angular/core'; -import {ReactiveFormsModule} from '@angular/forms'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {BrowserModule} from '@angular/platform-browser'; import {NgxGoogleAnalyticsModule} from 'ngx-google-analytics'; import {environment} from '../environments/environment'; @@ -14,6 +14,7 @@ import {NavbarComponent} from './components/navbar/navbar.component'; import {PlaceholderComponent} from './components/placeholder/placeholder.component'; import {AppComponent} from './containers/app/app.component'; import {BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import {InViewDirective} from './directives/in-view.directive'; import {MaterialModule} from './material.module'; import {PrelaodService} from './services/prelaod.service'; import {FourOFourComponent} from './views/404/404.component'; @@ -24,13 +25,14 @@ import {CalendarComponent} from './views/events/calendar/calendar.component'; import {HibernaComponent} from './views/events/hiberna/hiberna.component'; import {GalleryComponent} from './views/gallery/gallery.component'; import {HomeComponent} from './views/home/home.component'; -import {DiyComponent} from './views/reenact/diy/diy.component'; import {DrillComponent} from './views/reenact/drill/drill.component'; +import {EquipmentComponent} from './views/reenact/equipment/equipment.component'; import {GettingStartedComponent} from './views/reenact/getting-started/getting-started.component'; import {MaintenanceComponent} from './views/reenact/maintinance/maintenance.component'; import {RulesComponent} from './views/reenact/rules/rules.component'; -import {BuyComponent} from './views/reenact/buy/buy.component'; import {ResourcesComponent} from './views/resources/resources.component'; +import {RegisterComponent} from './views/register/register.component'; +import {UploaderComponent} from './components/uploader/uploader.component'; export const APP_COMPONENTS: any[] = [ AboutComponent, @@ -38,12 +40,11 @@ export const APP_COMPONENTS: any[] = [ AgoniumComponent, AppComponent, BannerComponent, - BuyComponent, CalendarComponent, CarouselComponent, ContactComponent, - DiyComponent, DrillComponent, + EquipmentComponent, FooterComponent, FourOFourComponent, GalleryComponent, @@ -51,18 +52,22 @@ export const APP_COMPONENTS: any[] = [ HibernaComponent, HomeComponent, ImageViewerComponent, + InViewDirective, LogoComponent, MaintenanceComponent, NavbarComponent, PlaceholderComponent, + RegisterComponent, ResourcesComponent, RulesComponent, + UploaderComponent, ] export const APP_IMPORTS: any[] = [ AppRouting, BrowserAnimationsModule, BrowserModule, + FormsModule, ReactiveFormsModule, MaterialModule ] diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 412b373..6ca6e7f 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -8,20 +8,19 @@ import {CalendarComponent} from './views/events/calendar/calendar.component'; import {HibernaComponent} from './views/events/hiberna/hiberna.component'; import {GalleryComponent} from './views/gallery/gallery.component'; import {HomeComponent} from './views/home/home.component'; -import {DiyComponent} from './views/reenact/diy/diy.component'; import {DrillComponent} from './views/reenact/drill/drill.component'; +import {EquipmentComponent} from './views/reenact/equipment/equipment.component'; import {GettingStartedComponent} from './views/reenact/getting-started/getting-started.component'; import {MaintenanceComponent} from './views/reenact/maintinance/maintenance.component'; import {RulesComponent} from './views/reenact/rules/rules.component'; -import {BuyComponent} from './views/reenact/buy/buy.component'; +import {RegisterComponent} from './views/register/register.component'; import {ResourcesComponent} from './views/resources/resources.component'; const routes: Routes = [ {path: '', pathMatch: 'full', component: HomeComponent}, {path: 'about', component: AboutComponent, data: {title: 'About'}}, - {path: 'buy', component: BuyComponent, data: {title: 'Buy'}}, {path: 'drill', component: DrillComponent, data: {title: 'Drill Commands'}}, - {path: 'diy', component: DiyComponent, data: {title: 'Build Equipment'}}, + {path: 'equipment', component: EquipmentComponent, data: {title: 'Equipment'}}, {path: 'events/agonium', component: AgoniumComponent, data: {title: 'Agonium'}}, {path: 'events/castra-aestiva', component: AestivaComponent, data: {title: 'Castra Aestiva'}}, {path: 'events/castra-hiberna', component: HibernaComponent, data: {title: 'Castra Hiberna'}}, @@ -30,6 +29,7 @@ const routes: Routes = [ {path: 'getting-started', component: GettingStartedComponent, data: {title: 'Getting Started'}}, {path: 'info/resources', component: ResourcesComponent, data: {title: 'Resources'}}, {path: 'maintenance', component: MaintenanceComponent, data: {title: 'Maintenance'}}, + {path: 'register', component: RegisterComponent, data: {title: 'Register'}}, {path: 'rules', component: RulesComponent, data: {title: 'Rules & Regulations'}}, {path: '**', component: FourOFourComponent, data: {title: '404'}} ]; diff --git a/src/app/components/carousel/carousel.component.ts b/src/app/components/carousel/carousel.component.ts index e1cf3f5..112a6a0 100644 --- a/src/app/components/carousel/carousel.component.ts +++ b/src/app/components/carousel/carousel.component.ts @@ -1,4 +1,4 @@ -import {AfterViewInit, Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {AfterViewInit, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; import {Photo} from '../models/photo'; @Component({ @@ -18,6 +18,7 @@ export class CarouselComponent implements OnDestroy, OnInit, AfterViewInit { @Input() disableAutoplay = false; @Input() index = ~~(Math.random() * this.photos.length); @Input() height = '100%'; + @Output() indexChange = new EventEmitter(); ngOnInit() { if(this.disableAutoplay) this.pause = true; @@ -41,11 +42,13 @@ export class CarouselComponent implements OnDestroy, OnInit, AfterViewInit { this.pause = pause; this.index++; if(this.index >= this.photos.length) this.index = 0; + this.indexChange.emit(this.index); } previous(pause = true) { this.loading = true; this.pause = pause; this.index = this.index > 0 ? this.index - 1 : this.photos.length - 1; + this.indexChange.emit(this.index); } } diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html index 330ad75..cc422d2 100644 --- a/src/app/components/footer/footer.component.html +++ b/src/app/components/footer/footer.component.html @@ -1,24 +1,16 @@