+
{children}
);
diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx
index 5b7efc5..f8f3d84 100644
--- a/src/contexts/ThemeContext.tsx
+++ b/src/contexts/ThemeContext.tsx
@@ -12,13 +12,14 @@ export const ThemeProvider = ({ children }: { children: any }) => {
useEffect(() => {
const savedTheme = localStorage.getItem('admin_theme') as 'light' | 'dark' | null;
- const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
- const initialTheme = savedTheme || (prefersDark ? 'dark' : 'light');
+ const initialTheme = savedTheme || 'light';
setMode(initialTheme);
if (initialTheme === 'dark') {
document.documentElement.classList.add('dark');
+ } else {
+ document.documentElement.classList.remove('dark');
}
}, []);
diff --git a/src/index.css b/src/index.css
index b5bc0fb..a259ee3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -59,7 +59,7 @@
@layer components {
.card {
- @apply bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700;
+ @apply bg-white dark:bg-gray-800 rounded-xl shadow-md border border-gray-200 dark:border-gray-700 transition-shadow duration-200 hover:shadow-lg;
}
.btn-primary {
diff --git a/src/pages/UsersNew.tsx b/src/pages/UsersNew.tsx
index 219e4a2..94f45d5 100644
--- a/src/pages/UsersNew.tsx
+++ b/src/pages/UsersNew.tsx
@@ -6,7 +6,6 @@ import { Modal } from '../components/ui/Modal';
import { Pagination } from '../components/ui/Pagination';
import { UserForm } from '../components/forms/UserForm';
import { PermissionWrapper } from '../components/common/PermissionWrapper';
-import { LoadingSpinner } from '../components/ui/LoadingSpinner';
import { TableColumn } from '../types';
import { UserFormData } from '../utils/validationSchemas';
import { useUsers, useCreateUser, useUpdateUser, useDeleteUser } from '../hooks/useUsers';
@@ -211,7 +210,9 @@ const Users = () => {
diff --git a/src/pages/admin-users/admin-user-detail/AdminUserDetailPage.tsx b/src/pages/admin-users/admin-user-detail/AdminUserDetailPage.tsx
index e9bb08c..3f7a07c 100644
--- a/src/pages/admin-users/admin-user-detail/AdminUserDetailPage.tsx
+++ b/src/pages/admin-users/admin-user-detail/AdminUserDetailPage.tsx
@@ -1,7 +1,6 @@
import { useParams, useNavigate } from 'react-router-dom';
import { ArrowRight, Shield, Users, Key, Edit, Calendar, FileText, User } from 'lucide-react';
import { Button } from '../../../components/ui/Button';
-import { LoadingSpinner } from '../../../components/ui/LoadingSpinner';
import { useAdminUser } from '../core/_hooks';
import { PermissionWrapper } from '../../../components/common/PermissionWrapper';
import { PageContainer, PageTitle, SectionTitle, SectionSubtitle, BodyText } from '../../../components/ui/Typography';
@@ -12,7 +11,47 @@ const AdminUserDetailPage = () => {
const { data: user, isLoading, error } = useAdminUser(id);
- if (isLoading) return
;
+ if (isLoading) {
+ return (
+
+
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+
+
+ {[...Array(4)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+ {[...Array(2)].map((_, i) => (
+
+
+
+ {[...Array(3)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+
+ );
+ }
if (error) return
خطا در بارگذاری اطلاعات کاربر
;
if (!user) return
کاربر یافت نشد
;
diff --git a/src/pages/admin-users/admin-user-form/AdminUserFormPage.tsx b/src/pages/admin-users/admin-user-form/AdminUserFormPage.tsx
index 36bc29f..8c9ada0 100644
--- a/src/pages/admin-users/admin-user-form/AdminUserFormPage.tsx
+++ b/src/pages/admin-users/admin-user-form/AdminUserFormPage.tsx
@@ -9,7 +9,6 @@ import { usePermissions } from '../../permissions/core/_hooks';
import { useRoles } from '../../roles/core/_hooks';
import { Button } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { MultiSelectAutocomplete, Option } from "@/components/ui/MultiSelectAutocomplete";
import { ArrowRight } from "lucide-react";
import { FormHeader, PageContainer, Label } from '../../../components/ui/Typography';
@@ -134,9 +133,19 @@ const AdminUserFormPage = () => {
if (isEdit && isLoadingUser) {
return (
-
-
-
+
+
+
+
+ {[...Array(6)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/categories/category-form/CategoryFormPage.tsx b/src/pages/categories/category-form/CategoryFormPage.tsx
index f9bfaf8..78b11f4 100644
--- a/src/pages/categories/category-form/CategoryFormPage.tsx
+++ b/src/pages/categories/category-form/CategoryFormPage.tsx
@@ -3,7 +3,6 @@ import { useNavigate, useParams } from 'react-router-dom';
import { ArrowRight, FolderOpen } from 'lucide-react';
import { Button } from '../../../components/ui/Button';
import { Input } from '../../../components/ui/Input';
-import { LoadingSpinner } from '../../../components/ui/LoadingSpinner';
import { FileUploader } from '../../../components/ui/FileUploader';
import { useFileUpload, useFileDelete } from '../../../hooks/useFileUpload';
import { useToast } from '../../../contexts/ToastContext';
@@ -116,9 +115,19 @@ const CategoryFormPage = () => {
if (isEdit && isLoadingCategory) {
return (
-
-
-
+
+
+
+
+ {[...Array(4)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/discount-codes/discount-code-form/DiscountCodeFormPage.tsx b/src/pages/discount-codes/discount-code-form/DiscountCodeFormPage.tsx
index 3aae7bf..018c74a 100644
--- a/src/pages/discount-codes/discount-code-form/DiscountCodeFormPage.tsx
+++ b/src/pages/discount-codes/discount-code-form/DiscountCodeFormPage.tsx
@@ -8,7 +8,6 @@ import { useDiscountCode, useCreateDiscountCode, useUpdateDiscountCode } from '.
import { CreateDiscountCodeRequest } from '../core/_models';
import { Button } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { MultiSelectAutocomplete, Option } from "@/components/ui/MultiSelectAutocomplete";
import { SingleSelectAutocomplete } from "@/components/ui/SingleSelectAutocomplete";
import { JalaliDateTimePicker } from "@/components/ui/JalaliDateTimePicker";
@@ -258,7 +257,23 @@ const DiscountCodeFormPage = () => {
}
};
- if (isEdit && dcLoading) return
;
+ if (isEdit && dcLoading) {
+ return (
+
+
+
+
+ {[...Array(6)].map((_, i) => (
+
+ ))}
+
+
+ );
+ }
const isLoading = creating || updating;
return (
diff --git a/src/pages/landing-hero/HeroSliderPage.tsx b/src/pages/landing-hero/HeroSliderPage.tsx
index d67efc8..81f9070 100644
--- a/src/pages/landing-hero/HeroSliderPage.tsx
+++ b/src/pages/landing-hero/HeroSliderPage.tsx
@@ -7,10 +7,10 @@ import { FileUploader } from "@/components/ui/FileUploader";
import { Button } from "@/components/ui/Button";
import { useLandingHero, useUpdateLandingHero } from "./core/_hooks";
import { LandingHeroData, HeroImage } from "./core/_models";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { PlusCircle, Trash2, Save } from "lucide-react";
import { useFileUpload, useFileDelete } from "@/hooks/useFileUpload";
import { Modal } from "@/components/ui/Modal";
+import { PageContainer } from "@/components/ui/Typography";
const heroImageSchema = yup.object({
alt_text: yup.string().required("متن ALT الزامی است"),
@@ -92,9 +92,19 @@ export const HeroSliderPage = () => {
if (isLoading) {
return (
-
-
-
+
+
+
+
+ {[...Array(5)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/orders/order-detail/OrderDetailPage.tsx b/src/pages/orders/order-detail/OrderDetailPage.tsx
index 582aa48..eb27d38 100644
--- a/src/pages/orders/order-detail/OrderDetailPage.tsx
+++ b/src/pages/orders/order-detail/OrderDetailPage.tsx
@@ -4,7 +4,6 @@ import { useOrder, useUpdateOrderStatus } from '../core/_hooks';
import { OrderStatus } from '../core/_models';
import { useShippingMethods } from '@/pages/shipping-methods/core/_hooks';
import { Button } from "@/components/ui/Button";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { Modal } from "@/components/ui/Modal";
import { PageContainer, PageTitle, SectionTitle } from "@/components/ui/Typography";
import {
@@ -117,7 +116,41 @@ const OrderDetailPage = () => {
}
};
- if (isLoading) return
;
+ if (isLoading) {
+ return (
+
+
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+
+
+ {[...Array(4)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+ {[...Array(2)].map((_, i) => (
+
+
+
+ {[...Array(3)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+
+ );
+ }
if (error || !order) {
return (
diff --git a/src/pages/payment-card/card-form/CardFormPage.tsx b/src/pages/payment-card/card-form/CardFormPage.tsx
index 9c83069..14540df 100644
--- a/src/pages/payment-card/card-form/CardFormPage.tsx
+++ b/src/pages/payment-card/card-form/CardFormPage.tsx
@@ -6,7 +6,6 @@ import { CreditCard } from 'lucide-react';
import { PageContainer, PageTitle } from '@/components/ui/Typography';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
-import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
import { usePaymentCard, useUpdatePaymentCard } from '../core/_hooks';
import { persianToEnglish } from '@/utils/numberUtils';
@@ -141,9 +140,19 @@ const CardFormPage = () => {
if (isLoading) {
return (
-
-
-
+
+
+
+
+ {[...Array(4)].map((_, i) => (
+
+ ))}
+
+
-
+
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+ ))}
+
+
);
diff --git a/src/pages/permissions/permission-form/PermissionFormPage.tsx b/src/pages/permissions/permission-form/PermissionFormPage.tsx
index ae646dd..845d45f 100644
--- a/src/pages/permissions/permission-form/PermissionFormPage.tsx
+++ b/src/pages/permissions/permission-form/PermissionFormPage.tsx
@@ -7,7 +7,6 @@ import { usePermission, useCreatePermission, useUpdatePermission } from '../core
import { PermissionFormData } from '../core/_models';
import { Button } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { ArrowRight } from "lucide-react";
import { FormHeader, PageContainer, Label } from '../../../components/ui/Typography';
@@ -81,9 +80,19 @@ const PermissionFormPage = () => {
if (isEdit && isLoadingPermission) {
return (
-
-
-
+
+
+
+
+ {[...Array(4)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/product-options/product-option-form/ProductOptionFormPage.tsx b/src/pages/product-options/product-option-form/ProductOptionFormPage.tsx
index db5d5cc..5453881 100644
--- a/src/pages/product-options/product-option-form/ProductOptionFormPage.tsx
+++ b/src/pages/product-options/product-option-form/ProductOptionFormPage.tsx
@@ -7,7 +7,6 @@ import { useProductOption, useCreateProductOption, useUpdateProductOption } from
import { ProductOptionFormData } from '../core/_models';
import { Button } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { FileUploader } from "@/components/ui/FileUploader";
import { useFileUpload, useFileDelete } from "@/hooks/useFileUpload";
import { ArrowRight, Plus, Trash2 } from "lucide-react";
@@ -142,9 +141,19 @@ const ProductOptionFormPage = () => {
if (isLoadingOption) {
return (
-
-
-
+
+
+
+
+ {[...Array(4)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/products/product-detail/ProductDetailPage.tsx b/src/pages/products/product-detail/ProductDetailPage.tsx
index bc0ace9..631f642 100644
--- a/src/pages/products/product-detail/ProductDetailPage.tsx
+++ b/src/pages/products/product-detail/ProductDetailPage.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react';
import { Modal } from '../../../components/ui/Modal';
import { ArrowRight, Edit, Package, Tag, Image, Calendar, FileText, Eye, DollarSign, Hash, Layers, Settings } from 'lucide-react';
import { Button } from '../../../components/ui/Button';
-import { LoadingSpinner } from '../../../components/ui/LoadingSpinner';
import { useProduct } from '../core/_hooks';
import { PRODUCT_TYPE_LABELS } from '../core/_models';
import { PageContainer, PageTitle, SectionTitle } from '../../../components/ui/Typography';
@@ -25,7 +24,44 @@ const ProductDetailPage = () => {
const [previewMedia, setPreviewMedia] = useState<{ url: string; type: 'image' | 'video' } | null>(null);
- if (isLoading) return
;
+ if (isLoading) {
+ return (
+
+
+
+
+
+ {[...Array(4)].map((_, i) => (
+
+
+
+ {[...Array(4)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+ {[...Array(3)].map((_, i) => (
+
+
+
+ {[...Array(3)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+
+ );
+ }
if (error) return
خطا در بارگذاری اطلاعات محصول
;
if (!product) return
محصول یافت نشد
;
diff --git a/src/pages/products/product-form/ProductFormPage.tsx b/src/pages/products/product-form/ProductFormPage.tsx
index b70a781..ea33299 100644
--- a/src/pages/products/product-form/ProductFormPage.tsx
+++ b/src/pages/products/product-form/ProductFormPage.tsx
@@ -11,7 +11,6 @@ import { ProductFormData, ProductImage, ProductVariantFormData, PRODUCT_TYPES, P
import { MultiSelectAutocomplete } from "@/components/ui/MultiSelectAutocomplete";
import { Button } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { FileUploader } from "@/components/ui/FileUploader";
import { VariantManager } from "@/components/ui/VariantManager";
import { ArrowRight, X } from "lucide-react";
@@ -420,9 +419,19 @@ const ProductFormPage = () => {
if (isEdit && isLoadingProduct) {
return (
-
-
-
+
+
+
+
+ {[...Array(8)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/products/products-list/ProductsListPage.tsx b/src/pages/products/products-list/ProductsListPage.tsx
index 9272c7c..486dd9a 100644
--- a/src/pages/products/products-list/ProductsListPage.tsx
+++ b/src/pages/products/products-list/ProductsListPage.tsx
@@ -4,7 +4,7 @@ import { useProducts, useDeleteProduct } from '../core/_hooks';
import { useCategories } from '../../categories/core/_hooks';
import { Product } from '../core/_models';
import { Button } from "@/components/ui/Button";
-
+import { PageContainer } from "@/components/ui/Typography";
import { Trash2, Edit3, Plus, Package, Eye, Image } from "lucide-react";
import { Modal } from "@/components/ui/Modal";
import { persianToEnglish } from '../../../utils/numberUtils';
@@ -152,335 +152,355 @@ const ProductsListPage = () => {
if (error) {
return (
-
+
);
}
return (
-
- {/* Header */}
-
-
-
-
- مدیریت محصولات
-
-
- مدیریت محصولات، قیمتها و موجودی
-
+
+
+ {/* Header */}
+
+
+
+
+ مدیریت محصولات
+
+
+ مدیریت محصولات، قیمتها و موجودی
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {/* Desktop Table */}
-
-
-
-
-
- |
- محصول
- |
-
- قیمت
- |
-
- دستهبندی
- |
-
- وضعیت
- |
-
- عملیات
- |
-
-
-
- {products.map((product: Product) => (
-
-
-
-
- {getFirstImageUrl(product) ? (
- )
- ) : (
-
-
-
- )}
-
-
-
- {product.name}
-
- {product.sku && (
-
- SKU: {product.sku}
-
- )}
-
- |
-
- {formatPrice(product.price || 0)}
- |
-
- {product.category?.name || 'بدون دستهبندی'}
- |
-
- {getStatusBadge(product.status || '')}
- |
-
-
-
-
-
-
- |
-
- ))}
-
-
-
-
-
- {/* Mobile Cards */}
-
- {products.map((product: Product) => (
-
-
-
- {getFirstImageUrl(product) ? (
-
- ) : (
-
-
-
- )}
-
-
-
- {product.name}
-
-
- {formatPrice(product.price || 0)}
-
-
- {getStatusBadge(product.status || '')}
- {product.category && (
-
- {product.category.name}
-
- )}
+ {/* Filters */}
+
+ {isLoading ? (
+
+ {[...Array(4)].map((_, i) => (
+
-
-
-
-
-
+ ) : (
+
+ )}
+ ))}
+
+ ) : (
+
-
- {/* Empty State */}
- {(!products || products.length === 0) && !isLoading && (
-
-
-
- محصولی موجود نیست
-
-
- برای شروع، اولین محصول خود را ایجاد کنید.
-
-
-
+
+
+
+
+
+
+
+
+
)}
- )}
- {/* Pagination */}
-
setFilters(prev => ({ ...prev, page }))}
- />
+ {/* Products Table */}
+ {isLoading ? (
+
+ ) : (
+
+ {/* Desktop Table */}
+
+
+
+
+
+ |
+ محصول
+ |
+
+ قیمت
+ |
+
+ دستهبندی
+ |
+
+ وضعیت
+ |
+
+ عملیات
+ |
+
+
+
+ {products.map((product: Product) => (
+
+
+
+
+ {getFirstImageUrl(product) ? (
+
+ ) : (
+
+
+
+ )}
+
+
+
+ {product.name}
+
+ {product.sku && (
+
+ SKU: {product.sku}
+
+ )}
+
+ |
+
+ {formatPrice(product.price || 0)}
+ |
+
+ {product.category?.name || 'بدون دستهبندی'}
+ |
+
+ {getStatusBadge(product.status || '')}
+ |
+
+
+
+
+
+
+ |
+
+ ))}
+
+
+
+
- {/* Delete Confirmation Modal */}
-
setDeleteProductId(null)}
- title="حذف محصول"
- >
-
-
- آیا از حذف این محصول اطمینان دارید؟ این عمل قابل بازگشت نیست و تمام اطلاعات مربوط به محصول از جمله نسخهها و تصاویر حذف خواهد شد.
-
-
-
-
+ {/* Mobile Cards */}
+
+ {products.map((product: Product) => (
+
+
+
+ {getFirstImageUrl(product) ? (
+
+ ) : (
+
+
+
+ )}
+
+
+
+ {product.name}
+
+
+ {formatPrice(product.price || 0)}
+
+
+ {getStatusBadge(product.status || '')}
+ {product.category && (
+
+ {product.category.name}
+
+ )}
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+ {/* Empty State */}
+ {(!products || products.length === 0) && !isLoading && (
+
+
+
+ محصولی موجود نیست
+
+
+ برای شروع، اولین محصول خود را ایجاد کنید.
+
+
+
+
+
+ )}
-
-
+
+ آیا از حذف این محصول اطمینان دارید؟ این عمل قابل بازگشت نیست و تمام اطلاعات مربوط به محصول از جمله نسخهها و تصاویر حذف خواهد شد.
+
+
+
+
+
+
+
);
};
diff --git a/src/pages/roles/role-detail/RoleDetailPage.tsx b/src/pages/roles/role-detail/RoleDetailPage.tsx
index 6822884..885c9d6 100644
--- a/src/pages/roles/role-detail/RoleDetailPage.tsx
+++ b/src/pages/roles/role-detail/RoleDetailPage.tsx
@@ -1,7 +1,6 @@
import { useParams, useNavigate } from 'react-router-dom';
import { ArrowRight, Shield, Users, Key, Edit, Calendar, FileText } from 'lucide-react';
import { Button } from '../../../components/ui/Button';
-import { LoadingSpinner } from '../../../components/ui/LoadingSpinner';
import { useRole } from '../core/_hooks';
import { PermissionWrapper } from '../../../components/common/PermissionWrapper';
import { PageContainer, PageTitle, SectionTitle, SectionSubtitle, BodyText } from '../../../components/ui/Typography';
@@ -12,7 +11,50 @@ const RoleDetailPage = () => {
const { data: role, isLoading, error } = useRole(id);
- if (isLoading) return
;
+ if (isLoading) {
+ return (
+
+
+
+
+
+
+ {[...Array(2)].map((_, i) => (
+
+
+
+ {[...Array(2)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+
+ );
+ }
if (error) return
خطا در بارگذاری اطلاعات نقش
;
if (!role) return
نقش یافت نشد
;
@@ -170,7 +212,7 @@ const RoleDetailPage = () => {
)}
-
+
);
};
diff --git a/src/pages/roles/role-form/RoleFormPage.tsx b/src/pages/roles/role-form/RoleFormPage.tsx
index c5ec1f8..10eabbb 100644
--- a/src/pages/roles/role-form/RoleFormPage.tsx
+++ b/src/pages/roles/role-form/RoleFormPage.tsx
@@ -7,7 +7,6 @@ import { useRole, useCreateRole, useUpdateRole } from '../core/_hooks';
import { RoleFormData } from '../core/_models';
import { Button } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { ArrowRight, Shield } from "lucide-react";
import { FormHeader, PageContainer, Label } from '../../../components/ui/Typography';
@@ -70,7 +69,21 @@ const RoleFormPage = () => {
};
if (isEdit && roleLoading) {
- return
;
+ return (
+
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+ ))}
+
+
+ );
}
const isLoading = creating || updating;
diff --git a/src/pages/roles/role-permissions/RolePermissionsPage.tsx b/src/pages/roles/role-permissions/RolePermissionsPage.tsx
index a4a593f..be033b8 100644
--- a/src/pages/roles/role-permissions/RolePermissionsPage.tsx
+++ b/src/pages/roles/role-permissions/RolePermissionsPage.tsx
@@ -2,10 +2,10 @@ import { useState } from "react";
import { useNavigate, useParams } from "react-router-dom";
import { useRole, useRolePermissions, usePermissions, useAssignPermission, useRemovePermission } from "../core/_hooks";
import { Button } from "@/components/ui/Button";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { Permission } from "@/types/auth";
import { ArrowRight, Plus, Trash2, Check, Shield } from "lucide-react";
import { Modal } from "@/components/ui/Modal";
+import { PageContainer } from "@/components/ui/Typography";
const RolePermissionsPage = () => {
const navigate = useNavigate();
@@ -56,11 +56,33 @@ const RolePermissionsPage = () => {
const isLoading = roleLoading || permissionsLoading;
- if (isLoading) return
;
+ if (isLoading) {
+ return (
+
+
+
+
+ {[...Array(2)].map((_, i) => (
+
+
+
+ {[...Array(5)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+ );
+ }
if (!role) return
نقش یافت نشد
;
return (
-
+
{/* Header */}
@@ -93,8 +115,10 @@ const RolePermissionsPage = () => {
{permissionsLoading ? (
-
-
+
+ {[...Array(5)].map((_, i) => (
+
+ ))}
) : (
@@ -143,8 +167,10 @@ const RolePermissionsPage = () => {
{allPermissionsLoading ? (
-
-
+
+ {[...Array(5)].map((_, i) => (
+
+ ))}
) : (
@@ -214,7 +240,7 @@ const RolePermissionsPage = () => {
-
+
);
};
diff --git a/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx b/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx
index 5e95757..0bccc97 100644
--- a/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx
+++ b/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx
@@ -4,7 +4,6 @@ import { useCreateShippingMethod, useShippingMethod, useUpdateShippingMethod } f
import { ShippingOpenHour } from '../core/_models';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
-import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
import { TagInput } from '@/components/ui/TagInput';
import { Truck } from 'lucide-react';
import { formatWithThousands, parseFormattedNumber } from '@/utils/numberUtils';
@@ -107,9 +106,19 @@ const ShippingMethodFormPage = () => {
if (isEdit && isLoading) {
return (
-
-
-
+
+
+
+
+ {[...Array(5)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx b/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx
index 5d6d973..461e010 100644
--- a/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx
+++ b/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Button } from '@/components/ui/Button';
import { Modal } from '@/components/ui/Modal';
-import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
+import { PageContainer } from '@/components/ui/Typography';
import { Plus, Edit3, Trash2, Truck } from 'lucide-react';
import { useShippingMethods, useDeleteShippingMethod } from '../core/_hooks';
import { ShippingMethod } from '../core/_models';
@@ -28,24 +28,59 @@ const ShippingMethodsListPage = () => {
if (isLoading) {
return (
-
-
-
+
+
+
+
+
+
+
+
+ {[...Array(7)].map((_, i) => (
+ |
+
+ |
+ ))}
+
+
+
+ {[...Array(5)].map((_, i) => (
+
+ {[...Array(7)].map((_, j) => (
+ |
+
+ |
+ ))}
+
+ ))}
+
+
+
+
+
);
}
if (error) {
return (
-
+
خطا در بارگذاری روشهای ارسال
-
+
);
}
return (
-
+
+
@@ -142,7 +177,8 @@ const ShippingMethodsListPage = () => {
-
+
+
);
};
diff --git a/src/pages/tickets/ticket-detail/TicketDetailPage.tsx b/src/pages/tickets/ticket-detail/TicketDetailPage.tsx
index 7975e13..907e388 100644
--- a/src/pages/tickets/ticket-detail/TicketDetailPage.tsx
+++ b/src/pages/tickets/ticket-detail/TicketDetailPage.tsx
@@ -10,7 +10,6 @@ import {
import { TicketStatus } from "../core/_models";
import { PageContainer, PageTitle, SectionTitle, Label } from "@/components/ui/Typography";
import { Button } from "@/components/ui/Button";
-import { LoadingSpinner } from "@/components/ui/LoadingSpinner";
import { FileUploader } from "@/components/ui/FileUploader";
import { useFileUpload, useFileDelete } from "@/hooks/useFileUpload";
import { Input } from "@/components/ui/Input";
@@ -155,9 +154,19 @@ const TicketDetailPage = () => {
if (isLoading) {
return (
-
-
-
+
+
+
+
+ {[...Array(5)].map((_, i) => (
+
+ ))}
+
+
);
}
diff --git a/src/pages/tickets/tickets-list/TicketsListPage.tsx b/src/pages/tickets/tickets-list/TicketsListPage.tsx
index b8cc912..d593f98 100644
--- a/src/pages/tickets/tickets-list/TicketsListPage.tsx
+++ b/src/pages/tickets/tickets-list/TicketsListPage.tsx
@@ -132,137 +132,178 @@ const TicketsListPage = () => {
return (
-
-
-
-
- مدیریت تیکتها
-
-
- {data?.total || 0} تیکت ثبت شده
-
-
-
-
-
-
-
-
-
+
+ {/* Header */}
+
-
-
+
+
+ مدیریت تیکتها
+
+
+ {data?.total || 0} تیکت ثبت شده
+
-
-
-
-
-
+
-
- {isLoading ? (
-
- ) : !data?.tickets || data.tickets.length === 0 ? (
-
- تیکتی برای نمایش وجود ندارد
+ {/* Filters */}
+
+ {isLoading ? (
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+ ))}
+
+
+ ) : (
+ <>
+
+
+
+
فیلترها
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
- ) : (
- <>
-
-
+ ) : !data?.tickets || data.tickets.length === 0 ? (
+
+ تیکتی برای نمایش وجود ندارد
+
+ ) : (
+ <>
+
+ {data.total > 0 && (
+
)}
- onPageChange={handlePageChange}
- itemsPerPage={filters.limit || 20}
- totalItems={data.total || 0}
- />
-
- )}
+
+ )}
+
);
};
diff --git a/src/pages/users-admin/user-admin-detail/UserAdminDetailPage.tsx b/src/pages/users-admin/user-admin-detail/UserAdminDetailPage.tsx
index beaac25..89ef7cf 100644
--- a/src/pages/users-admin/user-admin-detail/UserAdminDetailPage.tsx
+++ b/src/pages/users-admin/user-admin-detail/UserAdminDetailPage.tsx
@@ -6,7 +6,6 @@ import { englishToPersian } from '../../../utils/numberUtils';
import { PageContainer } from '../../../components/ui/Typography';
import { Button } from '../../../components/ui/Button';
import { Modal } from '../../../components/ui/Modal';
-import { LoadingSpinner } from '../../../components/ui/LoadingSpinner';
const UserAdminDetailPage: React.FC = () => {
const { id } = useParams<{ id: string }>();
@@ -56,8 +55,40 @@ const UserAdminDetailPage: React.FC = () => {
if (isLoading) {
return (
-
-
+
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+
+
+ {[...Array(4)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
+ {[...Array(2)].map((_, i) => (
+
+
+
+ {[...Array(3)].map((_, j) => (
+
+ ))}
+
+
+ ))}
+
+
);
diff --git a/src/pages/users-admin/user-admin-form/UserAdminFormPage.tsx b/src/pages/users-admin/user-admin-form/UserAdminFormPage.tsx
index 7c15085..f1689b0 100644
--- a/src/pages/users-admin/user-admin-form/UserAdminFormPage.tsx
+++ b/src/pages/users-admin/user-admin-form/UserAdminFormPage.tsx
@@ -9,7 +9,6 @@ import { CreateUserRequest, UpdateUserRequest } from '../core/_models';
import { PageContainer } from '../../../components/ui/Typography';
import { Button } from '../../../components/ui/Button';
import { Input } from '../../../components/ui/Input';
-import { LoadingSpinner } from '../../../components/ui/LoadingSpinner';
// Validation schema
const createUserSchema = yup.object({
@@ -139,8 +138,16 @@ const UserAdminFormPage: React.FC = () => {
if (isEdit && userLoading) {
return (
-
-
+
+
+
+ {[...Array(6)].map((_, i) => (
+
+ ))}
+
);
diff --git a/src/pages/wallet/wallet-list/WalletListPage.tsx b/src/pages/wallet/wallet-list/WalletListPage.tsx
index 10421a9..6aa2e75 100644
--- a/src/pages/wallet/wallet-list/WalletListPage.tsx
+++ b/src/pages/wallet/wallet-list/WalletListPage.tsx
@@ -1,7 +1,6 @@
import React from 'react';
import { Wallet, Loader2 } from 'lucide-react';
import { PageContainer, PageTitle } from '@/components/ui/Typography';
-import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
import { useWalletStatus, useUpdateWalletStatus } from '../core/_hooks';
import { WalletStatus, WALLET_LABELS } from '../core/_models';
@@ -64,8 +63,32 @@ const WalletListPage = () => {
if (isLoading) {
return (
-
-
+
+
+
+
+ {[...Array(3)].map((_, i) => (
+
+ ))}
+
+
);