Skip to content
This repository has been archived by the owner on Jan 6, 2021. It is now read-only.

Commit

Permalink
Update to the latest Beta11 release of Ionic!
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordan Matthiesen committed Sep 16, 2016
1 parent e3a0905 commit 971e905
Show file tree
Hide file tree
Showing 25 changed files with 281 additions and 91 deletions.
10 changes: 4 additions & 6 deletions app/app.ts
Expand Up @@ -45,9 +45,9 @@ class ConferenceApp {
rootPage: any = TabsPage;

constructor(
private events: Events,
private userData: UserData,
private menu: MenuController,
public events: Events,
public userData: UserData,
public menu: MenuController,
platform: Platform,
private confData: ConferenceData
) {
Expand Down Expand Up @@ -121,6 +121,4 @@ class ConferenceApp {
// See the theming docs for the default values:
// http://ionicframework.com/docs/v2/theming/platform-specific-styles/

ionicBootstrap(ConferenceApp, [ConferenceData, UserData], {
tabbarPlacement: 'bottom'
});
ionicBootstrap(ConferenceApp, [ConferenceData, UserData], { });
7 changes: 6 additions & 1 deletion app/pages/about/about.html
Expand Up @@ -29,7 +29,12 @@ <h4>Ionic Conference</h4>
<ion-item>
<ion-icon name="pin" item-left></ion-icon>
<ion-label>Location</ion-label>
<ion-label text-right>Madison, WI</ion-label>
<ion-select>
<ion-option value="madison" selected>Madison, WI</ion-option>
<ion-option value="austin">Austin, TX</ion-option>
<ion-option value="chicago">Chicago, IL</ion-option>
<ion-option value="seattle">Seattle, WA</ion-option>
</ion-select>
</ion-item>
</ion-list>

Expand Down
23 changes: 11 additions & 12 deletions app/pages/about/about.ts
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { NavController, Popover, ViewController, Alert } from 'ionic-angular';
import { PopoverController, ViewController, AlertController } from 'ionic-angular';
import {CodePushUpdate} from '../../providers/codepush-update';


Expand All @@ -15,9 +15,7 @@ import {CodePushUpdate} from '../../providers/codepush-update';
})
class PopoverPage {

constructor(private viewCtrl: ViewController) {

}
constructor(public viewCtrl: ViewController) { }

close() {
this.viewCtrl.dismiss();
Expand All @@ -35,28 +33,29 @@ export class AboutPage {
isWindows: boolean;

constructor(
private nav: NavController,
private updater: CodePushUpdate) {
public popoverCtrl: PopoverController,
public alertCtrl: AlertController,
public updater: CodePushUpdate) {
this.isWindows = window.cordova.platformId === 'windows';
}

presentPopover(event) {
let popover = Popover.create(PopoverPage);
this.nav.present(popover, { ev: event });
let popover = this.popoverCtrl.create(PopoverPage);
popover.present({ ev: event });
}

checkAndInstallUpdates() {
this.updater.checkForUpdate().then((remotePackage) => {
if (!remotePackage) {
let alert = Alert.create({
let alert = this.alertCtrl.create({
title: 'No update available!',
subTitle: 'We could not find any update.',
buttons: ['Ok']
});
this.nav.present(alert);
alert.present();
} else {
console.log('update available: ' + remotePackage.appVersion);
let alert = Alert.create({
let alert = this.alertCtrl.create({
title: 'Update ' + remotePackage.appVersion + ' available',
message: 'Would you like to update your app?',
buttons: [
Expand All @@ -74,7 +73,7 @@ export class AboutPage {
}
]
});
this.nav.present(alert);
alert.present();
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions app/pages/account/account.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';

import { Alert, NavController } from 'ionic-angular';
import { AlertController, NavController } from 'ionic-angular';

import { LoginPage } from '../login/login';
import { UserData } from '../../providers/user-data';
Expand All @@ -12,7 +12,7 @@ import { UserData } from '../../providers/user-data';
export class AccountPage {
username: string;

constructor(private nav: NavController, private userData: UserData) {
constructor(public alertCtrl: AlertController, public nav: NavController, public userData: UserData) {

}

Expand All @@ -28,7 +28,7 @@ export class AccountPage {
// clicking OK will update the username and display it
// clicking Cancel will close the alert and do nothing
changeUsername() {
let alert = Alert.create({
let alert = this.alertCtrl.create({
title: 'Change Username',
buttons: [
'Cancel'
Expand All @@ -47,7 +47,7 @@ export class AccountPage {
}
});

this.nav.present(alert);
alert.present();
}

getUsername() {
Expand Down
10 changes: 7 additions & 3 deletions app/pages/login/login.ts
Expand Up @@ -14,10 +14,14 @@ export class LoginPage {
login: {username?: string, password?: string} = {};
submitted = false;

constructor(private nav: NavController, private userData: UserData) {}
constructor(public navCtrl: NavController, public userData: UserData) { }

doLogin(provider: string) {
onLogin(provider: string) {
this.userData.login(provider);
this.nav.push(TabsPage);
this.navCtrl.push(TabsPage);
}

onSignup() {
this.navCtrl.push(SignupPage);
}
}
4 changes: 1 addition & 3 deletions app/pages/map/map.ts
@@ -1,15 +1,13 @@
import { Component } from '@angular/core';

import { Page } from 'ionic-angular';

import { ConferenceData } from '../../providers/conference-data';


@Component({
templateUrl: 'build/pages/map/map.html'
})
export class MapPage {
constructor(private confData: ConferenceData) {}
constructor(public confData: ConferenceData) {}

ionViewLoaded() {
this.confData.getMap().then(mapData => {
Expand Down
6 changes: 3 additions & 3 deletions app/pages/schedule-filter/schedule-filter.ts
Expand Up @@ -12,9 +12,9 @@ export class ScheduleFilterPage {
tracks: Array<{name: string, isChecked: boolean}> = [];

constructor(
private confData: ConferenceData,
private navParams: NavParams,
private viewCtrl: ViewController
public confData: ConferenceData,
public navParams: NavParams,
public viewCtrl: ViewController
) {
// passed in array of track names that should be excluded (unchecked)
let excludedTrackNames = this.navParams.data;
Expand Down
28 changes: 15 additions & 13 deletions app/pages/schedule/schedule.ts
@@ -1,6 +1,6 @@
import { Component, ViewChild } from '@angular/core';

import { Alert, App, ItemSliding, List, Modal, NavController, Page } from 'ionic-angular';
import { AlertController, App, ItemSliding, List, ModalController, NavController } from 'ionic-angular';

import { ConferenceData } from '../../providers/conference-data';
import { ScheduleFilterPage } from '../schedule-filter/schedule-filter';
Expand All @@ -26,10 +26,12 @@ export class SchedulePage {
groups = [];

constructor(
private app: App,
private nav: NavController,
private confData: ConferenceData,
private user: UserData
public alertCtrl: AlertController,
public app: App,
public modalCtrl: ModalController,
public navCtrl: NavController,
public confData: ConferenceData,
public user: UserData
) {

}
Expand Down Expand Up @@ -64,10 +66,10 @@ export class SchedulePage {
}

presentFilter() {
let modal = Modal.create(ScheduleFilterPage, this.excludeTracks);
this.nav.present(modal);
let modal = this.modalCtrl.create(ScheduleFilterPage, this.excludeTracks);
modal.present();

modal.onDismiss((data: any[]) => {
modal.onDidDismiss((data: any[]) => {
if (data) {
this.excludeTracks = data;
this.updateSchedule();
Expand All @@ -79,7 +81,7 @@ export class SchedulePage {
goToSessionDetail(sessionData) {
// go to the session detail page
// and pass in the session data
this.nav.push(SessionDetailPage, sessionData);
this.navCtrl.push(SessionDetailPage, sessionData);
}

addFavorite(slidingItem: ItemSliding, sessionData) {
Expand All @@ -93,7 +95,7 @@ export class SchedulePage {
this.user.addFavorite(sessionData.name);

// create an alert instance
let alert = Alert.create({
let alert = this.alertCtrl.create({
title: 'Favorite Added',
buttons: [{
text: 'OK',
Expand All @@ -104,14 +106,14 @@ export class SchedulePage {
}]
});
// now present the alert on top of all other content
this.nav.present(alert);
alert.present();
}

}

removeFavorite(slidingItem: ItemSliding, sessionData, title) {
sessionData.favorite = false;
let alert = Alert.create({
let alert = this.alertCtrl.create({
title: title,
message: 'Would you like to remove this session from your favorites?',
buttons: [
Expand All @@ -137,6 +139,6 @@ export class SchedulePage {
]
});
// now present the alert on top of all other content
this.nav.present(alert);
alert.present();
}
}
2 changes: 1 addition & 1 deletion app/pages/session-detail/session-detail.ts
Expand Up @@ -9,7 +9,7 @@ import { NavParams } from 'ionic-angular';
export class SessionDetailPage {
session: any;

constructor(private navParams: NavParams) {
constructor(public navParams: NavParams) {
this.session = navParams.data;
}
}
4 changes: 2 additions & 2 deletions app/pages/signup/signup.html
Expand Up @@ -17,7 +17,7 @@
<form #signupForm="ngForm" novalidate>
<ion-item>
<ion-label floating primary>Username</ion-label>
<ion-input [(ngModel)]="signup.username" ngControl="username" type="text" #username="ngForm" required>
<ion-input [(ngModel)]="signup.username" name="username" type="text" #username="ngModel" required>
</ion-input>
</ion-item>
<p [hidden]="username.valid || submitted == false" danger padding-left>
Expand All @@ -26,7 +26,7 @@

<ion-item>
<ion-label floating primary>Password</ion-label>
<ion-input [(ngModel)]="signup.password" ngControl="password" type="password" #password="ngForm" required>
<ion-input [(ngModel)]="signup.password" name="password" type="password" #password="ngModel" required>
</ion-input>
</ion-item>
<p [hidden]="password.valid || submitted == false" danger padding-left>
Expand Down
4 changes: 2 additions & 2 deletions app/pages/signup/signup.ts
Expand Up @@ -13,14 +13,14 @@ export class SignupPage {
signup: {username?: string, password?: string} = {};
submitted = false;

constructor(private nav: NavController, private userData: UserData) {}
constructor(public navCtrl: NavController, public userData: UserData) {}

onSignup(form) {
this.submitted = true;

if (form.valid) {
this.userData.signup(this.signup.username);
this.nav.push(TabsPage);
this.navCtrl.push(TabsPage);
}
}
}
6 changes: 3 additions & 3 deletions app/pages/speaker-detail/speaker-detail.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';

import { NavController, NavParams, Page } from 'ionic-angular';
import { NavController, NavParams } from 'ionic-angular';

import { SessionDetailPage } from '../session-detail/session-detail';

Expand All @@ -11,11 +11,11 @@ import { SessionDetailPage } from '../session-detail/session-detail';
export class SpeakerDetailPage {
speaker: any;

constructor(private nav: NavController, private navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams) {
this.speaker = this.navParams.data;
}

goToSessionDetail(session) {
this.nav.push(SessionDetailPage, session);
this.navCtrl.push(SessionDetailPage, session);
}
}
3 changes: 3 additions & 0 deletions app/pages/speaker-list/speaker-list.html
Expand Up @@ -16,6 +16,9 @@
<img [src]="speaker.profilePic">
</ion-avatar>
{{speaker.name}}
<button (click)="openContact(speaker)" clear item-right>
<ion-icon name="help-circle"></ion-icon>
</button>
</ion-item>
</ion-card-header>

Expand Down

0 comments on commit 971e905

Please sign in to comment.