diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bf8201b..1e4225d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -17,6 +17,7 @@ import { SensorDetailPage } from '../pages/sensor-detail/sensor-detail'; import { MySenseBoxPage } from '../pages/my-sense-box/my-sense-box'; import { LoginProvider } from '../providers/LoginProvider/LoginProvider'; import { SensorsPage } from '../pages/sensors/sensors'; +import { ConfigurationPage } from '../pages/configuration/configuration'; // For AoT compilation (production builds) we need to have a factory for the loader of translation files. // @TODO: we possibly could optimize this by using a static loader in combination with webpack: @@ -31,7 +32,8 @@ export function createTranslateLoader(http: HttpClient) { AddItemPage, SensorDetailPage, MySenseBoxPage, - SensorsPage + SensorsPage, + ConfigurationPage ], imports: [ HttpClientModule, @@ -53,7 +55,9 @@ export function createTranslateLoader(http: HttpClient) { AddItemPage, SensorDetailPage, MySenseBoxPage, - SensorsPage + SensorsPage, + ConfigurationPage + ], providers: [ diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts index 7697e63..3d019cf 100644 --- a/src/pages/login/login.ts +++ b/src/pages/login/login.ts @@ -35,7 +35,7 @@ export class LoginPage { catch(err){ console.log(err.message) } - this.navCtrl.push(MySenseBoxPage,this.boxes); + this.navCtrl.push(MySenseBoxPage,[this.boxes,this.token]); } ionViewDidLoad() { diff --git a/src/pages/my-sense-box/my-sense-box.html b/src/pages/my-sense-box/my-sense-box.html index 80d3b91..289d982 100644 --- a/src/pages/my-sense-box/my-sense-box.html +++ b/src/pages/my-sense-box/my-sense-box.html @@ -31,13 +31,10 @@ ID: {{box._id}} - + - - - - + diff --git a/src/pages/my-sense-box/my-sense-box.ts b/src/pages/my-sense-box/my-sense-box.ts index 4fa3ee6..6afba1a 100644 --- a/src/pages/my-sense-box/my-sense-box.ts +++ b/src/pages/my-sense-box/my-sense-box.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; import { IonicPage, NavController, NavParams } from 'ionic-angular'; import {LoginProvider} from "../../providers/LoginProvider/LoginProvider"; import { SensorsPage } from '../sensors/sensors'; +import { ConfigurationPage } from '../configuration/configuration'; /** * Generated class for the MySenseBoxPage page. * @@ -15,8 +16,8 @@ import { SensorsPage } from '../sensors/sensors'; templateUrl: 'my-sense-box.html', }) export class MySenseBoxPage { - token:string; - public boxes:Array; + public boxes:Array = this.navParams.data[0].data.boxes; + private token:string = this.navParams.data[1]; constructor(public navCtrl: NavController, public navParams: NavParams, private loginProvider: LoginProvider @@ -26,18 +27,14 @@ export class MySenseBoxPage { forwardShow(box){ this.navCtrl.push(SensorsPage,box) } - - forwardEdit(box){ - - } - forwardSketch(box){ + // Call sketch + // forward to config page + this.navCtrl.push(ConfigurationPage,box) } ionViewDidLoad() { console.log('ionViewDidLoad MySenseBoxPage'); - 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 1281137..94157a7 100644 --- a/src/providers/LoginProvider/LoginProvider.ts +++ b/src/providers/LoginProvider/LoginProvider.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { timeout } from 'rxjs/operators' const URL_login = 'https://api.opensensemap.org/users/sign-in'; const URL_user = 'https://api.opensensemap.org/users/me/boxes'; +const URL_sketch = 'https://api.opensensemap.org/boxes/'; // const URL = "http://compiler.snsbx.nroo.de" @@ -54,4 +55,21 @@ export class LoginProvider { return response; }) } + + async getUserSketch(token:string,id:string):Promise{ + let URL_sketch_final = URL_sketch+id+"/script"; + console.log(URL_sketch_final) + const headers = new HttpHeaders({'Authorization':"Bearer "+token,responseType:'text'}) + return this.http.get(URL_sketch_final,{headers}) + .pipe(timeout(30000)) + .toPromise() + .catch(err=>{ + let msg = err.message; + console.log(msg); + }) + .then((response:any)=>{ + console.log(response); + return response + }) + } }