Merge branch 'develop-nextjs' of github.com:credebl/studio into fix/deno

Author: sanjaykhondal-aw

nextjs/src/app/reset-password/PasswordSuggestionBox.tsx

@@ -71,7 +71,7 @@ const PasswordSuggestionBox = ({
 
   return (
     <div className="mt-4 ml-6">
-      <div className="absolute z-10 flex justify-end rounded-sm bg-white px-6 py-4 text-xs shadow-lg shadow-gray-500/50">
+      <div className="absolute z-10 flex justify-end rounded-sm bg-popover px-6 py-4 text-xs shadow-lg shadow-gray-500/50">
         {show === true ? (
           <>
             {restrictedChar ? (

nextjs/src/app/reset-password/ResetPassword.tsx

@@ -120,12 +120,12 @@ const ResetPassword = (): JSX.Element => {
               </div>
               <div className="flex grow-1 p-10">
                 <div className="flex w-full justify-center">
-                  <Card className="bg-card border-border relative z-10 w-full max-w-lg overflow-hidden rounded-xl border p-8 p-10 shadow-xl transition-transform duration-300 lg:max-w-md">
+                  <Card className="relative z-10 w-full max-w-lg overflow-hidden rounded-xl border p-8 shadow-xl transition-transform duration-300 lg:max-w-md">
                     <div className="flex w-full flex-col gap-4 lg:mt-8">
                       <div className="text-custom-900 dark:text-custom-100 font-inter flex justify-center text-center text-3xl leading-10 font-bold">
                         Reset Password
                       </div>
-                      <div className="font-inter h-5.061 text-secondary-foreground flex w-84 w-full flex-shrink-0 flex-col items-center justify-center text-base leading-5 font-medium">
+                      <div className="font-inter h-5.061 text-muted-foreground flex w-full flex-shrink-0 flex-col items-center justify-center text-base leading-5 font-medium">
                         Please set new password
                       </div>
                     </div>
@@ -178,29 +178,30 @@ const ResetPassword = (): JSX.Element => {
                                   {...formikHandlers.getFieldProps('password')}
                                   type={passwordVisible ? 'text' : 'password'}
                                   placeholder="Please enter password"
-                                  className="bg-accent w-full truncate rounded-md border py-2 pr-10 pl-4 text-sm text-gray-700 focus:ring-1 focus:outline-none dark:bg-gray-800"
+                                  className=""
                                   disabled={loading}
                                   onFocus={() => setShowSuggestion(true)}
                                   onBlur={(e) => {
                                     setShowSuggestion(false)
                                     formikHandlers.handleBlur(e)
                                   }}
                                 />
-                                <button
+                                <Button
                                   type="button"
                                   onClick={() =>
                                     setPasswordVisible(
                                       (prevVisible) => !prevVisible,
                                     )
                                   }
-                                  className="text-secondary-foreground absolute top-1/2 right-2 -translate-y-1/2 transform bg-transparent hover:text-gray-800 dark:text-white dark:hover:text-white"
+                                  className="absolute top-1/2 right-2 -translate-y-1/2 transform bg-transparent hover:bg-transparent hover:text-inherit"
+                                  variant={'ghost'}
                                 >
                                   {passwordVisible ? (
                                     <EyeOff className="h-4 w-4" />
                                   ) : (
                                     <Eye className="h-4 w-4" />
                                   )}
-                                </button>
+                                </Button>
                               </div>
                               {showSuggestion &&
                                 formikHandlers?.errors?.password &&
@@ -235,29 +236,30 @@ const ResetPassword = (): JSX.Element => {
                                     confirmPasswordVisible ? 'text' : 'password'
                                   }
                                   placeholder="Please re-enter password"
-                                  className="bg-accent w-full truncate rounded-md border py-2 pr-10 pl-4 text-sm text-gray-700 focus:ring-1 focus:outline-none dark:bg-gray-800"
+                                  className=""
                                   disabled={loading}
                                   onFocus={() => setShowSuggestion(true)}
                                   onBlur={(e) => {
                                     setShowSuggestion(false)
                                     formikHandlers.handleBlur(e)
                                   }}
                                 />
-                                <button
+                                <Button
                                   type="button"
                                   onClick={() =>
                                     setConfirmPasswordVisible(
                                       (prevVisible) => !prevVisible,
                                     )
                                   }
-                                  className="text-secondary-foreground absolute top-1/2 right-2 -translate-y-1/2 transform bg-transparent hover:text-gray-800 dark:text-white dark:hover:text-white"
+                                  className="absolute top-1/2 right-2 -translate-y-1/2 transform bg-transparent hover:bg-transparent hover:text-inherit"
+                                  variant={'ghost'}
                                 >
                                   {confirmPasswordVisible ? (
                                     <EyeOff className="h-4 w-4" />
                                   ) : (
                                     <Eye className="h-4 w-4" />
                                   )}
-                                </button>
+                                </Button>
                               </div>
                               {formikHandlers?.errors?.confirmPassword &&
                                 formikHandlers?.touched?.confirmPassword && (

nextjs/src/config/svgs/Auth.tsx

@@ -0,0 +1,23 @@
+import { JSX } from 'react'
+
+type IconProps = React.HTMLAttributes<SVGElement>
+
+export const Icons = {
+  gitHub: (props: IconProps): JSX.Element => (
+    <svg role="img" aria-label="GitHub logo" viewBox="0 0 438.549 438.549" {...props}>
+      <path
+        fill="currentColor"
+        d="M409.132 114.573c-19.608-33.596-46.205-60.194-79.798-79.8-33.598-19.607-70.277-29.408-110.063-29.408-39.781 0-76.472 9.804-110.063 29.408-33.596 19.605-60.192 46.204-79.8 79.8C9.803 148.168 0 184.854 0 224.63c0 47.78 13.94 90.745 41.827 128.906 27.884 38.164 63.906 64.572 108.063 79.227 5.14.954 8.945.283 11.419-1.996 2.475-2.282 3.711-5.14 3.711-8.562 0-.571-.049-5.708-.144-15.417a2549.81 2549.81 0 01-.144-25.406l-6.567 1.136c-4.187.767-9.469 1.092-15.846 1-6.374-.089-12.991-.757-19.842-1.999-6.854-1.231-13.229-4.086-19.13-8.559-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-.951-2.568-2.098-3.711-3.429-1.142-1.331-1.997-2.663-2.568-3.997-.572-1.335-.098-2.43 1.427-3.289 1.525-.859 4.281-1.276 8.28-1.276l5.708.853c3.807.763 8.516 3.042 14.133 6.851 5.614 3.806 10.229 8.754 13.846 14.842 4.38 7.806 9.657 13.754 15.846 17.847 6.184 4.093 12.419 6.136 18.699 6.136 6.28 0 11.704-.476 16.274-1.423 4.565-.952 8.848-2.383 12.847-4.285 1.713-12.758 6.377-22.559 13.988-29.41-10.848-1.14-20.601-2.857-29.264-5.14-8.658-2.286-17.605-5.996-26.835-11.14-9.235-5.137-16.896-11.516-22.985-19.126-6.09-7.614-11.088-17.61-14.987-29.979-3.901-12.374-5.852-26.648-5.852-42.826 0-23.035 7.52-42.637 22.557-58.817-7.044-17.318-6.379-36.732 1.997-58.24 5.52-1.715 13.706-.428 24.554 3.853 10.85 4.283 18.794 7.952 23.84 10.994 5.046 3.041 9.089 5.618 12.135 7.708 17.705-4.947 35.976-7.421 54.818-7.421s37.117 2.474 54.823 7.421l10.849-6.849c7.419-4.57 16.18-8.758 26.262-12.565 10.088-3.805 17.802-4.853 23.134-3.138 8.562 21.509 9.325 40.922 2.279 58.24 15.036 16.18 22.559 35.787 22.559 58.817 0 16.178-1.958 30.497-5.853 42.966-3.9 12.471-8.941 22.457-15.125 29.979-6.191 7.521-13.901 13.85-23.131 18.986-9.232 5.14-18.182 8.85-26.84 11.136-8.662 2.286-18.415 4.004-29.263 5.146 9.894 8.562 14.842 22.077 14.842 40.539v60.237c0 3.422 1.19 6.279 3.572 8.562 2.379 2.279 6.136 2.95 11.276 1.995 44.163-14.653 80.185-41.062 108.068-79.226 27.88-38.161 41.825-81.126 41.825-128.906-.01-39.771-9.818-76.454-29.414-110.049z"
+      ></path>
+    </svg>
+  ),
+
+  google: (props: IconProps): JSX.Element => (
+    <svg role="img" aria-label="Google logo" viewBox="0 0 24 24" {...props}>
+      <path
+        fill="currentColor"
+        d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"
+      />
+    </svg>
+  ),
+}

nextjs/src/features/auth/components/user-auth-form.tsx

@@ -5,7 +5,6 @@ import * as z from 'zod'
 import {
   Eye,
   EyeOff,
-  Github,
   KeyRound,
   Loader2,
   LockKeyhole,
@@ -26,6 +25,7 @@ import {
   passwordEncryption,
 } from '@/app/api/Auth'
 import React, { useState } from 'react'
+import { ToastContainer, toast } from 'react-toastify'
 import {
   generateAuthenticationOption,
   verifyAuthentication,
@@ -35,14 +35,13 @@ import { setRefreshToken, setToken } from '@/lib/authSlice'
 import { AxiosResponse } from 'axios'
 import { Button } from '@/components/ui/button'
 import { IVerifyRegistrationObj } from '@/components/profile/interfaces'
-import Image from 'next/image'
+import { Icons } from '@/config/svgs/Auth'
 import { Input } from '@/components/ui/input'
 import Link from 'next/link'
 import { apiStatusCodes } from '@/config/CommonConstant'
 import { setProfile } from '@/lib/profileSlice'
 import { signIn } from 'next-auth/react'
 import { startAuthentication } from '@simplewebauthn/browser'
-import { toast } from 'sonner'
 import { useDispatch } from 'react-redux'
 import { useForm } from 'react-hook-form'
 import { useRouter } from 'next/navigation'
@@ -287,21 +286,22 @@ export default function SignInViewPage(): React.JSX.Element {
 
   return (
     <div className="relative flex w-full items-center justify-center">
+      <ToastContainer />
       <div className="bg-card border-border relative z-10 h-full w-full max-w-md overflow-hidden rounded-xl border p-8 shadow-xl transition-transform duration-300">
         <div className="mb-6 text-center">
           <p className="text-muted-foreground text-sm">
             Sign in to your account to continue
           </p>
         </div>
 
-        <div className="bg-muted mb-4 flex overflow-hidden rounded-md text-sm font-medium">
+        <div className="bg-muted mb-4 flex overflow-hidden rounded-md p-1 text-sm font-medium">
           <Button
             type="button"
             variant="ghost"
-            className={`flex flex-1 items-center justify-center gap-1 px-4 py-2 ${
+            className={`flex flex-1 items-center justify-center gap-1 px-4 py-2 hover:text-inherit ${
               isPasswordTab
-                ? 'bg-muted text-muted-foreground'
-                : 'bg-card text-foreground'
+                ? 'bg-card text-foreground hover:bg-background'
+                : 'bg-muted text-muted-foreground hover:bg-transparent'
             }`}
             onClick={() => setIsPasswordTab(true)}
           >
@@ -311,10 +311,10 @@ export default function SignInViewPage(): React.JSX.Element {
           <Button
             type="button"
             variant="ghost"
-            className={`flex flex-1 items-center justify-center gap-1 px-4 py-2 ${
+            className={`flex flex-1 items-center justify-center gap-1 px-4 py-2 hover:text-inherit ${
               !isPasswordTab
-                ? 'bg-muted text-muted-foreground'
-                : 'bg-card text-foreground'
+                ? 'bg-card text-foreground hover:bg-background'
+                : 'bg-muted text-muted-foreground hover:bg-transparent'
             }`}
             onClick={() => setIsPasswordTab(false)}
           >
@@ -389,8 +389,8 @@ export default function SignInViewPage(): React.JSX.Element {
                 <Button
                   type="button"
                   onClick={forgotUserPassword}
-                  variant={'secondary'}
-                  className="text-secondary-foreground cursor-pointer bg-transparent shadow-none hover:bg-transparent hover:underline"
+                  variant={'default'}
+                  className="focus-visible:ring-ring text-foreground w-fit bg-transparent px-2 text-left underline-offset-4 shadow-none hover:bg-transparent hover:underline focus-visible:ring-1 focus-visible:outline-none disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0"
                 >
                   Forgot password?
                 </Button>
@@ -411,24 +411,21 @@ export default function SignInViewPage(): React.JSX.Element {
             <div className="mt-6 flex flex-col gap-3">
               <Button
                 type="button"
-                className="flex w-full items-center justify-center gap-3 rounded-md border border-[var(--color-gray-300)] bg-[var(--color-white)] py-2 text-sm font-medium text-[var(--color-gray-700)] transition-all duration-200 hover:bg-[var(--color-gray-50)] hover:shadow-sm"
+                className=""
                 onClick={() => route.push('#')}
+                variant={'outline'}
               >
-                <Image
-                  src="https://www.gstatic.com/firebasejs/ui/2.0.0/images/auth/google.svg"
-                  alt="Google"
-                  width={15}
-                  height={15}
-                />
+                <Icons.google className="mr-2 h-4 w-4" />
                 Sign in with Google
               </Button>
 
               <Button
                 type="button"
-                className="flex w-full items-center justify-center gap-2 rounded-md bg-[var(--color-black)] text-[var(--color-white)] transition-transform duration-200 hover:-translate-y-0.5 hover:bg-[var(--color-gray-800)] active:scale-95"
+                className=""
                 onClick={() => route.push('#')}
+                variant={'outline'}
               >
-                <Github className="h-5 w-5" />
+                <Icons.gitHub className="mr-2 h-4 w-4" />
                 <span className="text-sm font-medium">Sign in with GitHub</span>
               </Button>
             </div>
@@ -439,7 +436,7 @@ export default function SignInViewPage(): React.JSX.Element {
               </span>
               <Link
                 href="/auth/sign-up"
-                className="text-secondary hover:underline"
+                className="text-muted-foreground hover:text-inherit hover:underline"
               >
                 Create one
               </Link>