From 1f763a33ac893d6c49756b9b7e0c03872560d578 Mon Sep 17 00:00:00 2001 From: wixarm Date: Mon, 23 Feb 2026 12:30:27 +0330 Subject: [PATCH] refactor: organized pages based on domain --- src/Pages/Dashboard.tsx | 16 +++--- .../{ => LiveStock}/CooperativeRanchers.tsx | 32 ++++++------ src/Pages/{ => LiveStock}/Cooperatives.tsx | 36 ++++++------- src/Pages/{ => LiveStock}/Herds.tsx | 26 +++++----- src/Pages/{ => LiveStock}/IncentivePlans.tsx | 26 +++++----- src/Pages/{ => LiveStock}/Inventory.tsx | 12 ++--- .../{ => LiveStock}/LiveStockFarmers.tsx | 26 +++++----- src/Pages/{ => LiveStock}/LiveStocks.tsx | 22 ++++---- src/Pages/{ => LiveStock}/Organizations.tsx | 8 +-- src/Pages/{ => LiveStock}/Pos.tsx | 24 ++++----- src/Pages/{ => LiveStock}/PosAccounts.tsx | 28 +++++------ src/Pages/{ => LiveStock}/PosCompanies.tsx | 22 ++++---- src/Pages/{ => LiveStock}/Pricing.tsx | 10 ++-- src/Pages/{ => LiveStock}/Products.tsx | 36 ++++++------- .../{ => LiveStock}/ProductsCategories.tsx | 18 +++---- src/Pages/{ => LiveStock}/Quota.tsx | 12 ++--- src/Pages/{ => LiveStock}/RancherPlans.tsx | 16 +++--- src/Pages/{ => LiveStock}/Reporting.tsx | 10 ++-- src/Pages/{ => LiveStock}/Roles.tsx | 28 +++++------ src/Pages/{ => LiveStock}/SettingsOfUnits.tsx | 10 ++-- src/Pages/{ => LiveStock}/TagDistribution.tsx | 8 +-- .../TagDistributionDetails.tsx | 32 ++++++------ src/Pages/{ => LiveStock}/Tagging.tsx | 8 +-- src/Pages/{ => LiveStock}/Transactions.tsx | 43 ++++++++-------- src/Pages/{ => LiveStock}/Unions.tsx | 14 +++--- src/Pages/{ => LiveStock}/Users.tsx | 32 ++++++------ src/Pages/Menu.tsx | 4 +- src/Pages/UserProfile.tsx | 16 +++--- src/routes/routeConfigs.ts | 4 +- src/routes/routes.ts | 2 +- src/utils/getCategoryParameters.ts | 50 +++++++++---------- 31 files changed, 317 insertions(+), 314 deletions(-) rename src/Pages/{ => LiveStock}/CooperativeRanchers.tsx (87%) rename src/Pages/{ => LiveStock}/Cooperatives.tsx (86%) rename src/Pages/{ => LiveStock}/Herds.tsx (92%) rename src/Pages/{ => LiveStock}/IncentivePlans.tsx (84%) rename src/Pages/{ => LiveStock}/Inventory.tsx (70%) rename src/Pages/{ => LiveStock}/LiveStockFarmers.tsx (91%) rename src/Pages/{ => LiveStock}/LiveStocks.tsx (85%) rename src/Pages/{ => LiveStock}/Organizations.tsx (70%) rename src/Pages/{ => LiveStock}/Pos.tsx (86%) rename src/Pages/{ => LiveStock}/PosAccounts.tsx (89%) rename src/Pages/{ => LiveStock}/PosCompanies.tsx (80%) rename src/Pages/{ => LiveStock}/Pricing.tsx (68%) rename src/Pages/{ => LiveStock}/Products.tsx (87%) rename src/Pages/{ => LiveStock}/ProductsCategories.tsx (80%) rename src/Pages/{ => LiveStock}/Quota.tsx (73%) rename src/Pages/{ => LiveStock}/RancherPlans.tsx (82%) rename src/Pages/{ => LiveStock}/Reporting.tsx (69%) rename src/Pages/{ => LiveStock}/Roles.tsx (82%) rename src/Pages/{ => LiveStock}/SettingsOfUnits.tsx (86%) rename src/Pages/{ => LiveStock}/TagDistribution.tsx (76%) rename src/Pages/{ => LiveStock}/TagDistributionDetails.tsx (93%) rename src/Pages/{ => LiveStock}/Tagging.tsx (76%) rename src/Pages/{ => LiveStock}/Transactions.tsx (87%) rename src/Pages/{ => LiveStock}/Unions.tsx (84%) rename src/Pages/{ => LiveStock}/Users.tsx (84%) diff --git a/src/Pages/Dashboard.tsx b/src/Pages/Dashboard.tsx index adf9da2..60603cd 100644 --- a/src/Pages/Dashboard.tsx +++ b/src/Pages/Dashboard.tsx @@ -32,7 +32,7 @@ export default function Dashboard() { useDashboardTabStore(); const menuItems: ItemWithSubItems[] = getUserPermissions( - profile?.permissions + profile?.permissions, ); const [tabs, setTabs] = useState(dashboarTabs || []); @@ -55,7 +55,7 @@ export default function Dashboard() { hour: "2-digit", minute: "2-digit", hour12: false, - }) + }), ); useEffect(() => { @@ -65,7 +65,7 @@ export default function Dashboard() { hour: "2-digit", minute: "2-digit", hour12: false, - }) + }), ); }, 60000); return () => clearInterval(interval); @@ -96,7 +96,7 @@ export default function Dashboard() { if (activeTabId === id) { setActiveTabId( - newTabs.length > 0 ? newTabs[newTabs.length - 1].id : null + newTabs.length > 0 ? newTabs[newTabs.length - 1].id : null, ); } }; @@ -113,14 +113,14 @@ export default function Dashboard() { (subItem) => !subItem.path.includes("$") && (search.trim() === "" || - getFaPermissions(subItem.name).includes(search.trim())) + getFaPermissions(subItem.name).includes(search.trim())), ), })) .filter((item) => item.subItems.length > 0); function findSubItemByPath( items: ItemWithSubItems[], - path: string + path: string, ): ItemWithSubItems["subItems"][0] | null { for (const item of items) { for (const subItem of item.subItems) { @@ -247,7 +247,7 @@ export default function Dashboard() { const filteredSubItems = subItems.filter( (item) => !item.path.includes("$") && - getFaPermissions(item.name).includes(search.trim()) + getFaPermissions(item.name).includes(search.trim()), ); if (filteredSubItems.length === 0) return null; @@ -306,7 +306,7 @@ export default function Dashboard() { {subItems.map((sub, subIndex) => { const isActive = tabs.some( (tab) => - tab.path === sub.path && activeTabId === tab.id + tab.path === sub.path && activeTabId === tab.id, ); return ( , ]; - } + }, ); setCooperativesTableData(tableData); } diff --git a/src/Pages/Cooperatives.tsx b/src/Pages/LiveStock/Cooperatives.tsx similarity index 86% rename from src/Pages/Cooperatives.tsx rename to src/Pages/LiveStock/Cooperatives.tsx index afe0f72..c730da7 100644 --- a/src/Pages/Cooperatives.tsx +++ b/src/Pages/LiveStock/Cooperatives.tsx @@ -1,19 +1,19 @@ import { useEffect, useState } from "react"; -import { useApiRequest } from "../utils/useApiRequest"; -import { Grid } from "../components/Grid/Grid"; -import Table from "../components/Table/Table"; +import { useApiRequest } from "../../utils/useApiRequest"; +import { Grid } from "../../components/Grid/Grid"; +import Table from "../../components/Table/Table"; import { useNavigate, useParams } from "@tanstack/react-router"; -import { Popover } from "../components/PopOver/PopOver"; -import { Tooltip } from "../components/Tooltip/Tooltip"; -import Button from "../components/Button/Button"; -import { useModalStore } from "../context/zustand-store/appStore"; -import { ChildOrganizations } from "../partials/cooperatives/ChildOrganizations"; -import { COOPERATIVE_LIST } from "../routes/paths"; -import { TableButton } from "../components/TableButton/TableButton"; -import { CooperativesDashboardDetails } from "../partials/cooperatives/CooperativesDashboardDetails"; -import { AddActivityType } from "../partials/cooperatives/AddActivityType"; -import ShowMoreInfo from "../components/ShowMoreInfo/ShowMoreInfo"; -import ShowStringList from "../components/ShowStringList/ShowStringList"; +import { Popover } from "../../components/PopOver/PopOver"; +import { Tooltip } from "../../components/Tooltip/Tooltip"; +import Button from "../../components/Button/Button"; +import { useModalStore } from "../../context/zustand-store/appStore"; +import { ChildOrganizations } from "../../partials/cooperatives/ChildOrganizations"; +import { COOPERATIVE_LIST } from "../../routes/paths"; +import { TableButton } from "../../components/TableButton/TableButton"; +import { CooperativesDashboardDetails } from "../../partials/cooperatives/CooperativesDashboardDetails"; +import { AddActivityType } from "../../partials/cooperatives/AddActivityType"; +import ShowMoreInfo from "../../components/ShowMoreInfo/ShowMoreInfo"; +import ShowStringList from "../../components/ShowStringList/ShowStringList"; export default function Cooperatives() { const { openModal } = useModalStore(); @@ -64,7 +64,7 @@ export default function Cooperatives() { city.name + (city: any) => city.name, )} /> @@ -75,8 +75,8 @@ export default function Cooperatives() { item?.org_purchase_policy === "INTERNAL_ONLY" ? "بر اساس تعاونی" : item?.org_purchase_policy === "CROSS_COOP" - ? "برای کل استان" - : "-", + ? "برای کل استان" + : "-",