Compare commits

..

No commits in common. "v1.61.0" and "v1.60.2" have entirely different histories.

3 changed files with 3 additions and 48 deletions

View file

@ -182,7 +182,7 @@
</div> </div>
</div> </div>
@if (showLogin() || showRegister() || showRecoverPassword()) { @if (showLogin() || showRegister()) {
<div <div
class="fixed inset-0 bg-black/50 z-40" class="fixed inset-0 bg-black/50 z-40"
(click)="hideAuthForms()" (click)="hideAuthForms()"
@ -194,11 +194,7 @@
<div class="fixed inset-0 flex items-center justify-center z-50 p-4" role="presentation"> <div class="fixed inset-0 flex items-center justify-center z-50 p-4" role="presentation">
<div class="relative" role="dialog" aria-modal="true"> <div class="relative" role="dialog" aria-modal="true">
@if (showLogin()) { @if (showLogin()) {
<app-login <app-login (switchForm)="showRegisterForm()" (closeDialog)="hideAuthForms()"></app-login>
(forgotPassword)="showRecoverPasswordForm()"
(switchForm)="showRegisterForm()"
(closeDialog)="hideAuthForms()"
></app-login>
} }
@if (showRegister()) { @if (showRegister()) {
<app-register <app-register
@ -206,12 +202,6 @@
(closeDialog)="hideAuthForms()" (closeDialog)="hideAuthForms()"
></app-register> ></app-register>
} }
@if (showRecoverPassword()) {
<app-recover-password
(closeDialog)="hideAuthForms()"
(switchToLogin)="showLoginForm()"
></app-recover-password>
}
</div> </div>
</div> </div>
} }

View file

@ -11,12 +11,11 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
import { AuthService } from '@service/auth.service'; import { AuthService } from '@service/auth.service';
import { LoginComponent } from '../auth/login/login.component'; import { LoginComponent } from '../auth/login/login.component';
import { RegisterComponent } from '../auth/register/register.component'; import { RegisterComponent } from '../auth/register/register.component';
import { RecoverPasswordComponent } from '../auth/recover-password/recover-password.component';
@Component({ @Component({
selector: 'app-landing-page', selector: 'app-landing-page',
standalone: true, standalone: true,
imports: [NgFor, RouterLink, LoginComponent, RegisterComponent, RecoverPasswordComponent], imports: [NgFor, RouterLink, LoginComponent, RegisterComponent],
templateUrl: './landing.component.html', templateUrl: './landing.component.html',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
}) })
@ -27,7 +26,6 @@ export class LandingComponent implements OnInit, OnDestroy {
route: ActivatedRoute = inject(ActivatedRoute); route: ActivatedRoute = inject(ActivatedRoute);
showLogin = signal(false); showLogin = signal(false);
showRegister = signal(false); showRegister = signal(false);
showRecoverPassword = signal(false);
ngOnInit() { ngOnInit() {
this.startAutoplay(); this.startAutoplay();
@ -45,28 +43,18 @@ export class LandingComponent implements OnInit, OnDestroy {
showLoginForm() { showLoginForm() {
this.showLogin.set(true); this.showLogin.set(true);
this.showRegister.set(false); this.showRegister.set(false);
this.showRecoverPassword.set(false);
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
} }
showRegisterForm() { showRegisterForm() {
this.showRegister.set(true); this.showRegister.set(true);
this.showLogin.set(false); this.showLogin.set(false);
this.showRecoverPassword.set(false);
document.body.style.overflow = 'hidden';
}
showRecoverPasswordForm() {
this.showRecoverPassword.set(true);
this.showLogin.set(false);
this.showRegister.set(false);
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
} }
hideAuthForms() { hideAuthForms() {
this.showLogin.set(false); this.showLogin.set(false);
this.showRegister.set(false); this.showRegister.set(false);
this.showRecoverPassword.set(false);
document.body.style.overflow = 'auto'; document.body.style.overflow = 'auto';
} }

View file

@ -1,23 +0,0 @@
# Info
info:
just --list
# Starts the project in development mode
start:
command -v concurrently &> /dev/null || bun add -g concurrently
command -v watchexec &> /dev/null || brew install watchexec
docker compose up -d
conc -n "frontend,backend" "cd frontend && bun run start" "cd backend/ && watchexec -r -e java ./gradlew :bootRun"
# Builds both the backend and frontend docker images (obv)
build:
just build-fe
just build-be
# Builds the backend docker image
build-be:
docker buildx build -f backend/.docker/Dockerfile -t git.kjan.de/szut/casino-backend:latest backend
# Builds the frontend docker image
build-fe:
docker buildx build -f frontend/.docker/Dockerfile -t git.kjan.de/szut/casino-frontend:latest frontend