Merge remote-tracking branch 'origin/development_eric' into development_norwin

package.json

@@ -63,4 +63,4 @@
       "browser"
     ]
   }
-}
+}

src/app/app.component.ts

@@ -16,7 +16,8 @@ export class openSenseApp {
   pages: Array<{title: string, component: any}> = [
     { title: 'Home', component: HomePage },
     { title: 'About', component: 'AboutPage' },
-    { title: 'senseBox', component: 'SenseBoxPage' }
+    { title: 'senseBox', component: 'SenseBoxPage' },
+    {title:'Blockly', component:'BlocklyPage'}
   ];
 
   constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {

src/pages/Blockly/blockly.html

@@ -0,0 +1,25 @@
+<!--
+  Generated template for the SenseBoxPage page.
+
+  See http://ionicframework.com/docs/components/#navigation for more info on
+  Ionic pages and navigation.
+-->
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Blockly</ion-title>
+  </ion-navbar>
+</ion-header>
+  
+  
+
+
+<ion-content padding>
+
+  <div>
+    Blockly should be displayed here !
+  </div>
+
+</ion-content>

src/pages/Blockly/blockly.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { BlocklyPage } from './blockly';
+
+@NgModule({
+  declarations: [
+    BlocklyPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(BlocklyPage),
+  ],
+})
+export class BlocklyPageModule {}

src/pages/Blockly/blockly.scss

@@ -0,0 +1,3 @@
+page-blockly {
+
+}

src/pages/Blockly/blockly.ts

@@ -0,0 +1,28 @@
+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-blockly',
+  templateUrl: 'blockly.html',
+})
+export class BlocklyPage {
+
+
+  constructor(public navCtrl: NavController, public navParams: NavParams, private api: ApiProvider) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad SenseBoxPage');
+  }
+
+
+}