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

kdb-web/package.json

@@ -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",

kdb-web/src/app/components/footer/footer.component.ts

@@ -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({
   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;
       });
   }
 

kdb-web/src/app/models/config/software-version.ts

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

kdb-web/src/assets/config.json

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

kdb-web/src/assets/i18n/de.json

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