diff --git a/src/app/app.component.ts b/src/app/app.component.ts index eaccbc4..420381a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -14,7 +14,7 @@ export class openSenseApp { @ViewChild(Nav) nav: Nav; - rootPage:any = OtaWizardPage; // TODO: for development, revert to HomePage + rootPage:any = BlocklyPage; // TODO: for development, revert to HomePage pages: Array<{title: string, component: any}> = [ { title: 'Home', component: HomePage }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e280690..cdcf2df 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,7 +10,8 @@ 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'; +import { BlocklyPage } from '../pages/Blockly/blockly'; +import { BlocklyPageModule } from '../pages/Blockly/blockly.module'; @NgModule({ declarations: [ @@ -21,12 +22,14 @@ import { CompilerProvider } from '../providers/compiler/compiler'; HttpClientModule, BrowserModule, OtaWizardPageModule, + BlocklyPageModule, IonicModule.forRoot(openSenseApp) ], bootstrap: [IonicApp], entryComponents: [ openSenseApp, OtaWizardPage, + BlocklyPage, HomePage ], providers: [ @@ -34,7 +37,6 @@ import { CompilerProvider } from '../providers/compiler/compiler'; 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 89d0fae..d042643 100644 --- a/src/pages/Blockly/blockly.html +++ b/src/pages/Blockly/blockly.html @@ -16,21 +16,17 @@ - + - + - +
Blockly should be displayed here !
- - - id = "sketchtext" - - - - + + +
diff --git a/src/pages/Blockly/blockly.scss b/src/pages/Blockly/blockly.scss index c28a0a3..940c7be 100644 --- a/src/pages/Blockly/blockly.scss +++ b/src/pages/Blockly/blockly.scss @@ -1,10 +1,8 @@ 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 + textarea { + width: 100%; + height: 90%; + resize: none; + margin-top: 20px; + } } diff --git a/src/pages/Blockly/blockly.ts b/src/pages/Blockly/blockly.ts index 82a4bcd..333a8f4 100644 --- a/src/pages/Blockly/blockly.ts +++ b/src/pages/Blockly/blockly.ts @@ -15,20 +15,14 @@ import { OtaWizardPage } from '../ota-wizard/ota-wizard'; templateUrl: 'blockly.html', }) export class BlocklyPage { - sketchtext = "" + sketchtext = 'void setup() {\n Serial.begin(9600);\n Serial.println(\"Hello World\");\n}\n\nvoid loop() {\n\n}' + constructor( public navCtrl: NavController, - public navParams: NavParams) { - } - goTo(sketch) { - this.sketchtext = '' || 'No text Entered';} - ionViewDidLoad() { - console.log('ionViewDidLoad SenseBoxPage'); - } + public navParams: NavParams) { } launchOtaWizard() { - this.navCtrl.setRoot(OtaWizardPage,{sketch : this.sketchtext}) - + this.navCtrl.push(OtaWizardPage,{ sketch : this.sketchtext }) } } diff --git a/src/pages/ota-wizard/ota-wizard.ts b/src/pages/ota-wizard/ota-wizard.ts index 795b6a4..74de915 100644 --- a/src/pages/ota-wizard/ota-wizard.ts +++ b/src/pages/ota-wizard/ota-wizard.ts @@ -174,7 +174,7 @@ export class OtaWizardPage implements OnInit, OnDestroy { this.compiledSketch = 'firmware binary here..' this.state.compilation = 'done' this.slides.lockSwipeToNext(false) - }, 1000) + }, 5000) } }