mdazfar2 · mdazfar2 · Oct 18, 2024 · Oct 17, 2024 · Oct 17, 2024 · Oct 17, 2024
diff --git a/app/About/page.tsx → app/(Customer)/About/page.tsx b/app/About/page.tsx → app/(Customer)/About/page.tsx
diff --git a/app/Blog/[blogId]/page.tsx → app/(Customer)/Blog/[blogId]/page.tsx b/app/Blog/[blogId]/page.tsx → app/(Customer)/Blog/[blogId]/page.tsx
diff --git a/app/Blog/page.tsx → app/(Customer)/Blog/page.tsx b/app/Blog/page.tsx → app/(Customer)/Blog/page.tsx
diff --git a/app/Cart/components/cart-item.tsx → app/(Customer)/Cart/components/cart-item.tsx b/app/Cart/components/cart-item.tsx → app/(Customer)/Cart/components/cart-item.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { orderItemProps } from "@/app/MyOrders/components/orderItem";
+import { orderItemProps } from "@/app/(Customer)/MyOrders/components/orderItem";
 import Image from "next/image";
 
 

diff --git a/app/Cart/components/summary.tsx → app/(Customer)/Cart/components/summary.tsx b/app/Cart/components/summary.tsx → app/(Customer)/Cart/components/summary.tsx
diff --git a/app/Cart/loading.tsx → app/(Customer)/Cart/loading.tsx b/app/Cart/loading.tsx → app/(Customer)/Cart/loading.tsx
diff --git a/app/Cart/page.tsx → app/(Customer)/Cart/page.tsx b/app/Cart/page.tsx → app/(Customer)/Cart/page.tsx
diff --git a/app/Categories/page.tsx → app/(Customer)/Categories/page.tsx b/app/Categories/page.tsx → app/(Customer)/Categories/page.tsx
diff --git a/app/Contact/page.tsx → app/(Customer)/Contact/page.tsx b/app/Contact/page.tsx → app/(Customer)/Contact/page.tsx
diff --git a/app/MyOrders/[orderId]/page.tsx → app/(Customer)/MyOrders/[orderId]/page.tsx b/app/MyOrders/[orderId]/page.tsx → app/(Customer)/MyOrders/[orderId]/page.tsx
diff --git a/app/MyOrders/components/columns.tsx → ...Customer)/MyOrders/components/columns.tsx b/app/MyOrders/components/columns.tsx → ...Customer)/MyOrders/components/columns.tsx
diff --git a/app/MyOrders/components/datatable.tsx → ...stomer)/MyOrders/components/datatable.tsx b/app/MyOrders/components/datatable.tsx → ...stomer)/MyOrders/components/datatable.tsx
diff --git a/app/MyOrders/components/orderCard.tsx → ...stomer)/MyOrders/components/orderCard.tsx b/app/MyOrders/components/orderCard.tsx → ...stomer)/MyOrders/components/orderCard.tsx
diff --git a/app/MyOrders/components/orderItem.tsx → ...stomer)/MyOrders/components/orderItem.tsx b/app/MyOrders/components/orderItem.tsx → ...stomer)/MyOrders/components/orderItem.tsx
diff --git a/app/MyOrders/page.tsx → app/(Customer)/MyOrders/page.tsx b/app/MyOrders/page.tsx → app/(Customer)/MyOrders/page.tsx
@@ -242,7 +242,7 @@ const Orders = () => {
     } else {
       setIsFirstRender(false);
     }
