Compare commits

..

No commits in common. "299fc65d1f529a9d081eee3972a534ecf6bfb3aa" and "fd9d938b8aa2de66a1023b6c0f32662f280b23fe" have entirely different histories.

5 changed files with 30 additions and 29 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "kdb-web", "name": "kdb-web",
"version": "1.0.dev130", "version": "0.3.dev130",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"update-version": "ts-node-esm update-version.ts", "update-version": "ts-node-esm update-version.ts",

View File

@ -1,9 +1,10 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from '@angular/core';
import { catchError } from "rxjs/operators"; import { type } from 'os';
import { SoftwareVersion } from "src/app/models/config/software-version"; import { catchError } from 'rxjs/operators';
import { GuiService } from "src/app/services/gui/gui.service"; import { SoftwareVersion } from 'src/app/models/config/software-version';
import { SettingsService } from "src/app/services/settings/settings.service"; import { GuiService } from 'src/app/services/gui/gui.service';
import { SpinnerService } from "src/app/services/spinner/spinner.service"; import { SettingsService } from 'src/app/services/settings/settings.service';
import { SpinnerService } from 'src/app/services/spinner/spinner.service';
@Component({ @Component({
selector: 'app-footer', selector: 'app-footer',
@ -33,12 +34,12 @@ export class FooterComponent implements OnInit {
})) }))
.subscribe(version => { .subscribe(version => {
this.spinnerService.hideSpinner(); this.spinnerService.hideSpinner();
console.log('V', version) const webVersion = new SoftwareVersion(
this.backendVersion = new SoftwareVersion(
version.major, version.major,
version.minor, version.minor,
version.micro version.micro
); );
this.backendVersion = webVersion;
}); });
} }

View File

@ -1,8 +1,8 @@
{ {
"ApiURL": "http://localhost:5000", "ApiURL": "http://localhost:5000",
"WebVersion": { "WebVersion": {
"Major": "1", "Major": "0",
"Minor": "0", "Minor": "3",
"Micro": "dev130" "Micro": "dev130"
}, },
"Themes": [ "Themes": [

View File

@ -250,8 +250,8 @@
}, },
"footer": { "footer": {
"imprint": "Impressum", "imprint": "Impressum",
"backend": "API", "backend": "Webseite",
"frontend": "Webseite" "frontend": "API"
}, },
"dialog": { "dialog": {
"confirm": "Bestätigen", "confirm": "Bestätigen",