diff --git a/app/RecentRequest/layout.tsx b/app/RecentRequest/layout.tsx index 14b200b..d473072 100644 --- a/app/RecentRequest/layout.tsx +++ b/app/RecentRequest/layout.tsx @@ -11,7 +11,7 @@ export default function RequestLayout({ {/* Include shared UI here e.g. a header or sidebar */} -
{children}
+
{children}
); } diff --git a/app/globals.css b/app/globals.css index db848dc..93a02db 100644 --- a/app/globals.css +++ b/app/globals.css @@ -80,7 +80,7 @@ padding: 0; box-sizing: border-box; /* direction: rtl; */ - font-family: iranyekan; + font-family: "iranyekan"; -webkit-tap-highlight-color: transparent; --d-header-height: 70px; --d-sideMenu-width-open: 200px; @@ -103,7 +103,7 @@ button, input { - font-family: iranyekan; + font-family: 'iranyekan'; } @layer utilities { @@ -112,102 +112,10 @@ } } - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: bold; - src: url(../assets/fonts/eot/iranyekanwebboldfanum.eot); - src: url(../assets/fonts/eot/iranyekanwebboldfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(../assets/fonts/woff/iranyekanwebboldfanum.woff) format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(../assets/fonts/ttf/iranyekanwebboldfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: 100; - src: url(../assets/fonts/eot/iranyekanwebthinfanum.eot); - src: url(../assets/fonts/eot/iranyekanwebthinfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(../assets/fonts/woff/iranyekanwebthinfanum.woff) format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(../assets/fonts/ttf/iranyekanwebthinfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: 300; - src: url(../assets/fonts/eot/iranyekanweblightfanum.eot); - src: url(../assets/fonts/eot/iranyekanweblightfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(../assets/fonts/woff/iranyekanweblightfanum.woff) format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(../assets/fonts/ttf/iranyekanweblightfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: normal; - src: url(/fonts/eot/iranyekanwebregularfanum.eot); - src: url(/fonts/eot/iranyekanwebregularfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(/fonts/woff/iranyekanwebregularfanum.woff) - format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(/fonts/ttf/iranyekanwebregularfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: 500; - src: url(/fonts/eot/iranyekanwebmediumfanum.eot); - src: url(/fonts/eot/iranyekanwebmediumfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(/fonts/woff/iranyekanwebmediumfanum.woff) format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(/fonts/ttf/iranyekanwebmediumfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: 800; - src: url(../assets/fonts/eot/iranyekanwebextraboldfanum.eot); - src: url(../assets/fonts/eot/iranyekanwebextraboldfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(../assets/fonts/woff/iranyekanwebextraboldfanum.woff) - format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(../assets/fonts/ttf/iranyekanwebextraboldfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: 850; - src: url(../assets/fonts/eot/iranyekanwebblackfanum.eot); - src: url(../assets/fonts/eot/iranyekanwebblackfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(../assets/fonts/woff/iranyekanwebblackfanum.woff) format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(../assets/fonts/ttf/iranyekanwebblackfanum.ttf) format("truetype"); - } - - @font-face { - font-family: "iranyekan"; - font-style: normal; - font-weight: 900; - src: url(../assets/fonts/eot/iranyekanwebextrablackfanum.eot); - src: url(../assets/fonts/eot/iranyekanwebextrablackfanum.eot?#iefix) - format("embedded-opentype"), - /* IE6-8 */ url(../assets/fonts/woff/iranyekanwebextrablackfanum.woff) - format("woff"), - /* FF3.6+, IE9, Chrome6+, Saf5.1+*/ - url(../assets/fonts/ttf/iranyekanwebextrablackfanum.ttf) format("truetype"); - } +@font-face { + font-family: "iranyekan"; + font-style: normal; + src: url(../assets/fonts/ttf/iranyekanwebregularfanum.ttf); +} + diff --git a/components/Menu/SideMenu.tsx b/components/Menu/SideMenu.tsx index 7f33bb0..c4272ed 100644 --- a/components/Menu/SideMenu.tsx +++ b/components/Menu/SideMenu.tsx @@ -4,19 +4,21 @@ import { GoArrowLeft } from "react-icons/go"; import { menuItems } from "@/constants"; import Link from "next/link"; import { cn } from "@/lib/utils"; +import { usePathname } from "next/navigation"; const SideMenu = () => { const [open, setOpen] = useState(false); + const pathname = usePathname(); return (
setOpen(!open)} className={`flex items-center aspect-square bg-white rounded-full shadow-[0_0_4px_1px_rgba(0,0,0,0.1)] text-yellow cursor-pointer h-8 w-8 justify-center -left-3 absolute top-5 transition-all duration-700 ease-in-out z-[400] - ${open === true ? "rotate-180" : "rotate-0"} `} + ${open === true ? "rotate-0" : "rotate-180"} `} >
@@ -31,7 +33,7 @@ const SideMenu = () => {
@@ -40,10 +42,10 @@ const SideMenu = () => {
{menuItem.title} diff --git a/components/RecentRequest/RecentRequests.tsx b/components/RecentRequest/RecentRequests.tsx index 9cf446a..b5e64a1 100644 --- a/components/RecentRequest/RecentRequests.tsx +++ b/components/RecentRequest/RecentRequests.tsx @@ -2,22 +2,31 @@ import React from "react"; import OnMapRequests from "./OnMapRequests"; import AllRequests from "./AllRequests"; import NearestRequests from "./NearestRequests"; -import UserContainer from "../User/UserContainer"; +// import UserContainer from "../User/UserContainer"; function RecentRequests() { return ( - <> - -
- +
+ + + {/* Left */} +
+
+ +
-
- + + {/* Right */} +
+
+ +
+
+ +
-
- -
- + +
); } diff --git a/components/SignIn/LoginForm.tsx b/components/SignIn/LoginForm.tsx index 2f67018..9c80d0c 100644 --- a/components/SignIn/LoginForm.tsx +++ b/components/SignIn/LoginForm.tsx @@ -56,7 +56,7 @@ function LoginForm() { } = useQuery({ queryKey: ["Captcha"], queryFn: () => getCaptcha(), - refetchOnWindowFocus: false, + // refetchOnWindowFocus: false, }); const loginMutation = useMutation({ @@ -112,7 +112,7 @@ function LoginForm() { return ( <>
- + {/* Phone Number */} - refetch()} - color="#fcc52d" - />
)} + refetch()} + color="#fcc52d" + />