Some cleanup :-) (tm)

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';
 

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';

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[];
 

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';

src/BoardZ/app/components/locateIt/locateIt.ts

@@ -1,6 +1,7 @@
-///<reference path="../../../../../typings/main/ambient/leaflet/leaflet.d.ts" />
+///<reference path="../../../../../typings/globals/leaflet/index.d.ts" />
 
 import {Component, Output, OnInit, EventEmitter} from '@angular/core';
+
 import {GeoLocation} from '../../models/geoLocation';
 import {GeolocationService} from '../../services/geolocationService';
 

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';

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';

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'));
     }
-
 }

src/BoardZ/app/guards/authGuard.ts → 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<boolean> {

src/BoardZ/app/models/geoLocation.ts

@@ -1,6 +1,5 @@
 export class GeoLocation {
 
     constructor(public latitude: number, public longitude: number, public zoom: number) {
-
     }
 }

src/BoardZ/app/models/picture.ts

@@ -1,6 +1,5 @@
 export class Picture {
 
     constructor(public pictureUrl: string) {
-
     }
 }

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,

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({

src/BoardZ/app/modules/config.ts → 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';

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,

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<Game> {
 
     resolve(route: ActivatedRouteSnapshot): Promise<Game> {
         let id = route.params['id'];
+
         return new Promise((resolve) => {
             this._gamesService.getById(id).subscribe(game => {
                 if (game) {

src/BoardZ/app/routes/index.ts → src/BoardZ/app/routing/routingConfig.ts

@@ -4,26 +4,26 @@ 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 = [
 
     {
         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);

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';
 

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 {

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';
 

src/BoardZ/app/services/geolocationService.ts

@@ -1,4 +1,5 @@
 import {Injectable} from '@angular/core';
+
 import {GeoLocation} from '../models/geoLocation';
 
 @Injectable()

src/BoardZ/app/services/logService.ts

@@ -1,4 +1,5 @@
 import {Injectable} from '@angular/core';
+
 import {LogLevel} from '../models/logLevel';
 
 @Injectable()

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';

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;

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';
 

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';

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';

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';

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';

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';

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"
   }
 }