Solved few more reliability issues

anoopkarnik · Feb 2, 2025 · 9d1f3e8 · 9d1f3e8
1 parent 8320649
commit 9d1f3e8
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 108 deletions.
diff --git a/apps/nextjs-app/app/auth/error/page.tsx b/apps/nextjs-app/app/auth/error/page.tsx
@@ -1,23 +1,17 @@
 "use client"
 import ErrorPage from '@repo/ui/templates/auth/v1/ErrorPage'
-import { useRouter } from 'next/navigation'
 import React from 'react'
 
 const ErrorTemp = () => {
 
-  const router = useRouter()
-
   const quote = 'The only way to do great work is to love what you do.'
   const author = 'Late Steve Jobs'
   const credential = 'Ex CEO of Apple Inc.'
   const errorMessage = 'Oops! Something went wrong!'
-  const goToLoginPage = ()=>{
-      router.push('/auth/login')
-  }
 
   return (
     <div>
-      <ErrorPage errorMessage={errorMessage} backFunction={goToLoginPage} quote={quote} author={author} credential={credential}/>
+      <ErrorPage errorMessage={errorMessage} quote={quote} author={author} credential={credential}/>
     </div>
   )
 }

diff --git a/apps/nextjs-app/app/auth/forgot-password/page.tsx b/apps/nextjs-app/app/auth/forgot-password/page.tsx
@@ -1,12 +1,11 @@
 'use client'
 
