From c9b2deae19c41a82dcddab129690cc42f536597b Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 14 Apr 2021 14:30:35 +0200 Subject: [PATCH] #11 added config settings --- .../rocketman/package-lock.json | 191 +++++++++++++++--- .../frontend-angular/rocketman/package.json | 16 +- .../rocketman/src/app/app.module.ts | 16 +- .../src/app/config/config.component.html | 2 +- .../src/app/config/config.component.ts | 14 +- .../frontend-angular/rocketman/src/index.html | 1 + 6 files changed, 204 insertions(+), 36 deletions(-) diff --git a/prototypes/frontend-angular/rocketman/package-lock.json b/prototypes/frontend-angular/rocketman/package-lock.json index 9db1257..33e6759 100644 --- a/prototypes/frontend-angular/rocketman/package-lock.json +++ b/prototypes/frontend-angular/rocketman/package-lock.json @@ -12,6 +12,23 @@ "requires": { "@angular-devkit/core": "11.1.4", "rxjs": "6.6.3" + }, + "dependencies": { + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@angular-devkit/build-angular": { @@ -91,6 +108,23 @@ "webpack-sources": "2.2.0", "webpack-subresource-integrity": "1.5.2", "worker-plugin": "5.0.0" + }, + "dependencies": { + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@angular-devkit/build-optimizer": { @@ -106,6 +140,12 @@ "webpack-sources": "2.2.0" }, "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + }, "typescript": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", @@ -123,6 +163,23 @@ "@angular-devkit/architect": "0.1101.4", "@angular-devkit/core": "11.1.4", "rxjs": "6.6.3" + }, + "dependencies": { + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@angular-devkit/core": { @@ -136,6 +193,23 @@ "magic-string": "0.25.7", "rxjs": "6.6.3", "source-map": "0.7.3" + }, + "dependencies": { + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@angular-devkit/schematics": { @@ -147,6 +221,23 @@ "@angular-devkit/core": "11.1.4", "ora": "5.2.0", "rxjs": "6.6.3" + }, + "dependencies": { + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@angular/animations": { @@ -158,9 +249,9 @@ } }, "@angular/cdk": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.1.2.tgz", - "integrity": "sha512-RnKvMWAIcWbWoUdBfAoOs4pQl6t5O+1OuPlBNK5aL2FYqoLv5U0fP88Rf7OhjPlD0ASsPGLG45t+dA5sUVZ46Q==", + "version": "11.2.8", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.8.tgz", + "integrity": "sha512-RLJnL4U8FXoaUptVkuYjPA5eo+L0O34NEPZECKQMYZhFAD934bo8/nk+DEBZGyM77GxPUL1seaFNMm+y1wox2g==", "requires": { "parse5": "^5.0.0", "tslib": "^2.0.0" @@ -1678,6 +1769,14 @@ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, + "@types/chart.js": { + "version": "2.9.32", + "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.32.tgz", + "integrity": "sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==", + "requires": { + "moment": "^2.10.2" + } + }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -1689,9 +1788,9 @@ } }, "@types/jasmine": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.3.tgz", - "integrity": "sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA==", + "version": "3.6.9", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.9.tgz", + "integrity": "sha512-B53NIwMj/AO0O+xfSWLYmKB0Mo6TYxfv2Mk8/c1T2w/e38t55iaPR6p7pHXTTtqfTmevPK3i8T1YweYFTZlxDw==", "dev": true }, "@types/json-schema": { @@ -1707,9 +1806,9 @@ "dev": true }, "@types/node": { - "version": "12.19.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.16.tgz", - "integrity": "sha512-7xHmXm/QJ7cbK2laF+YYD7gb5MggHIIQwqyjin3bpEGiSuvScMQ5JZZXPvRipi1MwckTQbJZROMns/JxdnIL1Q==", + "version": "12.20.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.7.tgz", + "integrity": "sha512-gWL8VUkg8VRaCAUgG9WmhefMqHmMblxe2rVpMF86nZY/+ZysU+BkAp+3cz03AixWDSSz0ks5WX59yAhv/cDwFA==", "dev": true }, "@types/parse-json": { @@ -2982,6 +3081,32 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "chart.js": { + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz", + "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==", + "requires": { + "chartjs-color": "^2.1.0", + "moment": "^2.10.2" + } + }, + "chartjs-color": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz", + "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==", + "requires": { + "chartjs-color-string": "^0.6.0", + "color-convert": "^1.9.3" + } + }, + "chartjs-color-string": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz", + "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==", + "requires": { + "color-name": "^1.0.0" + } + }, "chokidar": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", @@ -3265,7 +3390,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -3273,8 +3397,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { "version": "1.5.4", @@ -7552,6 +7675,11 @@ "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -8066,6 +8194,11 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, + "moment": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", + "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -8202,6 +8335,16 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "ng2-charts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-2.4.2.tgz", + "integrity": "sha512-mY3C2uKCaApHCQizS2YxEOqQ7sSZZLxdV6N1uM9u/VvUgVtYvlPtdcXbKpN52ak93ZE22I73DiLWVDnDNG4/AQ==", + "requires": { + "@types/chart.js": "^2.9.24", + "lodash-es": "^4.17.15", + "tslib": "^2.0.0" + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -11479,9 +11622,9 @@ } }, "rxjs": { - "version": "6.6.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", - "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "requires": { "tslib": "^1.9.0" }, @@ -13088,9 +13231,9 @@ "dev": true }, "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==" }, "tslint": { "version": "6.1.3", @@ -13203,9 +13346,9 @@ "dev": true }, "typescript": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.4.tgz", - "integrity": "sha512-+Uru0t8qIRgjuCpiSPpfGuhHecMllk5Zsazj5LZvVsEStEjmIRRBZe+jHjGQvsgS7M1wONy2PQXd67EMyV6acg==", + "version": "4.0.0-dev.20200803", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.0-dev.20200803.tgz", + "integrity": "sha512-f/jDkFqCs0gbUd5MCUijO9u3AOMx1x1HdRDDHSidlc6uPVEkRduxjeTFhIXbGutO7ivzv+aC2sxH+1FQwsyBcg==", "dev": true }, "ua-parser-js": { @@ -15022,9 +15165,9 @@ "dev": true }, "zone.js": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.3.tgz", - "integrity": "sha512-Y4hTHoh4VcxU5BDGAqEoOnOiyT254w6CiHtpQxAJUSMZPyVgdbKf+5R7Mwz6xsPhMIeBXk5rTopRZDpjssTCUg==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.4.tgz", + "integrity": "sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==", "requires": { "tslib": "^2.0.0" } diff --git a/prototypes/frontend-angular/rocketman/package.json b/prototypes/frontend-angular/rocketman/package.json index 272c725..c046dfd 100644 --- a/prototypes/frontend-angular/rocketman/package.json +++ b/prototypes/frontend-angular/rocketman/package.json @@ -12,7 +12,7 @@ "private": true, "dependencies": { "@angular/animations": "~11.1.0", - "@angular/cdk": "^11.1.2", + "@angular/cdk": "^11.2.8", "@angular/common": "~11.1.0", "@angular/compiler": "~11.1.0", "@angular/core": "~11.1.0", @@ -21,16 +21,18 @@ "@angular/platform-browser": "~11.1.0", "@angular/platform-browser-dynamic": "~11.1.0", "@angular/router": "~11.1.0", - "rxjs": "~6.6.0", - "tslib": "^2.0.0", - "zone.js": "~0.11.3" + "chart.js": "^2.9.4", + "ng2-charts": "^2.4.2", + "rxjs": "^6.6.7", + "tslib": "^2.2.0", + "zone.js": "^0.11.4" }, "devDependencies": { "@angular-devkit/build-angular": "~0.1101.1", "@angular/cli": "~11.1.1", "@angular/compiler-cli": "~11.1.0", - "@types/jasmine": "~3.6.0", - "@types/node": "^12.11.1", + "@types/jasmine": "^3.6.9", + "@types/node": "^12.20.7", "codelyzer": "^6.0.0", "jasmine-core": "~3.6.0", "jasmine-spec-reporter": "~5.0.0", @@ -42,6 +44,6 @@ "protractor": "~7.0.0", "ts-node": "~8.3.0", "tslint": "~6.1.0", - "typescript": "~4.1.2" + "typescript": "4.0.0-dev.20200803" } } diff --git a/prototypes/frontend-angular/rocketman/src/app/app.module.ts b/prototypes/frontend-angular/rocketman/src/app/app.module.ts index 52c3b67..a1a55f1 100644 --- a/prototypes/frontend-angular/rocketman/src/app/app.module.ts +++ b/prototypes/frontend-angular/rocketman/src/app/app.module.ts @@ -7,25 +7,35 @@ import { HomeComponent } from './home/home.component'; import { ConfigComponent } from './config/config.component'; import { ArchiveComponent } from './archive/archive.component'; import {FormsModule} from '@angular/forms'; +import { ViewComponent } from './view/view.component'; +import {HttpClientModule} from '@angular/common/http'; +import {Chart} from 'chart.js'; +import {ChartsModule} from 'ng2-charts'; +import { GraphComponent } from './graph/graph.component'; const routes: Routes = [ { path: '', pathMatch: 'full', redirectTo: 'home' }, { path: 'home', component: HomeComponent }, { path: 'config', component: ConfigComponent }, - { path: 'archive', component: ArchiveComponent }]; + { path: 'archive', component: ArchiveComponent }, + { path: 'view', component: ViewComponent }]; @NgModule({ declarations: [ AppComponent, HomeComponent, ConfigComponent, - ArchiveComponent + ArchiveComponent, + ViewComponent, + GraphComponent, ], imports: [ BrowserModule, FlexLayoutModule, RouterModule.forRoot(routes), - FormsModule + FormsModule, + HttpClientModule, + ChartsModule ], providers: [], bootstrap: [AppComponent] diff --git a/prototypes/frontend-angular/rocketman/src/app/config/config.component.html b/prototypes/frontend-angular/rocketman/src/app/config/config.component.html index 5b91ded..a200f1e 100644 --- a/prototypes/frontend-angular/rocketman/src/app/config/config.component.html +++ b/prototypes/frontend-angular/rocketman/src/app/config/config.component.html @@ -17,7 +17,7 @@

