Merge pull request 'Set version to build for staging' (#207) from #130 into 1.0.0

Reviewed-on: sh-edraft.de/kd_discord_bot#207
This commit is contained in:
Sven Heidemann 2023-02-19 10:39:45 +01:00
commit 299fc65d1f
5 changed files with 29 additions and 30 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "kdb-web", "name": "kdb-web",
"version": "0.3.dev130", "version": "1.0.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,10 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from "@angular/core";
import { type } from 'os'; import { catchError } from "rxjs/operators";
import { catchError } from 'rxjs/operators'; import { SoftwareVersion } from "src/app/models/config/software-version";
import { SoftwareVersion } from 'src/app/models/config/software-version'; import { GuiService } from "src/app/services/gui/gui.service";
import { GuiService } from 'src/app/services/gui/gui.service'; import { SettingsService } from "src/app/services/settings/settings.service";
import { SettingsService } from 'src/app/services/settings/settings.service'; import { SpinnerService } from "src/app/services/spinner/spinner.service";
import { SpinnerService } from 'src/app/services/spinner/spinner.service';
@Component({ @Component({
selector: 'app-footer', selector: 'app-footer',
@ -34,12 +33,12 @@ export class FooterComponent implements OnInit {
})) }))
.subscribe(version => { .subscribe(version => {
this.spinnerService.hideSpinner(); this.spinnerService.hideSpinner();
const webVersion = new SoftwareVersion( console.log('V', version)
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": "0", "Major": "1",
"Minor": "3", "Minor": "0",
"Micro": "dev130" "Micro": "dev130"
}, },
"Themes": [ "Themes": [

View File

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