Skip to content

Commit d52b428

Browse files
committed
project list works
1 parent 4473e15 commit d52b428

File tree

5 files changed

+16
-33
lines changed

5 files changed

+16
-33
lines changed

src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ export class MyApp {
2828

2929
// used for an example of ngFor and navigation
3030
this.pages = [
31-
{ title: 'Home', component: HomePage },
32-
{ title: 'List', component: ListPage }
31+
{ title: 'Project List', component: ListPage },
32+
{ title: 'Create Project', component: HomePage }
3333
];
3434
}
3535

src/app/app.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { SplashScreen } from '@ionic-native/splash-screen';
1111
import { AuthService } from '../providers/auth-service/auth-service';
1212
import { IonicStorageModule } from '@ionic/storage';
1313
import {LoginPage} from "../pages/login/login";
14+
import { ProjectProvider } from '../providers/project/project';
1415

1516
const pages = [
1617
MyApp,
@@ -32,7 +33,8 @@ const pages = [
3233
StatusBar,
3334
SplashScreen,
3435
{provide: ErrorHandler, useClass: IonicErrorHandler},
35-
AuthService
36+
AuthService,
37+
ProjectProvider
3638
]
3739
})
3840
export class AppModule {}

src/pages/list/list.html

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,14 @@
33
<button ion-button menuToggle>
44
<ion-icon name="menu"></ion-icon>
55
</button>
6-
<ion-title>List</ion-title>
6+
<ion-title>Project List</ion-title>
77
</ion-navbar>
88
</ion-header>
99

1010
<ion-content>
1111
<ion-list>
1212
<button ion-item *ngFor="let item of items" (click)="itemTapped($event, item)">
13-
<ion-icon [name]="item.icon" item-left></ion-icon>
14-
{{item.title}}
15-
<div class="item-note" item-right>
16-
{{item.note}}
17-
</div>
13+
{{item.id}} - {{item.name}}
1814
</button>
1915
</ion-list>
20-
<div *ngIf="selectedItem" padding>
21-
You navigated here from <b>{{selectedItem.title}}</b>
22-
</div>
2316
</ion-content>

src/pages/list/list.ts

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { Component } from '@angular/core';
22
import { NavController, NavParams } from 'ionic-angular';
3+
import {HomePage} from "../home/home";
4+
import {Project} from "../../model/project";
5+
import {ProjectProvider} from "../../providers/project/project";
36

47
@Component({
58
selector: 'page-list',
@@ -8,29 +11,14 @@ import { NavController, NavParams } from 'ionic-angular';
811
export class ListPage {
912
selectedItem: any;
1013
icons: string[];
11-
items: Array<{title: string, note: string, icon: string}>;
14+
items: Array<Project>;
1215

13-
constructor(public navCtrl: NavController, public navParams: NavParams) {
14-
// If we navigated to this page, we will have an item available as a nav param
15-
this.selectedItem = navParams.get('item');
16-
17-
// Let's populate this page with some filler content for funzies
18-
this.icons = ['flask', 'wifi', 'beer', 'football', 'basketball', 'paper-plane',
19-
'american-football', 'boat', 'bluetooth', 'build'];
20-
21-
this.items = [];
22-
for (let i = 1; i < 11; i++) {
23-
this.items.push({
24-
title: 'Item ' + i,
25-
note: 'This is item #' + i,
26-
icon: this.icons[Math.floor(Math.random() * this.icons.length)]
27-
});
28-
}
16+
constructor(public navCtrl: NavController, public navParams: NavParams, private projectProvider: ProjectProvider) {
17+
this.projectProvider.list().subscribe(projects => this.items = projects);
2918
}
3019

3120
itemTapped(event, item) {
32-
// That's right, we're pushing to ourselves!
33-
this.navCtrl.push(ListPage, {
21+
this.navCtrl.push(HomePage, {
3422
item: item
3523
});
3624
}

src/pages/login/login.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {AlertController, IonicPage, LoadingController, NavController, NavParams}
33
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
44
import {AuthService} from "../../providers/auth-service/auth-service";
55
import {User} from "../../model/user";
6-
import {HomePage} from "../home/home";
6+
import {ListPage} from "../list/list";
77

88
/**
99
* Generated class for the LoginPage page.
@@ -44,7 +44,7 @@ export class LoginPage {
4444
this.authService.authenticate(this.form.value)
4545
.subscribe((user: User) => {
4646
loader.dismiss();
47-
this.navCtrl.setRoot(HomePage);
47+
this.navCtrl.setRoot(ListPage);
4848
}, (error: any) => {
4949
loader.dismiss();
5050
let message = this.alertController.create({

0 commit comments

Comments
 (0)