diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 910a864..eaccbc4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -4,6 +4,7 @@ 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 { OtaWizardPage } from '../pages/ota-wizard/ota-wizard'; @Component({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0f6bf88..e280690 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,6 +10,7 @@ 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 { CompilerProvider } from '../providers/compiler/compiler'; @NgModule({ declarations: [ @@ -33,6 +34,7 @@ import { OtaWizardPageModule } from '../pages/ota-wizard/ota-wizard.module'; SplashScreen, {provide: ErrorHandler, useClass: IonicErrorHandler}, ApiProvider, + CompilerProvider, ] }) export class AppModule {} diff --git a/src/pages/Blockly/blockly.html b/src/pages/Blockly/blockly.html index c365bc5..89d0fae 100644 --- a/src/pages/Blockly/blockly.html +++ b/src/pages/Blockly/blockly.html @@ -19,11 +19,18 @@ - + +
Blockly should be displayed here !
- + + + id = "sketchtext" + + + + diff --git a/src/pages/Blockly/blockly.scss b/src/pages/Blockly/blockly.scss index a1c6cee..c28a0a3 100644 --- a/src/pages/Blockly/blockly.scss +++ b/src/pages/Blockly/blockly.scss @@ -1,3 +1,10 @@ page-blockly { - + $text-input-highlight-color-valid : #32db64 + Color of the input highlight when valid + + $text-input-highlight-color-invalid #f53d3d + Color of the input highlight when invalid + + $text-input-placeholder-color #999 + Color of the input placeholder } diff --git a/src/pages/Blockly/blockly.ts b/src/pages/Blockly/blockly.ts index d6b2e77..82a4bcd 100644 --- a/src/pages/Blockly/blockly.ts +++ b/src/pages/Blockly/blockly.ts @@ -15,18 +15,20 @@ import { OtaWizardPage } from '../ota-wizard/ota-wizard'; templateUrl: 'blockly.html', }) export class BlocklyPage { - + sketchtext = "" constructor( public navCtrl: NavController, public navParams: NavParams) { } - + goTo(sketch) { + this.sketchtext = '' || 'No text Entered';} ionViewDidLoad() { console.log('ionViewDidLoad SenseBoxPage'); } - launchOtaWizard () { - this.navCtrl.setRoot(OtaWizardPage) + launchOtaWizard() { + this.navCtrl.setRoot(OtaWizardPage,{sketch : this.sketchtext}) + } } diff --git a/src/pages/ota-wizard/ota-wizard.html b/src/pages/ota-wizard/ota-wizard.html index d848f7a..5f68260 100644 --- a/src/pages/ota-wizard/ota-wizard.html +++ b/src/pages/ota-wizard/ota-wizard.html @@ -22,7 +22,7 @@ We will help you connect to your senseBox via WiFi.

- +

First, please make sure that your senseBox...