Redux removed: �✔ working fine

sinanptm · Aug 27, 2024 · de83fac · de83fac · vercel · Aug 27, 2024
1 parent 8a4c673
commit de83fac
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 445 deletions.
diff --git a/client/app/(patient)/signin/otp-verification/page.tsx b/client/app/(patient)/signin/otp-verification/page.tsx
@@ -1,25 +1,16 @@
 "use client";
 import OtpVerificationSection from "@/components/forms/OtpForms";
-import { useVerifyOtpMutation } from "@/lib/features/api/authApi";
 import Image from "next/image";
 import React, { FormEvent, useState } from "react";
-import { useSelector } from "react-redux";
-import {RootState} from '@/lib/store'
-
 const OtpVerificationPage = () => {
-   const [otp,setOtp] = useState('')
-   const [verifyOtp, { isLoading , data}] = useVerifyOtpMutation();
-   const email = useSelector((state:RootState)=>state.auth.token) as string
+   const [otp, setOtp] = useState("");
+   const [isLoading, setLoading] = useState(false);
 
    const handleVerify = async (e: FormEvent) => {
       e.preventDefault();
       try {
-         await verifyOtp({otp: parseInt(otp),email});
-         console.log(data);
-
       } catch (error) {
          console.log(error);
-
       }
    };
 
@@ -44,7 +35,6 @@ const OtpVerificationPage = () => {
                   isLoading={isLoading}
                   timer={30}
                />
-
             </div>
          </section>
 

diff --git a/client/app/StoreProvider.tsx b/client/app/StoreProvider.tsx
diff --git a/client/app/layout.tsx b/client/app/layout.tsx
@@ -3,7 +3,6 @@ import { Plus_Jakarta_Sans } from "next/font/google";
 import "../styles/globals.css";
 import { cn } from "@/lib/utils";
 import { ThemeProvider } from "@/components/ThemeProvider";
-import { StoreProvider } from "./StoreProvider";
 import NavBar from "@/components/NavBar";
 import Footer from "@/components/Footer";
 import { Toaster } from "@/components/ui/toaster";
@@ -31,14 +30,12 @@ export default function RootLayout({
    return (
       <html lang="en" suppressHydrationWarning>
          <body className={cn("min-h-[600px] bg-dark-300 font-sans antialiased", inter.variable)}>
-            <StoreProvider>
                <ThemeProvider attribute="class" defaultTheme="dark">
                   <NavBar />
                   <Toaster />
                   {children}
                   <Footer />
                </ThemeProvider>
-            </StoreProvider>
          </body>
       </html>
    );

diff --git a/client/app/staff/@signin/otp-verification/page.tsx b/client/app/staff/@signin/otp-verification/page.tsx
@@ -1,22 +1,16 @@
 'use client'
 import OtpForm from "@/components/forms/OtpForms";
-import { useVerifyOtpMutation } from "@/lib/features/api/authApi";
-import { RootState } from "@/lib/store";
 import Image from "next/image";
 import Link from "next/link";
 import { FormEvent, useState } from "react";
-import { useSelector } from "react-redux";
 
 const OtpVerificationPage = () => {
    const [otp,setOtp] = useState('')
-   const [verifyOtp, { isLoading , data}] = useVerifyOtpMutation();
-   const email = useSelector((state:RootState)=>state.auth.token) as string
-
+   const [isLoading,setLoading] = useState(false)
    const handleVerify = async (e: FormEvent) => {
       e.preventDefault();
       try {
-         await verifyOtp({otp: parseInt(otp),email});
-         console.log(data);
+
 
       } catch (error) {
          console.log(error);

diff --git a/client/app/staff/@signin/page.tsx b/client/app/staff/@signin/page.tsx
@@ -1,4 +1,3 @@
-"use server";
 import SigninForm from "@/components/forms/admin/SigninForm";
 import Image from "next/image";
 import Link from "next/link";

diff --git a/client/components/forms/OtpForms.tsx b/client/components/forms/OtpForms.tsx
@@ -1,48 +1,39 @@
 "use client";
 
-import { FormEvent, useState} from "react";
-import {
-  InputOTP,
-  InputOTPGroup,
-  InputOTPSlot,
-} from "@/components/ui/input-otp";
+import { FormEvent } from "react";
+import { InputOTP, InputOTPGroup, InputOTPSlot } from "@/components/ui/input-otp";
 import { Otptimer } from "otp-timer-ts";
 import { OtpFromProps } from "@/types/fromTypes";
 import SubmitButton from "../utils/SubmitButton";
 
-export default function OtpVerificationSection({handleVerify,handleResend,timer,isLoading,otp,setOtp}:OtpFromProps) {
-
-  return (
-    <form className="space-y-6 flex-1" onSubmit={(e:FormEvent)=>handleVerify(e)}>
-      <section className="mb-12 space-y-4">
-        <h1 className="header">OTP Verification </h1>
-        <p className="text-dark-700">
-          Please enter the OTP sent to your registered mobile number.
-        </p>
-      </section>
-      <InputOTP
-        maxLength={6}
-        value={otp}
-        onChange={value => setOtp(value)}
-        className="mb-6"
-      >
-        <InputOTPGroup className="shad-otp">
-          <InputOTPSlot index={0} className="shad-otp-slot" />
-          <InputOTPSlot index={1} className="shad-otp-slot" />
-          <InputOTPSlot index={2} className="shad-otp-slot" />
-          <InputOTPSlot index={3} className="shad-otp-slot" />
-          <InputOTPSlot index={4} className="shad-otp-slot" />
-          <InputOTPSlot index={5} className="shad-otp-slot" />
-        </InputOTPGroup>
-      </InputOTP>
-      <div className="mt-4 mb-5 flex justify-between items-center">
-        <Otptimer seconds={timer} onResend={handleResend} />
-      </div>
-      <SubmitButton
-        isLoading={isLoading}
-      >
-        Verify OTP
-      </SubmitButton>
-    </form>
-  );
+export default function OtpVerificationSection({
+   handleVerify,
+   handleResend,
+   timer,
+   isLoading,
+   otp,
+   setOtp,
+}: OtpFromProps) {
+   return (
+      <form className="space-y-6 flex-1" onSubmit={(e: FormEvent) => handleVerify(e)}>
+         <section className="mb-12 space-y-4">
+            <h1 className="header">OTP Verification </h1>
+            <p className="text-dark-700">Please enter the OTP sent to your registered mobile number.</p>
+         </section>
+         <InputOTP maxLength={6} value={otp} onChange={(value) => setOtp(value)} className="mb-6">
+            <InputOTPGroup className="shad-otp">
+               <InputOTPSlot index={0} className="shad-otp-slot" />
+               <InputOTPSlot index={1} className="shad-otp-slot" />
+               <InputOTPSlot index={2} className="shad-otp-slot" />
+               <InputOTPSlot index={3} className="shad-otp-slot" />
+               <InputOTPSlot index={4} className="shad-otp-slot" />
+               <InputOTPSlot index={5} className="shad-otp-slot" />
+            </InputOTPGroup>
+         </InputOTP>
+         <div className="mt-4 mb-5 flex justify-between items-center">
+            <Otptimer seconds={timer} onResend={handleResend} />
+         </div>
+         <SubmitButton isLoading={isLoading}>Verify OTP</SubmitButton>
+      </form>
+   );
 }
diff --git a/client/components/forms/RegistrationForm.tsx b/client/components/forms/RegistrationForm.tsx
@@ -16,7 +16,6 @@ import { SelectItem } from "../ui/select";
 
 const RegistrationForm = () => {
    const [isLoading, setIsLoading] = useState<boolean>(false);
-   // const [login] = useLoginMutation();
    const form = useForm<z.infer<typeof registerFormValidation>>({
       resolver: zodResolver(registerFormValidation),
       defaultValues: {
@@ -38,17 +37,6 @@ const RegistrationForm = () => {
          console.log(values);
          setIsLoading(false);
       }, 2000);
-      // try {
-      //   const user = await login({
-      //     phone: values.phone,
-      //     password: values.password,
-      //   }).unwrap();
-
-      //   console.log("Login successful:", user);
-      // } catch (error) {
-      //   console.error("Failed to log in:", error);
-      // } finally {
-      // }
    };
 
    return (
@@ -72,20 +60,16 @@ const RegistrationForm = () => {
                   control={form.control}
                   name="gender"
                   label="Gender  *"
-                  renderSkeleton={field => (
+                  renderSkeleton={(field) => (
                      <FormControl>
                         <RadioGroup
                            className="flex h-11 gap-6 xl:justify-between"
                            onValueChange={field.onChange}
-                           defaultValue={field.value}
-                        >
+                           defaultValue={field.value}>
                            {GenderOptions.map((option, i) => (
                               <div key={option} className="radio-group">
                                  <RadioGroupItem value={option} id={option} />
-                                 <Label
-                                    htmlFor={option}
-                                    className="cursor-pointer"
-                                 >
+                                 <Label htmlFor={option} className="cursor-pointer">
                                     {option}
                                  </Label>
                               </div>
@@ -101,8 +85,7 @@ const RegistrationForm = () => {
                   control={form.control}
                   name="bloodType"
                   label="Your blood type  *"
-                  placeholder="Select blood type"
-               >
+                  placeholder="Select blood type">
                   {BloodTypes.map((blood, i) => (
                      <SelectItem key={blood + i} value={blood}>
                         <div className="flex cursor-pointer items-center gap-2">
@@ -117,8 +100,7 @@ const RegistrationForm = () => {
                   control={form.control}
                   name="disease"
                   label="Primary Disease  *"
-                  placeholder="Select a disease"
-               >
+                  placeholder="Select a disease">
                   {DiseaseOptions.map((disease, i) => (
                      <SelectItem key={disease + i} value={disease}>
                         <div className="flex cursor-pointer items-center gap-2">

diff --git a/client/components/forms/SigninForm.tsx b/client/components/forms/SigninForm.tsx
@@ -10,18 +10,14 @@ import SubmitButton from "@/components/utils/SubmitButton";
 import { signinFormValidation } from "@/lib/validators/userValidation";
 import Link from "next/link";
 import { FormFieldType } from "@/types/fromTypes";
-import { useSignInMutation } from "@/lib/features/api/authApi";
 import { useToast } from "../ui/use-toast";
 import { useRouter } from "next/navigation";
-import { useDispatch } from "react-redux";
-import { setCredentials } from "@/lib/features/slices/authSlice";
 
 const LoginForm = () => {
-   const [signIn, { isLoading: isPosting, data, error: signinError }] = useSignInMutation();
    const [error, setError] = useState("");
    const { toast } = useToast();
    const router = useRouter();
-   const dispatch = useDispatch();
+   const [isLoading,setLoading] = useState(false);
 
    const form = useForm<z.infer<typeof signinFormValidation>>({
       resolver: zodResolver(signinFormValidation),
@@ -33,20 +29,14 @@ const LoginForm = () => {
 
    const onSubmit = async (values: z.infer<typeof signinFormValidation>) => {
       try {
-         const result = await signIn(values).unwrap();
-         console.log(result);
-
-         dispatch(setCredentials({token:result.email}));
-         router.push("/signin/otp-verification");
          toast({
             title: "OTP Verification",
             description: "Please check your email for the OTP.",
             variant: "default",
          });
+         router.push('/signin/otp-verification')
       } catch (error: any) {
          setError(error.data?.message || "An error occurred during sign-in.");
-         console.log(error);
-
          toast({
             title: "Sign-In Failed",
             description: error.data?.message || "Please try again.",
@@ -87,7 +77,7 @@ const LoginForm = () => {
 
             {error && <p className="text-red-500 text-sm mt-2">{error}</p>}
 
-            <SubmitButton isLoading={isPosting}>Sign In</SubmitButton>
+            <SubmitButton isLoading={isLoading}>Sign In</SubmitButton>
          </form>
       </Form>
    );

diff --git a/client/components/forms/SignupForm.tsx b/client/components/forms/SignupForm.tsx
@@ -8,7 +8,6 @@ import { Form } from "@/components/ui/form";
 import CustomFormField from "@/components/utils/CustomFormField";
 import SubmitButton from "@/components/utils/SubmitButton";
 import { signupFormValidation } from "@/lib/validators/userValidation";
-import { useSignUpMutation } from "@/lib/features/api/authApi";
 import { FormFieldType } from "@/types/fromTypes";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
@@ -19,6 +18,7 @@ const RegistrationForm = () => {
    const [error, setError] = useState<string>("");
    const router = useRouter();
    const { toast } = useToast();
+   const [isLoading, setLoading] = useState(false);
 
    const form = useForm<z.infer<typeof signupFormValidation>>({
       resolver: zodResolver(signupFormValidation),
@@ -31,11 +31,8 @@ const RegistrationForm = () => {
       },
    });
 
-   const [signUp, { isLoading: isPosting, data: response, error: signUpError }] = useSignUpMutation();
-
    const onSubmit = async (formData: z.infer<typeof signupFormValidation>) => {
       try {
-         await signUp(formData).unwrap();
          toast({
             title: "Registration Successful",
             description: "You have successfully registered. Please sign in.",
@@ -120,7 +117,7 @@ const RegistrationForm = () => {
 
             {error && <p className="text-red-500 text-sm mt-2">{error}</p>}
 
-            <SubmitButton isLoading={isPosting}>Sign Up</SubmitButton>
+            <SubmitButton isLoading={isLoading}>Sign Up</SubmitButton>
          </form>
       </Form>
    );

diff --git a/client/components/utils/SearchInput.tsx b/client/components/utils/SearchInput.tsx