From 15520a8e8b4f9be6a980f60f5430580663a171c3 Mon Sep 17 00:00:00 2001
From: Igor Propisnov <info@igor-propisnov.com>
Date: Wed, 29 May 2024 20:00:25 +0200
Subject: [PATCH] small fixes

---
 .../email-verify-root.component.html           | 18 +++++++++++-------
 .../email-verify-root.component.ts             |  6 ++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/pages/email-verify-root/email-verify-root.component.html b/frontend/src/app/pages/email-verify-root/email-verify-root.component.html
index 9862d41..d0c333d 100644
--- a/frontend/src/app/pages/email-verify-root/email-verify-root.component.html
+++ b/frontend/src/app/pages/email-verify-root/email-verify-root.component.html
@@ -1,15 +1,19 @@
 <div id="background">
   <div class="wrapper">
     <div class="content">
-      @if (showRedirectMessage()) {
-        <h1>Es geht gleich los!</h1>
-        <h2>
-          Danke für das bestätigen der E-Mail - Wir leiten dich zum Login
-          weiter!
-        </h2>
-      } @else {
+      @if (verifyStatus() === true) {
+        @if (showRedirectMessage()) {
+          <h1>Es geht gleich los!</h1>
+          <h2>
+            Danke für das bestätigen der E-Mail - Wir leiten dich zum Login
+            weiter!
+          </h2>
+        }
+      } @else if (verifyStatus() === false) {
         <h1>Oops, da ist etwas schief gelaufen!</h1>
         <h2>Der Link ist nicht mehr gültig</h2>
+      } @else {
+        <h1>Verifizierung wird durchgeführt...</h1>
       }
     </div>
   </div>
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 301c2e5..135d8bc 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
@@ -24,7 +24,9 @@ import { VerifyApiService } from '../../api';
 })
 export class EmailVerifyRootComponent implements OnInit {
   public token: InputSignal<string> = input<string>('');
-  public verifyStatus: WritableSignal<boolean> = signal<boolean>(false);
+  public verifyStatus: WritableSignal<boolean | null> = signal<boolean | null>(
+    null
+  );
   public showRedirectMessage: WritableSignal<boolean> = signal<boolean>(false);
 
   public constructor(
@@ -49,7 +51,7 @@ export class EmailVerifyRootComponent implements OnInit {
         tap(() => {
           this.showRedirectMessage.set(true);
         }),
-        delay(10000)
+        delay(5000)
       )
       .subscribe(() => {
         this.router.navigate(['/signup'], {