Aot

angular-cli-build.js

@@ -14,7 +14,8 @@ module.exports = function(defaults) {
       '@angular/**/*.+(js|js.map)',
       'angularfire2/**/*.js',
       'firebase/*.js',
-      '@angular2-material/**/*'
+      '@angular2-material/**/*',
+      'hammerjs/*.js'
     ]
   });
 };

package.json

@@ -1,10 +1,10 @@
 {
   "name": "ames",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "license": "MIT",
   "angular-cli": {},
   "scripts": {
-    "start": "ng server",
+    "start": "ngc -p src && ng server",
     "postinstall": "typings install",
     "lint": "tslint \"src/**/*.ts\"",
     "test": "ng test",
@@ -24,16 +24,18 @@
     "@angular/platform-server": "^2.0.0-rc.5",
     "@angular/router": "^3.0.0-rc.1",
     "@angular/tsc-wrapped": "^0.2.2",
-    "@angular2-material/button": "^2.0.0-alpha.7-2",
-    "@angular2-material/card": "^2.0.0-alpha.7-2",
-    "@angular2-material/core": "^2.0.0-alpha.7-2",
-    "@angular2-material/icon": "^2.0.0-alpha.7-2",
-    "@angular2-material/input": "^2.0.0-alpha.7-2",
-    "@angular2-material/slide-toggle": "^2.0.0-alpha.7-2",
-    "@angular2-material/toolbar": "^2.0.0-alpha.7-2",
+    "@angular2-material/button": "^2.0.0-alpha.7-4",
+    "@angular2-material/card": "^2.0.0-alpha.7-4",
+    "@angular2-material/core": "^2.0.0-alpha.7-4",
+    "@angular2-material/icon": "^2.0.0-alpha.7-4",
+    "@angular2-material/input": "^2.0.0-alpha.7-4",
+    "@angular2-material/slide-toggle": "^2.0.0-alpha.7-4",
+    "@angular2-material/toolbar": "^2.0.0-alpha.7-4",
+    "@types/hammerjs": "^2.0.31",
     "angularfire2": "next",
     "es6-shim": "^0.35.0",
     "firebase": "^3.0.5",
+    "hammerjs": "^2.0.8",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "systemjs": "0.19.26",

src/app/app.module.ts

@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { BrowserModule  } from '@angular/platform-browser';
 import { AmesAppComponent } from './ames.component';
 import { FormsModule } from '@angular/forms';
-import { ROUTER_DIRECTIVES, provideRouter, RouterModule } from '@angular/router';
+import { RouterModule } from '@angular/router';
 import { AngularFireModule  } from 'angularfire2';
 
 import { MdSlideToggleModule } from '@angular2-material/slide-toggle';
@@ -13,7 +13,6 @@ import { MdCardModule } from '@angular2-material/card';
 import { MdInputModule } from '@angular2-material/input';
 
 import { routes } from './routes';
-import {RouterConfig} from '@angular/router';
 
 import {HomeComponent} from './home.component';
 import {MissionsComponent} from './missions/missions.component';

src/app/communities/communities.component.ts

@@ -38,7 +38,7 @@ export class CommunitiesComponent {
     }
 
     edit(community) {
-        this.router.navigate(['/communities/', community.$key, '/edit']);
+        this.router.navigate(['/communities', community.$key, 'edit']);
     }
     new() {
         this.router.navigate(['/communities/new/edit']);

src/app/events/events.component.ts

@@ -63,7 +63,7 @@ export class EventsComponent {
     }
 
     edit(event) {
-        this.router.navigate(['/events/', event.$key, '/edit']);
+        this.router.navigate(['/events', event.$key, 'edit']);
     }
 
     new() {

src/app/experts/experts.component.ts

@@ -75,6 +75,6 @@ export class ExpertsComponent {
     }
 
     edit(expert) {
-        this.router.navigate(['/experts/', expert.$key, '/edit']);
+        this.router.navigate(['/experts', expert.$key, 'edit']);
     }
 }

src/app/missions/mission-list.component.ts

@@ -51,7 +51,7 @@ export class MissionListComponent implements OnInit {
     }
 
     edit(mission) {
-        this.router.navigate(["/missions/", mission.$key, '/edit'])
+        this.router.navigate(["/missions", mission.$key, 'edit'])
     }
 
 }

src/app/resources/resources.component.ts

@@ -35,7 +35,8 @@ declare var prompt;
             <h4>{{sub.$key}}</h4>
             <h4 *ngIf="priorityMode && (auth.isAdmin | async)"><button (click)="setSubcategoryPriority(category.$key, sub.$key,subPriority)">SetPriority</button><input [(ngModel)]="subPriority"></h4>
             <div *ngFor="let resource of sub.resources | refirebase" style="margin-left:16px;">
-                <a target="_blank" [href]="resource.url">{{resource.title}}</a> <a [routerLink]="['/resources/',category.$key,'/',sub.$key,'/',resource.$key]" *ngIf="auth.isAdmin | async"><svg style="width:12px;height:12px" viewBox="0 0 24 24">
+              {{sub | json}} and {{resource.$key}}
+                <a target="_blank" [href]="resource.url">{{resource.title}}</a> <a [routerLink]="['/resources',category.$key,sub.$key,resource.$key]" *ngIf="auth.isAdmin | async"><svg style="width:12px;height:12px" viewBox="0 0 24 24">
     <path fill="#000000" d="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
 </svg></a>
                 <span *ngIf="!resource.rev">(Awaiting Approval!)</span>

src/app/routes.ts

@@ -1,4 +1,4 @@
-import {RouterConfig} from '@angular/router';
+import {Routes} from '@angular/router';
 import {HomeComponent} from './home.component';
 import {MissionsComponent} from './missions/missions.component';
 import {MissionListComponent} from './missions/mission-list.component';
@@ -26,7 +26,7 @@ import {UserProfileShortComponent} from './users/user-profile-short.component';
 import {AdminComponent} from './admin.component';
 
 
-export const routes: RouterConfig = [
+export const routes: Routes = [
     {
         path: '',
         component: HomeComponent,

src/google9746a25784deb839.html

@@ -0,0 +1 @@
+google-site-verification: google9746a25784deb839.html

src/index.html

@@ -8,6 +8,7 @@
   {{#unless environment.production}}
   <script src="/ember-cli-live-reload.js" type="text/javascript"></script>
   {{/unless}}
+  <script src="https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"></script>
   <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700' rel='stylesheet' type='text/css'>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="app.css">

src/system-config.ts

@@ -1 +1 @@
-system-config.jit.ts
+system-config.aot.ts