diff --git a/angular-cli-build.js b/angular-cli-build.js index 58a1e93..c3a70b9 100644 --- a/angular-cli-build.js +++ b/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' ] }); }; diff --git a/package.json b/package.json index 0c6f44d..3929ee0 100644 --- a/package.json +++ b/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", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 51f8f2f..9a6daa3 100644 --- a/src/app/app.module.ts +++ b/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'; diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index f307fcd..2807253 100644 --- a/src/app/communities/communities.component.ts +++ b/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']); diff --git a/src/app/events/events.component.ts b/src/app/events/events.component.ts index c0e62ab..89fd813 100644 --- a/src/app/events/events.component.ts +++ b/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() { diff --git a/src/app/experts/experts.component.ts b/src/app/experts/experts.component.ts index a19d6fc..7d69c1a 100644 --- a/src/app/experts/experts.component.ts +++ b/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']); } } \ No newline at end of file diff --git a/src/app/missions/mission-list.component.ts b/src/app/missions/mission-list.component.ts index 9d0bc88..6931e13 100644 --- a/src/app/missions/mission-list.component.ts +++ b/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']) } } \ No newline at end of file diff --git a/src/app/resources/resources.component.ts b/src/app/resources/resources.component.ts index 037a4bf..89a8138 100644 --- a/src/app/resources/resources.component.ts +++ b/src/app/resources/resources.component.ts @@ -35,7 +35,8 @@ declare var prompt;

{{sub.$key}}

- {{resource.title}} + {{sub | json}} and {{resource.$key}} + {{resource.title}} (Awaiting Approval!) diff --git a/src/app/routes.ts b/src/app/routes.ts index 7ca6ad0..89b052a 100644 --- a/src/app/routes.ts +++ b/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, diff --git a/src/google9746a25784deb839.html b/src/google9746a25784deb839.html new file mode 100644 index 0000000..84935ce --- /dev/null +++ b/src/google9746a25784deb839.html @@ -0,0 +1 @@ +google-site-verification: google9746a25784deb839.html \ No newline at end of file diff --git a/src/index.html b/src/index.html index d7e724d..11fdc82 100644 --- a/src/index.html +++ b/src/index.html @@ -8,6 +8,7 @@ {{#unless environment.production}} {{/unless}} + diff --git a/src/system-config.ts b/src/system-config.ts index d2e93bf..923f1fb 120000 --- a/src/system-config.ts +++ b/src/system-config.ts @@ -1 +1 @@ -system-config.jit.ts \ No newline at end of file +system-config.aot.ts \ No newline at end of file