Compare commits

..

No commits in common. "59162408e585f71714c784345aa2ef1213060243" and "c0cd5bb70ef563196a7d66e98833100c5b3169a7" have entirely different histories.

33 changed files with 8975 additions and 1054 deletions

View File

@ -483,19 +483,18 @@ class AuthService(AuthServiceABC):
if user_dto is None: if user_dto is None:
raise ServiceException(ServiceErrorCode.InvalidData, "User not set") raise ServiceException(ServiceErrorCode.InvalidData, "User not set")
members = self._users.get_users_by_discord_id(dc_id)
if members.count() == 0:
raise ServiceException(ServiceErrorCode.InvalidUser, f"Member not found")
added_user = False added_user = False
db_user = self._auth_users.find_auth_user_by_email(user_dto.email) db_user = self._auth_users.find_auth_user_by_email(user_dto.email)
if db_user is None: if db_user is None:
self.add_auth_user(user_dto) self.add_auth_user(user_dto)
added_user = True added_user = True
# raise ServiceException(ServiceErrorCode.InvalidUser, f'User not found')
db_user = self._auth_users.get_auth_user_by_email(user_dto.email) db_user = self._auth_users.get_auth_user_by_email(user_dto.email)
if db_user.users.count() == 0: if db_user.users.count() == 0:
members.for_each(lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x))) self._users.get_users_by_discord_id(dc_id).for_each(
lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x))
)
if db_user.confirmation_id is not None and not added_user: if db_user.confirmation_id is not None and not added_user:
raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified") raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")

9562
kdb-web/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "kdb-web", "name": "kdb-web",
"version": "1.0.dev251", "version": "1.0.0.rc2",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"update-version": "ts-node-esm update-version.ts", "update-version": "ts-node-esm update-version.ts",

View File

@ -53,9 +53,9 @@ export class AppComponent implements OnInit, OnDestroy {
this.socket.startSocket(); this.socket.startSocket();
} }
public ngOnDestroy(): void { ngOnDestroy() {
this.unsubscriber.next(); this.unsubscriber.next();
this.unsubscriber.complete(); this.unsubscriber.unsubscribe();
} }
loadLang(): void { loadLang(): void {

View File

@ -21,8 +21,6 @@
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<button pButton label="{{'footer.privacy' | translate}}" class="btn text-btn" (click)="navigateToPrivacy()"></button> <a href="https://www.sh-edraft.de/Impressum" target="_blank">{{'footer.imprint' | translate}}</a>
<span> | </span>
<button pButton label="{{'footer.imprint' | translate}}" class="btn text-btn" (click)="navigateToImprint()"></button>
</div> </div>
</footer> </footer>

View File

@ -14,11 +14,8 @@ import { throwError } from "rxjs";
export class FooterComponent implements OnInit { export class FooterComponent implements OnInit {
public frontendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0"); frontendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0");
public backendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0"); backendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0");
public privacy: string = "";
public imprint: string = "";
constructor( constructor(
private settings: SettingsService, private settings: SettingsService,
@ -45,12 +42,4 @@ export class FooterComponent implements OnInit {
}); });
} }
public navigateToPrivacy(): void {
window.open(this.settings.getPrivacyURL(), "_blank");
}
public navigateToImprint(): void {
window.open(this.settings.getImprintURL(), "_blank");
}
} }

View File

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

View File

