From 66eb54074608ffd9cb72e01fce5eddbd8ce005f0 Mon Sep 17 00:00:00 2001 From: Abdulmalik Al-Gahmi Date: Mon, 9 May 2016 13:37:48 -0600 Subject: [PATCH] After services post --- app/application.ts | 5 ++--- app/components/content.component.ts | 2 +- app/components/footer.component.ts | 2 +- app/components/header.component.ts | 2 +- app/components/klass.component.ts | 2 +- app/components/klasses.component.ts | 6 +++--- app/components/login.component.ts | 2 +- app/services/klass.service.ts | 2 +- app/services/user.service.ts | 2 +- index.html | 20 ++++---------------- package.json | 24 ++++++++++++++++++------ 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/app/application.ts b/app/application.ts index 31480fa..275b742 100644 --- a/app/application.ts +++ b/app/application.ts @@ -1,5 +1,5 @@ -import {bootstrap} from 'angular2/platform/browser'; -import {Component} from 'angular2/core'; +import {bootstrap} from '@angular/platform-browser-dynamic'; +import {Component} from '@angular/core'; import {UserService} from './services/user.service'; import {KlassService} from './services/klass.service'; import {FooterComponent} from './components/footer.component'; @@ -14,7 +14,6 @@ import {KlassComponent} from './components/klass.component'; `, directives: [ContentComponent, FooterComponent] }) - export class AppComponent{} bootstrap(AppComponent, [UserService, KlassService]) diff --git a/app/components/content.component.ts b/app/components/content.component.ts index 2bcf78c..ea266d4 100644 --- a/app/components/content.component.ts +++ b/app/components/content.component.ts @@ -1,4 +1,4 @@ -import {Component} from 'angular2/core'; +import {Component} from '@angular/core'; import {HeaderComponent} from './header.component'; import {LoginComponent} from './login.component'; import {KlassesComponent} from './klasses.component'; diff --git a/app/components/footer.component.ts b/app/components/footer.component.ts index 790d490..c7b2f3d 100644 --- a/app/components/footer.component.ts +++ b/app/components/footer.component.ts @@ -1,4 +1,4 @@ -import {Component} from 'angular2/core'; +import {Component} from '@angular/core'; @Component({ selector: 'footer', diff --git a/app/components/header.component.ts b/app/components/header.component.ts index c9af0e4..95108fa 100644 --- a/app/components/header.component.ts +++ b/app/components/header.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, Output, EventEmitter} from 'angular2/core'; +import {Component, Input, Output, EventEmitter} from '@angular/core'; import {UserService} from '../services/user.service'; import {User} from '../models/user'; diff --git a/app/components/klass.component.ts b/app/components/klass.component.ts index d2b6a86..b19c1b0 100644 --- a/app/components/klass.component.ts +++ b/app/components/klass.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, Output, EventEmitter} from 'angular2/core'; +import {Component, Input, Output, EventEmitter} from '@angular/core'; import {KlassService} from '../services/klass.service'; import {Klass} from '../models/klass'; diff --git a/app/components/klasses.component.ts b/app/components/klasses.component.ts index 9ae6178..3408473 100644 --- a/app/components/klasses.component.ts +++ b/app/components/klasses.component.ts @@ -1,11 +1,11 @@ -import {Component, Output, EventEmitter} from 'angular2/core'; +import {Component, Output, EventEmitter} from '@angular/core'; import {KlassService} from '../services/klass.service'; import {Klass} from '../models/klass'; @Component({ selector: 'klasses', template: ` -
+
{{klass.title}}
By: {{klass.instructor}} @@ -16,7 +16,7 @@ import {Klass} from '../models/klass'; }) export class KlassesComponent{ @Output() classSelected = new EventEmitter(); - constructor(private klassService: KlassService) {} + constructor(private _klassService: KlassService) {} goToClass(klass){ this.classSelected.emit(klass); diff --git a/app/components/login.component.ts b/app/components/login.component.ts index d81fa60..2751724 100644 --- a/app/components/login.component.ts +++ b/app/components/login.component.ts @@ -1,4 +1,4 @@ -import {Component, Output, EventEmitter} from 'angular2/core'; +import {Component, Output, EventEmitter} from '@angular/core'; import {UserService} from '../services/user.service'; @Component({ diff --git a/app/services/klass.service.ts b/app/services/klass.service.ts index b73a76a..d151a18 100644 --- a/app/services/klass.service.ts +++ b/app/services/klass.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/core'; +import {Injectable} from '@angular/core'; import {Klass} from '../models/klass'; var AVAILABLR_CLASSES: Klass[] = [{ diff --git a/app/services/user.service.ts b/app/services/user.service.ts index 066a702..43066a0 100644 --- a/app/services/user.service.ts +++ b/app/services/user.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/core'; +import {Injectable} from '@angular/core'; import {User} from '../models/user'; var GUEST: User ={ email: 'guest@curriculr.org', name: "Guest User", loggedIn: false}; diff --git a/index.html b/index.html index 753b901..2a05e43 100644 --- a/index.html +++ b/index.html @@ -11,25 +11,13 @@ - - - - + + - - - + diff --git a/package.json b/package.json index 7700c7a..cc309c1 100644 --- a/package.json +++ b/package.json @@ -18,17 +18,29 @@ "author": "Abdulmalek Al-Gahmi", "license": "ISC", "dependencies": { - "angular2": "^2.0.0-beta.15", + "@angular/common": "2.0.0-rc.1", + "@angular/compiler": "2.0.0-rc.1", + "@angular/core": "2.0.0-rc.1", + "@angular/http": "2.0.0-rc.1", + "@angular/platform-browser": "2.0.0-rc.1", + "@angular/platform-browser-dynamic": "2.0.0-rc.1", + "@angular/router": "2.0.0-rc.1", + "@angular/router-deprecated": "2.0.0-rc.1", + "@angular/upgrade": "2.0.0-rc.1", + + "systemjs": "0.19.27", "es6-shim": "^0.35.0", - "reflect-metadata": "^0.1.2", - "rxjs": "^5.0.0-beta.2", - "systemjs": "^0.19.26", - "zone.js": "^0.6.12" + "reflect-metadata": "^0.1.3", + "rxjs": "5.0.0-beta.6", + "zone.js": "^0.6.12", + + "angular2-in-memory-web-api": "0.0.7", + "bootstrap": "^3.3.6" }, "devDependencies": { "concurrently": "^2.0.0", "lite-server": "^2.2.0", "typescript": "^1.8.10", - "typings": "^0.8.1" + "typings":"^0.8.1" } }