feat: edit user and add admin permission

fix: tokn timeout redirect
2026-02-01 15:37:32 +03:30 · 2026-02-01 15:09:31 +03:30
15 changed files with 230 additions and 596 deletions
--- a/1
+++ b/1
@@ -1,6 +1,5 @@
 FROM registry.hamdocker.ir/seniorkian/node:18-alpine

-
 WORKDIR /app

 COPY package*.json ./
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -11,7 +11,7 @@ import { makeRouter } from "./routes/routes";
 import { useDarkMode } from "./hooks/useDarkMode";
 import { ItemWithSubItems } from "./types/userPermissions";
 import { useFetchProfile } from "./hooks/useFetchProfile";
-import { getInspectionMenuItems } from "./config/menuItems";
+import { getInspectionMenuItems } from "./screen/SideBar";

 const versionNumber = "/src/version.txt";
 import "./index.css";
@@ -127,7 +127,7 @@ export default function App() {
      window.history.replaceState(
        {},
        document.title,
-        url.pathname + url.search,
+        url.pathname + url.search
      );
    }
  }, []);
--- a/src/Pages/Menu.tsx
+++ b/src/Pages/Menu.tsx
@@ -4,26 +4,99 @@ import { useUserProfileStore } from "../context/zustand-store/userStore";
 import { getFaPermissions } from "../utils/getFaPermissions";
 import { motion, AnimatePresence } from "framer-motion";
 import {
+  UsersIcon,
+  DocumentTextIcon,
+  ChartBarIcon,
  ChevronDownIcon,
+  UserIcon,
  GlobeAsiaAustraliaIcon,
-  MapPinIcon,
 } from "@heroicons/react/24/outline";
-import { getInspectionMenuItems } from "../config/menuItems";
+import { ItemWithSubItems } from "../types/userPermissions";
+import { checkMenuPermission } from "../utils/checkMenuPermission";

