diff --git a/README.md b/README.md index 35ce3c6..b1f29db 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ - please fork this repository to develop your apps ### Prequesites +- Git Installation + - use + `git clone https://github.com/AppDevelopmentAtsenseBox/openSenseApp --recursive` + because the ardublockly submodule is used to implememt blockly - Node + NPM (nvm) - https://www.npmjs.com/get-npm diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 910a864..434aa26 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -4,7 +4,7 @@ import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; import { HomePage } from '../pages/home/home'; -import { OtaWizardPage } from '../pages/ota-wizard/ota-wizard'; +import { BlocklyPage } from '../pages/Blockly/blockly'; @Component({ templateUrl: 'app.html' @@ -13,7 +13,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 0f6bf88..0b0850e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,6 +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 { BlocklyPage} from '../pages/Blockly/blockly' +import { BlocklyPageModule} from '../pages/Blockly/blockly.module' @NgModule({ declarations: [ @@ -20,13 +22,15 @@ import { OtaWizardPageModule } from '../pages/ota-wizard/ota-wizard.module'; HttpClientModule, BrowserModule, OtaWizardPageModule, - IonicModule.forRoot(openSenseApp) + IonicModule.forRoot(openSenseApp), + BlocklyPageModule ], bootstrap: [IonicApp], entryComponents: [ openSenseApp, OtaWizardPage, - HomePage + HomePage, + BlocklyPage ], providers: [ StatusBar, diff --git a/src/index.html b/src/index.html index 212d7bd..27b6ea4 100644 --- a/src/index.html +++ b/src/index.html @@ -29,6 +29,20 @@ + + + + + + + + + + + + + +
@@ -45,5 +59,27 @@ + + + + + + + + + + + + + + + + + + + + + +