From 2b20d129ae9251ceca57e251d36e68c21541d6ad Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Sun, 16 Oct 2022 14:12:37 +0200
Subject: [PATCH] bugfixes

---
 src/route-widgets/AliasRoute/CreateRandomAliasButton.tsx      | 4 ++--
 .../EmailForm/DetectEmailAutofillService.tsx                  | 0
 .../{root => SignupRoute}/EmailForm/EmailForm.tsx             | 0
 src/route-widgets/{root => SignupRoute}/EmailForm/index.ts    | 0
 .../{root => SignupRoute}/YouGotMail/ResendMailButton.tsx     | 0
 .../{root => SignupRoute}/YouGotMail/YouGotMail.tsx           | 0
 src/route-widgets/{root => SignupRoute}/YouGotMail/index.ts   | 0
 src/routes/SignupRoute.tsx                                    | 4 ++--
 src/routes/VerifyEmailRoute.tsx                               | 4 +++-
 9 files changed, 7 insertions(+), 5 deletions(-)
 rename src/route-widgets/{root => SignupRoute}/EmailForm/DetectEmailAutofillService.tsx (100%)
 rename src/route-widgets/{root => SignupRoute}/EmailForm/EmailForm.tsx (100%)
 rename src/route-widgets/{root => SignupRoute}/EmailForm/index.ts (100%)
 rename src/route-widgets/{root => SignupRoute}/YouGotMail/ResendMailButton.tsx (100%)
 rename src/route-widgets/{root => SignupRoute}/YouGotMail/YouGotMail.tsx (100%)
 rename src/route-widgets/{root => SignupRoute}/YouGotMail/index.ts (100%)

diff --git a/src/route-widgets/AliasRoute/CreateRandomAliasButton.tsx b/src/route-widgets/AliasRoute/CreateRandomAliasButton.tsx
index 6a77747..6f515ff 100644
--- a/src/route-widgets/AliasRoute/CreateRandomAliasButton.tsx
+++ b/src/route-widgets/AliasRoute/CreateRandomAliasButton.tsx
@@ -5,8 +5,8 @@ import {AxiosError} from "axios"
 import {Button} from "@mui/material"
 import {useMutation} from "@tanstack/react-query"
 
-import {CreateAliasData, createAlias} from "~/apis"
-import {Alias} from "~/server-types"
+import {createAlias, CreateAliasData} from "~/apis"
+import {Alias, AliasType} from "~/server-types"
 
 export interface CreateRandomAliasButtonProps {
 	onCreated: (alias: Alias) => void
diff --git a/src/route-widgets/root/EmailForm/DetectEmailAutofillService.tsx b/src/route-widgets/SignupRoute/EmailForm/DetectEmailAutofillService.tsx
similarity index 100%
rename from src/route-widgets/root/EmailForm/DetectEmailAutofillService.tsx
rename to src/route-widgets/SignupRoute/EmailForm/DetectEmailAutofillService.tsx
diff --git a/src/route-widgets/root/EmailForm/EmailForm.tsx b/src/route-widgets/SignupRoute/EmailForm/EmailForm.tsx
similarity index 100%
rename from src/route-widgets/root/EmailForm/EmailForm.tsx
rename to src/route-widgets/SignupRoute/EmailForm/EmailForm.tsx
diff --git a/src/route-widgets/root/EmailForm/index.ts b/src/route-widgets/SignupRoute/EmailForm/index.ts
similarity index 100%
rename from src/route-widgets/root/EmailForm/index.ts
rename to src/route-widgets/SignupRoute/EmailForm/index.ts
diff --git a/src/route-widgets/root/YouGotMail/ResendMailButton.tsx b/src/route-widgets/SignupRoute/YouGotMail/ResendMailButton.tsx
similarity index 100%
rename from src/route-widgets/root/YouGotMail/ResendMailButton.tsx
rename to src/route-widgets/SignupRoute/YouGotMail/ResendMailButton.tsx
diff --git a/src/route-widgets/root/YouGotMail/YouGotMail.tsx b/src/route-widgets/SignupRoute/YouGotMail/YouGotMail.tsx
similarity index 100%
rename from src/route-widgets/root/YouGotMail/YouGotMail.tsx
rename to src/route-widgets/SignupRoute/YouGotMail/YouGotMail.tsx
diff --git a/src/route-widgets/root/YouGotMail/index.ts b/src/route-widgets/SignupRoute/YouGotMail/index.ts
similarity index 100%
rename from src/route-widgets/root/YouGotMail/index.ts
rename to src/route-widgets/SignupRoute/YouGotMail/index.ts
diff --git a/src/routes/SignupRoute.tsx b/src/routes/SignupRoute.tsx
index 102f64c..eb17a27 100644
--- a/src/routes/SignupRoute.tsx
+++ b/src/routes/SignupRoute.tsx
@@ -4,8 +4,8 @@ import {useLoaderData} from "react-router-dom"
 
 import {MultiStepForm} from "~/components"
 import {ServerSettings} from "~/server-types"
-import EmailForm from "~/route-widgets/root/EmailForm"
-import YouGotMail from "~/route-widgets/root/YouGotMail"
+import EmailForm from "~/route-widgets/SignupRoute/EmailForm"
+import YouGotMail from "~/route-widgets/SignupRoute/YouGotMail"
 
 export default function SignupRoute(): ReactElement {
 	const serverSettings = useLoaderData() as ServerSettings
diff --git a/src/routes/VerifyEmailRoute.tsx b/src/routes/VerifyEmailRoute.tsx
index 1b20b92..e6432de 100644
--- a/src/routes/VerifyEmailRoute.tsx
+++ b/src/routes/VerifyEmailRoute.tsx
@@ -1,6 +1,6 @@
 import * as yup from "yup"
 import {useLoaderData, useNavigate} from "react-router-dom"
-import {useAsync} from "react-use"
+import {useAsync, useLocalStorage} from "react-use"
 import {MdCancel} from "react-icons/md"
 import {AxiosError} from "axios"
 import React, {ReactElement, useContext} from "react"
@@ -19,6 +19,7 @@ export default function VerifyEmailRoute(): ReactElement {
 	const theme = useTheme()
 	const navigate = useNavigate()
 	const {login} = useContext(AuthContext)
+	const [_, setEmail] = useLocalStorage<string>("signup-form-state-email", "")
 	const {email, token} = useQueryParams<{
 		email: string
 		token: string
@@ -44,6 +45,7 @@ export default function VerifyEmailRoute(): ReactElement {
 		ValidateEmailData
 	>(validateEmail, {
 		onSuccess: async ({user}) => {
+			setEmail("")
 			await login(user)
 			navigate("/")
 		},