@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { catchError, debounceTime, takeUntil } from "rxjs/operators"; import { catchError, debounceTime, takeUntil } from "rxjs/operators";
import { AuthRoles } from "src/app/models/auth/auth-roles.enum"; import { AuthRoles } from "src/app/models/auth/auth-roles.enum";
import { AuthUserDTO } from "src/app/models/auth/auth-user.dto"; import { AuthUserDTO } from "src/app/models/auth/auth-user.dto";
@ -22,7 +22,7 @@ import { TranslateService } from "@ngx-translate/core";
templateUrl: "./auth-user.component.html", templateUrl: "./auth-user.component.html",
styleUrls: ["./auth-user.component.scss"] styleUrls: ["./auth-user.component.scss"]
}) })
export class AuthUserComponent implements OnInit, OnDestroy { export class AuthUserComponent implements OnInit {
users!: AuthUserDTO[]; users!: AuthUserDTO[];
statuses!: any[]; statuses!: any[];
@ -62,7 +62,7 @@ export class AuthUserComponent implements OnInit, OnDestroy {
searchCriterions!: AuthUserSelectCriterion; searchCriterions!: AuthUserSelectCriterion;
totalRecords!: number; totalRecords!: number;
private unsubscriber = new Subject<void>(); private unsubscriber = new Subject();
constructor( constructor(
private authService: AuthService, private authService: AuthService,
@ -91,11 +91,6 @@ export class AuthUserComponent implements OnInit, OnDestroy {
this.loadNextPage(); this.loadNextPage();
} }
public ngOnDestroy(): void {
this.unsubscriber.next();
this.unsubscriber.complete();
}
setFilterForm() { setFilterForm() {
this.filterForm = this.fb.group({ this.filterForm = this.fb.group({
firstName: [""], firstName: [""],

View File

@ -1,14 +1,15 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from '@ngx-translate/core';
import { catchError } from "rxjs/operators"; import { catchError } from 'rxjs/operators';
import { SettingsDTO } from "src/app/models/config/settings.dto"; import { SettingsDTO } from 'src/app/models/config/settings.dto';
import { ErrorDTO } from "src/app/models/error/error-dto"; import { ErrorDTO } from 'src/app/models/error/error-dto';
import { ServiceErrorCode } from "src/app/models/error/service-error-code.enum"; import { ServiceErrorCode } from 'src/app/models/error/service-error-code.enum';
import { GuiService } from "src/app/services/gui/gui.service"; import { AuthService } from 'src/app/services/auth/auth.service';
import { SettingsService } from "src/app/services/settings/settings.service"; import { GuiService } from 'src/app/services/gui/gui.service';
import { SpinnerService } from "src/app/services/spinner/spinner.service"; import { SettingsService } from 'src/app/services/settings/settings.service';
import { ToastService } from "src/app/services/toast/toast.service"; import { SpinnerService } from 'src/app/services/spinner/spinner.service';
import { ToastService } from 'src/app/services/toast/toast.service';
import { throwError } from "rxjs"; import { throwError } from "rxjs";
@Component({ @Component({

View File

@ -7,7 +7,6 @@ import { AuthHeaderComponent } from './components/auth-header/auth-header.compon
import { ForgetPasswordComponent } from './components/forget-password/forget-password.component'; import { ForgetPasswordComponent } from './components/forget-password/forget-password.component';
import { LoginComponent } from './components/login/login.component'; import { LoginComponent } from './components/login/login.component';
import { RegistrationComponent } from './components/registration/registration.component'; import { RegistrationComponent } from './components/registration/registration.component';
import { AuthFooterComponent } from "./components/auth-footer/auth-footer.component";
@NgModule({ @NgModule({
@ -15,8 +14,7 @@ import { AuthFooterComponent } from "./components/auth-footer/auth-footer.compon
ForgetPasswordComponent, ForgetPasswordComponent,
LoginComponent, LoginComponent,
RegistrationComponent, RegistrationComponent,
AuthHeaderComponent, AuthHeaderComponent
AuthFooterComponent
], ],
imports: [ imports: [
CommonModule, CommonModule,

View File

@ -1,7 +0,0 @@
<div class="auth-footer">
<div class="logo-button-wrapper">
<button pButton label="{{'footer.privacy' | translate}}" class="btn text-btn" (click)="navigateToPrivacy()"></button>
<span> | </span>
<button pButton label="{{'footer.imprint' | translate}}" class="btn text-btn" (click)="navigateToImprint()"></button>
</div>
</div>

View File

@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AuthFooterComponent } from './auth-footer.component';
describe('AuthFooterComponent', () => {
let component: AuthFooterComponent;
let fixture: ComponentFixture<AuthFooterComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ AuthFooterComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(AuthFooterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -1,32 +0,0 @@
import { Component, OnInit } from "@angular/core";
import { Router } from "@angular/router";
import { SettingsService } from "../../../../services/settings/settings.service";
@Component({
selector: "app-auth-footer",
templateUrl: "./auth-footer.component.html",
styleUrls: ["./auth-footer.component.scss"]
})
export class AuthFooterComponent implements OnInit {
private privacy: string = "";
private imprint: string = "";
constructor(
private settings: SettingsService
) {
}
ngOnInit(): void {
this.privacy = this.settings.getPrivacyURL();
this.imprint = this.settings.getImprintURL();
}
public navigateToPrivacy(): void {
window.open(this.settings.getPrivacyURL(), "_blank");
}
public navigateToImprint(): void {
window.open(this.settings.getImprintURL(), "_blank");
}
}

View File

@ -1,10 +1,12 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from '@angular/core';
import { Router } from "@angular/router"; import { Router } from '@angular/router';
import { TranslateService } from "@ngx-translate/core"; import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
import { MenuItem, PrimeNGConfig } from "primeng/api"; import { MenuItem, PrimeNGConfig } from 'primeng/api';
import { SettingsService } from "src/app/services/settings/settings.service"; import { catchError } from 'rxjs';
import { SpinnerService } from "src/app/services/spinner/spinner.service"; import { AuthService } from 'src/app/services/auth/auth.service';
import { ThemeService } from "src/app/services/theme/theme.service"; import { SettingsService } from 'src/app/services/settings/settings.service';
import { SpinnerService } from 'src/app/services/spinner/spinner.service';
import { ThemeService } from 'src/app/services/theme/theme.service';
@Component({ @Component({
selector: 'app-auth-header', selector: 'app-auth-header',
@ -12,8 +14,9 @@ import { ThemeService } from "src/app/services/theme/theme.service";
styleUrls: ['./auth-header.component.scss'] styleUrls: ['./auth-header.component.scss']
}) })
export class AuthHeaderComponent implements OnInit { export class AuthHeaderComponent implements OnInit {
public langList: MenuItem[] = []; langList: MenuItem[] = [];
public themeList: MenuItem[] = []; themeList: MenuItem[] = [];
userMenuList!: MenuItem[];
constructor( constructor(
private router: Router, private router: Router,
@ -24,12 +27,12 @@ export class AuthHeaderComponent implements OnInit {
private config: PrimeNGConfig private config: PrimeNGConfig
) { } ) { }
public ngOnInit(): void { ngOnInit(): void {
this.initMenuLists(); this.initMenuLists();
this.loadLang(); this.loadLang();
} }
private initMenuLists(): void { initMenuLists(): void {
this.langList = [ this.langList = [
{ {
label: 'English', command: () => { label: 'English', command: () => {
@ -55,16 +58,16 @@ export class AuthHeaderComponent implements OnInit {
}); });
} }
private changeTheme(name: string): void { changeTheme(name: string): void {
this.themeService.setTheme(name, true); this.themeService.setTheme(name, true);
} }
private translate(lang: string) { translate(lang: string) {
this.translateService.use(lang); this.translateService.use(lang);
this.translateService.get('primeng').subscribe(res => this.config.setTranslation(res)); this.translateService.get('primeng').subscribe(res => this.config.setTranslation(res));
} }
private loadLang(): void { loadLang(): void {
let lang = localStorage.getItem(`default_lang`); let lang = localStorage.getItem(`default_lang`);
if (!lang) { if (!lang) {
lang = 'en'; lang = 'en';
@ -73,7 +76,7 @@ export class AuthHeaderComponent implements OnInit {
this.translate(lang); this.translate(lang);
} }
private setLang(lang: string): void { setLang(lang: string): void {
localStorage.setItem(`default_lang`, lang); localStorage.setItem(`default_lang`, lang);
} }

View File

@ -60,5 +60,4 @@
</div> </div>
<app-auth-header></app-auth-header> <app-auth-header></app-auth-header>
<app-auth-footer></app-auth-footer>
</section> </section>

View File

@ -62,5 +62,4 @@
</div> </div>
<app-auth-header></app-auth-header> <app-auth-header></app-auth-header>
<app-auth-footer></app-auth-footer>
</section> </section>

View File

@ -67,16 +67,11 @@
</div> </div>
</div> </div>
<div class="input-field">
<p-checkbox id="confirmPrivacyCheckbox" [binary]="true" formControlName="confirmPrivacy"></p-checkbox>
&nbsp;
<label for="confirmPrivacyCheckbox" [innerHTML]="confirmPrivacyString"></label>
</div>
<div class="login-form-submit"> <div class="login-form-submit">
<button pButton label="{{'auth.register.register' | translate}}" class="btn login-form-submit-btn" (click)="register()" <button pButton label="{{'auth.register.register' | translate}}" class="btn login-form-submit-btn" (click)="register()"
[disabled]="loginForm.invalid"></button> [disabled]="loginForm.invalid"></button>
</div> </div>
<div class="login-form-sub-button-wrapper"> <div class="login-form-sub-button-wrapper">
<div class="login-form-sub-btn-wrapper"> <div class="login-form-sub-btn-wrapper">
<button pButton label="{{'auth.register.login' | translate}}" class="btn login-form-sub-btn" (click)="login()"></button> <button pButton label="{{'auth.register.login' | translate}}" class="btn login-form-sub-btn" (click)="login()"></button>
@ -87,5 +82,4 @@
</div> </div>
<app-auth-header></app-auth-header> <app-auth-header></app-auth-header>
<app-auth-footer></app-auth-footer>
</section> </section>

View File

@ -1,7 +1,7 @@
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { catchError, takeUntil } from "rxjs/operators"; import { catchError, finalize } from "rxjs/operators";
import { AuthErrorMessages } from "src/app/models/auth/auth-error-messages.enum"; import { AuthErrorMessages } from "src/app/models/auth/auth-error-messages.enum";
import { AuthUserDTO } from "src/app/models/auth/auth-user.dto"; import { AuthUserDTO } from "src/app/models/auth/auth-user.dto";
import { AuthUserAtrErrors } from "src/app/models/auth/auth-user-atr-errors"; import { AuthUserAtrErrors } from "src/app/models/auth/auth-user-atr-errors";
@ -9,16 +9,15 @@ import { ErrorDTO } from "src/app/models/error/error-dto";
import { ServiceErrorCode } from "src/app/models/error/service-error-code.enum"; import { ServiceErrorCode } from "src/app/models/error/service-error-code.enum";
import { AuthService } from "src/app/services/auth/auth.service"; import { AuthService } from "src/app/services/auth/auth.service";
import { SpinnerService } from "src/app/services/spinner/spinner.service"; import { SpinnerService } from "src/app/services/spinner/spinner.service";
import { Subject, throwError } from "rxjs"; import { throwError } from "rxjs";
import { TranslateService } from "@ngx-translate/core"; import { OAuthDTO } from "../../../../models/auth/oauth.dto";
import { SettingsService } from "../../../../services/settings/settings.service";
@Component({ @Component({
selector: "app-registration", selector: "app-registration",
templateUrl: "./registration.component.html", templateUrl: "./registration.component.html",
styleUrls: ["./registration.component.scss"] styleUrls: ["./registration.component.scss"]
}) })
export class RegistrationComponent implements OnInit, OnDestroy { export class RegistrationComponent implements OnInit {
loginForm!: FormGroup<{ loginForm!: FormGroup<{
firstName: FormControl<string | null>, firstName: FormControl<string | null>,
@ -26,8 +25,7 @@ export class RegistrationComponent implements OnInit, OnDestroy {
email: FormControl<string | null>, email: FormControl<string | null>,
emailRepeat: FormControl<string | null>, emailRepeat: FormControl<string | null>,
password: FormControl<string | null>, password: FormControl<string | null>,
passwordRepeat: FormControl<string | null>, passwordRepeat: FormControl<string | null>
confirmPrivacy: FormControl<boolean | null>
}>; }>;
submitted = false; submitted = false;
authUserAtrErrors!: AuthUserAtrErrors; authUserAtrErrors!: AuthUserAtrErrors;
@ -36,17 +34,12 @@ export class RegistrationComponent implements OnInit, OnDestroy {
password: false password: false
}; };
public confirmPrivacyString: string = "";
private unsubscriber = new Subject<void>();
constructor( constructor(
private authService: AuthService, private authService: AuthService,
private formBuilder: FormBuilder, private formBuilder: FormBuilder,
private router: Router, private router: Router,
private spinnerService: SpinnerService, private spinnerService: SpinnerService,
private route: ActivatedRoute, private route: ActivatedRoute
private translate: TranslateService,
private settings: SettingsService
) { ) {
this.spinnerService.showSpinner(); this.spinnerService.showSpinner();
this.authService.isUserLoggedInAsync().then(res => { this.authService.isUserLoggedInAsync().then(res => {
@ -58,22 +51,12 @@ export class RegistrationComponent implements OnInit, OnDestroy {
} }
ngOnInit(): void { ngOnInit(): void {
this.translate.onLangChange.pipe(takeUntil(this.unsubscriber)).subscribe(lang => {
this.confirmPrivacyString = this.translate.instant("auth.register.confirm_privacy", { url: this.settings.getPrivacyURL() });
});
this.confirmEMail(); this.confirmEMail();
this.initData();
this.spinnerService.showSpinner(); this.spinnerService.showSpinner();
this.initData(); this.initData();
} }
public ngOnDestroy(): void {
this.unsubscriber.next();
this.unsubscriber.complete();
}
initData() { initData() {
this.initLoginForm(); this.initLoginForm();
this.resetStateFlags(); this.resetStateFlags();
@ -99,8 +82,7 @@ export class RegistrationComponent implements OnInit, OnDestroy {
email: ["", [Validators.required, Validators.email]], email: ["", [Validators.required, Validators.email]],
emailRepeat: ["", [Validators.required, Validators.email]], emailRepeat: ["", [Validators.required, Validators.email]],
password: ["", [Validators.required, Validators.minLength(8)]], password: ["", [Validators.required, Validators.minLength(8)]],
passwordRepeat: ["", [Validators.required, Validators.minLength(8)]], passwordRepeat: ["", [Validators.required, Validators.minLength(8)]]
confirmPrivacy: [false, [Validators.required, Validators.requiredTrue]]
}); });
} }
@ -169,8 +151,4 @@ export class RegistrationComponent implements OnInit, OnDestroy {
}); });
} }
} }
log($event: Event): void {
console.log($event);
}
} }

View File

@ -60,7 +60,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
this.loadNextPage(); this.loadNextPage();
} }
public ngOnDestroy(): void { public ngOnDestroy() {
this.unsubscriber.next(); this.unsubscriber.next();
this.unsubscriber.complete(); this.unsubscriber.complete();
} }

View File

@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { DataService } from "../../../../../../services/data/data.service"; import { DataService } from "../../../../../../services/data/data.service";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { AutoRoleRule, AutoRoleRuleFilter } from "../../../../../../models/data/auto_role.model"; import { AutoRoleRule, AutoRoleRuleFilter } from "../../../../../../models/data/auto_role.model";
@ -28,7 +28,7 @@ import { Subject, throwError } from "rxjs";
templateUrl: "./auto-roles-rules.component.html", templateUrl: "./auto-roles-rules.component.html",
styleUrls: ["./auto-roles-rules.component.scss"] styleUrls: ["./auto-roles-rules.component.scss"]
}) })
export class AutoRolesRulesComponent implements OnInit, OnDestroy { export class AutoRolesRulesComponent implements OnInit {
rules: AutoRoleRule[] = []; rules: AutoRoleRule[] = [];
guild: Guild = { channels: [], emojis: [], roles: [] }; guild: Guild = { channels: [], emojis: [], roles: [] };
@ -85,6 +85,7 @@ export class AutoRolesRulesComponent implements OnInit, OnDestroy {
} }
public ngOnInit(): void { public ngOnInit(): void {
this.setFilterForm(); this.setFilterForm();
this.data.getServerFromRoute(this.route).then(server => { this.data.getServerFromRoute(this.route).then(server => {
this.server = server; this.server = server;
@ -118,11 +119,6 @@ export class AutoRolesRulesComponent implements OnInit, OnDestroy {
}); });
} }
public ngOnDestroy(): void {
this.unsubscriber.next();
this.unsubscriber.complete();
}
public loadNextPage(): void { public loadNextPage(): void {
this.loading = true; this.loading = true;
this.data.query<AutoRoleRuleQuery>(Queries.autoRoleRulesQuery, { this.data.query<AutoRoleRuleQuery>(Queries.autoRoleRulesQuery, {

View File

@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { User } from "../../../../../../models/data/user.model"; import { User } from "../../../../../../models/data/user.model";
import { LazyLoadEvent, MenuItem } from "primeng/api"; import { LazyLoadEvent, MenuItem } from "primeng/api";
import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; import { FormBuilder, FormControl, FormGroup } from "@angular/forms";
@ -28,7 +28,7 @@ import { Server } from "../../../../../../models/data/server.model";
templateUrl: "./auto-roles.component.html", templateUrl: "./auto-roles.component.html",
styleUrls: ["./auto-roles.component.scss"] styleUrls: ["./auto-roles.component.scss"]
}) })
export class AutoRolesComponent implements OnInit, OnDestroy { export class AutoRolesComponent implements OnInit {
auto_roles: AutoRole[] = []; auto_roles: AutoRole[] = [];
guild: Guild = { channels: [], emojis: [], roles: [] }; guild: Guild = { channels: [], emojis: [], roles: [] };
channels: MenuItem[] = []; channels: MenuItem[] = [];
@ -100,12 +100,6 @@ export class AutoRolesComponent implements OnInit, OnDestroy {
}); });
} }
public ngOnDestroy(): void {
this.unsubscriber.next();
this.unsubscriber.complete();
}
public loadNextPage(): void { public loadNextPage(): void {
this.loading = true; this.loading = true;
this.data.query<AutoRoleQuery>(Queries.autoRolesQuery, { this.data.query<AutoRoleQuery>(Queries.autoRolesQuery, {

View File

@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; import { FormBuilder, FormControl, FormGroup } from "@angular/forms";
import { AuthService } from "../../../../services/auth/auth.service"; import { AuthService } from "../../../../services/auth/auth.service";
import { SpinnerService } from "../../../../services/spinner/spinner.service"; import { SpinnerService } from "../../../../services/spinner/spinner.service";
@ -26,7 +26,7 @@ import { Server } from "../../../../models/data/server.model";
templateUrl: "./members.component.html", templateUrl: "./members.component.html",
styleUrls: ["./members.component.scss"] styleUrls: ["./members.component.scss"]
}) })
export class MembersComponent implements OnInit, OnDestroy { export class MembersComponent implements OnInit {
members!: User[]; members!: User[];
levels!: MenuItem[]; levels!: MenuItem[];
leftServerOptions = [ leftServerOptions = [
@ -114,10 +114,6 @@ export class MembersComponent implements OnInit, OnDestroy {
this.loadNextPage(); this.loadNextPage();
}); });
} }
public ngOnDestroy(): void {
this.unsubscriber.next();
this.unsubscriber.complete();
}
loadNextPage() { loadNextPage() {
this.spinner.showSpinner(); this.spinner.showSpinner();

View File

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

View File

@ -1,11 +1,9 @@
{ {
"ApiURL": "http://localhost:8044", "ApiURL": "http://localhost:8044",
"PrivacyURL": "https://www.sh-edraft.de/Datenschutz",
"ImprintURL": "https://www.sh-edraft.de/Impressum",
"WebVersion": { "WebVersion": {
"Major": "1", "Major": "1",
"Minor": "0", "Minor": "0",
"Micro": "dev251" "Micro": "0.rc2"
}, },
"Themes": [ "Themes": [
{ {

View File

@ -113,8 +113,7 @@
"register_with_discord": "Mit Discord Registrieren", "register_with_discord": "Mit Discord Registrieren",
"repeat_email": "E-Mail wiederholen", "repeat_email": "E-Mail wiederholen",
"repeat_password": "Passwort wiederholen", "repeat_password": "Passwort wiederholen",
"user_already_exists": "Benutzer existiert bereits", "user_already_exists": "Benutzer existiert bereits"
"confirm_privacy": "Ich erkläre mich mit der <a href=\"{{url}}\">Datenschutzerklärung</a> einverstanden."
} }
}, },
"common": { "common": {
@ -164,8 +163,7 @@
"footer": { "footer": {
"backend": "API", "backend": "API",
"frontend": "Webseite", "frontend": "Webseite",
"imprint": "Impressum", "imprint": "Impressum"
"privacy": "Datenschutz"
}, },
"general": { "general": {
"days": "Tage", "days": "Tage",

View File

@ -113,8 +113,7 @@
"register_with_discord": "Register with discord", "register_with_discord": "Register with discord",
"repeat_email": "Repeat E-mail", "repeat_email": "Repeat E-mail",
"repeat_password": "Repeat password", "repeat_password": "Repeat password",
"user_already_exists": "User already exists", "user_already_exists": "User already exists"
"confirm_privacy": "I agree to the <a href=\"{{url}}\">Privacy Policy</a>."
} }
}, },
"common": { "common": {
@ -164,8 +163,7 @@
"footer": { "footer": {
"backend": "Website", "backend": "Website",
"frontend": "API", "frontend": "API",
"imprint": "Imprint", "imprint": "Imprint"
"privacy": "Privacy"
}, },
"general": { "general": {
"days": "Days", "days": "Days",

View File

@ -100,9 +100,6 @@ header {
} }
} }
.auth-footer {
}
.app { .app {
height: 100%; height: 100%;
display: flex; display: flex;
@ -477,9 +474,6 @@ footer {
.right { .right {
width: 50%; width: 50%;
text-align: right; text-align: right;
.p-button-label {
font-weight: unset !important;
}
} }
} }
@ -494,8 +488,7 @@ footer {
gap: 15px; gap: 15px;
.login-form-wrapper, .login-form-wrapper,
.auth-header, .auth-header {
.auth-footer {
width: 350px; width: 350px;
height: 450px; height: 450px;
@ -556,11 +549,6 @@ footer {
width: 350px; width: 350px;
height: 75px; height: 75px;
} }
.auth-footer {
width: 350px;
height: 75px;
}
} }
.input-field { .input-field {

View File

@ -231,10 +231,8 @@
background-color: $secondaryBackgroundColor; background-color: $secondaryBackgroundColor;
.login-form-wrapper, .login-form-wrapper,
.auth-header, .auth-header {
.auth-footer {
background-color: $primaryBackgroundColor; background-color: $primaryBackgroundColor;
color: $primaryTextColor !important;
.login-form { .login-form {
.input-field { .input-field {

View File

@ -231,10 +231,8 @@
background-color: $secondaryBackgroundColor; background-color: $secondaryBackgroundColor;
.login-form-wrapper, .login-form-wrapper,
.auth-header, .auth-header {
.auth-footer {
background-color: $primaryBackgroundColor; background-color: $primaryBackgroundColor;
color: $primaryTextColor !important;
.login-form { .login-form {
.input-field { .input-field {

View File

@ -235,10 +235,8 @@
background-color: $secondaryBackgroundColor; background-color: $secondaryBackgroundColor;
.login-form-wrapper, .login-form-wrapper,
.auth-header, .auth-header {
.auth-footer {
background-color: $primaryBackgroundColor; background-color: $primaryBackgroundColor;
color: $primaryTextColor !important;
.login-form { .login-form {
.input-field { .input-field {

View File

@ -231,10 +231,8 @@
background-color: $secondaryBackgroundColor; background-color: $secondaryBackgroundColor;
.login-form-wrapper, .login-form-wrapper,
.auth-header, .auth-header {
.auth-footer {
background-color: $primaryBackgroundColor; background-color: $primaryBackgroundColor;
color: $primaryTextColor !important;
.login-form { .login-form {
.input-field { .input-field {