Einstellungen

- +

diff --git a/prototypes/frontend-angular/rocketman/src/app/config/config.component.ts b/prototypes/frontend-angular/rocketman/src/app/config/config.component.ts index 282b03f..4e20b6b 100644 --- a/prototypes/frontend-angular/rocketman/src/app/config/config.component.ts +++ b/prototypes/frontend-angular/rocketman/src/app/config/config.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import {Router} from '@angular/router'; +import {HttpClient} from '@angular/common/http'; @Component({ selector: 'app-config', @@ -6,7 +8,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./config.component.css'] }) export class ConfigComponent implements OnInit { - constructor() { } + constructor(private router: Router, private httpClient: HttpClient) { } countdown = '00:00'; igniter = 0; @@ -24,4 +26,14 @@ export class ConfigComponent implements OnInit { changeVideo(state: boolean): void { this.useVideo = state; } + start(): void{ + this.httpClient.post('http://localhost:8080/api/config/addConf', [ + this.countdown, // zahl":"zahl + this.igniter, // int + this.resistance, // int + this.useJoyStick, // Boolean + this.useVideo // Boolean + ]); + this.router.navigate(['/view']); + } } diff --git a/prototypes/frontend-angular/rocketman/src/index.html b/prototypes/frontend-angular/rocketman/src/index.html index 50e2ff4..ccdbcf7 100644 --- a/prototypes/frontend-angular/rocketman/src/index.html +++ b/prototypes/frontend-angular/rocketman/src/index.html @@ -6,6 +6,7 @@ +