some more fixes/better error messages

RiskyMH · Jan 23, 2025 · 7e0f46a · 7e0f46a
1 parent 7fbee67
commit 7e0f46a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/apps/web/app/(emailthing.me)/emailme/[username]/action.ts b/apps/web/app/(emailthing.me)/emailme/[username]/action.ts
@@ -43,7 +43,7 @@ export async function emailMeForm(
 
         const result = await turnstile.json();
         if (!result.success) {
-            return { error: "Failed turnstile recapture test" };
+            return { error: "Failed cloudflare turnstile recapture test..." };
         }
         // return { success: "test done" }
     } else {

diff --git a/apps/web/app/(emailthing.me)/emailme/[username]/components.client.tsx b/apps/web/app/(emailthing.me)/emailme/[username]/components.client.tsx
@@ -16,6 +16,10 @@ export function Form({ publicEmail, username }: { className?: string; publicEmai
     useEffect(() => {
         if (state?.error) {
             (window as any)?.turnstile?.reset();
+
+            if (!document.querySelector(".cf-turnstile > div")) {
+                toast.error("Oh no, cloudflare is having issues displaying the verification to you :(", { description: () => <p className="text-foreground! italic">May need to refresh page to reset and try again</p>})
+            }
         }
     }, [state]);
 
@@ -27,7 +31,7 @@ export function Form({ publicEmail, username }: { className?: string; publicEmai
                 suppressHydrationWarning
                 id="emailme-form"
             >
-                <input name="username" value={username} hidden />
+                <input name="username" value={username} hidden readOnly />
                 <div className="flex flex-col gap-2 sm:flex-row">
                     <ClientInput
                         placeholder="Name *"
@@ -110,9 +114,11 @@ export function Form({ publicEmail, username }: { className?: string; publicEmai
             <Toaster message={state?.success} />
             <script
                 suppressHydrationWarning
+                type="text/javascript"
                 // biome-ignore lint/security/noDangerouslySetInnerHtml: <explanation>
                 dangerouslySetInnerHTML={{
                     __html: `{
+const fn = () => {
 const urlParams = new URLSearchParams(window.location.search);
 
 const mailtoLink = document.getElementById("mailto-link");
@@ -132,6 +138,9 @@ if (name && nameElem) nameElem.value = name;
 if (email && emailElem) emailElem.value = email;
 if (subject && subjectElem) subjectElem.value = subject;
 if (message && messageElem) messageElem.value = message;
+};
+document.addEventListener("DOMContentLoaded", fn);
+document.addEventListener("load", fn);
 }`.replaceAll("\n", " "),
                 }}
             />

diff --git a/apps/web/app/(emailthing.me)/emailme/[username]/not-found.tsx b/apps/web/app/(emailthing.me)/emailme/[username]/not-found.tsx
@@ -9,7 +9,7 @@ export default function NotFound() {
         <div className="flex h-screen w-full flex-col items-center justify-center">
             <h1 className="text-center font-bold text-4xl text-foreground">Not found</h1>
             <p className="px-2 text-center text-muted-foreground">
-                This user can not be found, if this is you please
+                This user can not be found, if this is you please {" "}
                 <Link
                     href="https://emailthing.app/settings/emailthing-me"
                     className="underline hover:text-blue"

diff --git a/apps/web/app/(emailthing.me)/emailme/page.tsx b/apps/web/app/(emailthing.me)/emailme/page.tsx
@@ -12,7 +12,7 @@ export default async function Home() {
                     <h1 className="block font-heading text-3xl sm:text-5xl md:text-6xl">
                         <span className="inline-block whitespace-nowrap bg-gradient-to-br from-[#FF9797] to-[#6D6AFF] bg-clip-text text-transparent">
                             EmailThing.me
-                        </span>
+                        </span> {" "}
                         is your own contact page to make emailing easy!
                     </h1>