-import { useRouter} from 'next/navigation'
 import React, {useState,useEffect } from 'react'
 import ForgotPasswordPage from '@repo/ui/templates/auth/v1/ForgotPasswordPage'
 import { ForgotPassword } from '../_actions/forgot-password'
 
 const ForgotPasswordClient = () => {
-    const router = useRouter()
+
 
     const quote = 'The only way to do great work is to love what you do.'
     const author = 'Late Steve Jobs'
@@ -16,10 +15,6 @@ const ForgotPasswordClient = () => {
     const [error, setError] = useState<string | undefined>()
     const [success, setSuccess] = useState<string | undefined>()
 
-    const goToLoginPage = ()=>{
-        router.push('/auth/login')
-    }
-
     const ResetPasswordFunction = async (email: string) => {
         if (success || error) return;
         try {
@@ -31,13 +26,10 @@ const ForgotPasswordClient = () => {
         }
     }
 
-    useEffect(()=>{
-
-  },[success,error])
 
   return (
     <div>
-      <ForgotPasswordPage errorMessage={error} successMessage={success} resetFunction={ResetPasswordFunction} backFunction={goToLoginPage} 
+      <ForgotPasswordPage errorMessage={error} successMessage={success} resetFunction={ResetPasswordFunction}  
       title={title} description={description} quote={quote} author={author} credential={credential} />
     </div>
   )

diff --git a/apps/nextjs-app/app/auth/login/page.tsx b/apps/nextjs-app/app/auth/login/page.tsx
@@ -1,14 +1,13 @@
 'use client'
 
 import LoginPage from '@repo/ui/templates/auth/v1/LoginPage'
-import { useRouter, useSearchParams } from 'next/navigation'
+import {  useSearchParams } from 'next/navigation'
 import React, { Suspense, useEffect, useState } from 'react'
 import { DEFAULT_LOGIN_REDIRECT } from '../../../routes'
 import { signIn } from 'next-auth/react'
 import { login } from '../_actions/login'
 
 const LoginContent = () => {
-  const router = useRouter()
   const searchParams = useSearchParams()
 
   const [urlError, setUrlError] = useState('')
@@ -19,21 +18,12 @@ const LoginContent = () => {
       setUrlError('This email is already in use with another provider.')
     }
   }, [searchParams])
-
 
 
   const loginWithSocials = async (type: string) => {
     await signIn(type, { callbackUrl: DEFAULT_LOGIN_REDIRECT })
   }
 
-  const goToForgotPasswordPage = () => {
-    router.push('/auth/forgot-password')
-  }
-
-  const goToRegisterPage = () => {
-    router.push('/auth/register')
-  }
-
   const title = 'Loading...'
   const description = 'Please wait while we are loading the page!'
   const quote = 'The only way to do great work is to love what you do.'
@@ -59,8 +49,6 @@ const LoginContent = () => {
       onGoogleProviderSubmit={()=>loginWithSocials('google')}
       onGithubProviderSubmit={()=>loginWithSocials('github')}
       onLinkedinProviderSubmit={()=>loginWithSocials('linkedin')}
-      forgotPasswordFunction={goToForgotPasswordPage}
-      backFunction={goToRegisterPage}
       errorMessage={urlError}
     />
   )

diff --git a/apps/nextjs-app/app/auth/new-verification/page.tsx b/apps/nextjs-app/app/auth/new-verification/page.tsx
@@ -1,13 +1,12 @@
 'use client'
 
 import NewVerificationPage from '@repo/ui/templates/auth/v1/NewVerificationPage'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { useSearchParams } from 'next/navigation'
 import React, { Suspense, useEffect, useState,useCallback } from 'react'
 import { newVerification } from '../_actions/new-verification'
 
 const NewVerificationContent = () => {
 
-    const router = useRouter();
     const [error, setError] = useState<string | undefined>()
     const [success, setSuccess] = useState<string | undefined>()
     const searchParams = useSearchParams();
@@ -38,15 +37,11 @@ const NewVerificationContent = () => {
   const author = 'Late Steve Jobs'
   const credential = 'Ex CEO of Apple Inc.'
 
-  const goToLoginPage = () => {
-    router.push('/auth/login')
-  }
 
   return (
     <NewVerificationPage 
     errorMessage={error} 
     successMessage={success} 
-    backFunction={goToLoginPage} 
     title={title} 
     description={description}
     quote={quote} 

diff --git a/apps/nextjs-app/app/auth/register/page.tsx b/apps/nextjs-app/app/auth/register/page.tsx
@@ -1,14 +1,13 @@
 'use client'
 
 import RegisterPage from '@repo/ui/templates/auth/v1/RegisterPage'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { useSearchParams } from 'next/navigation'
 import React, { Suspense, useEffect, useState } from 'react'
 import { DEFAULT_LOGIN_REDIRECT } from '../../../routes'
 import { signIn } from 'next-auth/react'
 import { register } from '../_actions/register'
 
 const RegisterContent = () => {
-  const router = useRouter()
   const searchParams = useSearchParams()
 
   const [urlError, setUrlError] = useState('')
@@ -34,10 +33,6 @@ const RegisterContent = () => {
     await signIn(type, { callbackUrl: DEFAULT_LOGIN_REDIRECT })
   }
 
-  const goToLoginPage = () => {
-    router.push('/auth/login')
-  }
-
   return (
     <RegisterPage
       title={title}
@@ -53,7 +48,6 @@ const RegisterContent = () => {
       onGoogleProviderSubmit={login}
       onGithubProviderSubmit={login}
       onLinkedinProviderSubmit={login}
-      backFunction={goToLoginPage}
       errorMessage={urlError}
     />
   )

diff --git a/apps/nextjs-app/app/auth/reset-password/page.tsx b/apps/nextjs-app/app/auth/reset-password/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useRouter, useSearchParams } from 'next/navigation'
+import { useSearchParams } from 'next/navigation'
 import React, { Suspense, useEffect, useState } from 'react'
 import ResetPasswordPage from '@repo/ui/templates/auth/v1/ResetPasswordPage'
 import { verifyResetToken } from '../_actions/verify-reset-token'
@@ -10,7 +10,6 @@ import { DataResultProps } from '@repo/ts-types/auth/v1'
 
 const ResetPasswordContent = () => {
 
-    const router = useRouter();
     const [error, setError] = useState<string | undefined>('')
     const [success, setSuccess] = useState<string | undefined>('')
     const searchParams = useSearchParams();
@@ -33,18 +32,14 @@ const ResetPasswordContent = () => {
   const author = 'Late Steve Jobs'
   const credential = 'Ex CEO of Apple Inc.'
 
-  const goToLoginPage = () => {
-    router.push('/auth/login')
-  }
 
   if (error){
     return (
         <ErrorPage
         errorMessage={error}
         quote={quote}
         author={author}
-        credential={credential}
-        backFunction={goToLoginPage}/>
+        credential={credential}/>
     )
   }
   else if (success){
@@ -53,7 +48,6 @@ const ResetPasswordContent = () => {
         errorMessage={error}
         successMessage={success}
         token={token as string}
-        backFunction={goToLoginPage}
         resetFunction={resetPassword}
         title={title}
         description={description}

diff --git a/packages/email/src/templates/ResetPassword.tsx b/packages/email/src/templates/ResetPassword.tsx
@@ -57,9 +57,7 @@ const ResetPassword = ({ resetPasswordLink }: { resetPasswordLink: string }) =>
                   href="mailto:support@bsamaritan.com"
                   className="text-green-500 underline"
                 >
-                  contact us
-                </a>
-                .
+                  contact us</a>.
               </Text>
             </Section>
           </Container>

diff --git a/packages/ts-types/src/auth/v1.ts b/packages/ts-types/src/auth/v1.ts
@@ -33,8 +33,6 @@ export interface LoginCardProps {
     onGoogleProviderSubmit?: any;
     onGithubProviderSubmit?: any;
     onLinkedinProviderSubmit?: any;
-    forgotPasswordFunction?: any;
-    backFunction?:()=>void;
     errorMessage?:string;
   }
 
@@ -48,23 +46,20 @@ export interface RegisterCardProps {
     onGoogleProviderSubmit?: any;
     onGithubProviderSubmit?: any;
     onLinkedinProviderSubmit?: any;
-    backFunction?:() => void;
     errorMessage?:string;
   }
 
 export interface VerificationCardProps {
     errorMessage?:string;  
     successMessage?:string;
     token?: string;
-    backFunction?:() => void;
     resetFunction?:any;
 }
 
 export interface ResetPasswordCardProps {
     errorMessage?:string;  
     successMessage?:string;
     token?: string;
-    backFunction?:() => void;
     resetFunction?:any;
 }
 
@@ -74,12 +69,10 @@ export interface ForgotPasswordCardProps {
     errorMessage?:string;  
     successMessage?:string;
     resetFunction?:any; 
-    backFunction?:() => void;
   }
 
  export interface ErrorCardProps {
     errorMessage?:string;
-    backFunction?:any
   }
 
 //Complex Interfaces for Auth Pages

diff --git a/packages/ui/src/components/organisms/custom/auth/v1/ErrorCard.tsx b/packages/ui/src/components/organisms/custom/auth/v1/ErrorCard.tsx
@@ -2,8 +2,11 @@ import { Card,  CardFooter, CardHeader } from '../../../../molecules/shadcn/card
 import { BsExclamationTriangle } from 'react-icons/bs';
 import { ErrorCardProps } from '@repo/ts-types/auth/v1';
 import { Button } from '../../../../atoms/shadcn/button';
+import { useRouter } from 'next/navigation';
 
-const ErrorCard = ({errorMessage,backFunction}:ErrorCardProps) => {
+const ErrorCard = ({errorMessage}:ErrorCardProps) => {
+
+  const router = useRouter();
 
   return (
     <Card className='w-[400px] bg-white text-black shadow-xl shadow-white/20'>
@@ -14,7 +17,7 @@ const ErrorCard = ({errorMessage,backFunction}:ErrorCardProps) => {
         <div className='text-md font-extralight text-center'>{errorMessage || "Oops! Something went wrong!"}</div>
       </CardHeader>
       <CardFooter className='flex justify-center'>
-        <Button onClick={backFunction} variant={'blank'}
+        <Button onClick={()=>router.push('/auth/login')} variant={'blank'}
         className='text-sm text-center text-black/60 hover:text-black cursor-pointer hover:underline'>
           Back to login
         </Button>

diff --git a/packages/ui/src/components/organisms/custom/auth/v1/ForgotPasswordCard.tsx b/packages/ui/src/components/organisms/custom/auth/v1/ForgotPasswordCard.tsx
@@ -17,8 +17,9 @@ import {
 import { Input } from '../../../../atoms/shadcn/input';
 import { FormResult } from './FormResult';
 import { ForgotPasswordCardProps } from '@repo/ts-types/auth/v1';
+import { useRouter } from 'next/navigation';
 
-const ForgotPasswordCard = ({errorMessage,successMessage,resetFunction,backFunction}
+const ForgotPasswordCard = ({errorMessage,successMessage,resetFunction}
   :ForgotPasswordCardProps
 ) => {
   const form = useForm<z.infer<typeof ForgotPasswordSchema>>({
@@ -44,6 +45,8 @@ const ForgotPasswordCard = ({errorMessage,successMessage,resetFunction,backFunct
     });
   }
 
+  const router = useRouter();
+
   return (
     <Card className='w-[400px] bg-white text-black shadow-xl shadow-white/20'>
       <CardHeader>
@@ -71,7 +74,7 @@ const ForgotPasswordCard = ({errorMessage,successMessage,resetFunction,backFunct
         </Form>
       </CardContent>
       <CardFooter className='flex justify-center'>
-        <Button onClick={backFunction} variant={'blank'}
+        <Button onClick={()=>router.push('/auth/login')} variant={'blank'}
         className='text-sm text-center text-black/60 hover:text-black cursor-pointer hover:underline'>
           Go to Login Page
         </Button>

diff --git a/packages/ui/src/components/organisms/custom/auth/v1/LoginCard.tsx b/packages/ui/src/components/organisms/custom/auth/v1/LoginCard.tsx
@@ -22,7 +22,7 @@ import { LoginCardProps } from '@repo/ts-types/auth/v1';
 import { useRouter } from 'next/navigation';
 
 const LoginCard = ({showEmail,showGoogleProvider,showGithubProvider,showLinkedinProvider,onEmailSubmit,
-  onGoogleProviderSubmit,onGithubProviderSubmit,onLinkedinProviderSubmit,forgotPasswordFunction,backFunction,errorMessage}
+  onGoogleProviderSubmit,onGithubProviderSubmit,onLinkedinProviderSubmit,errorMessage}
   :LoginCardProps
 ) => {
   const form = useForm<z.infer<typeof LoginSchema>>({
@@ -106,7 +106,7 @@ const LoginCard = ({showEmail,showGoogleProvider,showGithubProvider,showLinkedin
                   </FormItem>
                 )}/>
               </div>
-              <button onClick={forgotPasswordFunction} className='text-sm text-left text-black/60 hover:text-black cursor-pointer hover:underline'>Forgot Password</button>
+              <button type="button" onClick={()=>router.push('/auth/forgot-password')} className='text-sm text-left text-black/60 hover:text-black cursor-pointer hover:underline'>Forgot Password</button>
               <FormResult type="error" message={error }/>
               <FormResult type="success" message={success}/>
               <Button className='w-full' disabled={isPending} variant="default" type="submit">Login</Button>
@@ -123,7 +123,7 @@ const LoginCard = ({showEmail,showGoogleProvider,showGithubProvider,showLinkedin
         <Button className='w-full' disabled={isPending} variant="default" onClick={loginAsAdmin}>Login as Admin</Button>
       </CardFooter>
       <CardFooter className='flex justify-center'>
-        <button onClick={backFunction} 
+        <button onClick={()=>router.push('/auth/register')} 
         className='text-sm text-center text-black/60 hover:text-black cursor-pointer hover:underline'>
           Don't have an Account?
         </button>
@@ -132,9 +132,8 @@ const LoginCard = ({showEmail,showGoogleProvider,showGithubProvider,showLinkedin
         <span>
           By signing up, you agree to our <button
             onClick={() => router.push('/landing/terms-of-service')} 
-            className='cursor-pointer text-blue-400 hover:text-blue-800'> Terms of Service 
-          </button> 
-          , <button
+            className='cursor-pointer text-blue-400 hover:text-blue-800'> Terms of Service, </button>
+            <button
             onClick={() => router.push('/landing/privacy-policy')} 
             className='cursor-pointer text-blue-400 hover:text-blue-800'> Privacy Policy.
           </button>

diff --git a/packages/ui/src/components/organisms/custom/auth/v1/RegisterCard.tsx b/packages/ui/src/components/organisms/custom/auth/v1/RegisterCard.tsx
@@ -21,8 +21,7 @@ import { FormResult } from './FormResult';
 import { RegisterCardProps } from '@repo/ts-types/auth/v1';
 import { useRouter } from 'next/navigation';
 const RegisterCard = ({showEmail,showGoogleProvider,showGithubProvider,showLinkedinProvider,
-  onEmailSubmit,onGoogleProviderSubmit,onGithubProviderSubmit,onLinkedinProviderSubmit,backFunction,
-  errorMessage}:RegisterCardProps
+  onEmailSubmit,onGoogleProviderSubmit,onGithubProviderSubmit,onLinkedinProviderSubmit, errorMessage}:RegisterCardProps
 ) => {
   const form = useForm<z.infer<typeof RegisterSchema>>({
     resolver: zodResolver(RegisterSchema),
@@ -99,17 +98,16 @@ const RegisterCard = ({showEmail,showGoogleProvider,showGithubProvider,showLinke
         {showLinkedinProvider && <Button onClick={onLinkedinProviderSubmit} variant='secondary' className="w-full"><FaLinkedin/></Button>}
       </CardFooter>
       <CardFooter className='flex justify-center'>
-        <button onClick={backFunction} className='text-sm text-center text-black/60 hover:text-black cursor-pointer hover:underline'>
+        <button onClick={()=>router.push('/auth/login')} className='text-sm text-center text-black/60 hover:text-black cursor-pointer hover:underline'>
           Already have an Account!
         </button>
       </CardFooter>
       <CardFooter className='text-description text-wrap mx-2 text-center'>
         <span>
           By signing up, you agree to our <button
             onClick={() => router.push('/landing/terms-of-service')} 
-            className='cursor-pointer text-blue-400 hover:text-blue-800'> Terms of Service 
-          </button> 
-          , <button
+            className='cursor-pointer text-blue-400 hover:text-blue-800'> Terms of Service, </button> 
+          <button
             onClick={() => router.push('/landing/privacy-policy')} 
             className='cursor-pointer text-blue-400 hover:text-blue-800'> Privacy Policy.
           </button>