Compare commits

..

No commits in common. "7be40ed23638525181e0c2bfba02cc0c3b9b607b" and "ff415c354d0249fe614c6655bad47eece5aa94c3" have entirely different histories.

7 changed files with 8 additions and 37 deletions

View File

@ -21,8 +21,6 @@
</div>
</div>
<div class="right">
<a [href]="privacy" target="_blank">{{'footer.privacy' | translate}}</a>
<span> | </span>
<a [href]="imprint" target="_blank">{{'footer.imprint' | translate}}</a>
<a href="https://www.sh-edraft.de/Impressum" target="_blank">{{'footer.imprint' | translate}}</a>
</div>
</footer>
</footer>

View File

@ -17,18 +17,13 @@ export class FooterComponent implements OnInit {
frontendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0");
backendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0");
public privacy: string = "";
public imprint: string = "";
constructor(
private settings: SettingsService,
private guiService: GuiService,
private spinnerService: SpinnerService
) {}
) { }
ngOnInit(): void {
this.privacy = this.settings.getPrivacyURL();
this.imprint = this.settings.getImprintURL();
this.frontendVersion = this.settings.getWebVersion() ?? new SoftwareVersion('0', '0', '0');
this.spinnerService.showSpinner();

View File

@ -3,8 +3,6 @@ import { Theme } from '../view/theme';
export interface Appsettings {
ApiURL: string;
PrivacyURL: string;
ImprintURL: string;
WebVersion: SoftwareVersion;
Themes: Theme[];
}
}

View File

@ -30,29 +30,13 @@ export class SettingsService {
}
public getApiURL(): string {
if (!this.appsettings || !this.appsettings.ApiURL) {
if (!this.appsettings || !this.appsettings.Themes) {
console.error('ApiUrl is not set!');
return "";
}
return this.appsettings.ApiURL;
}
public getPrivacyURL(): string {
if (!this.appsettings || !this.appsettings.PrivacyURL) {
console.error('PrivacyURL is not set!');
return "";
}
return this.appsettings.PrivacyURL;
}
public getImprintURL(): string {
if (!this.appsettings || !this.appsettings.ImprintURL) {
console.error('ImprintURL is not set!');
return "";
}
return this.appsettings.ImprintURL;
}
public getWebVersion(): SoftwareVersion | null {
if (!this.appsettings || !this.appsettings.WebVersion) {
console.error('WebVersion is not set!');

View File

@ -1,7 +1,5 @@
{
"ApiURL": "http://localhost:8044",
"PrivacyURL": "https://www.sh-edraft.de/Datenschutz",
"ImprintURL": "https://www.sh-edraft.de/Impressum",
"WebVersion": {
"Major": "1",
"Minor": "0",
@ -25,4 +23,4 @@
"Name": "sh-edraft-dark-theme"
}
]
}
}

View File

@ -163,8 +163,7 @@
"footer": {
"backend": "API",
"frontend": "Webseite",
"imprint": "Impressum",
"privacy": "Datenschutz"
"imprint": "Impressum"
},
"general": {
"days": "Tage",

View File

@ -163,8 +163,7 @@
"footer": {
"backend": "Website",
"frontend": "API",
"imprint": "Imprint",
"privacy": "Privacy"
"imprint": "Imprint"
},
"general": {
"days": "Days",