diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 434aa26..b215d29 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,8 +3,8 @@ import { Nav, Platform } from 'ionic-angular'; import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; -import { HomePage } from '../pages/home/home'; import { BlocklyPage } from '../pages/Blockly/blockly'; +import { BlocklyPage } from '../pages/blockly/blockly'; @Component({ templateUrl: 'app.html' @@ -13,13 +13,11 @@ export class openSenseApp { @ViewChild(Nav) nav: Nav; - rootPage:any = BlocklyPage; // TODO: for development, revert to HomePage + rootPage:any = BlocklyPage; pages: Array<{title: string, component: any}> = [ - { title: 'Home', component: HomePage }, + { title:'Blockly', component:'BlocklyPage' }, { title: 'About', component: 'AboutPage' }, - { title: 'senseBox', component: 'SenseBoxPage' }, - {title:'Blockly', component:'BlocklyPage'} ]; constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index cdcf2df..8859de4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,18 +5,15 @@ import { SplashScreen } from '@ionic-native/splash-screen'; import { StatusBar } from '@ionic-native/status-bar'; import { openSenseApp } from './app.component'; -import { HomePage } from '../pages/home/home'; -import { ApiProvider } from '../providers/api/api'; import { HttpClientModule } from '@angular/common/http'; import { OtaWizardPage } from '../pages/ota-wizard/ota-wizard'; import { OtaWizardPageModule } from '../pages/ota-wizard/ota-wizard.module'; -import { BlocklyPage } from '../pages/Blockly/blockly'; +import { BlocklyPageModule } from '../pages/blockly/blockly.module'; import { BlocklyPageModule } from '../pages/Blockly/blockly.module'; @NgModule({ declarations: [ openSenseApp, - HomePage, ], imports: [ HttpClientModule, @@ -28,15 +25,11 @@ import { BlocklyPageModule } from '../pages/Blockly/blockly.module'; bootstrap: [IonicApp], entryComponents: [ openSenseApp, - OtaWizardPage, - BlocklyPage, - HomePage ], providers: [ StatusBar, SplashScreen, {provide: ErrorHandler, useClass: IonicErrorHandler}, - ApiProvider, ] }) export class AppModule {} diff --git a/src/pages/Blockly/blockly.html b/src/pages/blockly/blockly.html similarity index 92% rename from src/pages/Blockly/blockly.html rename to src/pages/blockly/blockly.html index f161f53..a223151 100644 --- a/src/pages/Blockly/blockly.html +++ b/src/pages/blockly/blockly.html @@ -9,7 +9,7 @@ - Blockly for SenseBox + {{ 'BLOCKLY.TITLE' | translate }} diff --git a/src/pages/Blockly/blockly.module.ts b/src/pages/blockly/blockly.module.ts similarity index 78% rename from src/pages/Blockly/blockly.module.ts rename to src/pages/blockly/blockly.module.ts index 332227b..5cce705 100644 --- a/src/pages/Blockly/blockly.module.ts +++ b/src/pages/blockly/blockly.module.ts @@ -1,5 +1,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; +import { TranslateModule } from '@ngx-translate/core'; + import { BlocklyPage } from './blockly'; @NgModule({ @@ -7,6 +9,7 @@ import { BlocklyPage } from './blockly'; BlocklyPage, ], imports: [ + TranslateModule, IonicPageModule.forChild(BlocklyPage) ], }) diff --git a/src/pages/Blockly/blockly.scss b/src/pages/blockly/blockly.scss similarity index 100% rename from src/pages/Blockly/blockly.scss rename to src/pages/blockly/blockly.scss diff --git a/src/pages/Blockly/blockly.ts b/src/pages/blockly/blockly.ts similarity index 91% rename from src/pages/Blockly/blockly.ts rename to src/pages/blockly/blockly.ts index ae4e969..126cf95 100644 --- a/src/pages/Blockly/blockly.ts +++ b/src/pages/blockly/blockly.ts @@ -1,7 +1,8 @@ import { Component, ViewChild, ElementRef } from '@angular/core'; import { IonicPage, NavController, NavParams } from 'ionic-angular'; -import { OtaWizardPage } from '../ota-wizard/ota-wizard'; +import { TranslateService } from '@ngx-translate/core'; +import { OtaWizardPage } from '../ota-wizard/ota-wizard'; @IonicPage() @Component({ @@ -15,7 +16,8 @@ export class BlocklyPage { constructor( public navCtrl: NavController, - public navParams: NavParams + public navParams: NavParams, + public translate: TranslateService, ) { // need to assign it here to keep the function reference for unsubscribing again // and to maintain the this scope properly diff --git a/src/pages/home/home.html b/src/pages/home/home.html deleted file mode 100644 index 2a4ef44..0000000 --- a/src/pages/home/home.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Home - - - - - Its all about sensors. - Create new pages for your project und link them in the menu please. - diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss deleted file mode 100644 index d4cc8fc..0000000 --- a/src/pages/home/home.scss +++ /dev/null @@ -1,3 +0,0 @@ -page-home { - -} diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts deleted file mode 100644 index 1d510dd..0000000 --- a/src/pages/home/home.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component } from '@angular/core'; -import { NavController } from 'ionic-angular'; - -@Component({ - selector: 'page-home', - templateUrl: 'home.html' -}) -export class HomePage { - - constructor(public navCtrl: NavController) { - - } - -} diff --git a/src/pages/sense-box/sense-box.html b/src/pages/sense-box/sense-box.html deleted file mode 100644 index f226491..0000000 --- a/src/pages/sense-box/sense-box.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - senseBox - - - - - - - - - - get data - - - - {{boxData.name}} - - - {{sensor.title}} - {{sensor.lastMeasurement.value}} {{sensor.unit}} - - - - - diff --git a/src/pages/sense-box/sense-box.module.ts b/src/pages/sense-box/sense-box.module.ts deleted file mode 100644 index 0926410..0000000 --- a/src/pages/sense-box/sense-box.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { IonicPageModule } from 'ionic-angular'; -import { SenseBoxPage } from './sense-box'; - -@NgModule({ - declarations: [ - SenseBoxPage, - ], - imports: [ - IonicPageModule.forChild(SenseBoxPage), - ], -}) -export class SenseBoxPageModule {} diff --git a/src/pages/sense-box/sense-box.scss b/src/pages/sense-box/sense-box.scss deleted file mode 100644 index d9bc03a..0000000 --- a/src/pages/sense-box/sense-box.scss +++ /dev/null @@ -1,3 +0,0 @@ -page-sense-box { - -} diff --git a/src/pages/sense-box/sense-box.ts b/src/pages/sense-box/sense-box.ts deleted file mode 100644 index 405d5f9..0000000 --- a/src/pages/sense-box/sense-box.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { ApiProvider } from './../../providers/api/api'; -import { Component } from '@angular/core'; -import { IonicPage, NavController, NavParams } from 'ionic-angular'; - -/** - * Generated class for the SenseBoxPage page. - * - * See https://ionicframework.com/docs/components/#navigation for more info on - * Ionic pages and navigation. - */ - -@IonicPage() -@Component({ - selector: 'page-sense-box', - templateUrl: 'sense-box.html', -}) -export class SenseBoxPage { - - boxData: any; - - constructor(public navCtrl: NavController, public navParams: NavParams, private api: ApiProvider) { - } - - ionViewDidLoad() { - console.log('ionViewDidLoad SenseBoxPage'); - } - - getData(){ - this.api.getData().subscribe(res => { - console.log(res); - this.boxData = res; - }) - - } - -} diff --git a/src/providers/api/api.ts b/src/providers/api/api.ts deleted file mode 100644 index 2fe8bda..0000000 --- a/src/providers/api/api.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; - -/* - Generated class for the ApiProvider provider. - - See https://angular.io/guide/dependency-injection for more info on providers - and Angular DI. -*/ -@Injectable() -export class ApiProvider { - - private API_URL = 'https://api.testing.opensensemap.org' - - constructor(public http: HttpClient) { - console.log('Hello ApiProvider Provider'); - } - - - getData(){ - return this.http.get(`${this.API_URL}/boxes/5b0d436fd40a290019ef444d`); - } - -}
Create new pages for your project und link them in the menu please.
{{sensor.lastMeasurement.value}} {{sensor.unit}}