Skip to content
This repository was archived by the owner on Apr 2, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import { Config, Platform } from 'ionic-angular';
import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';

import { TabsPage } from '../pages/tabs/tabs';
import { LoginPage } from '../pages/login/login';

import { User } from '../providers/user';


Expand All @@ -26,11 +23,11 @@ export class MyApp {
platform.ready().then(() => {
user.isAuthenticated().then(() => {
console.log('you are authenticated!');
this.rootPage = TabsPage;
this.rootPage = 'TabsPage';
globalActions();
}).catch(() => {
console.log('you are not authenticated..');
this.rootPage = LoginPage;
this.rootPage = 'LoginPage';
globalActions();
});
});
Expand Down
31 changes: 1 addition & 30 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,15 @@ import { Camera } from '@ionic-native/camera';

import { AwsConfig } from './app.config';
import { MyApp } from './app.component';
import { LoginPage } from '../pages/login/login';
import { SignupPage } from '../pages/signup/signup';
import { ConfirmPage } from '../pages/confirm/confirm';
import { SettingsPage } from '../pages/settings/settings';
import { AboutPage } from '../pages/about/about';
import { AccountPage } from '../pages/account/account';
import { TabsPage } from '../pages/tabs/tabs';
import { TasksPage } from '../pages/tasks/tasks';
import { TasksCreatePage } from '../pages/tasks-create/tasks-create';

import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';

import { User } from '../providers/user';
import { Cognito } from '../providers/aws.cognito';
import { DynamoDB } from '../providers/aws.dynamodb';
import { User, Cognito, DynamoDB } from '../providers/providers';

@NgModule({
declarations: [
MyApp,
LoginPage,
SignupPage,
ConfirmPage,
SettingsPage,
AboutPage,
AccountPage,
TabsPage,
TasksPage,
TasksCreatePage
],
imports: [
BrowserModule,
Expand All @@ -43,15 +23,6 @@ import { DynamoDB } from '../providers/aws.dynamodb';
bootstrap: [IonicApp],
entryComponents: [
MyApp,
LoginPage,
SignupPage,
ConfirmPage,
SettingsPage,
AboutPage,
AccountPage,
TabsPage,
TasksPage,
TasksCreatePage
],
providers: [
StatusBar,
Expand Down
16 changes: 16 additions & 0 deletions src/pages/about/about.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { AboutPage } from './about';

@NgModule({
declarations: [
AboutPage,
],
imports: [
IonicPageModule.forChild(AboutPage),
],
exports: [
AboutPage
]
})
export class AboutPageModule {}
2 changes: 2 additions & 0 deletions src/pages/about/about.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Component } from '@angular/core';
import { IonicPage } from 'ionic-angular';

@IonicPage()
@Component({
selector: 'page-about',
templateUrl: 'about.html'
Expand Down
16 changes: 16 additions & 0 deletions src/pages/account/account.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { AccountPage } from './account';

@NgModule({
declarations: [
AccountPage,
],
imports: [
IonicPageModule.forChild(AccountPage),
],
exports: [
AccountPage
]
})
export class AccountPageModule { }
6 changes: 2 additions & 4 deletions src/pages/account/account.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { Component, ViewChild } from '@angular/core';

import { Config, LoadingController, NavController } from 'ionic-angular';

import {IonicPage, Config, LoadingController, NavController } from 'ionic-angular';
import { Camera, CameraOptions } from '@ionic-native/camera';

import { DynamoDB, User } from '../../providers/providers';

declare var AWS: any;

@IonicPage()
@Component({
selector: 'page-account',
templateUrl: 'account.html'
Expand Down
16 changes: 16 additions & 0 deletions src/pages/login/login.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { LoginPage } from './login';

@NgModule({
declarations: [
LoginPage,
],
imports: [
IonicPageModule.forChild(LoginPage),
],
exports: [
LoginPage
]
})
export class LoginPageModule { }
12 changes: 5 additions & 7 deletions src/pages/login/login.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { Component } from '@angular/core';

import { NavController, LoadingController } from 'ionic-angular';
import {IonicPage, NavController, LoadingController } from 'ionic-angular';

import { TabsPage } from '../tabs/tabs';
import { SignupPage } from '../signup/signup';
import { ConfirmPage } from '../confirm/confirm';

import { User } from '../../providers/providers';

Expand All @@ -13,6 +10,7 @@ export class LoginDetails {
password: string;
}

@IonicPage()
@Component({
selector: 'page-login',
templateUrl: 'login.html'
Expand All @@ -38,19 +36,19 @@ export class LoginPage {
this.user.login(details.username, details.password).then((result) => {
console.log('result:', result);
loading.dismiss();
this.navCtrl.setRoot(TabsPage);
this.navCtrl.setRoot('TabsPage');
}).catch((err) => {
if (err.message === "User is not confirmed.") {
loading.dismiss();
this.navCtrl.push(ConfirmPage, { 'username': details.username });
this.navCtrl.push('ConfirmPage', { 'username': details.username });
}
console.log('errrror', err);
loading.dismiss();
});
}

signup() {
this.navCtrl.push(SignupPage);
this.navCtrl.push('SignupPage');
}

}
16 changes: 16 additions & 0 deletions src/pages/settings/settings.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { SettingsPage } from './settings';

@NgModule({
declarations: [
SettingsPage,
],
imports: [
IonicPageModule.forChild(SettingsPage),
],
exports: [
SettingsPage
]
})
export class SettingsPageModule { }
12 changes: 5 additions & 7 deletions src/pages/settings/settings.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
import { Component } from '@angular/core';
import { App } from 'ionic-angular';
import { LoginPage } from '../login/login';
import { AboutPage } from '../about/about';
import { AccountPage } from '../account/account';
import {IonicPage, App } from 'ionic-angular';

import { User } from '../../providers/providers';

@IonicPage()
@Component({
templateUrl: 'settings.html'
})
export class SettingsPage {

public aboutPage = AboutPage;
public accountPage = AccountPage;
public aboutPage = 'AboutPage';
public accountPage = 'AccountPage';

constructor(public user: User, public app: App) {
}

logout() {
this.user.logout();
this.app.getRootNav().setRoot(LoginPage);
this.app.getRootNav().setRoot('LoginPage');
}

}
16 changes: 16 additions & 0 deletions src/pages/signup/signup.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import {SignupPage} from './signup';

@NgModule({
declarations: [
SignupPage,
],
imports: [
IonicPageModule.forChild(SignupPage),
],
exports: [
SignupPage
]
})
export class SignupPageModule { }
10 changes: 4 additions & 6 deletions src/pages/signup/signup.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { Component } from '@angular/core';

import { NavController, LoadingController } from 'ionic-angular';

import { LoginPage } from '../login/login';
import { ConfirmPage } from '../confirm/confirm';
import {IonicPage, NavController, LoadingController } from 'ionic-angular';

import { User } from '../../providers/user';

Expand All @@ -13,6 +10,7 @@ export class UserDetails {
password: string;
}

@IonicPage()
@Component({
selector: 'page-signup',
templateUrl: 'signup.html'
Expand Down Expand Up @@ -42,15 +40,15 @@ export class SignupPage {
this.user.register(details.username, details.password, {'email': details.email}).then((user) => {
console.log('hooray', user);
loading.dismiss();
this.navCtrl.push(ConfirmPage, { username: details.username });
this.navCtrl.push('ConfirmPage', { username: details.username });
}).catch((err) => {
loading.dismiss();
this.error = err;
});
}

login() {
this.navCtrl.push(LoginPage);
this.navCtrl.push('LoginPage');
}

}
16 changes: 16 additions & 0 deletions src/pages/tabs/tabs.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TabsPage } from './tabs';

@NgModule({
declarations: [
TabsPage,
],
imports: [
IonicPageModule.forChild(TabsPage),
],
exports: [
TabsPage
]
})
export class TabsPageModule { }
9 changes: 4 additions & 5 deletions src/pages/tabs/tabs.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Component } from '@angular/core';
import { IonicPage } from 'ionic-angular';

import { SettingsPage } from '../settings/settings';
import { TasksPage } from '../tasks/tasks';

@IonicPage()
@Component({
templateUrl: 'tabs.html'
})
export class TabsPage {

tab1Root = TasksPage;
tab2Root = SettingsPage;
tab1Root = 'TasksPage';
tab2Root = 'SettingsPage';

constructor() {

Expand Down
16 changes: 16 additions & 0 deletions src/pages/tasks-create/tasks-create.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TasksCreatePage } from './tasks-create';

@NgModule({
declarations: [
TasksCreatePage,
],
imports: [
IonicPageModule.forChild(TasksCreatePage),
],
exports: [
TasksCreatePage
]
})
export class TasksCreatePageModule { }
11 changes: 6 additions & 5 deletions src/pages/tasks-create/tasks-create.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { NavController, NavParams, ViewController, Platform } from 'ionic-angular';
import { IonicPage, NavController, NavParams, ViewController, Platform } from 'ionic-angular';

@IonicPage()
@Component({
selector: 'page-tasks-create',
templateUrl: 'tasks-create.html'
Expand All @@ -15,9 +16,9 @@ export class TasksCreatePage {


constructor(public navCtrl: NavController,
public navParams: NavParams,
public viewCtrl: ViewController,
public platform: Platform) {
public navParams: NavParams,
public viewCtrl: ViewController,
public platform: Platform) {
this.isAndroid = platform.is('android');
this.item = {
'taskId': navParams.get('id'),
Expand All @@ -34,7 +35,7 @@ export class TasksCreatePage {
this.viewCtrl.dismiss();
}

done() {
done() {
this.viewCtrl.dismiss(this.item);
}
}
Loading