-const ADMIN_PROVINCES = [
-  { value: "hamedan", label: "همدان" },
-  { value: "markazi", label: "مرکزی" },
-] as const;
+const getInspectionMenuItems = (
+  permissions: string[] = []
+): ItemWithSubItems[] => {
+  const items: ItemWithSubItems[] = [];
+
+  if (checkMenuPermission("nationalinfo", permissions)) {
+    items.push({
+      en: "nationalinfo",
+      fa: "اطلاعات",
+      icon: () => <UserIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "nationalinfo",
+          path: "/nationalinfo",
+          component: () => import("./NationalInfo"),
+        },
+        {
+          name: "ladinginfo",
+          path: "/ladinginfo",
+          component: () => import("./LadingInfo"),
+        },
+        {
+          name: "veterinarytransfer",
+          path: "/veterinarytransfer",
+          component: () => import("./VeterinaryTransfer"),
+        },
+      ],
+    });
+  }
+
+  if (checkMenuPermission("users", permissions)) {
+    items.push({
+      en: "users",
+      fa: "کاربران",
+      icon: () => <UsersIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "users",
+          path: "/users",
+          component: () => import("./Users"),
+        },
+      ],
+    });
+  }
+
+  if (checkMenuPermission("inspections", permissions)) {
+    items.push({
+      en: "inspections",
+      fa: "سوابق بازرسی",
+      icon: () => <DocumentTextIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "inspections",
+          path: "/inspections",
+          component: () => import("./UserInspections"),
+        },
+      ],
+    });
+  }
+
+  if (checkMenuPermission("statics", permissions)) {
+    items.push({
+      en: "statics",
+      fa: "آمار",
+      icon: () => <ChartBarIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "statics",
+          path: "/statics",
+          component: () => import("./Statics"),
+        },
+      ],
+    });
+  }
+
+  return items;
+};

 export const Menu = () => {
-  const { profile, updateProfile } = useUserProfileStore();
+  const { profile } = useUserProfileStore();
  const navigate = useNavigate();
  const menuItems = getInspectionMenuItems(profile?.permissions || []);
  const [openIndex, setOpenIndex] = useState<number | null>(null);
-  const hasAdmin =
-    Array.isArray(profile?.permissions) &&
-    profile.permissions.includes("admin");
-  const currentProvince = profile?.province || "hamedan";

  const toggleSubmenu = (index: number) => {
    setOpenIndex((prev) => (prev === index ? null : index));
@@ -37,7 +110,7 @@ export const Menu = () => {
        منو
      </h1>

-      <div className="mb-4 space-y-3">
+      <div className="mb-4">
        <button
          onClick={() => navigate({ to: "/" })}
          className="w-full flex items-center justify-center gap-2 px-4 py-3 rounded-xl bg-primary-500 hover:bg-primary-600 cursor-pointer dark:bg-primary-800 dark:hover:bg-primary-700 text-white font-semibold text-sm transition-all duration-200 shadow-md hover:shadow-lg"
@@ -45,30 +118,6 @@ export const Menu = () => {
          <GlobeAsiaAustraliaIcon className="w-5 h-5" />
          <span>مشاهده نقشه</span>
        </button>
-        {hasAdmin && (
-          <div className="flex flex-col gap-2 p-3 rounded-xl bg-white dark:bg-dark-700 border border-gray-200 dark:border-dark-600">
-            <div className="flex items-center gap-2 text-sm font-medium text-gray-600 dark:text-gray-400">
-              <MapPinIcon className="w-4 h-4 shrink-0" />
-              <span>استان</span>
-            </div>
-            <div className="grid grid-cols-2 gap-2">
-              {ADMIN_PROVINCES.map(({ value, label }) => (
-                <button
-                  key={value}
-                  type="button"
-                  onClick={() => updateProfile({ province: value })}
-                  className={`px-4 py-2.5 rounded-lg text-sm font-medium transition-all ${
-                    currentProvince === value
-                      ? "bg-primary-500 text-white dark:bg-primary-600 shadow-md"
-                      : "bg-gray-100 dark:bg-dark-600 text-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-dark-500"
-                  }`}
-                >
-                  {label}
-                </button>
-              ))}
-            </div>
-          </div>
-        )}
      </div>

      <div className="space-y-2">
--- a/src/Pages/PostcodeInquiry.tsx
+++ b/src/Pages/PostcodeInquiry.tsx
@@ -1,290 +0,0 @@
-import React, { useState } from "react";
-import { Grid } from "../components/Grid/Grid";
-import Textfield from "../components/Textfeild/Textfeild";
-import { useApiMutation } from "../utils/useApiRequest";
-import { motion, AnimatePresence } from "framer-motion";
-import Typography from "../components/Typography/Typography";
-import { useToast } from "../hooks/useToast";
-import {
-  MapPinIcon,
-  BuildingOfficeIcon,
-  IdentificationIcon,
-} from "@heroicons/react/24/outline";
-import Button from "../components/Button/Button";
-
-interface PostcodeInquiryData {
-  avenue: string;
-  buildingName: string;
-  description: string;
-  floorNo: number | null;
-  houseNo: string;
-  houseNoSpecified: boolean;
-  location: string;
-  locationCode: string;
-  locationType: string;
-  parish: string | null;
-  postCode: string;
-  preAvenue: string;
-  sideFloor: number | null;
-  state: string;
-  townShip: string;
-  village: string;
-  zone: string;
-  address: string;
-  hasError: boolean;
-  errorMessage: string | null;
-  errorCode: number;
-}
-
-interface PostcodeInquiryResponse {
-  status: boolean;
-  statusCode: number;
-  data: PostcodeInquiryData;
-  apiLogId: string;
-}
-
-const PostcodeInquiry: React.FC = () => {
-  const [postcode, setPostcode] = useState("");
-  const [inquiryData, setInquiryData] = useState<PostcodeInquiryData | null>(
-    null,
-  );
-  const showToast = useToast();
-
-  const inquiryMutation = useApiMutation<PostcodeInquiryResponse>({
-    api: "postcode-inquiry",
-    method: "get",
-  });
-
-  const handleSearch = async () => {
-    const trimmed = postcode.trim();
-
-    if (!trimmed) {
-      showToast("لطفا کد پستی را وارد کنید", "error");
-      return;
-    }
-
-    if (trimmed.length !== 10) {
-      showToast("کد پستی باید 10 رقم باشد", "error");
-      return;
-    }
-
-    try {
-      const result = await inquiryMutation.mutateAsync({ postcode: trimmed });
-
-      if (result?.status && result?.data) {
-        if (result.data.hasError) {
-          setInquiryData(null);
-          showToast(result.data.errorMessage || "نتیجه‌ای یافت نشد", "info");
-        } else {
-          setInquiryData(result.data);
-        }
-      } else {
-        setInquiryData(null);
-        showToast("نتیجه‌ای یافت نشد", "info");
-      }
-    } catch (error: any) {
-      console.error("Postcode inquiry error:", error);
-      showToast(
-        error?.response?.data?.message || "خطا در استعلام کد پستی",
-        "error",
-      );
-      setInquiryData(null);
-    }
-  };
-
-  const handlePostcodeChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    const numericValue = value.replace(/\D/g, "").slice(0, 10);
-    setPostcode(numericValue);
-  };
-
-  const handleKeyPress = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key === "Enter") {
-      handleSearch();
-    }
-  };
-
-  return (
-    <Grid container column className="gap-4 p-4 max-w-6xl mx-auto">
-      <motion.div
-        initial={{ opacity: 0, y: 20 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.4, delay: 0.1 }}
-        className="w-full"
-      >
-        <Grid
-          container
-          column
-          className="gap-4 p-6 bg-white dark:bg-dark-800 rounded-xl shadow-lg border border-gray-200 dark:border-dark-600"
-        >
-          <Typography
-            variant="h5"
-            className="text-gray-900 dark:text-gray-100 font-bold mb-2"
-          >
-            استعلام کد پستی
-          </Typography>
-
-          <Grid container className="gap-4 items-end">
-            <Grid container className="flex-1" column>
-              <Textfield
-                placeholder="کد پستی (10 رقم)"
-                value={postcode}
-                onChange={handlePostcodeChange}
-                onKeyPress={handleKeyPress}
-                fullWidth
-              />
-            </Grid>
-            <Button
-              onClick={handleSearch}
-              disabled={inquiryMutation.isPending}
-              className="px-6 py-2.5"
-            >
-              {inquiryMutation.isPending ? "در حال جستجو..." : "جستجو"}
-            </Button>
-          </Grid>
-        </Grid>
-      </motion.div>
-
-      <AnimatePresence mode="popLayout">
-        {inquiryData && (
-          <motion.div
-            initial={{ opacity: 0, y: 20 }}
-            animate={{ opacity: 1, y: 0 }}
-            exit={{ opacity: 0 }}
-            className="w-full"
-          >
-            <div className="bg-white dark:bg-dark-800 rounded-xl shadow-lg border border-gray-200 dark:border-dark-600 p-6">
-              <Grid container column className="gap-4">
-                <div className="flex items-start justify-between pb-4 border-b border-gray-200 dark:border-dark-600">
-                  <div className="flex items-center gap-3">
-                    <div className="p-3 bg-primary-100 dark:bg-primary-900/30 rounded-lg">
-                      <MapPinIcon className="w-6 h-6 text-primary-600 dark:text-primary-400" />
-                    </div>
-                    <div>
-                      <Typography
-                        variant="h6"
-                        className="text-gray-900 dark:text-gray-100 font-bold"
-                      >
-                        نتیجه استعلام کد پستی
-                      </Typography>
-                      <Typography
-                        variant="body2"
-                        className="text-gray-600 dark:text-gray-400 mt-1"
-                      >
-                        کد پستی: {inquiryData.postCode}
-                      </Typography>
-                    </div>
-                  </div>
-                </div>
-
-                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                  {inquiryData.address && (
-                    <div className="flex items-start gap-3 p-3 bg-gray-50 dark:bg-dark-700 rounded-lg md:col-span-2">
-                      <MapPinIcon className="w-5 h-5 text-gray-600 dark:text-gray-400 shrink-0 mt-0.5" />
-                      <div className="flex-1">
-                        <Typography
-                          variant="body2"
-                          className="text-gray-500 dark:text-gray-400 text-xs mb-1"
-                        >
-                          آدرس
-                        </Typography>
-                        <Typography
-                          variant="body1"
-                          className="text-gray-900 dark:text-gray-100 font-medium"
-                        >
-                          {inquiryData.address}
-                        </Typography>
-                      </div>
-                    </div>
-                  )}
-
-                  {inquiryData.buildingName && (
-                    <div className="flex items-center gap-3 p-3 bg-gray-50 dark:bg-dark-700 rounded-lg">
-                      <BuildingOfficeIcon className="w-5 h-5 text-gray-600 dark:text-gray-400 shrink-0" />
-                      <div>
-                        <Typography
-                          variant="body2"
-                          className="text-gray-500 dark:text-gray-400 text-xs"
-                        >
-                          نام ساختمان
-                        </Typography>
-                        <Typography
-                          variant="body1"
-                          className="text-gray-900 dark:text-gray-100 font-medium"
-                        >
-                          {inquiryData.buildingName}
-                        </Typography>
-                      </div>
-                    </div>
-                  )}
-
-                  {inquiryData.state && (
-                    <div className="flex items-center gap-3 p-3 bg-gray-50 dark:bg-dark-700 rounded-lg">
-                      <MapPinIcon className="w-5 h-5 text-gray-600 dark:text-gray-400 shrink-0" />
-                      <div>
-                        <Typography
-                          variant="body2"
-                          className="text-gray-500 dark:text-gray-400 text-xs"
-                        >
-                          استان
-                        </Typography>
-                        <Typography
-                          variant="body1"
-                          className="text-gray-900 dark:text-gray-100 font-medium"
-                        >
-                          {inquiryData.state}
-                        </Typography>
-                      </div>
-                    </div>
-                  )}
-
-                  {inquiryData.townShip && (
-                    <div className="flex items-center gap-3 p-3 bg-gray-50 dark:bg-dark-700 rounded-lg">
-                      <MapPinIcon className="w-5 h-5 text-gray-600 dark:text-gray-400 shrink-0" />
-                      <div>
-                        <Typography
-                          variant="body2"
-                          className="text-gray-500 dark:text-gray-400 text-xs"
-                        >
-                          شهرستان
-                        </Typography>
-                        <Typography
-                          variant="body1"
-                          className="text-gray-900 dark:text-gray-100 font-medium"
-                        >
-                          {inquiryData.townShip}
-                        </Typography>
-                      </div>
-                    </div>
-                  )}
-
-                  {inquiryData.locationCode && (
-                    <div className="flex items-center gap-3 p-3 bg-gray-50 dark:bg-dark-700 rounded-lg">
-                      <IdentificationIcon className="w-5 h-5 text-gray-600 dark:text-gray-400 shrink-0" />
-                      <div>
-                        <Typography
-                          variant="body2"
-                          className="text-gray-500 dark:text-gray-400 text-xs"
-                        >
-                          کد شهر
-                        </Typography>
-                        <Typography
-                          variant="body1"
-                          className="text-gray-900 dark:text-gray-100 font-medium"
-                        >
-                          {inquiryData.locationCode}
-                        </Typography>
-                      </div>
-                    </div>
-                  )}
-                </div>
-              </Grid>
-            </div>
-          </motion.div>
-        )}
-      </AnimatePresence>
-    </Grid>
-  );
-};
-
-export default PostcodeInquiry;
--- a/src/config/menuItems.tsx
+++ b/src/config/menuItems.tsx
@@ -1,91 +0,0 @@
-import {
-  UsersIcon,
-  DocumentTextIcon,
-  ChartBarIcon,
-  UserIcon,
-} from "@heroicons/react/24/outline";
-import { ItemWithSubItems } from "../types/userPermissions";
-import { checkMenuPermission } from "../utils/checkMenuPermission";
-
-export const getInspectionMenuItems = (
-  permissions: string[] = [],
-): ItemWithSubItems[] => {
-  const items: ItemWithSubItems[] = [];
-
-  if (checkMenuPermission("nationalinfo", permissions)) {
-    items.push({
-      en: "nationalinfo",
-      fa: "اطلاعات",
-      icon: () => <UserIcon className="w-6 h-6" />,
-      subItems: [
-        {
-          name: "nationalinfo",
-          path: "/nationalinfo",
-          component: () => import("../Pages/NationalInfo"),
-        },
-        {
-          name: "ladinginfo",
-          path: "/ladinginfo",
-          component: () => import("../Pages/LadingInfo"),
-        },
-        {
-          name: "veterinarytransfer",
-          path: "/veterinarytransfer",
-          component: () => import("../Pages/VeterinaryTransfer"),
-        },
-        {
-          name: "postcodeinquiry",
-          path: "/postcode-inquiry",
-          component: () => import("../Pages/PostcodeInquiry"),
-        },
-      ],
-    });
-  }
-
-  if (checkMenuPermission("users", permissions)) {
-    items.push({
-      en: "users",
-      fa: "کاربران",
-      icon: () => <UsersIcon className="w-6 h-6" />,
-      subItems: [
-        {
-          name: "users",
-          path: "/users",
-          component: () => import("../Pages/Users"),
-        },
-      ],
-    });
-  }
-
-  if (checkMenuPermission("inspections", permissions)) {
-    items.push({
-      en: "inspections",
-      fa: "سوابق بازرسی",
-      icon: () => <DocumentTextIcon className="w-6 h-6" />,
-      subItems: [
-        {
-          name: "inspections",
-          path: "/inspections",
-          component: () => import("../Pages/UserInspections"),
-        },
-      ],
-    });
-  }
-
-  if (checkMenuPermission("statics", permissions)) {
-    items.push({
-      en: "statics",
-      fa: "آمار",
-      icon: () => <ChartBarIcon className="w-6 h-6" />,
-      subItems: [
-        {
-          name: "statics",
-          path: "/statics",
-          component: () => import("../Pages/Statics"),
-        },
-      ],
-    });
-  }
-
-  return items;
-};
--- a/src/context/zustand-store/userStore.ts
+++ b/src/context/zustand-store/userStore.ts
@@ -5,13 +5,12 @@ import { useDashboardTabStore } from "./dashboardTabStore";
 interface UseUserProfileStore {
  profile?: Record<string, any> | null;
  setUserProfile: (profile: Record<string, any>) => void;
-  updateProfile: (updates: Partial<Record<string, any>>) => void;
  clearProfile: () => void;
 }

 const arePermissionsEqual = (
  permissions1?: string[],
-  permissions2?: string[],
+  permissions2?: string[]
 ): boolean => {
  if (!permissions1 && !permissions2) return true;
  if (!permissions1 || !permissions2) return false;
@@ -25,7 +24,7 @@ const arePermissionsEqual = (

 const areProfilesEqual = (
  currentProfile: Record<string, any> | null | undefined,
-  newProfile: Record<string, any>,
+  newProfile: Record<string, any>
 ): boolean => {
  if (!currentProfile) return false;

@@ -36,10 +35,10 @@ const areProfilesEqual = (
  }

  const currentKeys = Object.keys(currentProfile).filter(
-    (key) => key !== "permissions",
+    (key) => key !== "permissions"
  );
  const newKeys = Object.keys(newProfile).filter(
-    (key) => key !== "permissions",
+    (key) => key !== "permissions"
  );

  if (currentKeys.length !== newKeys.length) return false;
@@ -73,15 +72,10 @@ export const useUserProfileStore = create<UseUserProfileStore>()(
          console.log("profile", profile);
        }
      },
-      updateProfile: (updates) => {
-        const currentProfile = get().profile;
-        if (!currentProfile) return;
-        set({ profile: { ...currentProfile, ...updates } });
-      },
      clearProfile: () => set({ profile: null }),
    }),
-    { name: "userprofile" },
-  ),
+    { name: "userprofile" }
+  )
 );

 interface UseUserStore {
@@ -103,6 +97,6 @@ export const useUserStore = create<UseUserStore>()(
    }),
    {
      name: "user",
-    },
-  ),
+    }
+  )
 );
--- a/src/partials/main/MainInfractions.tsx
+++ b/src/partials/main/MainInfractions.tsx
@@ -1,103 +1,17 @@
 import Typography from "../../components/Typography/Typography";
-import { motion, AnimatePresence } from "framer-motion";
-import {
-  ExclamationTriangleIcon,
-  DocumentTextIcon,
-  CheckCircleIcon,
-} from "@heroicons/react/24/outline";
-
-const containerVariants = {
-  hidden: { opacity: 0 },
-  visible: {
-    opacity: 1,
-    transition: { staggerChildren: 0.08, delayChildren: 0.05 },
-  },
-  exit: {
-    opacity: 0,
-    transition: { staggerChildren: 0.05, staggerDirection: -1 },
-  },
-};
-
-const itemVariants = {
-  hidden: { opacity: 0, y: 12 },
-  visible: { opacity: 1, y: 0 },
-  exit: { opacity: 0, y: -8 },
-};
+import { Grid } from "../../components/Grid/Grid";

 export const MainInfractions = ({
  data,
-  handleUpdate: _handleUpdate,
+  handleUpdate,
 }: {
  data: any;
  handleUpdate: () => void;
 }) => {
-  const infractions = data?.infractions || [];
-
-  if (infractions.length === 0) {
-    return (
-      <motion.div
-        initial={{ opacity: 0, scale: 0.96 }}
-        animate={{ opacity: 1, scale: 1 }}
-        transition={{ duration: 0.3 }}
-        className="flex flex-col items-center justify-center py-12 px-6 rounded-xl bg-gray-50 dark:bg-gray-800/50 border border-gray-200 dark:border-gray-700"
-      >
-        <CheckCircleIcon className="w-14 h-14 text-emerald-500 dark:text-emerald-400 mb-4" />
-        <Typography
-          variant="body1"
-          className="text-gray-500 dark:text-gray-400 text-center"
-        >
-          تخلفی ثبت نشده است
-        </Typography>
-      </motion.div>
-    );
-  }
-
+  console.log(data, handleUpdate);
  return (
-    <motion.div
-      variants={containerVariants}
-      initial="hidden"
-      animate="visible"
-      exit="exit"
-      className="flex flex-col gap-3"
-    >
-      <AnimatePresence mode="popLayout">
-        {infractions.map(
-          (
-            infraction: { _id: string; title: string; description?: string },
-            index: number,
-          ) => (
-            <motion.div
-              key={infraction._id || index}
-              variants={itemVariants}
-              layout
-              className="group flex gap-4 p-4 rounded-xl border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800/80 hover:bg-gray-50 dark:hover:bg-gray-800 hover:border-red-200 dark:hover:border-red-900/50 shadow-sm hover:shadow-md transition-all duration-200"
-            >
-              <div className="flex-shrink-0 w-10 h-10 rounded-lg bg-red-100 dark:bg-red-900/30 flex items-center justify-center">
-                <ExclamationTriangleIcon className="w-5 h-5 text-red-600 dark:text-red-400" />
-              </div>
-              <div className="flex-1 min-w-0">
-                <Typography
-                  variant="subtitle2"
-                  className="font-semibold mb-1 text-gray-900 dark:text-gray-100"
-                >
-                  {index + 1}. {infraction.title}
-                </Typography>
-                {infraction.description && (
-                  <div className="flex items-start gap-2 mt-2">
-                    <DocumentTextIcon className="w-4 h-4 text-gray-400 dark:text-gray-500 flex-shrink-0 mt-0.5" />
-                    <Typography
-                      variant="body2"
-                      className="text-gray-600 dark:text-gray-400 leading-relaxed"
-                    >
-                      {infraction.description}
-                    </Typography>
-                  </div>
-                )}
-              </div>
-            </motion.div>
-          ),
-        )}
-      </AnimatePresence>
-    </motion.div>
+    <Grid container column>
+      <Typography variant="body1">این بخش در دست توسعه است</Typography>
+    </Grid>
  );
 };
--- a/src/partials/main/MainPlaceInfo.tsx
+++ b/src/partials/main/MainPlaceInfo.tsx
@@ -119,7 +119,7 @@ const MainPlaceInfo: React.FC<MainPlaceInfoProps> = ({
  const [personRegistryData, setPersonRegistryData] =
    useState<PersonRegistryData | null>(null);
  const [unitRegistryData, setUnitRegistryData] = useState<UnitRegistryData[]>(
-    [],
+    []
  );
  const [isLoadingRegistry, setIsLoadingRegistry] = useState(false);
  const { openDrawer } = useDrawerStore();
@@ -201,7 +201,7 @@ const MainPlaceInfo: React.FC<MainPlaceInfoProps> = ({
        const unitsCandidate =
          unitResult?.data ?? (Array.isArray(unitResult) ? unitResult : []);
        setUnitRegistryData(
-          Array.isArray(unitsCandidate) ? unitsCandidate : [],
+          Array.isArray(unitsCandidate) ? unitsCandidate : []
        );
      } catch (error: any) {
        console.error("Unit registry error:", error);
@@ -320,6 +320,7 @@ const MainPlaceInfo: React.FC<MainPlaceInfoProps> = ({
              )}
            </div>

+            {/* Submit Inspection Button */}
            <div className="pt-2">
              <Button
                onClick={handleOpenInspection}
--- a/src/partials/main/MainSubmitInspection.tsx
+++ b/src/partials/main/MainSubmitInspection.tsx
@@ -93,28 +93,30 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
    { key: "عمده فروش", value: "عمده فروش" },
  ];

-  const usersList = Array.isArray(usersData)
-    ? usersData
-    : ((usersData as any)?.data ?? []);
-
  const inspectorOptions = useMemo(() => {
-    if (!usersList?.length) return [];
-    return usersList
-      .filter((user: any) => user.province === profile?.province)
+    if (!usersData?.data) return [];
+    return usersData.data
+      .filter(
+        (user: any) =>
+          user.province === profile?.province &&
+          !user?.permissions?.includes("admin")
+      )
      .map((user: any) => ({
        key: `${user.fullname} / ${user.mobile}`,
        value: `${user.fullname} / ${user.mobile}`,
      }));
-  }, [usersList, profile]);
+  }, [usersData, profile]);

  const defaultInspectorKeys = useMemo(() => {
    if (!isEdit || !item?.inspectors) return [];
    return item.inspectors.map((insp: any) => {
      if (typeof insp === "string") return insp;
-      const user = usersList?.find((u: any) => u.fullname === insp.fullname);
+      const user = usersData?.data?.find(
+        (u: any) => u.fullname === insp.fullname
+      );
      return user ? `${insp.fullname} / ${user.mobile}` : insp.fullname;
    });
-  }, [item, isEdit, usersList]);
+  }, [item, isEdit, usersData]);

  const {
    control,
@@ -148,15 +150,17 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
  const watchedInfractions = watch("infractions");

  useEffect(() => {
-    if (isEdit && item?.inspectors && usersList?.length) {
+    if (isEdit && item?.inspectors && usersData?.data) {
      const inspectorStrings = item.inspectors.map((insp: any) => {
        if (typeof insp === "string") return insp;
-        const user = usersList.find((u: any) => u.fullname === insp.fullname);
+        const user = usersData.data.find(
+          (u: any) => u.fullname === insp.fullname
+        );
        return user ? `${insp.fullname} / ${user.mobile}` : insp.fullname;
      });
      setValue("inspectors", inspectorStrings);
    }
-  }, [item, isEdit, usersList, setValue]);
+  }, [item, isEdit, usersData, setValue]);

  const submitInspectionMutation = useApiMutation({
    api: "inspections",
@@ -222,8 +226,8 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
                (Array.isArray(field.value)
                  ? field.value
                  : field.value
-                    ? [field.value]
-                    : []) as (string | number)[]
+                  ? [field.value]
+                  : []) as (string | number)[]
              }
              onChange={(keys) => setValue("license_type", keys as any)}
              title="نوع پروانه کسب"
@@ -303,8 +307,8 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
                (Array.isArray(field.value)
                  ? field.value
                  : field.value
-                    ? [field.value]
-                    : []) as (string | number)[]
+                  ? [field.value]
+                  : []) as (string | number)[]
              }
              onChange={(keys) => setValue("ownership_type", keys as any)}
              title="نوع مالکیت"
@@ -324,8 +328,8 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
                (Array.isArray(field.value)
                  ? field.value
                  : field.value
-                    ? [field.value]
-                    : []) as (string | number)[]
+                  ? [field.value]
+                  : []) as (string | number)[]
              }
              onChange={(keys) => setValue("unit_type", keys as any)}
              title="نوع واحد"
--- a/src/routes/paths.ts
+++ b/src/routes/paths.ts
@@ -14,4 +14,3 @@ export const AUTO_LOGIN_WITH_PARAMS = "/autologin/:key/:province";
 export const NATIONAL_INFO = "/nationalinfo";
 export const LADING_INFO = "/ladinginfo";
 export const VETERINARY_TRANSFER = "/veterinarytransfer";
-export const POSTCODE_INQUIRY = "/postcode-inquiry";
--- a/src/routes/routeConfigs.ts
+++ b/src/routes/routeConfigs.ts
@@ -11,7 +11,6 @@ import AutoLogin from "../Pages/AutoLogin";
 import NationalInfo from "../Pages/NationalInfo";
 import LadingInfo from "../Pages/LadingInfo";
 import VeterinaryTransfer from "../Pages/VeterinaryTransfer";
