From 90a66031bd47defa0ebc32b9d30a19806cebe330 Mon Sep 17 00:00:00 2001 From: AmirmahdiNourkazemi Date: Mon, 17 Aug 2026 07:44:00 +0330 Subject: [PATCH] feat: response in mobile and accouting --- app/admin/accounting/page.tsx | 323 +++++++++++++++++++------ app/admin/dashboard/page.tsx | 2 +- app/admin/layout.tsx | 4 +- app/admin/packages/page.tsx | 24 +- app/admin/products/page.tsx | 25 +- app/admin/promotions/page.tsx | 24 +- app/admin/purchases/page.tsx | 55 ++++- app/admin/referral-rewards/page.tsx | 25 +- app/admin/reminders/page.tsx | 25 +- app/admin/users/page.tsx | 26 +- app/layout.tsx | 3 +- app/page.tsx | 4 +- components/Toast.tsx | 2 +- components/admin/ConfirmDialog.tsx | 100 ++++++++ components/admin/PersianDatePicker.tsx | 2 +- components/admin/StepIndicator.tsx | 2 +- lib/api/client.ts | 1 - lib/api/purchases.ts | 4 + package-lock.json | 13 + types/purchase.ts | 6 + 20 files changed, 556 insertions(+), 114 deletions(-) create mode 100644 components/admin/ConfirmDialog.tsx diff --git a/app/admin/accounting/page.tsx b/app/admin/accounting/page.tsx index 004a5d6..9b77dd9 100644 --- a/app/admin/accounting/page.tsx +++ b/app/admin/accounting/page.tsx @@ -1,6 +1,7 @@ 'use client'; import { useState, useEffect, useCallback } from 'react'; +import type { ComponentType } from 'react'; import { useAuth } from '@/contexts/AuthContext'; import { purchasesApi } from '@/lib/api/purchases'; import { packagesApi } from '@/lib/api/packages'; @@ -25,6 +26,51 @@ import { // بنابراین هر دو وضعیت باید به‌عنوان فروش محسوب شوند. const PAID_STATUSES = [2, 3]; +// Local-time Gregorian helpers. The "YYYY-MM-DD" format matches what +// PersianDatePicker exchanges and what the created_at comparison expects. +const toGregorianValue = (date: Date): string => { + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + return `${year}-${month}-${day}`; +}; + +const addDays = (date: Date, days: number): Date => { + const copy = new Date(date); + copy.setDate(copy.getDate() + days); + return copy; +}; + +const todayValue = (): string => toGregorianValue(new Date()); + +type DatePreset = 'today' | 'yesterday' | 'last7' | 'thisMonth'; + +const presetRange = (preset: DatePreset): { from: string; to: string } => { + const now = new Date(); + switch (preset) { + case 'today': + return { from: toGregorianValue(now), to: toGregorianValue(now) }; + case 'yesterday': { + const yesterday = addDays(now, -1); + return { from: toGregorianValue(yesterday), to: toGregorianValue(yesterday) }; + } + case 'last7': + return { from: toGregorianValue(addDays(now, -6)), to: toGregorianValue(now) }; + case 'thisMonth': + return { + from: toGregorianValue(new Date(now.getFullYear(), now.getMonth(), 1)), + to: toGregorianValue(now), + }; + } +}; + +const PRESET_LABELS: { key: DatePreset; label: string }[] = [ + { key: 'today', label: 'امروز' }, + { key: 'yesterday', label: 'دیروز' }, + { key: 'last7', label: '۷ روز اخیر' }, + { key: 'thisMonth', label: 'این ماه' }, +]; + interface StoreSummary { count: number; gross: number; @@ -166,9 +212,10 @@ export default function AccountingPage() { const [products, setProducts] = useState([]); const [selectedProductId, setSelectedProductId] = useState(''); - // Date range - const [dateFrom, setDateFrom] = useState(''); - const [dateTo, setDateTo] = useState(''); + // Date range — defaults to today so the daily account is the first thing shown + const [dateFrom, setDateFrom] = useState(todayValue); + const [dateTo, setDateTo] = useState(todayValue); + const [preset, setPreset] = useState('today'); // Time range const [timeFrom, setTimeFrom] = useState(''); @@ -187,20 +234,20 @@ export default function AccountingPage() { const [result, setResult] = useState(null); const [isLoading, setIsLoading] = useState(false); const [error, setError] = useState(null); + // Bumped by the «تحلیل» button / «بارگذاری مجدد» to force a refetch + const [refreshTick, setRefreshTick] = useState(0); const inputClass = 'block w-full px-3 py-2.5 text-gray-900 dark:text-gray-100 border border-gray-200 dark:border-gray-700 rounded-xl shadow-sm focus:ring-2 focus:ring-indigo-500 focus:border-transparent sm:text-sm dark:bg-gray-800/80 transition-colors'; const labelClass = 'block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5'; - // Load packages once on mount + // Load packages once on mount — "همه پکیج‌ها" stays selected by default so + // the initial view covers the whole business. useEffect(() => { if (!token) return; packagesApi .getAllPackages(token) - .then((data) => { - setPackages(data); - if (data.length > 0) setSelectedPackageName(data[0].name || ''); - }) + .then(setPackages) .catch(() => setError('خطا در دریافت لیست پکیج‌ها')); }, [token]); @@ -218,28 +265,61 @@ export default function AccountingPage() { .catch(() => setProducts([])); }, [selectedPackageName, token]); - const handleAnalyze = useCallback(async () => { + // The server-side query window. Fetching only the selected window keeps the + // payload small; the backend filters created_at by these dates. Runs + // automatically on mount (today's account) and whenever the window, + // package or product selection changes. + const windowKey = [dateFrom, dateTo, timeFrom, timeTo, selectedPackageName, selectedProductId].join('|'); + + useEffect(() => { if (!token) return; + let cancelled = false; setIsLoading(true); setError(null); - try { - // Fetch all purchases once, then filter/aggregate in-memory. - const purchases = await purchasesApi.getAllPurchases({ per_page: 500 }, token); - setAllPurchases(purchases); - setResult( - computeAccounting( - purchases, - parseStoreRate(myketRate), - parseStoreRate(cafeRate), - parseFee(transactionFee) - ) - ); - } catch (err) { - setError(err instanceof Error ? err.message : 'خطا در دریافت داده‌ها'); - } finally { - setIsLoading(false); - } - }, [token, myketRate, cafeRate, transactionFee]); + + purchasesApi + .getAllPurchases( + { + per_page: 500, + ...(dateFrom && { date_from: dateFrom }), + ...(dateTo && { date_to: dateTo }), + ...(timeFrom && { time_from: timeFrom }), + ...(timeTo && { time_to: timeTo }), + ...(selectedPackageName && { package_name: selectedPackageName }), + ...(selectedProductId && { product_id: Number(selectedProductId) }), + }, + token + ) + .then((purchases) => { + if (cancelled) return; + setAllPurchases(purchases); + setResult( + computeAccounting( + purchases, + parseStoreRate(myketRate), + parseStoreRate(cafeRate), + parseFee(transactionFee) + ) + ); + }) + .catch((err) => { + if (!cancelled) { + setError(err instanceof Error ? err.message : 'خطا در دریافت داده‌ها'); + } + }) + .finally(() => { + if (!cancelled) setIsLoading(false); + }); + + return () => { + cancelled = true; + }; + // Commission rates are read at fetch time only; changing them recomputes + // locally (see runAnalysis) without refetching. + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [token, windowKey, refreshTick]); + + const handleAnalyze = () => setRefreshTick((t) => t + 1); // Recompute whenever filters or commission rates change (uses cached data) const runAnalysis = useCallback(() => { @@ -291,13 +371,29 @@ export default function AccountingPage() { if (allPurchases) runAnalysis(); }, [runAnalysis, allPurchases]); - const handleReset = () => { - setSelectedPackageName(packages[0]?.name || ''); - setSelectedProductId(''); - setDateFrom(''); - setDateTo(''); + const applyPreset = (key: DatePreset) => { + const range = presetRange(key); + setPreset(key); + setDateFrom(range.from); + setDateTo(range.to); setTimeFrom(''); setTimeTo(''); + }; + + const handleDateFromChange = (value: string) => { + setPreset(null); + setDateFrom(value); + }; + + const handleDateToChange = (value: string) => { + setPreset(null); + setDateTo(value); + }; + + const handleReset = () => { + setSelectedPackageName(''); + setSelectedProductId(''); + applyPreset('today'); setStatuses([...PAID_STATUSES]); setMyketRate('85'); setCafeRate('85'); @@ -310,11 +406,6 @@ export default function AccountingPage() { ); }; - const statCardClass = - 'rounded-2xl bg-white dark:bg-gray-900 ring-1 ring-gray-200 dark:ring-gray-800 p-5 shadow-sm'; - const statIconClass = 'h-5 w-5'; - const statValueClass = 'text-2xl font-bold text-gray-900 dark:text-gray-100 mt-1.5'; - return (
@@ -384,7 +475,7 @@ export default function AccountingPage() { label="از تاریخ" placeholder="انتخاب تاریخ شروع" value={dateFrom} - onChange={setDateFrom} + onChange={handleDateFromChange} />
@@ -406,7 +497,7 @@ export default function AccountingPage() { label="تا تاریخ" placeholder="انتخاب تاریخ پایان" value={dateTo} - onChange={setDateTo} + onChange={handleDateToChange} />
@@ -423,6 +514,30 @@ export default function AccountingPage() { + {/* Quick date-range presets */} +
+ +
+ {PRESET_LABELS.map(({ key, label }) => { + const active = preset === key; + return ( + + ); + })} +
+
+ {/* Status checkboxes */}
@@ -495,7 +610,7 @@ export default function AccountingPage() { کافه‌بازار ۸۵٪ (فروش زیر ۱۰ میلیارد ریال) و ۷۰٪ (بالای آن) است.

-
+
) : ( -
- + <> + {/* Mobile: stacked cards */} +
    + {result.rows.map((row) => ( +
  • +
    +
    +

    + {row.title} +

    +

    + {row.packageName} +

    +
    + + {formatPrice(row.count)} فروش + +
    +
    +
    +

    فروش ناخالص

    +

    + {formatPrice(row.gross)} +

    +
    +
    +

    کارمزد

    +

    + {formatPrice(row.commission)} +

    +
    +
    +

    سود خالص

    +

    + {formatPrice(row.net)} +

    +
    +
    +
    • + ))} +
+ + {/* Desktop: table */} +
+
@@ -630,7 +760,8 @@ export default function AccountingPage() { ))}
محصول
-
+
+ )}
@@ -651,6 +782,48 @@ export default function AccountingPage() { ); } +const STAT_TONES = { + indigo: 'bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400', + sky: 'bg-sky-50 text-sky-600 dark:bg-sky-500/10 dark:text-sky-400', + amber: 'bg-amber-50 text-amber-600 dark:bg-amber-500/10 dark:text-amber-400', + emerald: 'bg-emerald-50 text-emerald-600 dark:bg-emerald-500/10 dark:text-emerald-400', +} as const; + +function StatCard({ + label, + value, + unit, + Icon, + tone, +}: { + label: string; + value: string; + unit?: string; + Icon: ComponentType<{ className?: string }>; + tone: keyof typeof STAT_TONES; +}) { + const valueColor = + tone === 'amber' + ? 'text-amber-600 dark:text-amber-400' + : tone === 'emerald' + ? 'text-emerald-600 dark:text-emerald-400' + : 'text-gray-900 dark:text-gray-100'; + + return ( +
+
+ + + + {label} +
+
+ {value} {unit && {unit}} +
+
+ ); +} + function StoreCard({ title, summary }: { title: string; summary: StoreSummary }) { return (
diff --git a/app/admin/dashboard/page.tsx b/app/admin/dashboard/page.tsx index 2e678c0..cce1a7b 100644 --- a/app/admin/dashboard/page.tsx +++ b/app/admin/dashboard/page.tsx @@ -113,7 +113,7 @@ export default function Dashboard() {

{desc}

-
+
ورود به بخش diff --git a/app/admin/layout.tsx b/app/admin/layout.tsx index 3492bbe..ef086d3 100644 --- a/app/admin/layout.tsx +++ b/app/admin/layout.tsx @@ -23,7 +23,9 @@ export default function AdminLayout({ ) : ( -
+ {/* Extra top padding on mobile so content clears the + fixed hamburger button; the desktop sidebar needs none. */} +
{children}
diff --git a/app/admin/packages/page.tsx b/app/admin/packages/page.tsx index daa61b8..bfabb87 100644 --- a/app/admin/packages/page.tsx +++ b/app/admin/packages/page.tsx @@ -6,6 +6,7 @@ import { packagesApi } from '@/lib/api/packages'; import PackageList from '@/components/admin/packages/PackageList'; import PackageForm from '@/components/admin/packages/PackageForm'; import PageHeader from '@/components/admin/PageHeader'; +import ConfirmDialog from '@/components/admin/ConfirmDialog'; import { showToast } from '@/components/Toast'; import { PackageName, CreatePackageData, UpdatePackageData } from '@/types/package'; import { PlusIcon } from '@heroicons/react/24/outline'; @@ -17,6 +18,7 @@ export default function PackagesPage() { const [isLoading, setIsLoading] = useState(false); const [isFormVisible, setIsFormVisible] = useState(false); const [error, setError] = useState(null); + const [deleteTarget, setDeleteTarget] = useState(null); useEffect(() => { if (token) { @@ -47,10 +49,13 @@ export default function PackagesPage() { setIsFormVisible(true); }; - const handleDelete = async (pkg: PackageName) => { - if (!confirm(`آیا از حذف پکیج "${pkg.title}" اطمینان دارید؟`)) { - return; - } + const handleDelete = (pkg: PackageName) => { + setDeleteTarget(pkg); + }; + + const confirmDelete = async () => { + if (!deleteTarget) return; + const pkg = deleteTarget; setIsLoading(true); setError(null); @@ -63,6 +68,7 @@ export default function PackagesPage() { setError(err instanceof Error ? err.message : 'خطا در حذف پکیج'); } finally { setIsLoading(false); + setDeleteTarget(null); } }; @@ -139,6 +145,16 @@ export default function PackagesPage() { isLoading={isLoading} /> )} + + setDeleteTarget(null)} + />
); diff --git a/app/admin/products/page.tsx b/app/admin/products/page.tsx index 65925d9..d8d98aa 100644 --- a/app/admin/products/page.tsx +++ b/app/admin/products/page.tsx @@ -7,6 +7,7 @@ import { productsApi } from '@/lib/api/products'; import ProductList from '@/components/admin/products/ProductList'; import ProductForm from '@/components/admin/products/ProductForm'; import PageHeader from '@/components/admin/PageHeader'; +import ConfirmDialog from '@/components/admin/ConfirmDialog'; import { showToast } from '@/components/Toast'; import { PackageName } from '@/types/package'; import { Product, CreateProductData, UpdateProductData } from '@/types/product'; @@ -22,6 +23,7 @@ export default function ProductsPage() { const [isLoadingPackages, setIsLoadingPackages] = useState(false); const [isFormVisible, setIsFormVisible] = useState(false); const [error, setError] = useState(null); + const [deleteTarget, setDeleteTarget] = useState(null); const initialLoadRef = useRef(false); const prevPackageRef = useRef(null); @@ -94,11 +96,13 @@ export default function ProductsPage() { setIsFormVisible(true); }; - const handleDelete = async (product: Product) => { - if (!selectedPackage) return; - if (!confirm(`آیا از حذف محصول "${product.title}" اطمینان دارید؟`)) { - return; - } + const handleDelete = (product: Product) => { + setDeleteTarget(product); + }; + + const confirmDelete = async () => { + if (!selectedPackage || !deleteTarget) return; + const product = deleteTarget; setIsLoading(true); setError(null); @@ -114,6 +118,7 @@ export default function ProductsPage() { setError(err instanceof Error ? err.message : 'خطا در حذف محصول'); } finally { setIsLoading(false); + setDeleteTarget(null); } }; @@ -226,6 +231,16 @@ export default function ProductsPage() { )} )} + + setDeleteTarget(null)} + />
); diff --git a/app/admin/promotions/page.tsx b/app/admin/promotions/page.tsx index 767012e..64bc5af 100644 --- a/app/admin/promotions/page.tsx +++ b/app/admin/promotions/page.tsx @@ -6,6 +6,7 @@ import { promotionsApi } from '@/lib/api/promotions'; import PromotionList from '@/components/admin/promotions/PromotionList'; import PromotionForm from '@/components/admin/promotions/PromotionForm'; import PageHeader from '@/components/admin/PageHeader'; +import ConfirmDialog from '@/components/admin/ConfirmDialog'; import { showToast } from '@/components/Toast'; import { Promotion, CreatePromotionData, UpdatePromotionData } from '@/types/promotion'; import { PlusIcon } from '@heroicons/react/24/outline'; @@ -17,6 +18,7 @@ export default function PromotionsPage() { const [isLoading, setIsLoading] = useState(false); const [isFormVisible, setIsFormVisible] = useState(false); const [error, setError] = useState(null); + const [deleteTarget, setDeleteTarget] = useState(null); const initialLoadRef = useRef(false); @@ -50,10 +52,13 @@ export default function PromotionsPage() { setIsFormVisible(true); }; - const handleDelete = async (promotion: Promotion) => { - if (!confirm(`آیا از حذف تبلیغ "${promotion.title || 'بدون عنوان'}" اطمینان دارید؟`)) { - return; - } + const handleDelete = (promotion: Promotion) => { + setDeleteTarget(promotion); + }; + + const confirmDelete = async () => { + if (!deleteTarget) return; + const promotion = deleteTarget; setIsLoading(true); setError(null); @@ -66,6 +71,7 @@ export default function PromotionsPage() { setError(err instanceof Error ? err.message : 'خطا در حذف تبلیغ'); } finally { setIsLoading(false); + setDeleteTarget(null); } }; @@ -159,6 +165,16 @@ export default function PromotionsPage() { isLoading={isLoading} /> )} + + setDeleteTarget(null)} + /> ); diff --git a/app/admin/purchases/page.tsx b/app/admin/purchases/page.tsx index acff371..af1d3fc 100644 --- a/app/admin/purchases/page.tsx +++ b/app/admin/purchases/page.tsx @@ -148,7 +148,7 @@ export default function PurchasesPage() { -
+
) : ( -
+ <> + {/* Mobile: stacked cards */} +
    + {result.data.map((purchase) => ( +
  • +
    +
    +

    + {purchase.product?.title || '—'} +

    +

    + {purchase.product?.package_name?.title || purchase.product?.package_name?.name || '—'} + {purchase.product ? ` • ${getProductTypeLabel(purchase.product.type)}` : ''} +

    +
    + + {getPurchaseStatusLabel(purchase.status)} + +
    +
    +

    + {purchase.user?.full_name?.trim() || 'بدون نام'} +

    + {purchase.user?.email && ( +

    {purchase.user.email}

    + )} + {purchase.user?.mobile && ( +

    {purchase.user.mobile}

    + )} +
    +
    + + {formatPrice(getPurchaseFinalPrice(purchase))} تومان + +
    + + {getGatewayLabel(purchase.gateway)} + + + {formatDate(purchase.created_at)} {formatTime(purchase.created_at)} + +
    +
    +
    • + ))} +
+ + {/* Desktop: table */} +
@@ -260,7 +308,8 @@ export default function PurchasesPage() { ))}
-
+
+ )} {/* Pagination */} diff --git a/app/admin/referral-rewards/page.tsx b/app/admin/referral-rewards/page.tsx index b4e0ed8..9295267 100644 --- a/app/admin/referral-rewards/page.tsx +++ b/app/admin/referral-rewards/page.tsx @@ -5,6 +5,7 @@ import { useAuth } from '@/contexts/AuthContext'; import { referralApi } from '@/lib/api/referral'; import ReferralList from '@/components/admin/referral/ReferralList'; import PageHeader from '@/components/admin/PageHeader'; +import ConfirmDialog from '@/components/admin/ConfirmDialog'; import { showToast } from '@/components/Toast'; import { ReferralRewardUser } from '@/types/referral'; import { ArrowPathIcon } from '@heroicons/react/24/outline'; @@ -16,6 +17,7 @@ export default function ReferralRewardsPage() { const [isLoading, setIsLoading] = useState(false); const [fulfillingId, setFulfillingId] = useState(null); const [error, setError] = useState(null); + const [fulfillTarget, setFulfillTarget] = useState(null); const initialLoadRef = useRef(false); @@ -40,10 +42,13 @@ export default function ReferralRewardsPage() { } }; - const handleFulfill = async (user: ReferralRewardUser) => { - if (!confirm(`آیا از اعطای یک ماه اشتراک رایگان به «${user.name || user.mobile || user.email}» اطمینان دارید؟`)) { - return; - } + const handleFulfill = (user: ReferralRewardUser) => { + setFulfillTarget(user); + }; + + const confirmFulfill = async () => { + if (!fulfillTarget) return; + const user = fulfillTarget; setFulfillingId(user.id); setIsLoading(true); @@ -58,6 +63,7 @@ export default function ReferralRewardsPage() { } finally { setFulfillingId(null); setIsLoading(false); + setFulfillTarget(null); } }; @@ -104,6 +110,17 @@ export default function ReferralRewardsPage() { fulfillingId={fulfillingId} /> )} + + setFulfillTarget(null)} + />
); diff --git a/app/admin/reminders/page.tsx b/app/admin/reminders/page.tsx index 777c4c8..0198754 100644 --- a/app/admin/reminders/page.tsx +++ b/app/admin/reminders/page.tsx @@ -7,6 +7,7 @@ import { remindersApi } from '@/lib/api/reminders'; import ReminderList from '@/components/admin/reminders/ReminderList'; import ReminderForm from '@/components/admin/reminders/ReminderForm'; import PageHeader from '@/components/admin/PageHeader'; +import ConfirmDialog from '@/components/admin/ConfirmDialog'; import { showToast } from '@/components/Toast'; import { PackageName } from '@/types/package'; import { Reminder, CreateReminderData, UpdateReminderData } from '@/types/reminder'; @@ -22,6 +23,7 @@ export default function RemindersPage() { const [isLoadingPackages, setIsLoadingPackages] = useState(false); const [isFormVisible, setIsFormVisible] = useState(false); const [error, setError] = useState(null); + const [deleteTarget, setDeleteTarget] = useState(null); const initialLoadRef = useRef(false); const prevPackageRef = useRef(null); @@ -94,11 +96,13 @@ export default function RemindersPage() { setIsFormVisible(true); }; - const handleDelete = async (reminder: Reminder) => { - if (!selectedPackage) return; - if (!confirm(`آیا از حذف یادآوری "${reminder.title}" اطمینان دارید؟`)) { - return; - } + const handleDelete = (reminder: Reminder) => { + setDeleteTarget(reminder); + }; + + const confirmDelete = async () => { + if (!selectedPackage || !deleteTarget) return; + const reminder = deleteTarget; setIsLoading(true); setError(null); @@ -114,6 +118,7 @@ export default function RemindersPage() { setError(err instanceof Error ? err.message : 'خطا در حذف یادآوری'); } finally { setIsLoading(false); + setDeleteTarget(null); } }; @@ -226,6 +231,16 @@ export default function RemindersPage() { )} )} + + setDeleteTarget(null)} + /> ); diff --git a/app/admin/users/page.tsx b/app/admin/users/page.tsx index a0bef82..ed1d4d7 100644 --- a/app/admin/users/page.tsx +++ b/app/admin/users/page.tsx @@ -11,6 +11,7 @@ import UserEditForm from '@/components/admin/users/UserEditForm'; import PackageSelector from '@/components/admin/users/PackageSelector'; import PageHeader from '@/components/admin/PageHeader'; import StepIndicator from '@/components/admin/StepIndicator'; +import ConfirmDialog from '@/components/admin/ConfirmDialog'; import { showToast } from '@/components/Toast'; import { User, Product, UpdateUserProfileData } from '@/types/user'; import { PackageName } from '@/types/package'; @@ -159,7 +160,9 @@ export default function UsersPage() { } }; - const handleDeleteUser = async () => { + const [isDeleteConfirmOpen, setIsDeleteConfirmOpen] = useState(false); + + const handleDeleteUser = () => { if (!user) return; const identifier = user.email || user.mobile; if (!identifier) { @@ -167,9 +170,13 @@ export default function UsersPage() { return; } - if (!confirm('آیا از حذف این کاربر اطمینان دارید؟ این عملیات قابل بازگشت نیست.')) { - return; - } + setIsDeleteConfirmOpen(true); + }; + + const confirmDeleteUser = async () => { + if (!user) return; + const identifier = user.email || user.mobile; + if (!identifier) return; setIsLoading(true); setError(null); @@ -178,6 +185,7 @@ export default function UsersPage() { await usersApi.deleteUser(identifier, token!); showToast('success', 'کاربر با موفقیت حذف شد'); setUser(null); + setIsDeleteConfirmOpen(false); } catch (err) { setError(err instanceof Error ? err.message : 'خطا در حذف کاربر'); } finally { @@ -324,6 +332,16 @@ export default function UsersPage() { isLoading={isLoading} /> )} + + setIsDeleteConfirmOpen(false)} + /> ); diff --git a/app/layout.tsx b/app/layout.tsx index a837b83..924becf 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -35,8 +35,7 @@ export default function RootLayout({ /> {/* Favicon */} - - + {/* Preload critical resources */} diff --git a/app/page.tsx b/app/page.tsx index 86acdac..8b9c2ab 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -7,8 +7,8 @@ export default function Home() { const router = useRouter(); useEffect(() => { - router.push('/admin/login'); + router.replace('/admin/login'); }, [router]); - + return null; } \ No newline at end of file diff --git a/components/Toast.tsx b/components/Toast.tsx index a6f92f8..1a0f50b 100644 --- a/components/Toast.tsx +++ b/components/Toast.tsx @@ -40,7 +40,7 @@ export default function ToastContainer() { if (toasts.length === 0) return null; return ( -
+
{toasts.map((toast) => (
void; + onCancel: () => void; +} + +// Styled replacement for the native confirm() dialog so destructive actions +// match the rest of the panel. +export default function ConfirmDialog({ + open, + title, + message, + confirmLabel = 'تأیید', + cancelLabel = 'انصراف', + tone = 'danger', + isLoading = false, + onConfirm, + onCancel, +}: ConfirmDialogProps) { + useEffect(() => { + if (!open) return; + const handleKeyDown = (event: KeyboardEvent) => { + if (event.key === 'Escape' && !isLoading) onCancel(); + }; + document.addEventListener('keydown', handleKeyDown); + return () => document.removeEventListener('keydown', handleKeyDown); + }, [open, isLoading, onCancel]); + + if (!open) return null; + + const confirmClass = + tone === 'danger' + ? 'bg-red-600 hover:bg-red-700 focus:ring-red-500/30 shadow-red-500/20' + : 'bg-indigo-600 hover:bg-indigo-700 focus:ring-indigo-500/30 shadow-indigo-500/20'; + const iconWrapClass = + tone === 'danger' + ? 'bg-red-50 text-red-600 dark:bg-red-500/10 dark:text-red-400' + : 'bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400'; + + return ( +
{ + if (!isLoading) onCancel(); + }} + > +
event.stopPropagation()} + role="alertdialog" + aria-modal="true" + aria-label={title} + > +
+
+ +
+
+

{title}

+

{message}

+
+
+ +
+ + +
+
+
+ ); +} diff --git a/components/admin/PersianDatePicker.tsx b/components/admin/PersianDatePicker.tsx index b682f81..f0d6f03 100644 --- a/components/admin/PersianDatePicker.tsx +++ b/components/admin/PersianDatePicker.tsx @@ -139,7 +139,7 @@ export default function PersianDatePicker({ {open && ( -
+
{ if (filters.product_id !== undefined && filters.product_id !== null) { params.append('product_id', String(filters.product_id)); } + if (filters.date_from) params.append('date_from', filters.date_from); + if (filters.date_to) params.append('date_to', filters.date_to); + if (filters.time_from) params.append('time_from', filters.time_from); + if (filters.time_to) params.append('time_to', filters.time_to); if (filters.per_page) params.append('per_page', String(filters.per_page)); if (filters.page) params.append('page', String(filters.page)); diff --git a/package-lock.json b/package-lock.json index ced79a4..56da592 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,6 +74,7 @@ "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", @@ -1610,6 +1611,7 @@ "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -1670,6 +1672,7 @@ "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/types": "8.46.3", @@ -2200,6 +2203,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2578,6 +2582,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -3161,6 +3166,7 @@ "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -3346,6 +3352,7 @@ "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.9", @@ -5522,6 +5529,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -5596,6 +5604,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz", "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -5631,6 +5640,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz", "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==", "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -6317,6 +6327,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -6479,6 +6490,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -6754,6 +6766,7 @@ "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==", "dev": true, "license": "MIT", + "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/types/purchase.ts b/types/purchase.ts index aa09d49..c9b495a 100644 --- a/types/purchase.ts +++ b/types/purchase.ts @@ -90,6 +90,12 @@ export interface PurchaseFilters { gateway?: string; // gateway name key (e.g. "zarinpal") status?: number; product_id?: number; // filter by a specific product + // Date/time window on created_at (Y-m-d dates, H:i(:s) times, Tehran-local — + // same values the accounting filters use). Times only apply with their date. + date_from?: string; + date_to?: string; + time_from?: string; + time_to?: string; per_page?: number; page?: number; }