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