From 3d0eb5a66d1890ec3c0b5f0a554594f26c3baa73 Mon Sep 17 00:00:00 2001
From: alij <ali.josheghani2005@gmail.com>
Date: Sat, 22 Jun 2024 16:15:51 +0430
Subject: [PATCH] feat : fixed menu

---
 package-lock.json                             |  6 +++++
 package.json                                  |  1 +
 src/common/modal/index.tsx                    | 19 +++++++++------
 src/components/alert/Alert.tsx                |  6 ++---
 .../header/components/navbar/Navbar.tsx       |  4 ++--
 src/components/header/index.tsx               | 24 +++++++++++++++----
 src/main.tsx                                  |  9 ++++++-
 7 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf84885..bf3d48a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "country-flag-icons": "^1.5.11",
         "formik": "^2.4.6",
         "framer-motion": "^11.2.9",
+        "lodash.debounce": "^4.0.8",
         "nprogress": "^0.2.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -4008,6 +4009,11 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
diff --git a/package.json b/package.json
index 3bad12f..ed472be 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "country-flag-icons": "^1.5.11",
     "formik": "^2.4.6",
     "framer-motion": "^11.2.9",
+    "lodash.debounce": "^4.0.8",
     "nprogress": "^0.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/src/common/modal/index.tsx b/src/common/modal/index.tsx
