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",
"version": "0.3.dev130",
"version": "1.0.dev130",
"scripts": {
"ng": "ng",
"update-version": "ts-node-esm update-version.ts",

View File

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

View File

@ -1,19 +1,19 @@
export class SoftwareVersion {
Major: string;
Minor: string;
Micro: string;
Major: string;
Minor: string;
Micro: string;
constructor(
major: string,
minor: string,
micro: string
) {
this.Major = major;
this.Minor = minor;
this.Micro = micro;
}
constructor(
major: string,
minor: string,
micro: string
) {
this.Major = major;
this.Minor = minor;
this.Micro = micro;
}
getVersionString(): string {
return `${this.Major}.${this.Minor}.${this.Micro}`;
}
}
getVersionString(): string {
return `${this.Major}.${this.Minor}.${this.Micro}`;
}
}

View File

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

View File

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