sh-edraft.de/sh_discord_bot
5
1
Fork 1
Code Issues 26 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Improved docker support for deployment #70

Browse Source
This commit is contained in:
Sven Heidemann
2022-10-23 14:11:15 +02:00
parent ffe7b5e109
commit f891587ce3
13 changed files with 135 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kdb-web/src/app/services/settings/settings.service.ts
View File

@@ -1,11 +1,11 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { Appsettings } from 'src/app/models/config/appsettings';
import { SoftwareVersion } from 'src/app/models/config/software-version';
import { Theme } from 'src/app/models/view/theme';
import { Themes } from 'src/app/models/view/themes.enum';
import { HttpClient } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { throwError } from "rxjs";
import { catchError } from "rxjs/operators";
import { Appsettings } from "src/app/models/config/appsettings";
import { SoftwareVersion } from "src/app/models/config/software-version";
import { Theme } from "src/app/models/view/theme";
import { environment } from "../../../environments/environment";
@Injectable({
providedIn: 'root'
@@ -31,11 +31,11 @@ export class SettingsService {
}
public getApiURL(): string {
if (!this.appsettings || !this.appsettings.ApiURL) {
if (!environment || !environment.apiURL) {
console.error('ApiURL is not set!');
return '';
}
return this.appsettings.ApiURL;
return environment.apiURL;
}
public getWebVersion(): SoftwareVersion | null {
@@ -43,12 +43,11 @@ export class SettingsService {
console.error('WebVersion is not set!');
return null;
}
const webVersion = new SoftwareVersion(
return new SoftwareVersion(
this.appsettings.WebVersion.Major,
this.appsettings.WebVersion.Minor,
this.appsettings.WebVersion.Micro
);
return webVersion;
}
public getThemes(): Theme[] | null {

15
kdb-web/src/app/services/socket/socket.service.ts
View File

@@ -1,11 +1,10 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { ToastOptions } from 'src/app/models/utils/toast-options';
import { SettingsService } from '../settings/settings.service';
import { SpinnerService } from '../spinner/spinner.service';
import { ToastService } from '../toast/toast.service';
import { Injectable } from "@angular/core";
import { ToastOptions } from "src/app/models/utils/toast-options";
import { SettingsService } from "../settings/settings.service";
import { SpinnerService } from "../spinner/spinner.service";
import { ToastService } from "../toast/toast.service";
import io from "socket.io-client";
import { MessageService } from 'primeng/api';
import { MessageService } from "primeng/api";
@Injectable({
providedIn: 'root'
@@ -23,7 +22,7 @@ export class SocketService {
}
startSocket() {
this.socket = io(`${this.settingsService.getApiURL()}`)
this.socket = io(`${this.settingsService.getApiURL()}`, {path: '/api/socket.io'})
this.socket.on('connect', () => {
if (this.disconnected) {
if (this.spinnerService.showSpinnerState) {