Commit 5bdd3537 authored by metalvarez's avatar metalvarez

cambios para cargar modulos al vuelo, lazyloading

parent 26aeaa6e
# Specifies intentionally untracked files to ignore when using Git
# http://git-scm.com/docs/gitignore
*~
*.sw[mnpcod]
*.log
*.tmp
*.tmp.*
log.txt
*.sublime-project
*.sublime-workspace
.vscode/
npm-debug.log*
.idea/
.ionic/
.sourcemaps/
.sass-cache/
.tmp/
.versions/
coverage/
www/
node_modules/
tmp/
temp/
$RECYCLE.BIN/
.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate
...@@ -3864,7 +3864,8 @@ ...@@ -3864,7 +3864,8 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true "bundled": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -3882,11 +3883,13 @@ ...@@ -3882,11 +3883,13 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true "bundled": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -3899,15 +3902,18 @@ ...@@ -3899,15 +3902,18 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true "bundled": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true "bundled": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true "bundled": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -4010,7 +4016,8 @@ ...@@ -4010,7 +4016,8 @@
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true "bundled": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -4020,6 +4027,7 @@ ...@@ -4020,6 +4027,7 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -4032,17 +4040,20 @@ ...@@ -4032,17 +4040,20 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true "bundled": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -4059,6 +4070,7 @@ ...@@ -4059,6 +4070,7 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -4131,7 +4143,8 @@ ...@@ -4131,7 +4143,8 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true "bundled": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -4141,6 +4154,7 @@ ...@@ -4141,6 +4154,7 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -4216,7 +4230,8 @@ ...@@ -4216,7 +4230,8 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true "bundled": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -4246,6 +4261,7 @@ ...@@ -4246,6 +4261,7 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -4263,6 +4279,7 @@ ...@@ -4263,6 +4279,7 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -4301,11 +4318,13 @@ ...@@ -4301,11 +4318,13 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true "bundled": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true "bundled": true,
"optional": true
} }
} }
}, },
......
...@@ -8,8 +8,6 @@ import { Content } from 'ionic-angular'; ...@@ -8,8 +8,6 @@ import { Content } from 'ionic-angular';
import { FCM } from '@ionic-native/fcm'; import { FCM } from '@ionic-native/fcm';
import { Push} from '@ionic-native/push'; import { Push} from '@ionic-native/push';
import { RestProvider } from '../providers/rest/rest'; import { RestProvider } from '../providers/rest/rest';
import { MenuPage } from '../pages/menu/menu';
import { PassportloginPage } from '../pages/passportlogin/passportlogin';
import { CacheService } from "ionic-cache"; import { CacheService } from "ionic-cache";
import {XMPPService} from "../providers/xmpp-service/xmpp-service"; import {XMPPService} from "../providers/xmpp-service/xmpp-service";
import { Firebase } from '@ionic-native/firebase'; import { Firebase } from '@ionic-native/firebase';
...@@ -26,7 +24,7 @@ export class MyApp { ...@@ -26,7 +24,7 @@ export class MyApp {
@ViewChild(Nav) nav: Nav; @ViewChild(Nav) nav: Nav;
@ViewChild('myNav') navCtrl: NavController; @ViewChild('myNav') navCtrl: NavController;
@ViewChild(Content) content: Content; @ViewChild(Content) content: Content;
rootPage:any = PassportloginPage; rootPage:any = 'PassportloginPage';
appId: any = '12345678'; appId: any = '12345678';
Rut : any; Rut : any;
error : any = ''; error : any = '';
...@@ -83,7 +81,7 @@ export class MyApp { ...@@ -83,7 +81,7 @@ export class MyApp {
if (value == "login") { if (value == "login") {
this.app.getRootNav().push(ChatPage); this.app.getRootNav().push(ChatPage);
} else if (value == "logout") { } else if (value == "logout") {
app.getRootNav().push(PassportloginPage); app.getRootNav().push('PassportloginPage');
} }
}); });
...@@ -92,9 +90,9 @@ export class MyApp { ...@@ -92,9 +90,9 @@ export class MyApp {
let usuario = window.localStorage.getItem('usuario') ? window.localStorage.getItem('usuario') : ''; let usuario = window.localStorage.getItem('usuario') ? window.localStorage.getItem('usuario') : '';
let password = window.localStorage.getItem('password') ? window.localStorage.getItem('password') : ''; let password = window.localStorage.getItem('password') ? window.localStorage.getItem('password') : '';
if(usuario && password) { if(usuario && password) {
this.nav.setRoot(MenuPage); this.nav.setRoot('MenuPage');
}else{ }else{
this.nav.setRoot(PassportloginPage); this.nav.setRoot('PassportloginPage');
} }
} }
......
...@@ -9,11 +9,6 @@ import { FileTransfer} from '@ionic-native/file-transfer'; ...@@ -9,11 +9,6 @@ import { FileTransfer} from '@ionic-native/file-transfer';
import { File } from '@ionic-native/file'; import { File } from '@ionic-native/file';
import { Camera } from '@ionic-native/camera'; import { Camera } from '@ionic-native/camera';
import { MyApp } from './app.component'; import { MyApp } from './app.component';
import { HomePage } from '../pages/home/home';
import { MenuPage } from '../pages/menu/menu';
import { InquiryPage } from '../pages/inquiry/inquiry';
import { PassportloginPage } from '../pages/passportlogin/passportlogin';
import { PassportloginPageModule } from '../pages/passportlogin/passportlogin.module';
import { HeaderComponent } from '../components/header/header'; import { HeaderComponent } from '../components/header/header';
import { HeaderComponentModule } from '../components/header/header.module'; import { HeaderComponentModule } from '../components/header/header.module';
import { FooterComponentModule } from '../components/footer/footer.module'; import { FooterComponentModule } from '../components/footer/footer.module';
...@@ -29,9 +24,7 @@ import { Push } from '@ionic-native/push'; ...@@ -29,9 +24,7 @@ import { Push } from '@ionic-native/push';
import { CacheModule } from 'ionic-cache'; import { CacheModule } from 'ionic-cache';
import { Base64 } from '@ionic-native/base64'; import { Base64 } from '@ionic-native/base64';
import { SelectSearchableModule } from 'ionic-select-searchable'; import { SelectSearchableModule } from 'ionic-select-searchable';
import {ChatPage} from "../pages/chat/chat";
import { Firebase } from '@ionic-native/firebase'; import { Firebase } from '@ionic-native/firebase';
import {NotiDetailPage} from "../pages/noti-detail/noti-detail";
import {FileChooser} from "@ionic-native/file-chooser"; import {FileChooser} from "@ionic-native/file-chooser";
import {AndroidPermissions} from "@ionic-native/android-permissions"; import {AndroidPermissions} from "@ionic-native/android-permissions";
import {Diagnostic} from "@ionic-native/diagnostic"; import {Diagnostic} from "@ionic-native/diagnostic";
...@@ -42,40 +35,33 @@ import {FileOpener} from "@ionic-native/file-opener"; ...@@ -42,40 +35,33 @@ import {FileOpener} from "@ionic-native/file-opener";
import { InquiryProvider } from '../providers/inquiry/inquiry'; import { InquiryProvider } from '../providers/inquiry/inquiry';
@NgModule({ @NgModule({
declarations: [ declarations: [
MyApp, MyApp
HomePage, ChatPage, NotiDetailPage,
MenuPage, InquiryPage
], ],
imports: [ imports: [
HttpClientModule, HttpClientModule,
BrowserModule, BrowserModule,
IonicModule.forRoot(MyApp, { ios: { IonicModule.forRoot(MyApp, { ios: {
scrollAssist: false, scrollAssist: false,
autoFocusAssist: false, autoFocusAssist: false,
inputBlurring: false inputBlurring: false
} }), } }),
IonicStorageModule.forRoot({ IonicStorageModule.forRoot({
name: '__mydb', name: '__mydb',
driverOrder: ['indexeddb', 'sqlite', 'websql'] driverOrder: ['indexeddb', 'sqlite', 'websql']
}), }),
CacheModule.forRoot(), CacheModule.forRoot(),
HeaderComponentModule, HeaderComponentModule,
FooterComponentModule, FooterComponentModule,
PassportloginPageModule,
EmojiPickerComponentModule, EmojiPickerComponentModule,
SelectSearchableModule SelectSearchableModule
], ],
bootstrap: [IonicApp], bootstrap: [IonicApp],
entryComponents: [ entryComponents: [
MyApp, MyApp,
HomePage, ChatPage, HeaderComponent
PassportloginPage,
MenuPage, NotiDetailPage,
InquiryPage,
HeaderComponent,
], ],
providers: [ providers: [
Keyboard, Keyboard,
StatusBar, Diagnostic, BackgroundMode, StatusBar, Diagnostic, BackgroundMode,
SplashScreen, SplashScreen,
{provide: ErrorHandler, useClass: IonicErrorHandler}, {provide: ErrorHandler, useClass: IonicErrorHandler},
......
...@@ -7,12 +7,10 @@ import { Events, Content } from 'ionic-angular'; ...@@ -7,12 +7,10 @@ import { Events, Content } from 'ionic-angular';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { RestProvider, UserInfo } from '../../providers/rest/rest'; import { RestProvider, UserInfo } from '../../providers/rest/rest';
import { Loader } from "../../providers/loader/loader"; import { Loader } from "../../providers/loader/loader";
import { MenuPage } from '../../pages/menu/menu';
import { Strophe } from "strophe.js"; import { Strophe } from "strophe.js";
import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer'; import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer';
import { XMPPService } from "../../providers/xmpp-service/xmpp-service"; import { XMPPService } from "../../providers/xmpp-service/xmpp-service";
import { File } from '@ionic-native/file'; import { File } from '@ionic-native/file';
import { AndroidPermissions } from "@ionic-native/android-permissions";
import { Diagnostic } from "@ionic-native/diagnostic"; import { Diagnostic } from "@ionic-native/diagnostic";
declare function enviaArchivo(debug, cancelar, idUpload); declare function enviaArchivo(debug, cancelar, idUpload);
import { Keyboard } from '@ionic-native/keyboard'; import { Keyboard } from '@ionic-native/keyboard';
...@@ -431,7 +429,7 @@ export class ChatPage { ...@@ -431,7 +429,7 @@ export class ChatPage {
} }
}); });
this.xmppService.logout(); this.xmppService.logout();
this.navCtrl.push(MenuPage); this.navCtrl.push('MenuPage');
} }
ionViewDidLoad() { ionViewDidLoad() {
......
...@@ -23,7 +23,7 @@ export class FormularyPage { ...@@ -23,7 +23,7 @@ export class FormularyPage {
private alertCtrl: AlertController, private alertCtrl: AlertController,
private loader: Loader, public storage: Storage) { private loader: Loader, public storage: Storage) {
this.messageForm = formBuilder.group({ this.messageForm = this.formBuilder.group({
message: ['', Validators.compose([Validators.required])], message: ['', Validators.compose([Validators.required])],
request: ['', Validators.compose([Validators.required])] request: ['', Validators.compose([Validators.required])]
}); });
......
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { MenuPage } from '../../pages/menu/menu'; import { MenuPage } from '../../pages/menu/menu';
import { RestProvider, UserInfo } from '../../providers/rest/rest'; import { RestProvider } from '../../providers/rest/rest';
import { AlertController } from 'ionic-angular'; import { AlertController } from 'ionic-angular';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
...@@ -106,6 +106,6 @@ export class InquiryPage { ...@@ -106,6 +106,6 @@ export class InquiryPage {
return "assets/imgs/" + star + ".png"; return "assets/imgs/" + star + ".png";
} }
goback(){ goback(){
this.navCtrl.push(MenuPage); this.navCtrl.push('MenuPage');
} }
} }
...@@ -10,9 +10,6 @@ import { HeaderComponentModule } from '../../components/header/header.module'; ...@@ -10,9 +10,6 @@ import { HeaderComponentModule } from '../../components/header/header.module';
imports: [ imports: [
IonicPageModule.forChild(MenuPage), IonicPageModule.forChild(MenuPage),
HeaderComponentModule HeaderComponentModule
],
exports: [
MenuPage
] ]
}) })
export class MenuPageModule {} export class MenuPageModule {}
...@@ -5,7 +5,6 @@ import { RestProvider } from '../../providers/rest/rest'; ...@@ -5,7 +5,6 @@ import { RestProvider } from '../../providers/rest/rest';
import { AlertController } from 'ionic-angular'; import { AlertController } from 'ionic-angular';
import { Loader } from "../../providers/loader/loader"; import { Loader } from "../../providers/loader/loader";
import {XMPPService} from "../../providers/xmpp-service/xmpp-service"; import {XMPPService} from "../../providers/xmpp-service/xmpp-service";
import { InquiryPage } from '../../pages/inquiry/inquiry';
import { InquiryProvider } from "../../providers/inquiry/inquiry"; import { InquiryProvider } from "../../providers/inquiry/inquiry";
@IonicPage() @IonicPage()
...@@ -74,7 +73,7 @@ export class MenuPage { ...@@ -74,7 +73,7 @@ export class MenuPage {
ionViewDidEnter(){ ionViewDidEnter(){
if (this.inquiryProvider.inquiry != null){ if (this.inquiryProvider.inquiry != null){
this.navCtrl.push(InquiryPage, this.inquiryProvider.get()); this.navCtrl.push('InquiryPage', this.inquiryProvider.get());
} }
} }
ionViewDidLoad() { ionViewDidLoad() {
......
...@@ -38,7 +38,7 @@ export class NotiListPage { ...@@ -38,7 +38,7 @@ export class NotiListPage {
openDetailPage(page){ openDetailPage(page){
if (page.title){ if (page.title){
this.navCtrl.push(NotiDetailPage,{message:page.title}); this.navCtrl.push('NotiDetailPage', {message:page.title});
} }
} }
......
...@@ -114,7 +114,7 @@ export class PasswordPage { ...@@ -114,7 +114,7 @@ export class PasswordPage {
this.storage.get('device_token').then(getToken =>{ this.storage.get('device_token').then(getToken =>{
this.restProvider.sendToken(this.rut, clave,getToken); this.restProvider.sendToken(this.rut, clave,getToken);
}); });
this.navCtrl.push(MenuPage); this.navCtrl.push('MenuPage');
} }
}).catch(error => { }).catch(error => {
this.loader.hide(); this.loader.hide();
......
...@@ -2,7 +2,6 @@ import { Component } from '@angular/core'; ...@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
import { IonicPage, NavController} from 'ionic-angular'; import { IonicPage, NavController} from 'ionic-angular';
import { RestProvider } from '../../providers/rest/rest'; import { RestProvider } from '../../providers/rest/rest';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { MenuPage } from '../../pages/menu/menu';
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -108,7 +107,7 @@ export class TraveladvicePage { ...@@ -108,7 +107,7 @@ export class TraveladvicePage {
} }
goback(){ goback(){
this.navCtrl.push(MenuPage); this.navCtrl.push('MenuPage');
} }
} }
...@@ -3,7 +3,6 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; ...@@ -3,7 +3,6 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { RestProvider } from '../../providers/rest/rest'; import { RestProvider } from '../../providers/rest/rest';
import { Loader } from "../../providers/loader/loader"; import { Loader } from "../../providers/loader/loader";
import { MenuPage } from '../../pages/menu/menu';
import { SelectSearchableComponent } from 'ionic-select-searchable'; import { SelectSearchableComponent } from 'ionic-select-searchable';
class Port { class Port {
...@@ -124,7 +123,7 @@ export class UsefulinfoPage { ...@@ -124,7 +123,7 @@ export class UsefulinfoPage {
} }
goback(){ goback(){
this.navCtrl.push(MenuPage); this.navCtrl.push('MenuPage');
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment