diff --git a/app/UserPanel/(Admin)/AdminDashboard/ChangePhoneNumber/page.tsx b/app/UserPanel/(Admin)/AdminDashboard/ChangePhoneNumber/page.tsx
new file mode 100644
index 0000000..d791a45
--- /dev/null
+++ b/app/UserPanel/(Admin)/AdminDashboard/ChangePhoneNumber/page.tsx
@@ -0,0 +1,8 @@
+import ChangePhoneNumber from "@/components/ChangePhoneNumber";
+import React from "react";
+
+function page() {
+ return ;
+}
+
+export default page;
diff --git a/app/UserPanel/(Admin)/AdminDashboard/Profile/page.tsx b/app/UserPanel/(Admin)/AdminDashboard/Profile/page.tsx
new file mode 100644
index 0000000..b60c3b0
--- /dev/null
+++ b/app/UserPanel/(Admin)/AdminDashboard/Profile/page.tsx
@@ -0,0 +1,6 @@
+import Profile from "@/components/ui/Profile";
+import React from "react";
+
+export default function page() {
+ return ;
+}
diff --git a/app/UserPanel/(Controller)/ControllerDashboard/ChangePhoneNumber/page.tsx b/app/UserPanel/(Controller)/ControllerDashboard/ChangePhoneNumber/page.tsx
new file mode 100644
index 0000000..d791a45
--- /dev/null
+++ b/app/UserPanel/(Controller)/ControllerDashboard/ChangePhoneNumber/page.tsx
@@ -0,0 +1,8 @@
+import ChangePhoneNumber from "@/components/ChangePhoneNumber";
+import React from "react";
+
+function page() {
+ return ;
+}
+
+export default page;
diff --git a/app/UserPanel/(Controller)/ControllerDashboard/Profile/page.tsx b/app/UserPanel/(Controller)/ControllerDashboard/Profile/page.tsx
new file mode 100644
index 0000000..b60c3b0
--- /dev/null
+++ b/app/UserPanel/(Controller)/ControllerDashboard/Profile/page.tsx
@@ -0,0 +1,6 @@
+import Profile from "@/components/ui/Profile";
+import React from "react";
+
+export default function page() {
+ return ;
+}
diff --git a/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx b/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx
index bf0df32..005297c 100644
--- a/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx
+++ b/app/UserPanel/(Controller)/ControllerDashboard/layout.tsx
@@ -11,7 +11,7 @@ export default function RootLayout({
if (!token?.value) {
return redirect("/");
}
-
+
return (
<>
diff --git a/components/AdminKeysManagement.tsx b/components/AdminKeysManagement.tsx
index 4b969fc..dce79c0 100644
--- a/components/AdminKeysManagement.tsx
+++ b/components/AdminKeysManagement.tsx
@@ -42,8 +42,9 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
import * as z from "zod";
import { Textarea } from "./ui/textarea";
-import { Check } from "lucide-react";
+import { Check, KeyRound } from "lucide-react";
import { Progress } from "./ui/progress";
+import { cn } from "@/lib/utils";
const MAX_FILE_SIZE = 5242880; // 5 MB
// Edit Key Form
@@ -449,13 +450,22 @@ export default function AdminKeysManagement() {
return (
-
- عنوان کلید:{" "}
- {item.title}
-
+
+
+
+
+
+ {/* عنوان کلید:{" "} */}
+ {item.title}
+
+
+
{/*
آیدی بازرس:{" "}
diff --git a/components/AdminSlider.tsx b/components/AdminSlider.tsx
index 0cf138f..aeea738 100644
--- a/components/AdminSlider.tsx
+++ b/components/AdminSlider.tsx
@@ -136,7 +136,7 @@ export default function AdminSlider() {
refetch: refetch1,
} = useQuery({
queryKey: ["SliderList"],
- queryFn: () => GetAllSliders(),
+ queryFn: () => GetAllSliders(),
// refetchOnWindowFocus: false,
});
@@ -195,119 +195,116 @@ export default function AdminSlider() {
});
// Edit Submit
-
-// ............'Mutation' Change Slider Submit
-const ChangeSliderMutation = useMutation({
- mutationKey: ["ChangeSlider"],
- mutationFn: UpdateSlider,
- onSuccess: (res) => {
- setOpenEdit(false);
+ // ............'Mutation' Change Slider Submit
+ const ChangeSliderMutation = useMutation({
+ mutationKey: ["ChangeSlider"],
+ mutationFn: UpdateSlider,
+ onSuccess: (res) => {
+ setOpenEdit(false);
- refetch1();
+ refetch1();
- toast("عملیات شما با موفقیت انجام شد. ", {
- className: "!bg-green-500 !text-white",
- });
- },
- onError: (err: any | string) => {
- toast(<>{err.response.data.detail}>, {
- className: "!bg-red-500 !text-white",
- });
- },
-});
-
-//Delete
-const DeleteSliderMutation = useMutation({
- mutationKey: ["DeleteSlider"],
- mutationFn: DeleteSlider,
- onSuccess: (res) => {
- setOpenEdit(false);
- refetch1();
- toast("عملیات شما با موفقیت انجام شد. ", {
- className: "!bg-green-500 !text-white",
- });
- },
- onError: (err: any | string) => {
- toast(<>{err.response.data.detail}>, {
- className: "!bg-red-500 !text-white",
- });
- },
-});
-
-// Add
-// ............'Mutation' Add Slider Submit
-const AddSliderMutation = useMutation({
- mutationKey: ["AddSlider"],
- mutationFn: SubmitSlider,
- onSuccess: (res) => {
- setOpenAdd(false);
- refetch1();
-
- toast("عملیات شما با موفقیت انجام شد. ", {
- className: "!bg-green-500 !text-white",
- });
- formAdd.reset({
- titleSlider: "",
- uploadImg: null,
- urlSlider: "",
- description: "",
- });
-
- },
- onError: (err: any | string) => {
- toast(<>{err.response.data.detail}>, {
- className: "!bg-red-500 !text-white",
- });
- formAdd.reset({
- titleSlider: "",
- uploadImg: null,
- urlSlider: "",
- description: "",
- });
- },
-});
-
-function onSubmitEdit(data: EditSliderFormValues) {
- const formData = new FormData();
- formData.append("Title", data.titleSlider);
- if (data?.uploadImg instanceof File) {
- formData.append("Image", data.uploadImg);
- }
- formData.append("Url", data.urlSlider);
- formData.append("Description", data.description);
- // if (data?.media && data?.media?.length > 0) {
- // for (let i = 0; i < data.media.length; i++) {
- // formData.append("Medias", data.media[i]);
- // }
- // }
- ChangeSliderMutation.mutate({id: keyId, payload: formData});
-
- refetch1();
-
-}
-
-function onSubmitAdd(data: AddSliderFormValues) {
- const formData = new FormData();
- formData.append("Title", data.titleSlider);
- formData.append("Url", data.urlSlider);
- formData.append("Description", data.description);
-
- if (data?.uploadImg instanceof File) {
- formData.append("Image", data.uploadImg);
- }
-
- AddSliderMutation.mutate(formData);
-}
-
-const resetFormAdd = () => {
- formAdd.reset({
- titleSlider: "",
- uploadImg: null,
- urlSlider: "",
- description: "",
+ toast("عملیات شما با موفقیت انجام شد. ", {
+ className: "!bg-green-500 !text-white",
+ });
+ },
+ onError: (err: any | string) => {
+ toast(<>{err.response.data.detail}>, {
+ className: "!bg-red-500 !text-white",
+ });
+ },
});
-};
-const { resetField } = useForm();
+
+ //Delete
+ const DeleteSliderMutation = useMutation({
+ mutationKey: ["DeleteSlider"],
+ mutationFn: DeleteSlider,
+ onSuccess: (res) => {
+ setOpenEdit(false);
+ refetch1();
+ toast("عملیات شما با موفقیت انجام شد. ", {
+ className: "!bg-green-500 !text-white",
+ });
+ },
+ onError: (err: any | string) => {
+ toast(<>{err.response.data.detail}>, {
+ className: "!bg-red-500 !text-white",
+ });
+ },
+ });
+
+ // Add
+ // ............'Mutation' Add Slider Submit
+ const AddSliderMutation = useMutation({
+ mutationKey: ["AddSlider"],
+ mutationFn: SubmitSlider,
+ onSuccess: (res) => {
+ setOpenAdd(false);
+ refetch1();
+
+ toast("عملیات شما با موفقیت انجام شد. ", {
+ className: "!bg-green-500 !text-white",
+ });
+ formAdd.reset({
+ titleSlider: "",
+ uploadImg: null,
+ urlSlider: "",
+ description: "",
+ });
+ },
+ onError: (err: any | string) => {
+ toast(<>{err.response.data.detail}>, {
+ className: "!bg-red-500 !text-white",
+ });
+ formAdd.reset({
+ titleSlider: "",
+ uploadImg: null,
+ urlSlider: "",
+ description: "",
+ });
+ },
+ });
+
+ function onSubmitEdit(data: EditSliderFormValues) {
+ const formData = new FormData();
+ formData.append("Title", data.titleSlider);
+ if (data?.uploadImg instanceof File) {
+ formData.append("Image", data.uploadImg);
+ }
+ formData.append("Url", data.urlSlider);
+ formData.append("Description", data.description);
+ // if (data?.media && data?.media?.length > 0) {
+ // for (let i = 0; i < data.media.length; i++) {
+ // formData.append("Medias", data.media[i]);
+ // }
+ // }
+ ChangeSliderMutation.mutate({ id: keyId, payload: formData });
+
+ refetch1();
+ }
+
+ function onSubmitAdd(data: AddSliderFormValues) {
+ const formData = new FormData();
+ formData.append("Title", data.titleSlider);
+ formData.append("Url", data.urlSlider);
+ formData.append("Description", data.description);
+
+ if (data?.uploadImg instanceof File) {
+ formData.append("Image", data.uploadImg);
+ }
+
+ AddSliderMutation.mutate(formData);
+ }
+
+ const resetFormAdd = () => {
+ formAdd.reset({
+ titleSlider: "",
+ uploadImg: null,
+ urlSlider: "",
+ description: "",
+ });
+ };
+ const { resetField } = useForm();
return (
@@ -337,7 +334,12 @@ const { resetField } = useForm();
افزودن اسلایدر
-
{ resetFormAdd(); }}>
+ {
+ resetFormAdd();
+ }}
+ >
@@ -473,7 +475,12 @@ const { resetField } = useForm();
>
افزودن
- { resetFormAdd(); }}>
+ {
+ resetFormAdd();
+ }}
+ >
بستن
@@ -646,63 +653,70 @@ const { resetField } = useForm();
return (
-
- عنوان :{item.title}
-
-
- توضیحات:
-
- {item.description}
-
-
-
-
- {/*
+
+
+
+
+
+
+ عنوان :
+ {item.title}
+
+
+ توضیحات:
+
+ {item.description}
+
+
+
+ {/*
محتوا:
{item.content}
*/}
-
-
{
- DeleteSliderMutation.mutate({
- id: item.id,
- });
- }}
- id={item.id}
- />
-
-
- {/* */}
- setKeyId(item?.id)}
- onClick={() =>
- handleClickEdit(
- item?.id,
- item?.title,
- item?.description,
- item?.url,
- item?.image
- )
- }
+
+
{
+ DeleteSliderMutation.mutate({
+ id: item.id,
+ });
+ }}
+ id={item.id}
/>
-
+
+
+ {/* */}
+ setKeyId(item?.id)}
+ onClick={() =>
+ handleClickEdit(
+ item?.id,
+ item?.title,
+ item?.description,
+ item?.url,
+ item?.image
+ )
+ }
+ />
+
+
);
diff --git a/components/ChangePasswordDialog.tsx b/components/ChangePasswordDialog.tsx
new file mode 100644
index 0000000..673976b
--- /dev/null
+++ b/components/ChangePasswordDialog.tsx
@@ -0,0 +1,153 @@
+import React from "react";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { X } from "lucide-react";
+import { Button } from "./ui/button";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+import {
+ Form,
+ FormControl,
+ FormDescription,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { useMutation } from "@tanstack/react-query";
+import { changePassword } from "@/utils/authenticateApi";
+import { deleteCookie } from "cookies-next";
+import { toast } from "sonner";
+import { useRouter } from "next/navigation";
+export default function ChangePasswordDialog({
+ data,
+ open,
+ setOpen,
+}: {
+ data?: any;
+ open: any;
+ setOpen: (state: any) => any;
+}) {
+ const router = useRouter();
+ const ChangePasswordMutation = useMutation({
+ mutationKey: ["ChangePassword"],
+ mutationFn: changePassword,
+ onSuccess: (res) => {
+ deleteCookie("Sootzani_Admin_Token");
+ localStorage.removeItem("privateKey");
+ localStorage.removeItem("privatePassword");
+ router.push("/");
+ toast("رمز عبور شما با موفقیت تغییر یافت.", {
+ className: "!bg-green-500 !text-white",
+ });
+ },
+ onError: (err: any | string) => {
+ toast(<>{err.response.data.detail}>, {
+ className: "!bg-red-500 !text-white",
+ });
+ },
+ });
+
+ const FormSchema = z.object({
+ oldPassword: z.string(),
+ newPassword: z.string(),
+ repeatedPassword: z.string(),
+ });
+
+ const form = useForm
>({
+ resolver: zodResolver(FormSchema),
+ });
+
+ function onSubmit(data: z.infer) {
+ if (data.newPassword !== data.repeatedPassword) {
+ toast("رمز عبور شما با هم مطابقت ندارد.", {
+ className: "!bg-red-500 !text-white",
+ });
+ return;
+ }
+ ChangePasswordMutation.mutate({
+ oldPassword: data.oldPassword,
+ newPassword: data.newPassword,
+ });
+ }
+
+ return (
+
+ );
+}
diff --git a/components/ChangePhoneNumber.tsx b/components/ChangePhoneNumber.tsx
new file mode 100644
index 0000000..ba4d4f0
--- /dev/null
+++ b/components/ChangePhoneNumber.tsx
@@ -0,0 +1,129 @@
+"use client";
+import { putChangePhoneNumber } from "@/utils/authenticateApi";
+import { useMutation } from "@tanstack/react-query";
+import React, { useEffect, useState } from "react";
+import { toast } from "sonner";
+import LoginIcon from "../public/img/login-icon.svg";
+import Image from "next/image";
+import OTPInput from "react-otp-input";
+import { useRouter } from "next/navigation";
+import { deleteCookie } from "cookies-next";
+
+export default function ChangePhoneNumber() {
+ const [otp, setOtp] = useState("");
+ const [otp2, setOtp2] = useState("");
+ const [phoneNumber, setPhoneNumber] = useState("");
+ const [newPhoneNumber, setNewPhoneNumber] = useState("");
+ const space = "\xa0";
+ const router = useRouter();
+ const changePhoneNumberMutation = useMutation({
+ mutationKey: ["putChangePhoneNumber"],
+ mutationFn: putChangePhoneNumber,
+ onSuccess: (res) => {
+ deleteCookie("Sootzani_Admin_Token");
+ localStorage.removeItem("privateKey");
+ localStorage.removeItem("privatePassword");
+ router.push("/");
+ toast("شماره موبایل با موفقیت تغییر یافت.", {
+ className: "!bg-green-500 !text-white",
+ });
+ },
+ onError: (err: any | string) => {
+ toast(<>{err.response.data.detail}>, {
+ className: "!bg-red-500 !text-white",
+ });
+ },
+ });
+
+ useEffect(() => {
+ if (otp.length == 6 && otp2.length == 6) {
+ const payload = {
+ token1: localStorage.getItem("ph_token") as string,
+ code1: otp,
+ token2: localStorage.getItem("ph_newToken") as string,
+ code2: otp2,
+ };
+ changePhoneNumberMutation.mutate(payload);
+ }
+ }, [otp,otp2]);
+
+ useEffect(() => {
+ const phoneNumber = localStorage.getItem("ph_phoneNumber");
+ const newPhoneNumber = localStorage.getItem("ph_newPhoneNumber");
+ setPhoneNumber(phoneNumber);
+ setNewPhoneNumber(newPhoneNumber);
+ }, []);
+ return (
+
+
+
+
+
+ کد شماره {phoneNumber}
+
+
+ {space}}
+ renderInput={(props, idx) => (
+
+ )}
+ containerStyle=" flex justify-center"
+ inputStyle={` !w-10 rounded-md h-10 bg-[#F5F5F5] border border-blue/30 text-black `}
+ />
+
+
+ کد شماره {newPhoneNumber}
+
+
+ {space}}
+ renderInput={(props, idx) => (
+
+ )}
+ containerStyle=" flex justify-center"
+ inputStyle={` !w-10 rounded-md h-10 bg-[#F5F5F5] border border-blue/30 text-black `}
+ />
+
+
+ {/*
+
+
*/}
+
+
+
+ );
+}
diff --git a/components/ChangePhoneNumberDialog.tsx b/components/ChangePhoneNumberDialog.tsx
new file mode 100644
index 0000000..d9d438f
--- /dev/null
+++ b/components/ChangePhoneNumberDialog.tsx
@@ -0,0 +1,199 @@
+import React from "react";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { RefreshCcw, X } from "lucide-react";
+import { Button } from "./ui/button";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+import {
+ Form,
+ FormControl,
+ FormDescription,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { getCaptcha } from "@/utils/commonApi";
+import { ThreeDots } from "react-loader-spinner";
+import Image from "next/image";
+import { postChangePhoneNumber } from "@/utils/authenticateApi";
+import { toast } from "sonner";
+import { useRouter } from "next/navigation";
+export default function ChangePhoneNumberDialog({
+ data,
+ open,
+ setOpen,
+}: {
+ data?: any;
+ open: any;
+ setOpen: (state: any) => any;
+}) {
+ const router = useRouter();
+
+ const {
+ data: CaptchaData,
+ isLoading,
+ refetch,
+ } = useQuery({
+ queryKey: ["Captcha"],
+ queryFn: () => getCaptcha(),
+ refetchOnWindowFocus: false,
+ });
+
+ const changePhoneNumberMutation = useMutation({
+ mutationKey: ["postChangePhoneNumber"],
+ mutationFn: postChangePhoneNumber,
+ onSuccess: (res) => {
+ localStorage.setItem("ph_token", res.token);
+ localStorage.setItem("ph_newToken", res.newToken);
+ localStorage.setItem("ph_phoneNumber", res.phoneNumber);
+ localStorage.setItem("ph_newPhoneNumber", res.newPhoneNumber);
+ const userRole = localStorage.getItem("userRole");
+ if (userRole === "Admin") {
+ router.push(`/UserPanel/AdminDashboard/ChangePhoneNumber`);
+ } else {
+ router.push(`/UserPanel/ControllerDashboard/ChangePhoneNumber`);
+ }
+ },
+ onError: (err: any | string) => {
+ refetch();
+ toast(<>{err.response.data.detail}>, {
+ className: "!bg-red-500 !text-white",
+ });
+ },
+ });
+
+ const FormSchema = z.object({
+ phoneNumber: z.string().min(1, {
+ message: "لطفا شماره موبایل را وارد نمایید.",
+ }),
+ captcha: z
+ .string({ required_error: "لطفا کد امنیتی را وارد نمایید." })
+ .length(5, { message: "لطفا کد امنیتی را به طور کامل وارد نمایید." }),
+ });
+
+ const form = useForm>({
+ resolver: zodResolver(FormSchema),
+ });
+
+ function onSubmit(data: z.infer) {
+ const payload = {
+ newPhoneNumber: data.phoneNumber,
+ captcha: {
+ key: CaptchaData?.headers["captcha-key"],
+ value: data.captcha,
+ },
+ };
+ changePhoneNumberMutation.mutate(payload);
+ }
+
+ const srcForImage = CaptchaData
+ ? URL.createObjectURL(CaptchaData.data)
+ : null;
+
+ return (
+
+ );
+}
diff --git a/components/Login.tsx b/components/Login.tsx
index e0fca26..02014d8 100644
--- a/components/Login.tsx
+++ b/components/Login.tsx
@@ -87,7 +87,7 @@ export default function Login() {
saveData({
username: data.username,
password: data.password,
- });
+ });
}
const srcForImage = CaptchaData
diff --git a/components/NavbarPanel.tsx b/components/NavbarPanel.tsx
index 7412c20..6f92a17 100644
--- a/components/NavbarPanel.tsx
+++ b/components/NavbarPanel.tsx
@@ -10,6 +10,7 @@ import { useMutation, useQuery } from "@tanstack/react-query";
import { DoorOpen, LogOut } from "lucide-react";
import { deleteCookie, getCookie } from "cookies-next";
import useSignalR from "@/hooks/useSignalR";
+import ProfileDropDown from "./ProfileDropDown";
export default function NavbarPanel() {
const [isOpen, setOpen] = useState(false);
@@ -141,17 +142,8 @@ export default function NavbarPanel() {
- {data && (
- <>
- {role === "Admin"
- ? `${data?.title ? data.title : data.username} (ادمین)`
- : `${data?.title ? data.title : data.username} (بازرس)`}
- >
- )}
+
-
-
-
);
diff --git a/components/ProfileDropDown.tsx b/components/ProfileDropDown.tsx
new file mode 100644
index 0000000..0be8048
--- /dev/null
+++ b/components/ProfileDropDown.tsx
@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from "react";
+
+import { CreditCard, LogOut, User, UserPlus, Users } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuGroup,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuPortal,
+ DropdownMenuSeparator,
+ DropdownMenuShortcut,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { getProfile, revoke } from "@/utils/authenticateApi";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import Link from "next/link";
+import useToken from "@/store/useToken";
+import { deleteCookie, getCookie } from "cookies-next";
+import { useRouter } from "next/navigation";
+
+export default function ProfileDropDown() {
+ const router = useRouter();
+ const [role, setRole] = useState