diff --git a/src/BoardZ/app/components/dashboard/dashboard.ts b/src/BoardZ/app/components/dashboard/dashboard.ts index 0fe6c48..774f070 100644 --- a/src/BoardZ/app/components/dashboard/dashboard.ts +++ b/src/BoardZ/app/components/dashboard/dashboard.ts @@ -1,4 +1,5 @@ import {Component, OnInit} from '@angular/core'; + import {GamesService} from '../../services/gamesService'; import {PlayersService} from '../../services/playersService'; diff --git a/src/BoardZ/app/components/games/details.ts b/src/BoardZ/app/components/games/details.ts index 22f7767..9a07b21 100644 --- a/src/BoardZ/app/components/games/details.ts +++ b/src/BoardZ/app/components/games/details.ts @@ -1,5 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {Router, ActivatedRoute} from '@angular/router'; + import {Game} from '../../models/game'; import {LogService} from '../../services/logService'; import {GamesService} from '../../services/gamesService'; diff --git a/src/BoardZ/app/components/games/list.ts b/src/BoardZ/app/components/games/list.ts index fa262d3..8dca629 100644 --- a/src/BoardZ/app/components/games/list.ts +++ b/src/BoardZ/app/components/games/list.ts @@ -1,14 +1,15 @@ import {Component, OnInit} from '@angular/core'; import {Router, ActivatedRoute} from '@angular/router'; + import {Game} from '../../models/game'; import {GamesService} from '../../services/gamesService'; import {NotificationService} from '../../services/notificationService'; + @Component({ moduleId: module.id, selector: 'game-list', templateUrl: 'list.html' }) - export class GameListComponent implements OnInit { public games: Game[]; diff --git a/src/BoardZ/app/components/header/header.ts b/src/BoardZ/app/components/header/header.ts index c3bae1c..398d747 100644 --- a/src/BoardZ/app/components/header/header.ts +++ b/src/BoardZ/app/components/header/header.ts @@ -1,4 +1,5 @@ import {Component, OnInit} from '@angular/core'; + import {Notification} from '../../models/notification'; import {LoginService} from '../../services/loginService'; import {TokenService} from '../../services/tokenService'; diff --git a/src/BoardZ/app/components/locateIt/locateIt.ts b/src/BoardZ/app/components/locateIt/locateIt.ts index 3ee4326..9a19391 100644 --- a/src/BoardZ/app/components/locateIt/locateIt.ts +++ b/src/BoardZ/app/components/locateIt/locateIt.ts @@ -1,6 +1,7 @@ -/// +/// import {Component, Output, OnInit, EventEmitter} from '@angular/core'; + import {GeoLocation} from '../../models/geoLocation'; import {GeolocationService} from '../../services/geolocationService'; diff --git a/src/BoardZ/app/components/login/login.ts b/src/BoardZ/app/components/login/login.ts index e54fa26..d583b2e 100644 --- a/src/BoardZ/app/components/login/login.ts +++ b/src/BoardZ/app/components/login/login.ts @@ -1,5 +1,6 @@ import {Component} from '@angular/core'; import {Router} from '@angular/router'; + import {LoginService} from '../../services/loginService'; import {LogService} from '../../services/logService'; import {NotificationService} from '../../services/notificationService'; diff --git a/src/BoardZ/app/components/radiusSearch/radiusSearch.ts b/src/BoardZ/app/components/radiusSearch/radiusSearch.ts index 04cca07..17fe7c5 100644 --- a/src/BoardZ/app/components/radiusSearch/radiusSearch.ts +++ b/src/BoardZ/app/components/radiusSearch/radiusSearch.ts @@ -1,4 +1,5 @@ import {Component, OnInit} from '@angular/core'; + import {GeoLocation} from '../../models/geoLocation'; import {GeolocationService} from '../../services/geolocationService'; import {PlayersService} from '../../services/playersService'; diff --git a/src/BoardZ/app/components/sidebar/sidebar.ts b/src/BoardZ/app/components/sidebar/sidebar.ts index ebbb574..9694a0f 100644 --- a/src/BoardZ/app/components/sidebar/sidebar.ts +++ b/src/BoardZ/app/components/sidebar/sidebar.ts @@ -1,4 +1,5 @@ import {Component} from '@angular/core'; + import {NavigationEntry} from '../../models/navigationEntry'; @Component({ @@ -18,5 +19,4 @@ export class SidebarComponent { //this.navigationEntries.push(new NavigationEntry(['/notifications'], 'bell', 'Test Notifcations')); } - } diff --git a/src/BoardZ/app/guards/authGuard.ts b/src/BoardZ/app/guards/authenticationGuard.ts similarity index 94% rename from src/BoardZ/app/guards/authGuard.ts rename to src/BoardZ/app/guards/authenticationGuard.ts index 30a308d..eee41ab 100644 --- a/src/BoardZ/app/guards/authGuard.ts +++ b/src/BoardZ/app/guards/authenticationGuard.ts @@ -1,13 +1,13 @@ import {CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router} from '@angular/router'; import {Injectable} from '@angular/core'; -import {TokenService} from '../services/tokenService'; import {Observable} from 'rxjs/Rx'; +import {TokenService} from '../services/tokenService'; + @Injectable() -export class AuthGuard implements CanActivate { +export class AuthenticationGuard implements CanActivate { constructor(private _router: Router, private _tokenService: TokenService) { - } public canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { diff --git a/src/BoardZ/app/models/geoLocation.ts b/src/BoardZ/app/models/geoLocation.ts index d35fe2c..0f65803 100644 --- a/src/BoardZ/app/models/geoLocation.ts +++ b/src/BoardZ/app/models/geoLocation.ts @@ -1,6 +1,5 @@ export class GeoLocation { constructor(public latitude: number, public longitude: number, public zoom: number) { - } } diff --git a/src/BoardZ/app/models/picture.ts b/src/BoardZ/app/models/picture.ts index 1cf5869..bc2197a 100644 --- a/src/BoardZ/app/models/picture.ts +++ b/src/BoardZ/app/models/picture.ts @@ -1,6 +1,5 @@ export class Picture { constructor(public pictureUrl: string) { - } } diff --git a/src/BoardZ/app/modules/appModule.ts b/src/BoardZ/app/modules/appModule.ts index 01fd418..2a430ba 100644 --- a/src/BoardZ/app/modules/appModule.ts +++ b/src/BoardZ/app/modules/appModule.ts @@ -1,10 +1,10 @@ import {NgModule} from '@angular/core'; -import {ModuleConfiguration} from './config'; import {SharedModule} from './sharedModule'; import {GamesModule} from './gamesModule'; +import {ModuleConfiguration} from './modulesConfig'; @NgModule({ - imports: [ ModuleConfiguration.App.imports, SharedModule, GamesModule], + imports: [ModuleConfiguration.App.imports, SharedModule, GamesModule], exports: ModuleConfiguration.App.exports, declarations: ModuleConfiguration.App.declarations, providers: ModuleConfiguration.App.providers, diff --git a/src/BoardZ/app/modules/gamesModule.ts b/src/BoardZ/app/modules/gamesModule.ts index 061327c..c368cc8 100644 --- a/src/BoardZ/app/modules/gamesModule.ts +++ b/src/BoardZ/app/modules/gamesModule.ts @@ -1,5 +1,5 @@ import {NgModule} from '@angular/core'; -import {ModuleConfiguration} from './config'; +import {ModuleConfiguration} from './modulesConfig'; import {SharedModule} from './sharedModule'; @NgModule({ diff --git a/src/BoardZ/app/modules/config.ts b/src/BoardZ/app/modules/modulesConfig.ts similarity index 99% rename from src/BoardZ/app/modules/config.ts rename to src/BoardZ/app/modules/modulesConfig.ts index 2ad2ff5..2c5b0a5 100644 --- a/src/BoardZ/app/modules/config.ts +++ b/src/BoardZ/app/modules/modulesConfig.ts @@ -11,7 +11,7 @@ import {BackButtonDirective} from '../directives/backButtonDirective'; import {CloseSidebarOnClickDirective} from '../directives/closeSidebarOnClickDirective'; import {BrowserModule} from '@angular/platform-browser'; import {HttpModule, XHRBackend, ConnectionBackend} from '@angular/http'; -import {APP_ROUTING, appRoutingProviders, GAMES_ROUTING} from '../routes/index'; +import {APP_ROUTING, appRoutingProviders, GAMES_ROUTING} from '../routing/routingConfig'; import {ApiConfig} from '../apiConfig'; import {HashLocationStrategy, LocationStrategy, CommonModule} from '@angular/common'; import {NativeIntegrationService} from '../services/nativeIntegrationService'; diff --git a/src/BoardZ/app/modules/sharedModule.ts b/src/BoardZ/app/modules/sharedModule.ts index 0232abd..ab04328 100644 --- a/src/BoardZ/app/modules/sharedModule.ts +++ b/src/BoardZ/app/modules/sharedModule.ts @@ -1,5 +1,5 @@ import {NgModule} from '@angular/core'; -import {ModuleConfiguration} from './config'; +import {ModuleConfiguration} from './modulesConfig'; @NgModule({ declarations: ModuleConfiguration.Shared.declarations, diff --git a/src/BoardZ/app/resolvers/gameDetailsResolver.ts b/src/BoardZ/app/resolvers/gameDetailsResolver.ts index 472bbfa..c109a74 100644 --- a/src/BoardZ/app/resolvers/gameDetailsResolver.ts +++ b/src/BoardZ/app/resolvers/gameDetailsResolver.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; import {Resolve, ActivatedRouteSnapshot} from '@angular/router'; + import {Game} from '../models/game'; import {GamesService} from '../services/gamesService'; @@ -10,6 +11,7 @@ export class GameDetailsResolver implements Resolve { resolve(route: ActivatedRouteSnapshot): Promise { let id = route.params['id']; + return new Promise((resolve) => { this._gamesService.getById(id).subscribe(game => { if (game) { diff --git a/src/BoardZ/app/routes/index.ts b/src/BoardZ/app/routing/routingConfig.ts similarity index 81% rename from src/BoardZ/app/routes/index.ts rename to src/BoardZ/app/routing/routingConfig.ts index 5f530aa..7b4d58a 100644 --- a/src/BoardZ/app/routes/index.ts +++ b/src/BoardZ/app/routing/routingConfig.ts @@ -4,18 +4,18 @@ import {DashboardComponent} from '../components/dashboard/dashboard'; import {LoginComponent} from '../components/login/login'; import {NotificationsComponent} from '../components/notifications/notifications'; import {RadiusSearchComponent} from '../components/radiusSearch/radiusSearch'; -import {AuthGuard} from '../guards/authGuard'; import {GameDetailsResolver} from '../resolvers/gameDetailsResolver'; import {GameDetailsComponent} from '../components/games/details'; import {GameListComponent} from '../components/games/list'; import {GamesRootComponent} from '../components/games/gamesRoot'; +import {AuthenticationGuard} from '../guards/authenticationGuard'; const appRootRoutes: Routes = [ - { path: '', name: 'Dashboard', canActivate: [AuthGuard], component: DashboardComponent }, + { path: '', name: 'Dashboard', canActivate: [AuthenticationGuard], component: DashboardComponent }, { path: 'login', name: 'Login', component: LoginComponent }, - { path: 'notifications', name: 'Notifications', canActivate: [AuthGuard], component: NotificationsComponent }, - { path: 'radiussearch', name: 'RadiusSearch', canActivate: [AuthGuard], component: RadiusSearchComponent } + { path: 'notifications', name: 'Notifications', canActivate: [AuthenticationGuard], component: NotificationsComponent }, + { path: 'radiussearch', name: 'RadiusSearch', canActivate: [AuthenticationGuard], component: RadiusSearchComponent } ]; const gameRoutes: Routes = [ @@ -23,7 +23,7 @@ const gameRoutes: Routes = [ { path: 'games', component: GamesRootComponent, - canActivate: [AuthGuard], + canActivate: [AuthenticationGuard], children: [ { path: 'all', component: GameListComponent, data: { displayName: 'Game overview' } }, { @@ -43,7 +43,7 @@ const gameRoutes: Routes = [ } ]; -export const appRoutingProviders: any[] = [AuthGuard]; +export const appRoutingProviders: any[] = [AuthenticationGuard]; export const APP_ROUTING: ModuleWithProviders = RouterModule.forRoot(appRootRoutes); export const GAMES_ROUTING: ModuleWithProviders = RouterModule.forChild(gameRoutes); diff --git a/src/BoardZ/app/services/authenticatedHttp.ts b/src/BoardZ/app/services/authenticatedHttp.ts index b476cd5..1815085 100644 --- a/src/BoardZ/app/services/authenticatedHttp.ts +++ b/src/BoardZ/app/services/authenticatedHttp.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {Http, RequestOptionsArgs, Response, Headers} from '@angular/http'; import {Observable} from 'rxjs/Observable'; + import {ApiConfig} from '../apiConfig'; import {TokenService} from './tokenService'; diff --git a/src/BoardZ/app/services/desktopCameraService.ts b/src/BoardZ/app/services/desktopCameraService.ts index b7e0002..08c7949 100644 --- a/src/BoardZ/app/services/desktopCameraService.ts +++ b/src/BoardZ/app/services/desktopCameraService.ts @@ -1,7 +1,7 @@ -import {ICameraService} from './cameraService'; import {Observable} from 'rxjs/Rx'; -// Just to stop annoying TSC... +import {ICameraService} from './cameraService'; + declare let window; export class DesktopCameraService implements ICameraService { diff --git a/src/BoardZ/app/services/gamesService.ts b/src/BoardZ/app/services/gamesService.ts index e7db363..38a344d 100644 --- a/src/BoardZ/app/services/gamesService.ts +++ b/src/BoardZ/app/services/gamesService.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {Headers} from '@angular/http'; import {Observable} from 'rxjs/Observable'; + import {AuthenticatedHttp} from './authenticatedHttp'; import {Game} from '../models/game'; diff --git a/src/BoardZ/app/services/geolocationService.ts b/src/BoardZ/app/services/geolocationService.ts index d6b8189..b6e79e9 100644 --- a/src/BoardZ/app/services/geolocationService.ts +++ b/src/BoardZ/app/services/geolocationService.ts @@ -1,4 +1,5 @@ import {Injectable} from '@angular/core'; + import {GeoLocation} from '../models/geoLocation'; @Injectable() diff --git a/src/BoardZ/app/services/logService.ts b/src/BoardZ/app/services/logService.ts index 25a557e..825b79f 100644 --- a/src/BoardZ/app/services/logService.ts +++ b/src/BoardZ/app/services/logService.ts @@ -1,4 +1,5 @@ import {Injectable} from '@angular/core'; + import {LogLevel} from '../models/logLevel'; @Injectable() diff --git a/src/BoardZ/app/services/loginService.ts b/src/BoardZ/app/services/loginService.ts index 533b8b2..94e50bb 100644 --- a/src/BoardZ/app/services/loginService.ts +++ b/src/BoardZ/app/services/loginService.ts @@ -2,6 +2,7 @@ import {Injectable} from '@angular/core'; import {Http, Headers, RequestOptions} from '@angular/http'; import {Router} from '@angular/router'; import {Observable} from 'rxjs/Observable'; + import {TokenService} from './tokenService'; import {ApiConfig} from '../apiConfig'; import {LogService} from './logService'; diff --git a/src/BoardZ/app/services/mobileCameraService.ts b/src/BoardZ/app/services/mobileCameraService.ts index 50aea5c..3598866 100644 --- a/src/BoardZ/app/services/mobileCameraService.ts +++ b/src/BoardZ/app/services/mobileCameraService.ts @@ -1,5 +1,6 @@ import {Observable} from 'rxjs/Rx'; import {Observer} from 'rxjs/Rx'; + import {ICameraService} from './cameraService'; declare let window; diff --git a/src/BoardZ/app/services/nativeIntegrationService.ts b/src/BoardZ/app/services/nativeIntegrationService.ts index 35418a6..c93244f 100644 --- a/src/BoardZ/app/services/nativeIntegrationService.ts +++ b/src/BoardZ/app/services/nativeIntegrationService.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; import {Router} from '@angular/router'; + import {PlatformInformationService} from './platformInformationService'; import {IBoardZAppWindow} from '../interfaces/boardzAppWindow'; diff --git a/src/BoardZ/app/services/notificationService.ts b/src/BoardZ/app/services/notificationService.ts index 4ea8328..ffddaf5 100644 --- a/src/BoardZ/app/services/notificationService.ts +++ b/src/BoardZ/app/services/notificationService.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; import {Subject} from 'rxjs/Subject'; + import {LogService} from './logService'; import {Notification} from '../models/notification'; import {NotificationType} from '../models/notificationType'; diff --git a/src/BoardZ/app/services/playersService.ts b/src/BoardZ/app/services/playersService.ts index c353d3d..16ae737 100644 --- a/src/BoardZ/app/services/playersService.ts +++ b/src/BoardZ/app/services/playersService.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {Headers} from '@angular/http'; import {Observable} from 'rxjs/Observable'; + import {GeoLocation} from '../models/geoLocation'; import {AuthenticatedHttp} from './authenticatedHttp'; import {Player} from '../models/player'; diff --git a/src/BoardZ/app/services/signalrService.ts b/src/BoardZ/app/services/signalrService.ts index 77c3fbe..7c19450 100644 --- a/src/BoardZ/app/services/signalrService.ts +++ b/src/BoardZ/app/services/signalrService.ts @@ -1,4 +1,5 @@ import {Injectable, EventEmitter} from '@angular/core'; + import {ApiConfig} from '../apiConfig'; import {LogService} from './logService'; import {TokenService} from './tokenService'; diff --git a/src/BoardZ/app/services/tokenService.ts b/src/BoardZ/app/services/tokenService.ts index 3d761c2..5baca6b 100644 --- a/src/BoardZ/app/services/tokenService.ts +++ b/src/BoardZ/app/services/tokenService.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs/Observable'; + import {LogService} from './logService'; const tokenKey: string = 'Authentication::Token'; diff --git a/src/BoardZ/app/services/uiNotificationService.ts b/src/BoardZ/app/services/uiNotificationService.ts index ad7ad60..0778135 100644 --- a/src/BoardZ/app/services/uiNotificationService.ts +++ b/src/BoardZ/app/services/uiNotificationService.ts @@ -1,4 +1,5 @@ import {Injectable} from '@angular/core'; + import {NotificationService} from './notificationService'; import {Notification} from '../models/notification'; import {NotificationType} from '../models/notificationType'; diff --git a/typings.json b/typings.json index 7da31ca..e212549 100644 --- a/typings.json +++ b/typings.json @@ -2,6 +2,7 @@ "globalDependencies": { "core-js": "registry:dt/core-js#0.0.0+20160725163759", "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", + "leaflet": "registry:dt/leaflet#1.0.0+20160630180443", "node": "registry:dt/node#6.0.0+20160909174046" } }