Auth - Login/Signup/Forgot/Rest

src/routes/signup.svelte

@@ -6,19 +6,16 @@
 
 <script>
   import { goto } from '@sapper/app';
-  import { Chasing } from 'svelte-loading-spinners';
   import TextField from '../components/Form/TextField.svelte';
   import PrimaryButton from '../components/PrimaryButton/index.svelte';
   import { getSupabase } from '../utils/functions/supabase';
-  import { user } from '../utils/store/user';
   import {
-    signUpValidation,
+    authValidation,
     getConfirmPasswordError,
     getDisableSubmit,
   } from '../utils/functions/validator';
   import { SIGNUP_FIELDS } from '../utils/constants/authentication';
   import AuthUI from '../components/AuthUI/index.svelte';
-  import EmailSentIcon from '../components/Icons/EmailSentIcon.svelte';
 
   export let config;
 
@@ -29,9 +26,10 @@
   let errors = {};
   let submitError;
   let disableSubmit = false;
+  let formRef;
 
-  async function handleSubmit() {
-    const validationRes = signUpValidation(fields);
+  async function handleSubmit(e) {
+    const validationRes = authValidation(fields);
     console.log('validationRes', validationRes);
 
     if (Object.keys(validationRes).length) {
@@ -44,14 +42,12 @@
       const { data, error } = await supabase.auth.signUp({
         email: fields.email,
         password: fields.password,
-        options: {
-          data: {
-            fullname: fields.name,
-          },
-        },
       });
+      console.log('data', data);
       if (error) throw error;
 
+      formRef?.reset();
+
       return goto('/login');
       // success = true;
       // fields = Object.assign({}, SIGNUP_FIELDS);
@@ -67,90 +63,76 @@
 </script>
 
 <svelte:head>
-  <title>Sign Up - ClassroomIO</title>
+  <title>Join ClassroomIO</title>
 </svelte:head>
 
-<AuthUI {supabase} isLogin={false} {handleSubmit} showOnlyContent={success}>
+<AuthUI
+  {supabase}
+  isLogin={false}
+  {handleSubmit}
+  showOnlyContent={success}
+  bind:formRef
+>
   <div class="mt-4 w-full">
-    {#if $user.fetchingUser}
-      <div class="h-40 text-md flex items-center justify-center">
-        <Chasing size="60" color="#ff3e00" unit="px" duration="1s" />
-      </div>
-    {:else if success}
-      <div class="text-md flex items-center justify-center flex-col">
-        <EmailSentIcon />
-        <h2 class="text-xl">Email sent!</h2>
-        <p class="mt-4 text-center">
-          We have sent a confirmation email to {fields.email}. Please check both
-          your
-          <strong>spam </strong>and your<strong>&nbsp; inbox</strong>.
-        </p>
-      </div>
-    {:else}
-      <p class="text-lg font-semibold mb-6">Create a free account</p>
-      <TextField
-        label="Full Name"
-        bind:value={fields.name}
-        type="text"
-        autoFocus={true}
-        placeholder="e.g Joke Silva"
-        className="mb-6"
-        inputClassName="w-full"
-        isDisabled={loading}
-        errorMessage={errors.name}
-        isRequired
-      />
-      <TextField
-        label="Your Email"
-        bind:value={fields.email}
-        type="email"
-        placeholder="[email protected]"
-        className="mb-6"
-        inputClassName="w-full"
-        isDisabled={loading}
-        errorMessage={errors.email}
-        isRequired
-      />
-      <TextField
-        label="Your Password"
-        bind:value={fields.password}
-        type="password"
-        placeholder="************"
-        className="mb-6"
-        inputClassName="w-full"
-        isDisabled={loading}
-        errorMessage={errors.password}
-        helperMessage="Password must be more than 6 characters"
-        isRequired
-      />
-      <TextField
-        label="Confirm Password"
-        bind:value={fields.confirmPassword}
-        type="password"
-        placeholder="************"
-        className="mb-6"
-        inputClassName="w-full"
-        isDisabled={loading}
-        errorMessage={errors.confirmPassword}
-        isRequired
-      />
-      {#if submitError}
-        <p class="text-sm text-red-500">{submitError}</p>
-      {/if}
-      <div class="w-full text-right">
-        <a class="text-md text-blue-700" href="/forgot"> Forgot password? </a>
-      </div>
+    <p class="text-lg font-semibold mb-6">Create a free account</p>
+    <!-- <TextField
+      label="Full Name"
+      bind:value={fields.name}
+      type="text"
+      autoFocus={true}
+      placeholder="e.g Joke Silva"
+      className="mb-6"
+      inputClassName="w-full"
+      isDisabled={loading}
+      errorMessage={errors.name}
+      isRequired
+    /> -->
+    <TextField
+      label="Your Email"
+      bind:value={fields.email}
+      type="email"
+      placeholder="[email protected]"
+      className="mb-6"
+      inputClassName="w-full"
+      isDisabled={loading}
+      errorMessage={errors.email}
+      isRequired
+    />
+    <TextField
+      label="Your Password"
+      bind:value={fields.password}
+      type="password"
+      placeholder="************"
+      className="mb-6"
+      inputClassName="w-full"
+      isDisabled={loading}
+      errorMessage={errors.password}
+      helperMessage="Password must be more than 6 characters"
+      isRequired
+    />
+    <TextField
+      label="Confirm Password"
+      bind:value={fields.confirmPassword}
+      type="password"
+      placeholder="************"
+      className="mb-6"
+      inputClassName="w-full"
+      isDisabled={loading}
+      errorMessage={errors.confirmPassword}
+      isRequired
+    />
+    {#if submitError}
+      <p class="text-sm text-red-500">{submitError}</p>
     {/if}
   </div>
 
-  {#if !success}
-    <div class="my-4 w-full flex justify-end items-center">
-      <PrimaryButton
-        label={loading ? 'Creating...' : 'Create Account'}
-        type="submit"
-        className="py-3 sm:w-full w-full"
-        isDisabled={disableSubmit || loading}
-      />
-    </div>
-  {/if}
+  <div class="my-4 w-full flex justify-end items-center">
+    <PrimaryButton
+      label="Create Account"
+      type="submit"
+      className="sm:w-full w-full"
+      isDisabled={disableSubmit || loading}
+      isLoading={loading}
+    />
+  </div>
 </AuthUI>