-  }, [currentPage]);
+  }, [isFirstRender,currentPage]);
 
   return (
     <div className="h-full mb-10  dark:bg-DarkGray">

diff --git a/app/Teams/page.tsx → app/(Customer)/Teams/page.tsx b/app/Teams/page.tsx → app/(Customer)/Teams/page.tsx
@@ -2,6 +2,7 @@
 const Teams = () => {
   return (
     <></>
+    // Dont remove the comments below!
     // <div className="h-full pb-20  dark:bg-DarkGray">
     //   <div className="h-full">
     //     <div className="text-white flex items-center justify-center  bg-customTeal dark:bg-gradient-to-r from-Green to-Yellow h-full mb-20 p-24">

diff --git a/app/WishList/components/wishlistItem.tsx → ...mer)/WishList/components/wishlistItem.tsx b/app/WishList/components/wishlistItem.tsx → ...mer)/WishList/components/wishlistItem.tsx
diff --git a/app/WishList/page.tsx → app/(Customer)/WishList/page.tsx b/app/WishList/page.tsx → app/(Customer)/WishList/page.tsx
diff --git a/app/(authFE)/components/loginPage.tsx → app/(Customer)/auth/components/loginPage.tsx b/app/(authFE)/components/loginPage.tsx → app/(Customer)/auth/components/loginPage.tsx
diff --git a/app/(authFE)/components/signupPage.tsx → ...(Customer)/auth/components/signupPage.tsx b/app/(authFE)/components/signupPage.tsx → ...(Customer)/auth/components/signupPage.tsx
diff --git a/app/(authFE)/login/page.tsx → app/(Customer)/auth/customer/page.tsx b/app/(authFE)/login/page.tsx → app/(Customer)/auth/customer/page.tsx
diff --git a/app/fonts/GeistMonoVF.woff → app/(Customer)/fonts/GeistMonoVF.woff b/app/fonts/GeistMonoVF.woff → app/(Customer)/fonts/GeistMonoVF.woff
diff --git a/app/fonts/GeistVF.woff → app/(Customer)/fonts/GeistVF.woff b/app/fonts/GeistVF.woff → app/(Customer)/fonts/GeistVF.woff
diff --git a/app/(Customer)/layout.tsx b/app/(Customer)/layout.tsx
@@ -0,0 +1,18 @@
+import Footer from "@/components/footer";
+import Navbar from "@/components/Navbar/navbar";
+
+export default function Layout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    // <body>
+    <>
+      <Navbar />
+      {children}
+      <Footer />
+      </>
+    // {/* </body> */}
+  );
+}
diff --git a/app/page.tsx → app/(Customer)/page.tsx b/app/page.tsx → app/(Customer)/page.tsx
diff --git a/app/shops/[shopCategory]/page.tsx → app/(Customer)/shops/[shopCategory]/page.tsx b/app/shops/[shopCategory]/page.tsx → app/(Customer)/shops/[shopCategory]/page.tsx
diff --git a/app/shops/page.tsx → app/(Customer)/shops/page.tsx b/app/shops/page.tsx → app/(Customer)/shops/page.tsx
diff --git a/app/(Seller)/auth/components/loginPage.tsx b/app/(Seller)/auth/components/loginPage.tsx
@@ -0,0 +1,145 @@
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/spinner";
+import { Eye, EyeOff, Mail, User } from "lucide-react";
+import { signIn, useSession } from "next-auth/react";
+import { useState } from "react";
+import toast from "react-hot-toast";
+
+interface LoginPageProps {
+  switchCss: boolean;
+  setSwitchCss: (value: boolean) => void;
+  isResetOpen: boolean;
+  setIsResetOpen: (value: boolean) => void;
+  loading: boolean;
+  setError: (value: string) => void;
+  setloading: (value: boolean) => void;
+}
+
+const LoginPage: React.FC<LoginPageProps> = ({
+  switchCss,
+  setSwitchCss,
+  isResetOpen,
+  setIsResetOpen,
+  loading,
+  setloading,
+  setError,
+}) => {
+  const session = useSession();
+
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+
+  const [showPassword, setShowPassword] = useState(false);
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    setloading(true);
+    e.preventDefault();
+
+    const result = await signIn("credentials", {
+      email,
+      password,
+      redirect: false,
+    });
+    console.log(result);
+    if (result?.error) setError("Invalid email or password");
+    else {
+      toast.success(`Welcome ${session.data?.user?.name}`);
+      window.location.href = "/"; // Redirect on success
+    }
+    setloading(false);
+  };
+
+  return (
+    <>
+      {switchCss && !isResetOpen && (
+        <div className="flex flex-col z-10 items-center justify-start pt-24  pr-14 gap-4 w-2/4">
+          <div className="font-nunito text-4xl text-customTeal dark:text-Green font-extrabold">
+            Login
+          </div>
+          <form
+            // closed login button
+            onSubmit={handleSubmit}
+            className="w-full flex dark:text-gray-200 flex-col items-center gap-4"
+          >
+            <div className="flex items-center w-4/5 justify-center">
+              <Input
+                className="rounded-full"
+                type="email"
+                placeholder="Email"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+              />
+              <User className="h-7 w-7 text-customTeal dark:text-Yellow" />
+            </div>
+            <div className="flex items-center w-4/5 justify-center">
+              <Input
+                className="rounded-full"
+                type={showPassword ? "text" : "password"}
+                placeholder="Password"
+                value={password}
+                onChange={(e) => setPassword(e.target.value)}
+              />
+              <div
+                className=" cursor-pointer"
+                onClick={() => setShowPassword(!showPassword)}
+              >
+                {showPassword ? (
+                  <EyeOff className="h-7 w-7 text-customTeal dark:text-Yellow" />
+                ) : (
+                  <Eye className="h-7 w-7 text-customTeal dark:text-Yellow" />
+                )}
+              </div>
+            </div>
+            <Button
+              type="submit"
+                disabled
+              // disabled={loading}
+              className="rounded-full bg-customTeal dark:bg-Green font-bold h-10 w-4/5 disabled"
+            >
+              {loading ? <Spinner /> : "Login"}
+            </Button>
+          </form>
+          <div
+            className="text-customTeal dark:text-Green cursor-pointer"
+            onClick={() => setIsResetOpen(!isResetOpen)}
+          >
+            Forgot Password?
+          </div>
+          <div className="flex items-center dark:text-gray-500 justify-center gap-2">
+            Don&apos;t have an account?
+            <div
+              className="text-customTeal dark:text-Green cursor-pointer"
+              onClick={() => setSwitchCss(!switchCss)}
+            >
+              {" "}
+              Sign Up
+            </div>
+          </div>
+        </div>
+      )}
+      {switchCss && isResetOpen && (
+        <div className="flex flex-col z-10 items-center justify-start pt-32  pr-14 gap-4 w-2/4">
+          <div className="font-nunito text-4xl text-customTeal dark:text-Green font-extrabold">
+            Forgot Password
+          </div>
+          <div className="flex items-center gap-2 w-4/5 justify-center">
+            <Input className="rounded-full" type="text" placeholder="Email" />
+            <Mail className="h-7 w-7 text-customTeal  dark:text-Yellow" />
+          </div>
+          <Button className="rounded-full font-bold h-10 w-4/5 bg-customTeal dark:bg-Green">
+            Send reset link
+          </Button>
+          <div
+            className="text-customTeal dark:text-Green cursor-pointer"
+            onClick={() => setIsResetOpen(!isResetOpen)}
+          >
+            Back to Login
+          </div>
+        </div>
+      )}
+    </>
+  );
+};
+
+export default LoginPage;
diff --git a/app/(Seller)/auth/components/signupPage.tsx b/app/(Seller)/auth/components/signupPage.tsx
@@ -0,0 +1,177 @@
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { AtSign, Phone, User, Eye, EyeOff } from "lucide-react"; // Import Eye and EyeOff
+import React, { useState } from "react";
+import toast from "react-hot-toast";
+import axios from "axios"
+import { Spinner } from "@/components/ui/spinner";
+
+interface SignupPageProps {
+  switchCss: boolean;
+  setSwitchCss: (value: boolean) => void;
+  setError: (value: string) => void;
+  loading:boolean,
+  setloading:(value:boolean)=>void;
+}
+
+const SignupPage: React.FC<SignupPageProps> =({ switchCss, setSwitchCss,setError ,loading,setloading}) => {
+  // State for form fields
+  const [fullname, setFullname] = useState("");
+  const [mobileNumber, setmobileNumber] = useState("");
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
+
+  // State for showing passwords
+  const [showPassword, setShowPassword] = useState(false);
+  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+
+  // Handle form submission
+  const handleSubmit = async(e: React.FormEvent) => {
+      setloading(true)
+    e.preventDefault();
+
+    // Basic validation
+    if (!fullname || !mobileNumber || !email || !password || !confirmPassword) {
+      setError("All fields are required.");
+      setloading(false)
+      return;
+    }
+    if (password !== confirmPassword) {
+      setError("Passwords do not match.");
+      setloading(false)
+      return;
+    }
+
+
+    const result = await axios.post('/api/auth/signup/seller',{
+        email,
+        password,
+        name:fullname,
+        mobileNumber
+    })
+    console.log(result)
+    if (!result) setError("Invalid email or password");
+    else {
+      toast.success(`Successful, you can login now.`)
+    //   ${session.data?.user?.name}
+      window.location.href = "/auth/seller"; // Redirect on success
+    }
+
+    // Reset form fields after submission
+    setFullname("");
+    setmobileNumber("");
+    setEmail("");
+    setPassword("");
+    setConfirmPassword("");
+
+    setloading(false)
+  };
+
+  return (
+    <>
+      {!switchCss && (
+        <div className="flex flex-col dark:text-gray-200 z-10 items-center justify-start pt-12 pl-14 gap-4 w-2/4">
+          <div className="font-nunito text-4xl text-customTeal dark:text-Green font-extrabold">
+            Sign Up
+          </div>
+          <form
+            onSubmit={handleSubmit}
+            className="w-full flex flex-col items-center justify-center"
+          >
+            <div className="flex items-center w-4/5 justify-center mb-4">
+              <Input
+                className="rounded-full"
+                type="text"
+                placeholder="Fullname"
+                value={fullname}
+                onChange={(e) => setFullname(e.target.value)}
+              />
+              <User className="h-7 w-7 text-customTeal dark:text-Yellow" />
+            </div>
+            <div className="flex items-center w-4/5 justify-center mb-4">
+              <Input
+                className="rounded-full"
+                type="text"
+                placeholder="mobileNumber"
+                value={mobileNumber}
+                onChange={(e) => setmobileNumber(e.target.value)}
+              />
+              <Phone className="h-7 w-7 text-customTeal dark:text-Yellow" />
+            </div>
+            <div className="flex items-center w-4/5 justify-center mb-4">
+              <Input
+                className="rounded-full"
+                type="email"
+                placeholder="Email"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+              />
+              <AtSign className="h-7 w-7 text-customTeal dark:text-Yellow" />
+            </div>
+            <div className="flex items-center w-4/5 justify-center mb-4 relative">
+              {" "}
+              {/* Added relative for positioning */}
+              <Input
+                className="rounded-full pr-12" // Added padding for the icon
+                type={showPassword ? "text" : "password"} // Toggle password visibility
+                placeholder="Enter Password"
+                value={password}
+                onChange={(e) => setPassword(e.target.value)}
+              />
+              <div
+                className=" cursor-pointer"
+                onClick={() => setShowPassword(!showPassword)}
+              >
+                {showPassword ? (
+                  <EyeOff className="h-7 w-7 text-customTeal dark:text-Yellow" />
+                ) : (
+                  <Eye className="h-7 w-7 text-customTeal dark:text-Yellow" />
+                )}
+              </div>
+            </div>
+            <div className="flex items-center w-4/5 justify-center mb-4 relative">
+              {" "}
+              {/* Added relative for positioning */}
+              <Input
+                className="rounded-full pr-12" // Added padding for the icon
+                type={showConfirmPassword ? "text" : "password"} // Toggle password visibility
+                placeholder="Confirm Password"
+                value={confirmPassword}
+                onChange={(e) => setConfirmPassword(e.target.value)}
+              />
+              <div
+                className="cursor-pointer"
+                onClick={() => setShowConfirmPassword(!showConfirmPassword)}
+              >
+                {showConfirmPassword ? (
+                  <EyeOff className="h-7 w-7 text-customTeal dark:text-Yellow" />
+                ) : (
+                  <Eye className="h-7 w-7 text-customTeal dark:text-Yellow" />
+                )}
+              </div>
+            </div>
+            <Button
+              className="rounded-full h-10 w-4/5 font-bold bg-customTeal dark:bg-Green"
+              type="submit"
+              // disabled
+            >
+              {loading ? <Spinner /> : "Sign Up"}
+            </Button>
+          </form>
+          <div className="flex items-center dark:text-gray-500 justify-center gap-2">
+            Already have an account?
+            <div
+              className="text-customTeal dark:text-Green cursor-pointer"
+              onClick={() => setSwitchCss(!switchCss)}
+            >
+              Login
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+};
+
+export default SignupPage;