diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts index a89e124..7697e63 100644 --- a/src/pages/login/login.ts +++ b/src/pages/login/login.ts @@ -18,7 +18,7 @@ export class LoginPage { userName: string; password: string; private token:string - private user:ArrayBuffer=undefined; + private boxes:Object; public loading=false; constructor( public navCtrl: NavController, @@ -30,12 +30,12 @@ export class LoginPage { private async submitLogin(form){ try { this.token = await this.loginProvider.login("e_thie10@uni-muenster.de","Qxpxtexb1") - this.user = await this.loginProvider.getUser(this.token); + this.boxes = await this.loginProvider.getUserBoxes(this.token); } catch(err){ console.log(err.message) } - this.navCtrl.push(MySenseBoxPage,this.user); + this.navCtrl.push(MySenseBoxPage,this.boxes); } ionViewDidLoad() { diff --git a/src/pages/my-sense-box/my-sense-box.html b/src/pages/my-sense-box/my-sense-box.html index 512b411..3986f69 100644 --- a/src/pages/my-sense-box/my-sense-box.html +++ b/src/pages/my-sense-box/my-sense-box.html @@ -11,8 +11,29 @@ - - - - + + + + + + {{box.name}} + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/pages/my-sense-box/my-sense-box.scss b/src/pages/my-sense-box/my-sense-box.scss index cfb77f6..f2fbe41 100644 --- a/src/pages/my-sense-box/my-sense-box.scss +++ b/src/pages/my-sense-box/my-sense-box.scss @@ -1,3 +1,6 @@ page-my-sense-box { } +.actionButton{ + width:100% +} \ No newline at end of file diff --git a/src/pages/my-sense-box/my-sense-box.ts b/src/pages/my-sense-box/my-sense-box.ts index 0157a7f..9340db7 100644 --- a/src/pages/my-sense-box/my-sense-box.ts +++ b/src/pages/my-sense-box/my-sense-box.ts @@ -15,7 +15,7 @@ import {LoginProvider} from "../../providers/LoginProvider/LoginProvider"; }) export class MySenseBoxPage { token:string; - private user: ArrayBuffer=undefined; + public boxes:Array; constructor(public navCtrl: NavController, public navParams: NavParams, private loginProvider: LoginProvider @@ -24,6 +24,8 @@ export class MySenseBoxPage { ionViewDidLoad() { console.log('ionViewDidLoad MySenseBoxPage'); - console.log(this.navParams) } + this.boxes = this.navParams.data.data.boxes + console.log(this.boxes); + } } diff --git a/src/providers/LoginProvider/LoginProvider.ts b/src/providers/LoginProvider/LoginProvider.ts index 881ef62..1281137 100644 --- a/src/providers/LoginProvider/LoginProvider.ts +++ b/src/providers/LoginProvider/LoginProvider.ts @@ -41,7 +41,7 @@ export class LoginProvider { }); }; - async getUser(token:string):Promise{ + async getUserBoxes(token:string):Promise{ const headers = new HttpHeaders({'Authorization':"Bearer "+token}) return this.http.get(URL_user,{headers}) .pipe(timeout(30000))