-import PostcodeInquiry from "../Pages/PostcodeInquiry";

 interface Route {
  path: string;
@@ -31,7 +30,6 @@ export const getRoutes = (auth: string | null): Route[] => {
      { path: R.NATIONAL_INFO, component: NationalInfo },
      { path: R.LADING_INFO, component: LadingInfo },
      { path: R.VETERINARY_TRANSFER, component: VeterinaryTransfer },
-      { path: R.POSTCODE_INQUIRY, component: PostcodeInquiry },
    ];

    if (checkIsMobile()) {
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -17,7 +17,15 @@ export function makeRouter(auth: string | null) {
  try {
    const routeConfigs = getRoutes(auth);

+    console.log(
+      "Creating router with routes:",
+      routeConfigs.length,
+      "auth:",
+      !!auth
+    );
+
    if (routeConfigs.length === 0) {
+      console.log("No routes found, adding default Auth route");
      routeConfigs.push({ path: "/", component: Auth });
    }

@@ -49,6 +57,7 @@ export function makeRouter(auth: string | null) {
      defaultPreload: "intent",
    });

+    console.log("Router created successfully");
    return router;
  } catch (error) {
    console.error("Error creating router:", error);
--- a/src/screen/SideBar.tsx
+++ b/src/screen/SideBar.tsx
@@ -4,25 +4,24 @@ import { useState } from "react";
 import { motion, AnimatePresence } from "framer-motion";
 import { ChevronDownIcon } from "@heroicons/react/24/solid";
 import { useUserProfileStore } from "../context/zustand-store/userStore";
+import { ItemWithSubItems } from "../types/userPermissions";
 import { useNavigate } from "@tanstack/react-router";
 import { getFaPermissions } from "../utils/getFaPermissions";
 import { useSideBarStore } from "../context/zustand-store/appStore";
 import SVGImage from "../components/SvgImage/SvgImage";
-import { getInspectionMenuItems } from "../config/menuItems";
+import { checkMenuPermission } from "../utils/checkMenuPermission";
 import {
  ChevronLeftIcon,
  ChevronRightIcon,
  MagnifyingGlassIcon,
  BuildingOfficeIcon,
+  UsersIcon,
+  DocumentTextIcon,
+  ChartBarIcon,
+  UserIcon,
  GlobeAsiaAustraliaIcon,
-  MapPinIcon,
 } from "@heroicons/react/24/outline";

-const ADMIN_PROVINCES = [
-  { value: "hamedan", label: "همدان" },
-  { value: "markazi", label: "مرکزی" },
-] as const;
-
 const containerVariants = {
  hidden: {},
  visible: { transition: { staggerChildren: 0.03 } },
@@ -70,14 +69,91 @@ const sidebarVariants = {
  },
 };

+export const getInspectionMenuItems = (
+  permissions: string[] = []
+): ItemWithSubItems[] => {
+  const items: ItemWithSubItems[] = [];
+
+  if (checkMenuPermission("nationalinfo", permissions)) {
+    items.push({
+      en: "nationalinfo",
+      fa: "اطلاعات",
+      icon: () => <UserIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "nationalinfo",
+          path: "/nationalinfo",
+          component: () => import("../Pages/NationalInfo"),
+        },
+
+        {
+          name: "ladinginfo",
+          path: "/ladinginfo",
+          component: () => import("../Pages/LadingInfo"),
+        },
+        {
+          name: "veterinarytransfer",
+          path: "/veterinarytransfer",
+          component: () => import("../Pages/VeterinaryTransfer"),
+        },
+      ],
+    });
+  }
+
+  if (checkMenuPermission("users", permissions)) {
+    items.push({
+      en: "users",
+      fa: "کاربران",
+      icon: () => <UsersIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "users",
+          path: "/users",
+          component: () => import("../Pages/Users"),
+        },
+      ],
+    });
+  }
+
+  if (checkMenuPermission("inspections", permissions)) {
+    items.push({
+      en: "inspections",
+      fa: "سوابق بازرسی",
+      icon: () => <DocumentTextIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "inspections",
+          path: "/inspections",
+          component: () => import("../Pages/UserInspections"),
+        },
+      ],
+    });
+  }
+
+  if (checkMenuPermission("statics", permissions)) {
+    items.push({
+      en: "statics",
+      fa: "آمار",
+      icon: () => <ChartBarIcon className="w-6 h-6" />,
+      subItems: [
+        {
+          name: "statics",
+          path: "/statics",
+          component: () => import("../Pages/Statics"),
+        },
+      ],
+    });
+  }
+
+  return items;
+};
+
 export const SideBar = () => {
  const isMobile = checkIsMobile();
-  const { profile, updateProfile } = useUserProfileStore();
-  const menuItems = getInspectionMenuItems(profile?.permissions || []);
-  const hasAdmin =
-    Array.isArray(profile?.permissions) &&
-    profile.permissions.includes("admin");
-  const currentProvince = profile?.province || "hamedan";
+  const { profile } = useUserProfileStore();
+  const menuItems: ItemWithSubItems[] = getInspectionMenuItems(
+    profile?.permissions || []
+  );
  const [search, setSearch] = useState("");

  const { isSideBarOpen, toggleSideBar } = useSideBarStore();
@@ -85,7 +161,7 @@ export const SideBar = () => {
  const getOpenedItem = () => {
    if (window.location.pathname !== "/") {
      const matchedIndex = menuItems.findIndex((item) =>
-        item.subItems.some((sub) => sub.path === window.location.pathname),
+        item.subItems.some((sub) => sub.path === window.location.pathname)
      );
      return matchedIndex;
    } else {
@@ -104,7 +180,7 @@ export const SideBar = () => {
          getFaPermissions(subItem.name)
            .toLowerCase()
            .includes(search.toLowerCase()) ||
-          subItem.path.toLowerCase().includes(search.toLowerCase()),
+          subItem.path.toLowerCase().includes(search.toLowerCase())
      );

      return {
@@ -115,7 +191,7 @@ export const SideBar = () => {
    .filter(
      (item) =>
        item.subItems.length > 0 ||
-        item.fa.toLowerCase().includes(search.toLowerCase()),
+        item.fa.toLowerCase().includes(search.toLowerCase())
    );

  if (isMobile) return null;
@@ -211,30 +287,6 @@ export const SideBar = () => {
                    <span>مشاهده نقشه</span>
                  </motion.button>
                )}
-                {isSideBarOpen && hasAdmin && (
-                  <div className="flex flex-col gap-2">
-                    <div className="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-400">
-                      <MapPinIcon className="w-4 h-4 shrink-0" />
-                      <span>استان</span>
-                    </div>
-                    <div className="grid grid-cols-2 gap-1.5">
-                      {ADMIN_PROVINCES.map(({ value, label }) => (
-                        <button
-                          key={value}
-                          type="button"
-                          onClick={() => updateProfile({ province: value })}
-                          className={`px-3 py-2 rounded-lg text-sm font-medium transition-all ${
-                            currentProvince === value
-                              ? "bg-primary-500 text-white dark:bg-primary-600 shadow-md"
-                              : "bg-gray-100 dark:bg-dark-600 text-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-dark-500"
-                          }`}
-                        >
-                          {label}
-                        </button>
-                      ))}
-                    </div>
-                  </div>
-                )}
              </div>
            </motion.div>
          )}
--- a/src/utils/checkMenuPermission.ts
+++ b/src/utils/checkMenuPermission.ts
@@ -1,6 +1,6 @@
 export const checkMenuPermission = (
  menuItemName: string,
-  userPermissions: string[] = [],
+  userPermissions: string[] = []
 ): boolean => {
  if (userPermissions.includes("admin")) {
    return true;
@@ -24,7 +24,7 @@ export const checkMenuPermission = (

 export const checkRoutePermission = (
  routePath: string,
-  userPermissions: string[] = [],
+  userPermissions: string[] = []
 ): boolean => {
  if (userPermissions.includes("admin")) {
    return true;
@@ -35,7 +35,6 @@ export const checkRoutePermission = (
    "/inspections": ["admin", "submit"],
    "/statics": [],
    "/nationalinfo": ["admin"],
-    "/postcode-inquiry": ["admin"],
  };

  const requiredPermissions = routePermissionMap[routePath] || [];
--- a/src/utils/getFaPermissions.ts
+++ b/src/utils/getFaPermissions.ts
@@ -22,9 +22,6 @@ export function getFaPermissions(permission: string) {
    case "veterinarytransfer":
      faPermission = "اطلاعات گواهی حمل";
      break;
-    case "postcodeinquiry":
-      faPermission = "استعلام کد پستی";
-      break;
    case "main":
      faPermission = "صفحه اصلی";
      break;
Author	SHA1	Message	Date
wixarm	9ec195870a	feat: edit user and add admin permission	2026-02-01 15:37:32 +03:30
wixarm	c13a3042c1	fix: tokn timeout redirect	2026-02-01 15:09:31 +03:30