From 640fe30af61d68f4e1a81fa820b5cf2b01b8892b Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 31 May 2017 23:08:54 +0200 Subject: [PATCH 1/2] refactor(): add *.module.ts files --- src/pages/about/about.module.ts | 16 ++++++++++++++++ src/pages/account/account.module.ts | 16 ++++++++++++++++ src/pages/confirm/confirm.module.ts | 16 ++++++++++++++++ src/pages/login/login.module.ts | 16 ++++++++++++++++ src/pages/settings/settings.module.ts | 16 ++++++++++++++++ src/pages/signup/signup.module.ts | 16 ++++++++++++++++ src/pages/tabs/tabs.module.ts | 16 ++++++++++++++++ src/pages/tasks-create/tasks-create.module.ts | 16 ++++++++++++++++ src/pages/tasks/tasks.module.ts | 16 ++++++++++++++++ 9 files changed, 144 insertions(+) create mode 100644 src/pages/about/about.module.ts create mode 100644 src/pages/account/account.module.ts create mode 100644 src/pages/confirm/confirm.module.ts create mode 100644 src/pages/login/login.module.ts create mode 100644 src/pages/settings/settings.module.ts create mode 100644 src/pages/signup/signup.module.ts create mode 100644 src/pages/tabs/tabs.module.ts create mode 100644 src/pages/tasks-create/tasks-create.module.ts create mode 100644 src/pages/tasks/tasks.module.ts diff --git a/src/pages/about/about.module.ts b/src/pages/about/about.module.ts new file mode 100644 index 0000000..9f5767f --- /dev/null +++ b/src/pages/about/about.module.ts @@ -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 { } diff --git a/src/pages/account/account.module.ts b/src/pages/account/account.module.ts new file mode 100644 index 0000000..179b79f --- /dev/null +++ b/src/pages/account/account.module.ts @@ -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 { } diff --git a/src/pages/confirm/confirm.module.ts b/src/pages/confirm/confirm.module.ts new file mode 100644 index 0000000..7de4864 --- /dev/null +++ b/src/pages/confirm/confirm.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { ConfirmPage } from './confirm'; + +@NgModule({ + declarations: [ + ConfirmPage, + ], + imports: [ + IonicPageModule.forChild(ConfirmPage), + ], + exports: [ + ConfirmPage + ] +}) +export class ConfirmPageModule { } diff --git a/src/pages/login/login.module.ts b/src/pages/login/login.module.ts new file mode 100644 index 0000000..5faea15 --- /dev/null +++ b/src/pages/login/login.module.ts @@ -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 { } diff --git a/src/pages/settings/settings.module.ts b/src/pages/settings/settings.module.ts new file mode 100644 index 0000000..5e67b38 --- /dev/null +++ b/src/pages/settings/settings.module.ts @@ -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 { } diff --git a/src/pages/signup/signup.module.ts b/src/pages/signup/signup.module.ts new file mode 100644 index 0000000..0bcdb24 --- /dev/null +++ b/src/pages/signup/signup.module.ts @@ -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 { } diff --git a/src/pages/tabs/tabs.module.ts b/src/pages/tabs/tabs.module.ts new file mode 100644 index 0000000..1ea6c77 --- /dev/null +++ b/src/pages/tabs/tabs.module.ts @@ -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 { } diff --git a/src/pages/tasks-create/tasks-create.module.ts b/src/pages/tasks-create/tasks-create.module.ts new file mode 100644 index 0000000..d5314cf --- /dev/null +++ b/src/pages/tasks-create/tasks-create.module.ts @@ -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 { } diff --git a/src/pages/tasks/tasks.module.ts b/src/pages/tasks/tasks.module.ts new file mode 100644 index 0000000..2535e14 --- /dev/null +++ b/src/pages/tasks/tasks.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { TasksPage } from './tasks'; + +@NgModule({ + declarations: [ + TasksPage, + ], + imports: [ + IonicPageModule.forChild(TasksPage), + ], + exports: [ + TasksPage + ] +}) +export class TasksPageModule { } From dde365b04f9dbef37b5d08b2e4276dbb30003691 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 1 Jun 2017 12:28:46 +0200 Subject: [PATCH 2/2] update --- src/pages/about/about.ts | 2 ++ src/pages/account/account.ts | 7 ++++--- src/pages/confirm/confirm.ts | 5 +++-- src/pages/login/login.ts | 9 +++++---- src/pages/settings/settings.ts | 3 ++- src/pages/signup/signup.ts | 3 ++- src/pages/tabs/tabs.ts | 3 +++ src/pages/tasks-create/tasks-create.ts | 5 +++-- src/pages/tasks/tasks.ts | 3 ++- 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/pages/about/about.ts b/src/pages/about/about.ts index 9ca806b..5c6896c 100644 --- a/src/pages/about/about.ts +++ b/src/pages/about/about.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; +import { IonicPage } from 'ionic-angular'; +@IonicPage() @Component({ selector: 'page-about', templateUrl: 'about.html' diff --git a/src/pages/account/account.ts b/src/pages/account/account.ts index a3587a6..be0c969 100644 --- a/src/pages/account/account.ts +++ b/src/pages/account/account.ts @@ -1,6 +1,6 @@ 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'; @@ -8,12 +8,13 @@ import { DynamoDB, User } from '../../providers/providers'; declare var AWS: any; +@IonicPage() @Component({ selector: 'page-account', templateUrl: 'account.html' }) export class AccountPage { - + @ViewChild('avatar') avatarInput; private s3: any; @@ -104,6 +105,6 @@ export class AccountPage { }); } loading.dismiss(); - + } } diff --git a/src/pages/confirm/confirm.ts b/src/pages/confirm/confirm.ts index 9899e33..0c07e1e 100644 --- a/src/pages/confirm/confirm.ts +++ b/src/pages/confirm/confirm.ts @@ -1,16 +1,17 @@ import { Component } from '@angular/core'; -import { NavController, NavParams } from 'ionic-angular'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; import { LoginPage } from '../login/login'; import { User } from '../../providers/user'; +@IonicPage() @Component({ selector: 'page-confirm', templateUrl: 'confirm.html' }) export class ConfirmPage { - + public code: string; public username: string; diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts index ac23f25..6cde17c 100644 --- a/src/pages/login/login.ts +++ b/src/pages/login/login.ts @@ -1,6 +1,6 @@ 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'; @@ -13,18 +13,19 @@ export class LoginDetails { password: string; } +@IonicPage() @Component({ selector: 'page-login', templateUrl: 'login.html' }) export class LoginPage { - + public loginDetails: LoginDetails; constructor(public navCtrl: NavController, public user: User, public loadingCtrl: LoadingController) { - this.loginDetails = new LoginDetails(); + this.loginDetails = new LoginDetails(); } login() { @@ -39,7 +40,7 @@ export class LoginPage { console.log('result:', result); loading.dismiss(); this.navCtrl.setRoot(TabsPage); - }).catch((err) => { + }).catch((err) => { if (err.message === "User is not confirmed.") { loading.dismiss(); this.navCtrl.push(ConfirmPage, { 'username': details.username }); diff --git a/src/pages/settings/settings.ts b/src/pages/settings/settings.ts index c1b3baf..7179501 100644 --- a/src/pages/settings/settings.ts +++ b/src/pages/settings/settings.ts @@ -1,11 +1,12 @@ import { Component } from '@angular/core'; -import { App } from 'ionic-angular'; +import { IonicPage, App } from 'ionic-angular'; import { LoginPage } from '../login/login'; import { AboutPage } from '../about/about'; import { AccountPage } from '../account/account'; import { User } from '../../providers/providers'; +@IonicPage() @Component({ templateUrl: 'settings.html' }) diff --git a/src/pages/signup/signup.ts b/src/pages/signup/signup.ts index 31f2286..dda4dc6 100644 --- a/src/pages/signup/signup.ts +++ b/src/pages/signup/signup.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { NavController, LoadingController } from 'ionic-angular'; +import { IonicPage, NavController, LoadingController } from 'ionic-angular'; import { LoginPage } from '../login/login'; import { ConfirmPage } from '../confirm/confirm'; @@ -13,6 +13,7 @@ export class UserDetails { password: string; } +@IonicPage() @Component({ selector: 'page-signup', templateUrl: 'signup.html' diff --git a/src/pages/tabs/tabs.ts b/src/pages/tabs/tabs.ts index 7171d0c..0760a39 100644 --- a/src/pages/tabs/tabs.ts +++ b/src/pages/tabs/tabs.ts @@ -1,8 +1,11 @@ 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' }) diff --git a/src/pages/tasks-create/tasks-create.ts b/src/pages/tasks-create/tasks-create.ts index 252f15f..58d0e67 100644 --- a/src/pages/tasks-create/tasks-create.ts +++ b/src/pages/tasks-create/tasks-create.ts @@ -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' @@ -34,7 +35,7 @@ export class TasksCreatePage { this.viewCtrl.dismiss(); } - done() { + done() { this.viewCtrl.dismiss(this.item); } } diff --git a/src/pages/tasks/tasks.ts b/src/pages/tasks/tasks.ts index ac6a397..7a695a0 100644 --- a/src/pages/tasks/tasks.ts +++ b/src/pages/tasks/tasks.ts @@ -1,12 +1,13 @@ import { Component } from '@angular/core'; -import { NavController, ModalController } from 'ionic-angular'; +import { IonicPage, NavController, ModalController } from 'ionic-angular'; import { TasksCreatePage } from '../tasks-create/tasks-create'; import { DynamoDB, User } from '../../providers/providers'; declare var AWS: any; +@IonicPage() @Component({ selector: 'page-tasks', templateUrl: 'tasks.html'