EII/mobilapp
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'matt' into guillaume

Browse source
This commit is contained in:
GME 2018-11-08 14:29:32 +01:00
parent 3d8d66ffed dc9280f825
commit 16cc98c53b
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/app.module.ts
View file

@ -13,6 +13,7 @@ import { ContactsPage } from "../pages/contacts/contacts";
import { SendPage} from "../pages/send/send";
import { TransactionsPage} from "../pages/transactions/transactions";
import { SearchPage } from "../pages/search/search";
import { GitsonProvider } from '../providers/gitson/gitson';
@NgModule({
declarations: [
@ -44,7 +45,8 @@ import { SearchPage } from "../pages/search/search";
providers: [
StatusBar,
SplashScreen,
{provide: ErrorHandler, useClass: IonicErrorHandler}
{provide: ErrorHandler, useClass: IonicErrorHandler},
GitsonProvider,
]
})
export class AppModule {}

4
src/pages/login/login.ts
View file

@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { HomePage } from '../home/home';
import { AlertController } from 'ionic-angular';
import { GitsonProvider } from '../../providers/gitson/gitson';
/**
* Generated class for the LoginPage page.
@ -17,7 +18,7 @@ import { AlertController } from 'ionic-angular';
})
export class LoginPage {
constructor(public navCtrl: NavController, public navParams: NavParams, public alertCtrl: AlertController) {
constructor(public navCtrl: NavController, public navParams: NavParams, public alertCtrl: AlertController, private gitsonService: GitsonProvider) {
}
@ -27,6 +28,7 @@ export class LoginPage {
validLogin($username, $password) {
if ($username === "test" && $password === "test") {
this.navCtrl.setRoot(HomePage);
}
else {

21
src/providers/gitson/gitson.ts Normal file
View file

@ -0,0 +1,21 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import 'rxjs/add/operator/map';
/*
Generated class for the GitsonProvider provider.
See https://angular.io/guide/dependency-injection for more info on providers
and Angular DI.
*/
@Injectable()
export class GitsonProvider {
apiUrl ="https://raw.githubusercontent.com/Aveias/mobilapp/dev/resources/raw/config.json";
constructor(public http: HttpClient) {
console.log('Hello GitsonProvider Provider');
this.http.get("https://raw.githubusercontent.com/Aveias/mobilapp/dev/resources/raw/config.json");
}
}