diff --git a/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx b/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx index 26a0c2b..a727181 100644 --- a/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx +++ b/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx @@ -15,7 +15,7 @@ export default function RootLayout({ return ( <> - {children} +
{children}
); } diff --git a/app/layout.tsx b/app/layout.tsx index 99afec3..a806a1b 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -22,11 +22,7 @@ export default function RootLayout({ - - - -
{children}
- + {children}
diff --git a/app/page.tsx b/app/page.tsx index f8c8429..1c971d5 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,6 +1,7 @@ -import Landing from "@/app/components/Landing"; import Image from "next/image"; +import CitizenLogin from "../components/CitizenLogin"; +import Login from "@/components/Login"; export default function Home() { - return ; + return ; } diff --git a/components/CitizenLogin.tsx b/components/CitizenLogin.tsx index dc17ce1..6afaccc 100644 --- a/components/CitizenLogin.tsx +++ b/components/CitizenLogin.tsx @@ -85,8 +85,8 @@ export default function CitizenLogin() { return (
icon diff --git a/components/ControllerDashboard.tsx b/components/ControllerDashboard.tsx index 103628d..e72b739 100644 --- a/components/ControllerDashboard.tsx +++ b/components/ControllerDashboard.tsx @@ -24,7 +24,7 @@ export default function ControllerDashboard() { if (data) { } return ( -
+
{/* Lg Show */}
diff --git a/components/Login.tsx b/components/Login.tsx index 21dd7f6..077f051 100644 --- a/components/Login.tsx +++ b/components/Login.tsx @@ -43,7 +43,7 @@ const FormSchema = z.object({ export default function Login() { const router = useRouter(); const saveData = useData((state) => state.saveData); - + const { data: CaptchaData, isLoading, @@ -90,136 +90,138 @@ export default function Login() { : null; return ( -
-
- icon +
+
+
+ icon -

- ورود به پنل کاربری -

+

+ ورود به پنل کاربری +

-
- - ( - - - نام کاربری - - - - - {/* - This is your public display name. - */} - - - )} - /> - - ( - - - رمز عبور - - - - - - - )} - /> -
+ + ( - - {/* - رمز عبور - */} + + + نام کاربری + - + + + {/* + This is your public display name. + */} + + + )} + /> + + ( + + + رمز عبور + + + )} /> - {isLoading ? ( -
- -
- ) : ( -
- icon -
- )} -
-
- -
- - +
+
+ +
+ + +
); diff --git a/components/NavbarPanel.tsx b/components/NavbarPanel.tsx index 9722d50..7037e3e 100644 --- a/components/NavbarPanel.tsx +++ b/components/NavbarPanel.tsx @@ -22,7 +22,7 @@ export default function NavbarPanel() {
@@ -68,9 +68,9 @@ export default function NavbarPanel() {

- - {role === 'Admin' ? 'نام و نام خانوادگی (ادمین)' : 'نام و نام خانوادگی (بازرس)'} - + {role === "Admin" + ? "نام و نام خانوادگی (ادمین)" + : "نام و نام خانوادگی (بازرس)"}

); diff --git a/components/TabController.tsx b/components/TabController.tsx index ce53221..7498749 100644 --- a/components/TabController.tsx +++ b/components/TabController.tsx @@ -68,7 +68,7 @@ export default function TabController() { const finishedComplaints = data?.filter((item: any) => item.status == 4); console.log(newComplaints); return ( -
+
-
- {/*
+ )} + containerStyle=" flex justify-center" + inputStyle=" !w-10 rounded-md h-10 bg-[#F5F5F5] border border-blue/30 text-black" + /> +
+ +
+ +
+ {/* */} +
); diff --git a/tailwind.config.js b/tailwind.config.js index 056380b..9b22b90 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -29,7 +29,7 @@ module.exports = { blue50: "#335F9380", yellow: "#F7A600", brown: "#D28249", - gray: "#BFBFBF", + gray2: "#BFBFBF", border: "hsl(var(--border))", input: "hsl(var(--input))", ring: "hsl(var(--ring))",