index abd2f83..eae49f7 100644
--- a/src/common/modal/index.tsx
+++ b/src/common/modal/index.tsx
@@ -12,6 +12,7 @@ export default function MuiModal({
   nameService,
   submitText,
   submitOnClick,
+  disabled,
   children,
 }: MuiModalProps) {
   const [open, setOpen] = useState(false);
@@ -33,19 +34,19 @@ export default function MuiModal({
         onClose={handleClose}
         aria-labelledby="modal-modal-title"
         aria-describedby="modal-modal-description"
-        className="relative w-full h-full flex justify-center items-center border-none outline-none"
+        className="relative w-full h-full flex justify-center items-center !border-none !outline-none !ring-0"
       >
         <motion.div
           className="max-md:w-72 md:w-80 lg:w-96 min-h-80 shadow-xl shadow-[rgb(20,20,20)] bg-[rgb(20,20,20,0.99)] rounded-lg p-4 relative flex flex-col justify-between items-center gap-4"
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          transition={{duration:0.7}}
+          initial={{ y: "-100vw", opacity: 0 }}
+          animate={{ y: 0, opacity: 1 }}
+          transition={{ duration: 0.5 }}
         >
           <motion.div className="w-full h-full flex gap-2 justify-between">
             <h1 className="text-lg md:text-xl font-bold">
               {title && title}
               {nameService && (
-                <span className="text-green-600"> {nameService} </span>
+                <span className="text-secondTheme"> {nameService} </span>
               )}
             </h1>
             <button onClick={handleClose}>
@@ -55,10 +56,14 @@ export default function MuiModal({
           <motion.div className="w-full h-full flex flex-col justify-between text-center items-center">
             {children}
           </motion.div>
-          <motion.div className={`w-full h-full flex ${submitText ? 'justify-end' : 'justify-center' } items-center gap-2 md:gap-3 text-lg md:text-xl`}>
+          <motion.div
+            className={`w-full h-full flex ${
+              submitText ? "justify-end" : "justify-center"
+            } items-center gap-2 md:gap-3 text-lg md:text-xl`}
+          >
             <Button onClick={() => handleClose()}> بستن </Button>
             {submitText && (
-              <Button onClick={submitOnClick}> {submitText} </Button>
+              <Button onClick={submitOnClick} disabled={disabled}> {submitText} </Button>
             )}
           </motion.div>
         </motion.div>
diff --git a/src/components/alert/Alert.tsx b/src/components/alert/Alert.tsx
index 100987b..69f3278 100644
--- a/src/components/alert/Alert.tsx
+++ b/src/components/alert/Alert.tsx
@@ -1,6 +1,6 @@
 import { AlertProps, MessageType } from "../../types/props";
 
-const Alert = ({ children, type = "info", message }: AlertProps) => {
+const Alert = ({ children, type = "info", message , extra }: AlertProps) => {
   const types: Record<
     MessageType,
     {
@@ -57,7 +57,7 @@ const Alert = ({ children, type = "info", message }: AlertProps) => {
 
   return (
     <div
-      className={`w-full h-full flex items-center p-4 mb-4 text-xs md:text-sm ${text} rounded-lg ${bg} ${darkText} ${darkBg}`}
+      className={`w-full h-full flex items-center p-4 mb-4 text-xs md:text-sm ${text} rounded-lg ${bg} ${darkText} ${darkBg} ${extra}`}
       role="alert"
     >
       <svg
@@ -71,7 +71,7 @@ const Alert = ({ children, type = "info", message }: AlertProps) => {
       </svg>
       <span className="sr-only">{children}</span>
       <div>
-        <span className="font-medium">{children}</span> {message && message}
+        {message && message} <span className="font-medium">{children}</span>
       </div>
     </div>
   );
diff --git a/src/components/header/components/navbar/Navbar.tsx b/src/components/header/components/navbar/Navbar.tsx
index da3c5ad..84f1788 100644
--- a/src/components/header/components/navbar/Navbar.tsx
+++ b/src/components/header/components/navbar/Navbar.tsx
@@ -9,7 +9,7 @@ import { useNavigate } from "react-router-dom";
 import { Route } from "../../../../types/props";
 import { isAuthenticated } from "../../../../utils/auth";
 
-const Navbar = () => {
+const Navbar = ({extra}:{extra?:string}) => {
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const auth = isAuthenticated();
   const [routes] = useState<Route[]>(router);
@@ -29,7 +29,7 @@ const Navbar = () => {
 
   return (
     <div className="relative">
-      <nav className="glass text-white p-4 flex justify-between items-center">
+      <nav className={`glass text-white p-4 flex justify-between items-center ${extra}`}>
         <div className="flex items-center">
           <h1 className="text-xl font-bold">پرشین پینگ</h1>
         </div>
diff --git a/src/components/header/index.tsx b/src/components/header/index.tsx
index 722aac6..92c4233 100644
--- a/src/components/header/index.tsx
+++ b/src/components/header/index.tsx
@@ -1,10 +1,26 @@
+import { useEffect, useState } from "react";
 import Navbar from "./components/navbar/Navbar";
-
 const Header = () => {
+  const [isFixed, setIsFixed] = useState(false);
+
+  useEffect(() => {
+    const handleScroll = () => {
+      if (window.scrollY > 50) {
+        setIsFixed(true);
+      } else {
+        setIsFixed(false);
+      }
+    };
+    window.addEventListener("scroll", handleScroll);
+    return () => {
+      window.removeEventListener("scroll", handleScroll);
+    };
+  }, []);
+
   return (
-    <div className="relative w-full p-5 h-[7rem]">
-      <header>
-        <Navbar />
+    <div className="w-full p-5 h-[7rem]">
+      <header className={`w-full transition-all duration-300 ease-in-out ${isFixed ? "fixed max-w-[1400px] h-[6rem] mx-auto z-[1000] inset-0 p-2" : ""}`}>
+        <Navbar extra={`${isFixed && '!bg-gray-800/90'}`}/>
       </header>
     </div>
   );
diff --git a/src/main.tsx b/src/main.tsx
index 7dd3358..7ad0a05 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -7,7 +7,14 @@ import { PersistGate } from "redux-persist/integration/react";
 import store, { persistor } from "./redux/store";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
-export const queryClient = new QueryClient();
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: false,
+      refetchOnWindowFocus: false,
+    },
+  },
+});
 ReactDOM.createRoot(document.getElementById("root")!).render(
   <React.StrictMode>
     <Provider store={store}>