From e0785fa4ffd0d6478c214af5d48099c96663f103 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 11 Feb 2020 14:28:13 +0100 Subject: [PATCH] added configuration page to the sidebar --- package-lock.json | 90 +++++++++++++------ src/app/app.component.ts | 5 ++ src/pages/about/about.html | 1 - src/pages/configuration/configuration.html | 50 +++++++++++ .../configuration/configuration.module.ts | 15 ++++ src/pages/configuration/configuration.scss | 3 + src/pages/configuration/configuration.ts | 25 ++++++ 7 files changed, 163 insertions(+), 26 deletions(-) create mode 100644 src/pages/configuration/configuration.html create mode 100644 src/pages/configuration/configuration.module.ts create mode 100644 src/pages/configuration/configuration.scss create mode 100644 src/pages/configuration/configuration.ts diff --git a/package-lock.json b/package-lock.json index d436969..fa42a89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "blockly-sensebox", - "version": "1.1.0", + "version": "1.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -399,7 +399,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -420,12 +421,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -440,17 +443,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -567,7 +573,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -579,6 +586,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -593,6 +601,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -600,12 +609,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -624,6 +635,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -704,7 +716,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -716,6 +729,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -801,7 +815,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -837,6 +852,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -856,6 +872,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -899,12 +916,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -4029,7 +4048,8 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4121,7 +4141,8 @@ }, "yallist": { "version": "3.0.2", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -7973,7 +7994,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -7994,12 +8016,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -8014,17 +8038,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -8141,7 +8168,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -8153,6 +8181,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -8167,6 +8196,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -8174,12 +8204,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -8198,6 +8230,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -8278,7 +8311,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -8290,6 +8324,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -8375,7 +8410,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -8411,6 +8447,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8430,6 +8467,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -8473,12 +8511,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0ed63b1..d2c1b18 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -40,6 +40,11 @@ export class openSenseApp { icon: 'settings', component: 'SettingsPage' }, + { + title: 'MENU.CONFIGURATION', + icon: 'settings', + component: 'ConfigurationPage' + }, ]; constructor( diff --git a/src/pages/about/about.html b/src/pages/about/about.html index 8c3d654..fd776f4 100644 --- a/src/pages/about/about.html +++ b/src/pages/about/about.html @@ -40,7 +40,6 @@ -

diff --git a/src/pages/configuration/configuration.html b/src/pages/configuration/configuration.html new file mode 100644 index 0000000..a1c6168 --- /dev/null +++ b/src/pages/configuration/configuration.html @@ -0,0 +1,50 @@ + + + + Configuration + + + + + + + + + + + {{ 'ABOUT.BLOCKLY.TITLE' | translate }} + + +

+

+ + + + + + + + {{ 'ABOUT.OPENSOURCE.TITLE' | translate }} + + +

ABOUT.OPENSOURCE.TEXT

+ + + + + + + + +

+ + + + diff --git a/src/pages/configuration/configuration.module.ts b/src/pages/configuration/configuration.module.ts new file mode 100644 index 0000000..3a9529a --- /dev/null +++ b/src/pages/configuration/configuration.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { TranslateModule } from '@ngx-translate/core'; +import { ConfigurationPage } from './configuration'; + +@NgModule({ + declarations: [ + ConfigurationPage, + ], + imports: [ + TranslateModule, + IonicPageModule.forChild(ConfigurationPage), + ], +}) +export class ConfigurationPageModule {} diff --git a/src/pages/configuration/configuration.scss b/src/pages/configuration/configuration.scss new file mode 100644 index 0000000..201c659 --- /dev/null +++ b/src/pages/configuration/configuration.scss @@ -0,0 +1,3 @@ +.hint { + text-align: center; +} diff --git a/src/pages/configuration/configuration.ts b/src/pages/configuration/configuration.ts new file mode 100644 index 0000000..9866b86 --- /dev/null +++ b/src/pages/configuration/configuration.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; + +/** + * Generated class for the AboutPage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-configuration', + templateUrl: 'configuration.html', +}) +export class ConfigurationPage { + + constructor(public navCtrl: NavController, public navParams: NavParams) { + } + + ionViewDidLoad() { + console.log('ionViewDidLoad ConfigPage'); + } + +}