diff --git a/frontend/src/app/pages/email-verify-root/email-verify-root.component.ts b/frontend/src/app/pages/email-verify-root/email-verify-root.component.ts index 22fa081..48af55f 100644 --- a/frontend/src/app/pages/email-verify-root/email-verify-root.component.ts +++ b/frontend/src/app/pages/email-verify-root/email-verify-root.component.ts @@ -14,7 +14,7 @@ import { Router } from '@angular/router'; import { delay, filter, tap } from 'rxjs'; import { VerifyApiService } from '../../api'; -import { BackgroundPatternService } from '../../shared/service'; +import { BackgroundPatternService, ThemeService } from '../../shared/service'; @Component({ selector: 'app-email-verify-root', @@ -38,7 +38,8 @@ export class EmailVerifyRootComponent implements OnInit { private readonly api: VerifyApiService, private readonly router: Router, private readonly el: ElementRef, - private readonly backgroundPatternService: BackgroundPatternService + private readonly backgroundPatternService: BackgroundPatternService, + private readonly themeService: ThemeService ) {} public ngOnInit(): void { @@ -47,11 +48,23 @@ export class EmailVerifyRootComponent implements OnInit { } public setBackground(): void { - const color = getComputedStyle(this.el.nativeElement).getPropertyValue( - '--p' - ); + const theme = this.themeService.getTheme(); + let opacity: number; - const svgUrl = this.backgroundPatternService.getBubblesPattern(color, 0.1); + if (theme === 'dark') { + opacity = 0.05; + } else { + opacity = 0.1; + } + + const colorPrimary = getComputedStyle( + this.el.nativeElement + ).getPropertyValue('--p'); + + const svgUrl = this.backgroundPatternService.getWigglePattern( + colorPrimary, + opacity + ); this.backgroundStyle = { 'background-image': `url("${svgUrl}")` }; } @@ -80,7 +93,9 @@ export class EmailVerifyRootComponent implements OnInit { const verifyToken: string = this.extractVerifyToken(); const email: string = this.extractEmail(); - this.email.set(decodeURIComponent(atob(email))); + if (verifyToken && email) { + this.email.set(decodeURIComponent(atob(email))); + } this.api .verifyControllerVerifyEmail(verifyToken) diff --git a/frontend/src/app/pages/register-root/register-root.component.html b/frontend/src/app/pages/register-root/register-root.component.html index cc920cb..716472a 100644 --- a/frontend/src/app/pages/register-root/register-root.component.html +++ b/frontend/src/app/pages/register-root/register-root.component.html @@ -1,117 +1,8 @@ - - @if (!userSignupSuccess()) {
-