merged "AuthSubmitButton" with the "SubmitButton" + updated the other pages that needed this change

components/AuthSubmitButton.tsx

@@ -1,35 +0,0 @@
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { IconProp } from "@fortawesome/fontawesome-svg-core";
-
-type Props = {
-  onClick?: Function;
-  icon?: IconProp;
-  label: string;
-  loading: boolean;
-  className?: string;
-};
-
-export default function AuthSubmitButton({
-  onClick,
-  icon,
-  label,
-  loading,
-  className,
-}: Props) {
-  return (
-    <button
-      type="submit"
-      className={`text-white flex items-center gap-2 py-2 px-5 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
-        loading
-          ? "bg-sky-600 cursor-auto"
-          : "bg-sky-700 hover:bg-sky-600 cursor-pointer"
-      } ${className}`}
-      onClick={() => {
-        if (!loading && onClick) onClick();
-      }}
-    >
-      {icon && <FontAwesomeIcon icon={icon} className="h-5" />}
-      <p className="text-center w-full">{label}</p>
-    </button>
-  );
-}

components/SubmitButton.tsx

@@ -2,11 +2,12 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
 
 type Props = {
-  onClick: Function;
+  onClick?: Function;
   icon?: IconProp;
   label: string;
   loading: boolean;
   className?: string;
+  type?: "button" | "submit" | "reset" | undefined;
 };
 
 export default function SubmitButton({
@@ -15,20 +16,22 @@ export default function SubmitButton({
   label,
   loading,
   className,
+  type,
 }: Props) {
   return (
-    <div
+    <button
+      type={type ? type : undefined}
       className={`text-white flex items-center gap-2 py-2 px-5 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
         loading
           ? "bg-sky-600 cursor-auto"
           : "bg-sky-700 hover:bg-sky-600 cursor-pointer"
       } ${className}`}
       onClick={() => {
-        if (!loading) onClick();
+        if (!loading && onClick) onClick();
       }}
     >
-      {icon && <FontAwesomeIcon icon={icon} className="h-5 select-none" />}
-      <p className="text-center w-full select-none">{label}</p>
-    </div>
+      {icon && <FontAwesomeIcon icon={icon} className="h-5" />}
+      <p className="text-center w-full">{label}</p>
+    </button>
   );
 }

pages/choose-username.tsx

@@ -1,6 +1,6 @@
 import SubmitButton from "@/components/SubmitButton";
 import { signOut } from "next-auth/react";
-import { useState } from "react";
+import { FormEvent, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useSession } from "next-auth/react";
 import useAccountStore from "@/store/account";
@@ -15,7 +15,9 @@ export default function ChooseUsername() {
 
   const { updateAccount, account } = useAccountStore();
 
-  async function submitUsername() {
+  async function submitUsername(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     setSubmitLoader(true);
 
     const redirectionToast = toast.loading("Applying...");
@@ -38,6 +40,7 @@ export default function ChooseUsername() {
 
   return (
     <CenteredForm>
+      <form onSubmit={submitUsername}>
         <div className="p-4 mx-auto flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
           <p className="text-2xl text-center text-black dark:text-white font-bold">
             Choose a Username (Last step)
@@ -49,6 +52,7 @@ export default function ChooseUsername() {
             </p>
 
             <TextInput
+              autoFocus
               placeholder="john"
               value={inputedUsername}
               className="bg-white"
@@ -69,7 +73,7 @@ export default function ChooseUsername() {
           </div>
 
           <SubmitButton
-          onClick={submitUsername}
+            type="submit"
             label="Complete Registration"
             className="mt-2 w-full text-center"
             loading={submitLoader}
@@ -82,6 +86,7 @@ export default function ChooseUsername() {
             Sign Out
           </div>
         </div>
+      </form>
     </CenteredForm>
   );
 }

pages/forgot.tsx

@@ -3,7 +3,7 @@ import TextInput from "@/components/TextInput";
 import CenteredForm from "@/layouts/CenteredForm";
 import { signIn } from "next-auth/react";
 import Link from "next/link";
-import { useState } from "react";
+import { FormEvent, useState } from "react";
 import { toast } from "react-hot-toast";
 
 interface FormData {
@@ -17,7 +17,9 @@ export default function Forgot() {
     email: "",
   });
 
-  async function loginUser() {
+  async function sendConfirmation(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     if (form.email !== "") {
       setSubmitLoader(true);
 
@@ -40,14 +42,15 @@ export default function Forgot() {
 
   return (
     <CenteredForm>
+      <form onSubmit={sendConfirmation}>
         <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
           <p className="text-2xl text-center text-black dark:text-white font-bold">
             Password Recovery
           </p>
           <div>
             <p className="text-md text-black dark:text-white">
-            Enter your Email so we can send you a link to recover your account.
-            Make sure to change your password in the profile settings
+              Enter your Email so we can send you a link to recover your
+              account. Make sure to change your password in the profile settings
               afterwards.
             </p>
             <p className="text-sm text-gray-500 dark:text-gray-400">
@@ -60,6 +63,7 @@ export default function Forgot() {
             </p>
 
             <TextInput
+              autoFocus
               type="email"
               placeholder="johnny@example.com"
               value={form.email}
@@ -69,7 +73,7 @@ export default function Forgot() {
           </div>
 
           <SubmitButton
-          onClick={loginUser}
+            type="submit"
             label="Send Login Link"
             className="mt-2 w-full text-center"
             loading={submitLoader}
@@ -83,6 +87,7 @@ export default function Forgot() {
             </Link>
           </div>
         </div>
+      </form>
     </CenteredForm>
   );
 }

pages/login.tsx

@@ -5,7 +5,6 @@ import { signIn } from "next-auth/react";
 import Link from "next/link";
 import { useState, FormEvent } from "react";
 import { toast } from "react-hot-toast";
-import AuthSubmitButton from "@/components/AuthSubmitButton";
 
 interface FormData {
   username: string;
@@ -95,14 +94,18 @@ export default function Login() {
             )}
           </div>
 
-          <AuthSubmitButton
+          <SubmitButton
+            type="submit"
             label="Login"
             className=" w-full text-center"
             loading={submitLoader}
           />
-          {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true" ? undefined : (
+          {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION ===
+          "true" ? undefined : (
             <div className="flex items-baseline gap-1 justify-center">
-              <p className="w-fit text-gray-500 dark:text-gray-400">New here?</p>
+              <p className="w-fit text-gray-500 dark:text-gray-400">
+                New here?
+              </p>
               <Link
                 href={"/register"}
                 className="block text-black dark:text-white font-semibold"

pages/register.tsx

@@ -6,7 +6,6 @@ import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
 import CenteredForm from "@/layouts/CenteredForm";
 import TextInput from "@/components/TextInput";
-import AuthSubmitButton from "@/components/AuthSubmitButton";
 
 const emailEnabled = process.env.NEXT_PUBLIC_EMAIL_PROVIDER;
 
@@ -139,7 +138,9 @@ export default function Register() {
                   placeholder="john"
                   value={form.username}
                   className="bg-white"
-                onChange={(e) => setForm({ ...form, username: e.target.value })}
+                  onChange={(e) =>
+                    setForm({ ...form, username: e.target.value })
+                  }
                 />
               </div>
             )}
@@ -222,7 +223,8 @@ export default function Register() {
               </div>
             ) : undefined}
 
-          <AuthSubmitButton
+            <SubmitButton
+              type="submit"
               label="Sign Up"
               className="mt-2 w-full text-center"
               loading={submitLoader}