diff --git a/backend/eslint.config.mjs b/backend/eslint.config.mjs index b7b7d355..4e9f8271 100644 --- a/backend/eslint.config.mjs +++ b/backend/eslint.config.mjs @@ -27,15 +27,8 @@ export default tseslint.config( { rules: { '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-unsafe-assignment': 'off', - '@typescript-eslint/no-unsafe-member-access': 'off', - '@typescript-eslint/no-unsafe-call': 'off', - '@typescript-eslint/no-unsafe-return': 'off', - '@typescript-eslint/no-unsafe-argument': 'off', - '@typescript-eslint/no-floating-promises': 'off', - '@typescript-eslint/require-await': 'off', - '@typescript-eslint/unbound-method': 'off', - '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/no-floating-promises': 'warn', + '@typescript-eslint/no-unsafe-argument': 'warn', "prettier/prettier": ["error", { endOfLine: "auto" }], }, }, diff --git a/frontend/admin-panel/eslint.config.js b/frontend/admin-panel/eslint.config.js index bb9bca5e..ef614d25 100644 --- a/frontend/admin-panel/eslint.config.js +++ b/frontend/admin-panel/eslint.config.js @@ -18,17 +18,5 @@ export default defineConfig([ languageOptions: { globals: globals.browser, }, - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-unused-vars': 'off', - 'react-hooks/exhaustive-deps': 'off', - 'react-hooks/immutability': 'off', - 'react-hooks/set-state-in-effect': 'off', - 'react-hooks/static-components': 'off', - 'react-refresh/only-export-components': 'off', - 'react-hooks/refs': 'off', - 'no-useless-escape': 'off', - 'no-empty': 'off', - }, }, ]) diff --git a/frontend/admin-panel/src/components/ui/MediaSelector.tsx b/frontend/admin-panel/src/components/ui/MediaSelector.tsx index 22c8d7c7..dcbcb7e6 100644 --- a/frontend/admin-panel/src/components/ui/MediaSelector.tsx +++ b/frontend/admin-panel/src/components/ui/MediaSelector.tsx @@ -30,11 +30,39 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa const [pasteStatus, setPasteStatus] = useState(null); const fileInputRef = useRef(null); const pasteTimerRef = useRef>(null); + const [deleteTargetId, setDeleteTargetId] = useState(null); + + const fetchMedia = useCallback(async () => { + try { + const res = await api.get('/admin/media'); + if (res.data?.data) { + setMediaList(res.data.data); + } else if (Array.isArray(res.data)) { + setMediaList(res.data); + } + } catch (error) { + console.error('Failed to fetch media:', error); + } + }, []); useEffect(() => { - if (isOpen) { - fetchMedia(); - } + if (!isOpen) return; + let isSubscribed = true; + api.get('/admin/media').then(res => { + if (!isSubscribed) return; + if (res.data?.data) { + setMediaList(res.data.data); + } else if (Array.isArray(res.data)) { + setMediaList(res.data); + } + }).catch(err => { + console.error('Failed to fetch media:', err); + }).finally(() => { + if (isSubscribed) setIsLoading(false); + }); + return () => { + isSubscribed = false; + }; }, [isOpen]); useEffect(() => { @@ -84,31 +112,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa document.removeEventListener('paste', handlePaste); if (pasteTimerRef.current) clearTimeout(pasteTimerRef.current); }; - }, [isOpen]); - - const [deleteTargetId, setDeleteTargetId] = useState(null); - - const fetchMedia = async () => { - try { - setIsLoading(true); - const res = await api.get('/admin/media'); - if (res.data?.data) { - setMediaList(res.data.data); - } else if (Array.isArray(res.data)) { - setMediaList(res.data); - } - } catch (error) { - console.error('Failed to fetch media:', error); - } finally { - setIsLoading(false); - } - }; - - useEffect(() => { - if (isOpen) { - fetchMedia(); - } - }, [isOpen]); + }, [isOpen, multiple, onClose, onSelect, fetchMedia]); const handleFileUpload = async (e: React.ChangeEvent) => { if (!e.target.files || e.target.files.length === 0) return; @@ -123,7 +127,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa }); toast.success('تصویر با موفقیت آپلود شد'); fetchMedia(); - } catch (error: any) { + } catch (error) { console.error('Upload failed', error); toast.error('خطا در آپلود تصویر'); } finally { @@ -138,7 +142,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa await api.delete(`/admin/media/${deleteTargetId}`); toast.success('تصویر با موفقیت حذف شد'); setMediaList(mediaList.filter(m => m.id !== deleteTargetId)); - } catch (error: any) { + } catch (error) { console.error('Delete failed', error); toast.error('خطا در حذف تصویر'); } finally { @@ -173,7 +177,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa }); toast.success('تصویر با موفقیت آپلود شد'); fetchMedia(); - } catch (error) { + } catch { toast.error('خطا در آپلود تصویر'); } finally { setIsUploading(false); @@ -233,7 +237,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa diff --git a/frontend/admin-panel/src/pages/Blogs.tsx b/frontend/admin-panel/src/pages/Blogs.tsx index 30439ea7..7529877a 100644 --- a/frontend/admin-panel/src/pages/Blogs.tsx +++ b/frontend/admin-panel/src/pages/Blogs.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { Search, Plus, Edit2, Trash2, FileText, Image as ImageIcon, CheckCircle2, XCircle } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api, { BASE_DOMAIN } from '../services/api'; @@ -7,8 +7,21 @@ import Pagination from '../components/ui/Pagination'; import MediaSelector from '../components/ui/MediaSelector'; import ConfirmModal from '../components/ui/ConfirmModal'; +export interface BlogPost { + id: string; + title: string; + slug: string; + content: string; + isPublished: boolean; + metaTitle?: string; + metaDescription?: string; + keywords?: string; + imageUrl?: string; + createdAt?: string; +} + export default function Blogs() { - const [blogs, setBlogs] = useState([]); + const [blogs, setBlogs] = useState([]); const [isLoading, setIsLoading] = useState(true); const [search, setSearch] = useState(''); const [page, setPage] = useState(1); @@ -17,7 +30,7 @@ export default function Blogs() { const [isModalOpen, setIsModalOpen] = useState(false); const [isMediaSelectorOpen, setIsMediaSelectorOpen] = useState(false); - const [editingBlog, setEditingBlog] = useState(null); + const [editingBlog, setEditingBlog] = useState(null); const [deleteTargetId, setDeleteTargetId] = useState(null); const [formData, setFormData] = useState({ @@ -31,7 +44,7 @@ export default function Blogs() { imageUrl: '' }); - const fetchBlogs = async () => { + const fetchBlogs = useCallback(async () => { try { setIsLoading(true); const res = await api.get('/admin/blogs', { params: { page, limit, search } }); @@ -44,14 +57,14 @@ export default function Blogs() { } finally { setIsLoading(false); } - }; + }, [page, search]); useEffect(() => { const timer = setTimeout(() => { fetchBlogs(); }, 500); return () => clearTimeout(timer); - }, [search, page]); + }, [fetchBlogs]); const handleSave = async (e: React.FormEvent) => { e.preventDefault(); @@ -65,9 +78,9 @@ export default function Blogs() { } setIsModalOpen(false); fetchBlogs(); - } catch (error: any) { + } catch (error) { console.error('Save failed', error); - toast.error('خطا در ذخیره مقاله: ' + (error.response?.data?.message || error.message || '')); + toast.error('خطا در ذخیره مقاله'); } }; @@ -77,7 +90,7 @@ export default function Blogs() { await api.delete(`/admin/blogs/${deleteTargetId}`); toast.success('مقاله با موفقیت حذف شد'); fetchBlogs(); - } catch (error: any) { + } catch (error) { console.error('Delete failed', error); toast.error('خطا در حذف مقاله'); } finally { @@ -85,7 +98,7 @@ export default function Blogs() { } }; - const openModal = (blog: any = null) => { + const openModal = (blog: BlogPost | null = null) => { if (blog) { setEditingBlog(blog); setFormData({ diff --git a/frontend/admin-panel/src/pages/CMS.tsx b/frontend/admin-panel/src/pages/CMS.tsx index c77a957a..64e17062 100644 --- a/frontend/admin-panel/src/pages/CMS.tsx +++ b/frontend/admin-panel/src/pages/CMS.tsx @@ -3,9 +3,24 @@ import { toast } from 'react-hot-toast'; import api from '../services/api'; import ConfirmModal from '../components/ui/ConfirmModal'; +export interface HeroBanner { + id: string; + title: string; + subtitle: string; + imageUrl: string; + isActive: boolean; +} + +export interface VetTestimonial { + id: string; + vetName: string; + clinicName: string; + quote: string; +} + export default function CMS() { - const [banners, setBanners] = useState([]); - const [testimonials, setTestimonials] = useState([]); + const [banners, setBanners] = useState([]); + const [testimonials, setTestimonials] = useState([]); const [activeTab, setActiveTab] = useState<'banners' | 'testimonials'>('banners'); // Form States @@ -20,10 +35,6 @@ export default function CMS() { const [deleteBannerId, setDeleteBannerId] = useState(null); const [deleteTestimonialId, setDeleteTestimonialId] = useState(null); - useEffect(() => { - fetchData(); - }, []); - const fetchData = async () => { try { const [bannersRes, testimonialsRes] = await Promise.all([ @@ -37,6 +48,23 @@ export default function CMS() { } }; + useEffect(() => { + let isSubscribed = true; + Promise.all([ + api.get('/admin/cms/hero-banners').catch(() => ({ data: [] })), + api.get('/admin/cms/vet-testimonials').catch(() => ({ data: [] })), + ]).then(([bannersRes, testimonialsRes]) => { + if (!isSubscribed) return; + setBanners(bannersRes.data || []); + setTestimonials(testimonialsRes.data || []); + }).catch(err => { + console.error('Failed to fetch CMS data:', err); + }); + return () => { + isSubscribed = false; + }; + }, []); + const handleAddBanner = async (e: React.FormEvent) => { e.preventDefault(); try { @@ -51,7 +79,7 @@ export default function CMS() { setNewImageUrl(''); fetchData(); toast.success('بنر با موفقیت ایجاد شد'); - } catch (err: any) { + } catch { toast.error('خطا در ایجاد بنر'); } }; @@ -71,7 +99,7 @@ export default function CMS() { setQuote(''); fetchData(); toast.success('نظر دامپزشک ثبت شد'); - } catch (err: any) { + } catch { toast.error('خطا در ایجاد نظر دامپزشک'); } }; @@ -82,7 +110,7 @@ export default function CMS() { await api.delete(`/admin/cms/hero-banners/${deleteBannerId}`); toast.success('بنر با موفقیت حذف شد'); fetchData(); - } catch (err: any) { + } catch { toast.error('خطا در حذف بنر'); } finally { setDeleteBannerId(null); @@ -95,7 +123,7 @@ export default function CMS() { await api.delete(`/admin/cms/vet-testimonials/${deleteTestimonialId}`); toast.success('نظر با موفقیت حذف شد'); fetchData(); - } catch (err: any) { + } catch { toast.error('خطا در حذف نظر'); } finally { setDeleteTestimonialId(null); @@ -143,7 +171,7 @@ export default function CMS() {
- {banners.map((b: any) => ( + {banners.map((b: HeroBanner) => (

{b.title}

@@ -182,7 +210,7 @@ export default function CMS() {
- {testimonials.map((t: any) => ( + {testimonials.map((t: VetTestimonial) => (

{t.vetName} — {t.clinicName}

diff --git a/frontend/admin-panel/src/pages/Categories.tsx b/frontend/admin-panel/src/pages/Categories.tsx index d81dc6cd..b4f0caa1 100644 --- a/frontend/admin-panel/src/pages/Categories.tsx +++ b/frontend/admin-panel/src/pages/Categories.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { Search, Plus, Edit2, Trash2, FolderTree, Image as ImageIcon, X } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api, { BASE_DOMAIN } from '../services/api'; @@ -7,8 +7,20 @@ import Pagination from '../components/ui/Pagination'; import MediaSelector from '../components/ui/MediaSelector'; import ConfirmModal from '../components/ui/ConfirmModal'; +export interface Category { + id: string; + name: string; + slug: string; + description?: string; + metaTitle?: string; + metaDescription?: string; + keywords?: string; + imageUrl?: string; + createdAt?: string; +} + export default function Categories() { - const [categories, setCategories] = useState([]); + const [categories, setCategories] = useState([]); const [isLoading, setIsLoading] = useState(true); const [search, setSearch] = useState(''); const [page, setPage] = useState(1); @@ -17,7 +29,7 @@ export default function Categories() { const [isModalOpen, setIsModalOpen] = useState(false); const [isMediaSelectorOpen, setIsMediaSelectorOpen] = useState(false); - const [editingCategory, setEditingCategory] = useState(null); + const [editingCategory, setEditingCategory] = useState(null); const [deleteTargetId, setDeleteTargetId] = useState(null); const [formData, setFormData] = useState({ @@ -30,7 +42,7 @@ export default function Categories() { imageUrl: '' }); - const fetchCategories = async () => { + const fetchCategories = useCallback(async () => { try { setIsLoading(true); const res = await api.get('/admin/categories', { params: { page, limit, search } }); @@ -43,14 +55,14 @@ export default function Categories() { } finally { setIsLoading(false); } - }; + }, [page, search]); useEffect(() => { const timer = setTimeout(() => { fetchCategories(); }, 500); return () => clearTimeout(timer); - }, [search, page]); + }, [fetchCategories]); const handleSave = async (e: React.FormEvent) => { e.preventDefault(); @@ -64,9 +76,9 @@ export default function Categories() { } setIsModalOpen(false); fetchCategories(); - } catch (error: any) { + } catch (error) { console.error('Save failed', error); - toast.error('خطا در ذخیره دسته‌بندی: ' + (error.response?.data?.message || error.message || '')); + toast.error('خطا در ذخیره دسته‌بندی'); } }; @@ -76,7 +88,7 @@ export default function Categories() { await api.delete(`/admin/categories/${deleteTargetId}`); toast.success('دسته‌بندی با موفقیت حذف شد'); fetchCategories(); - } catch (error: any) { + } catch (error) { console.error('Delete failed', error); toast.error('خطا در حذف دسته‌بندی'); } finally { @@ -84,7 +96,7 @@ export default function Categories() { } }; - const openModal = (category: any = null) => { + const openModal = (category: Category | null = null) => { if (category) { setEditingCategory(category); setFormData({ diff --git a/frontend/admin-panel/src/pages/ContactSubmissions.tsx b/frontend/admin-panel/src/pages/ContactSubmissions.tsx index 065c4a25..802b464c 100644 --- a/frontend/admin-panel/src/pages/ContactSubmissions.tsx +++ b/frontend/admin-panel/src/pages/ContactSubmissions.tsx @@ -33,34 +33,42 @@ export default function ContactSubmissions() { const API_URL = import.meta.env.VITE_API_URL || ''; - const fetchSubmissions = async () => { - setLoading(true); + const fetchSubmissionsData = async () => { try { const token = localStorage.getItem('adminToken'); const res = await axios.get(`${API_URL}/api/contact/submissions`, { headers: { Authorization: `Bearer ${token}` }, }); setSubmissions(res.data.items || []); - } catch (err: any) { + } catch { toast.error('خطا در دریافت پیام‌های تماس با ما'); - } finally { - setLoading(false); - } - }; - - const fetchContactInfo = async () => { - try { - const res = await axios.get(`${API_URL}/api/contact/info`); - setInfoItems(res.data || []); - } catch (err: any) { - toast.error('خطا در دریافت اطلاعات نمایندگی'); } }; useEffect(() => { - fetchSubmissions(); - fetchContactInfo(); - }, []); + let isSubscribed = true; + const token = localStorage.getItem('adminToken'); + + axios.get(`${API_URL}/api/contact/submissions`, { + headers: { Authorization: `Bearer ${token}` }, + }).then(res => { + if (isSubscribed) setSubmissions(res.data.items || []); + }).catch(() => { + toast.error('خطا در دریافت پیام‌های تماس با ما'); + }).finally(() => { + if (isSubscribed) setLoading(false); + }); + + axios.get(`${API_URL}/api/contact/info`).then(res => { + if (isSubscribed) setInfoItems(res.data || []); + }).catch(() => { + toast.error('خطا در دریافت اطلاعات نمایندگی'); + }); + + return () => { + isSubscribed = false; + }; + }, [API_URL]); const handleUpdateStatus = async () => { if (!selectedSub) return; @@ -73,8 +81,8 @@ export default function ContactSubmissions() { ); toast.success('وضعیت پیام با موفقیت به‌روزرسانی شد'); setSelectedSub(null); - fetchSubmissions(); - } catch (err: any) { + fetchSubmissionsData(); + } catch { toast.error('خطا در ثبت تغییرات'); } }; @@ -88,7 +96,7 @@ export default function ContactSubmissions() { { headers: { Authorization: `Bearer ${token}` } }, ); toast.success('اطلاعات نمایندگی و دفتر مرکزی با موفقیت ذخیره شد'); - } catch (err: any) { + } catch { toast.error('خطا در بروزرسانی اطلاعات نمایندگی'); } }; diff --git a/frontend/admin-panel/src/pages/Coupons.tsx b/frontend/admin-panel/src/pages/Coupons.tsx index 9ba5530e..d607aeea 100644 --- a/frontend/admin-panel/src/pages/Coupons.tsx +++ b/frontend/admin-panel/src/pages/Coupons.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { Tag, Plus, Edit2, Trash2, Search, XCircle, CheckCircle2, User, Heart, ShoppingBag, FolderTree, Shield } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api from '../services/api'; @@ -6,8 +6,41 @@ import Spinner from '../components/ui/Spinner'; import Pagination from '../components/ui/Pagination'; import ConfirmModal from '../components/ui/ConfirmModal'; +export interface CouponTarget { + targetType: string; + targetId: string; + modifierType: string; + modifierValue: number | string; +} + +export interface Coupon { + id: string; + code: string; + type: string; + value: number; + minCartValue?: number; + maxCartValue?: number; + maxUses?: number; + usedCount?: number; + expiresAt?: string; + isActive: boolean; + targets?: CouponTarget[]; +} + +export interface CouponFormData { + code: string; + type: string; + value: number | string; + minCartValue: string; + maxCartValue: string; + maxUses: string; + expiresAt: string; + isActive: boolean; + targets: CouponTarget[]; +} + export default function Coupons() { - const [coupons, setCoupons] = useState([]); + const [coupons, setCoupons] = useState([]); const [isLoading, setIsLoading] = useState(true); const [search, setSearch] = useState(''); const [page, setPage] = useState(1); @@ -15,14 +48,14 @@ export default function Coupons() { const limit = 10; const [isModalOpen, setIsModalOpen] = useState(false); - const [editingCoupon, setEditingCoupon] = useState(null); + const [editingCoupon, setEditingCoupon] = useState(null); const [deleteTargetId, setDeleteTargetId] = useState(null); - const [formData, setFormData] = useState({ + const [formData, setFormData] = useState({ code: '', type: 'percent', value: 0, minCartValue: '', maxCartValue: '', maxUses: '', expiresAt: '', isActive: true, - targets: [] as any[] + targets: [] }); - const fetchData = async () => { + const fetchData = useCallback(async () => { try { setIsLoading(true); const res = await api.get('/admin/coupons', { params: { page, limit, search } }); @@ -35,14 +68,14 @@ export default function Coupons() { } finally { setIsLoading(false); } - }; + }, [page, search]); useEffect(() => { const timer = setTimeout(() => fetchData(), 500); return () => clearTimeout(timer); - }, [search, page]); + }, [fetchData]); - const openModal = (coupon: any = null) => { + const openModal = (coupon: Coupon | null = null) => { if (coupon) { setEditingCoupon(coupon); setFormData({ @@ -90,9 +123,9 @@ export default function Coupons() { setIsModalOpen(false); fetchData(); - } catch (err: any) { + } catch (err) { console.error('Save error', err); - toast.error('خطا در ذخیره کد تخفیف: ' + (err.response?.data?.message || err.message || '')); + toast.error('خطا در ذخیره کد تخفیف'); } }; @@ -102,7 +135,7 @@ export default function Coupons() { await api.delete(`/admin/coupons/${deleteTargetId}`); toast.success('کد تخفیف با موفقیت حذف شد'); fetchData(); - } catch (err: any) { + } catch { toast.error('خطا در حذف کد تخفیف'); } finally { setDeleteTargetId(null); @@ -113,7 +146,9 @@ export default function Coupons() { try { await api.put(`/admin/coupons/${id}/toggle`, { isActive: !currentStatus }); fetchData(); - } catch (err) {} + } catch { + toast.error('خطا در تغییر وضعیت کد تخفیف'); + } }; return ( @@ -211,8 +246,16 @@ export default function Coupons() { ); } +interface CouponModalProps { + formData: CouponFormData; + setFormData: React.Dispatch>; + onSave: (e: React.FormEvent) => Promise; + onClose: () => void; + isEditing: boolean; +} + // Sub-component for Modal to keep code clean -function CouponModal({ formData, setFormData, onSave, onClose, isEditing }: any) { +function CouponModal({ formData, setFormData, onSave, onClose, isEditing }: CouponModalProps) { const addTarget = () => { setFormData({ ...formData, @@ -226,9 +269,9 @@ function CouponModal({ formData, setFormData, onSave, onClose, isEditing }: any) setFormData({ ...formData, targets: nt }); }; - const updateTarget = (index: number, key: string, val: any) => { + const updateTarget = (index: number, key: keyof CouponTarget, val: string | number) => { const nt = [...formData.targets]; - nt[index][key] = val; + nt[index] = { ...nt[index], [key]: val }; setFormData({ ...formData, targets: nt }); }; @@ -308,7 +351,7 @@ function CouponModal({ formData, setFormData, onSave, onClose, isEditing }: any)
) : (
- {formData.targets.map((t: any, i: number) => ( + {formData.targets.map((t: CouponTarget, i: number) => (
diff --git a/frontend/admin-panel/src/pages/Dashboard.tsx b/frontend/admin-panel/src/pages/Dashboard.tsx index 9be1c5b9..749f8ae1 100644 --- a/frontend/admin-panel/src/pages/Dashboard.tsx +++ b/frontend/admin-panel/src/pages/Dashboard.tsx @@ -4,8 +4,21 @@ import { DollarSign, ShoppingCart, Users, Activity } from 'lucide-react'; import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, PieChart, Pie, Cell } from 'recharts'; import api from '../services/api'; +interface CategoryDist { + name: string; + value: number; +} + +interface DashboardData { + revenue: number; + newOrders: number; + users: number; + todayVisits: number; + categoriesDistribution?: CategoryDist[]; +} + export default function Dashboard() { - const [data, setData] = useState({ + const [data, setData] = useState({ revenue: 0, newOrders: 0, users: 0, @@ -36,7 +49,7 @@ export default function Dashboard() { { name: 'جمعه', بازدید: 349, فروش: 4300 }, ]; - const pieData = (data as any).categoriesDistribution || [ + const pieData = data.categoriesDistribution || [ { name: 'مکمل سگ', value: 8 }, { name: 'مکمل گربه', value: 6 }, { name: 'سگ و گربه', value: 12 }, diff --git a/frontend/admin-panel/src/pages/Login.tsx b/frontend/admin-panel/src/pages/Login.tsx index 599c64cf..afb4b47b 100644 --- a/frontend/admin-panel/src/pages/Login.tsx +++ b/frontend/admin-panel/src/pages/Login.tsx @@ -21,7 +21,7 @@ export default function Login() { toast.success('ورود با موفقیت انجام شد'); navigate('/'); } - } catch (error) { + } catch { toast.error('ایمیل یا رمز عبور اشتباه است'); } finally { setIsLoading(false); diff --git a/frontend/admin-panel/src/pages/Media.tsx b/frontend/admin-panel/src/pages/Media.tsx index 589ce6db..d7598820 100644 --- a/frontend/admin-panel/src/pages/Media.tsx +++ b/frontend/admin-panel/src/pages/Media.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useRef } from 'react'; +import { useState, useEffect, useRef, useCallback } from 'react'; import { Upload, Image as ImageIcon, Trash2, Copy, CheckCircle2, Search, X, FolderOpen } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api, { BASE_DOMAIN } from '../services/api'; @@ -30,10 +30,48 @@ export default function MediaManager() { const [isDragOver, setIsDragOver] = useState(false); const [previewUrl, setPreviewUrl] = useState(null); const fileInputRef = useRef(null); - const pasteTimerRef = useRef>(null); + + const fetchMedia = useCallback(async () => { + try { + const res = await api.get('/admin/media'); + setMediaList(Array.isArray(res.data) ? res.data : res.data?.data || []); + } catch (error) { + console.error('Failed to fetch media', error); + toast.error('خطا در دریافت رسانه‌ها'); + } + }, []); + + const uploadFile = useCallback(async (file: File) => { + const formData = new FormData(); + formData.append('file', file); + try { + setIsUploading(true); + await api.post('/admin/media/upload', formData, { + headers: { 'Content-Type': 'multipart/form-data' } + }); + toast.success('تصویر با موفقیت آپلود شد'); + fetchMedia(); + } catch (error) { + console.error('Upload failed', error); + toast.error('خطا در آپلود فایل'); + } finally { + setIsUploading(false); + } + }, [fetchMedia]); useEffect(() => { - fetchMedia(); + let isSubscribed = true; + api.get('/admin/media').then(res => { + if (isSubscribed) setMediaList(Array.isArray(res.data) ? res.data : res.data?.data || []); + }).catch(error => { + console.error('Failed to fetch media', error); + toast.error('خطا در دریافت رسانه‌ها'); + }).finally(() => { + if (isSubscribed) setIsLoading(false); + }); + return () => { + isSubscribed = false; + }; }, []); useEffect(() => { @@ -52,7 +90,7 @@ export default function MediaManager() { }; document.addEventListener('paste', handlePaste); return () => document.removeEventListener('paste', handlePaste); - }, []); + }, [uploadFile]); const [deleteTargetId, setDeleteTargetId] = useState(null); const [editingSeoMedia, setEditingSeoMedia] = useState(null); @@ -70,46 +108,11 @@ export default function MediaManager() { toast.success('تنظیمات سئوی تصویر با موفقیت ذخیره شد'); fetchMedia(); setEditingSeoMedia(null); - } catch (err) { + } catch { toast.error('خطا در ذخیره تنظیمات سئوی تصویر'); } }; - const fetchMedia = async () => { - try { - setIsLoading(true); - const res = await api.get('/admin/media'); - setMediaList(Array.isArray(res.data) ? res.data : res.data?.data || []); - } catch (error) { - console.error('Failed to fetch media', error); - toast.error('خطا در دریافت رسانه‌ها'); - } finally { - setIsLoading(false); - } - }; - - useEffect(() => { - fetchMedia(); - }, []); - - const uploadFile = async (file: File) => { - const formData = new FormData(); - formData.append('file', file); - try { - setIsUploading(true); - await api.post('/admin/media/upload', formData, { - headers: { 'Content-Type': 'multipart/form-data' } - }); - toast.success('تصویر با موفقیت آپلود شد'); - fetchMedia(); - } catch (error: any) { - console.error('Upload failed', error); - toast.error('خطا در آپلود فایل'); - } finally { - setIsUploading(false); - } - }; - const handleUpload = async (e: React.ChangeEvent) => { if (!e.target.files || e.target.files.length === 0) return; await uploadFile(e.target.files[0]); @@ -131,7 +134,7 @@ export default function MediaManager() { await api.delete(`/admin/media/${deleteTargetId}`); toast.success('تصویر با موفقیت حذف شد'); setMediaList(prev => prev.filter(m => m.id !== deleteTargetId)); - } catch (error: any) { + } catch (error) { console.error('Delete failed', error); toast.error('خطا در حذف تصویر'); } finally { @@ -144,8 +147,7 @@ export default function MediaManager() { try { await navigator.clipboard.writeText(fullUrl); setCopiedId(media.id); - if (pasteTimerRef.current) clearTimeout(pasteTimerRef.current); - pasteTimerRef.current = setTimeout(() => setCopiedId(null), 2000); + setTimeout(() => setCopiedId(null), 2000); } catch { const textarea = document.createElement('textarea'); textarea.value = fullUrl; @@ -154,8 +156,7 @@ export default function MediaManager() { document.execCommand('copy'); document.body.removeChild(textarea); setCopiedId(media.id); - if (pasteTimerRef.current) clearTimeout(pasteTimerRef.current); - pasteTimerRef.current = setTimeout(() => setCopiedId(null), 2000); + setTimeout(() => setCopiedId(null), 2000); } }; diff --git a/frontend/admin-panel/src/pages/Orders.tsx b/frontend/admin-panel/src/pages/Orders.tsx index c8dbeba3..13db409d 100644 --- a/frontend/admin-panel/src/pages/Orders.tsx +++ b/frontend/admin-panel/src/pages/Orders.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { ShoppingCart, Eye, @@ -14,7 +14,6 @@ import { Phone, Mail, Package, - CreditCard, Save, Download } from 'lucide-react'; @@ -23,7 +22,43 @@ import Skeleton from '../components/ui/Skeleton'; import Spinner from '../components/ui/Spinner'; import Pagination from '../components/ui/Pagination'; -const statusStyles: Record = { +export interface OrderItem { + id?: string; + name?: string; + priceValue?: number; + quantity?: number; + product?: { + nameFa?: string; + name?: string; + priceValue?: number; + imageUrl?: string; + image?: string; + }; +} + +export interface Order { + id: string; + trackingNumber?: string; + status: string; + createdAt?: string; + date?: string; + charityDonation?: number; + totalAmount?: number; + total?: number; + isRefill?: boolean; + paymentMethod?: string; + address?: string; + orderItems?: OrderItem[]; + items?: OrderItem[]; + user?: { + firstName?: string; + lastName?: string; + mobile?: string; + email?: string; + }; +} + +const statusStyles: Record = { pending: { label: 'در حال بررسی', color: 'bg-orange-100 text-orange-700 border-orange-200', icon: Clock }, processing: { label: 'در حال پردازش', color: 'bg-amber-100 text-amber-800 border-amber-200', icon: Clock }, shipped: { label: 'ارسال شده', color: 'bg-blue-100 text-blue-700 border-blue-200', icon: Truck }, @@ -38,7 +73,7 @@ const toPersianDigits = (n: string | number): string => { }; export default function Orders() { - const [orders, setOrders] = useState([]); + const [orders, setOrders] = useState([]); const [isLoading, setIsLoading] = useState(true); // Queries @@ -49,12 +84,12 @@ export default function Orders() { const [processingId, setProcessingId] = useState(null); // Modal State - const [selectedOrder, setSelectedOrder] = useState(null); + const [selectedOrder, setSelectedOrder] = useState(null); const [modalTrackingCode, setModalTrackingCode] = useState(''); const [modalStatus, setModalStatus] = useState(''); const [isSavingTracking, setIsSavingTracking] = useState(false); - const fetchOrders = async () => { + const fetchOrders = useCallback(async () => { try { setIsLoading(true); const params = new URLSearchParams(); @@ -69,7 +104,7 @@ export default function Orders() { // Update selectedOrder if open if (selectedOrder) { - const updated = response.data.data.find((o: any) => o.id === selectedOrder.id); + const updated = response.data.data.find((o: Order) => o.id === selectedOrder.id); if (updated) { setSelectedOrder(updated); } @@ -80,7 +115,7 @@ export default function Orders() { } finally { setIsLoading(false); } - }; + }, [page, search, status, selectedOrder]); useEffect(() => { const delayDebounceFn = setTimeout(() => { @@ -88,7 +123,7 @@ export default function Orders() { }, 500); return () => clearTimeout(delayDebounceFn); - }, [page, search, status]); + }, [fetchOrders]); const handleUpdateStatus = async (id: string, newStatus: string, trackingNumber?: string) => { try { @@ -105,7 +140,7 @@ export default function Orders() { } }; - const openOrderModal = (order: any) => { + const openOrderModal = (order: Order) => { setSelectedOrder(order); setModalTrackingCode(order.trackingNumber || ''); setModalStatus(order.status || 'processing'); @@ -127,18 +162,18 @@ export default function Orders() { } }; - const handlePrintInvoice = (orderToPrint: any) => { + const handlePrintInvoice = (orderToPrint: Order) => { if (!orderToPrint) return; const printWindow = window.open('', '_blank'); if (!printWindow) return; - const orderDate = new Date(orderToPrint.createdAt || orderToPrint.date); + const orderDate = new Date(orderToPrint.createdAt || orderToPrint.date || Date.now()); const formattedDate = toPersianDigits(orderDate.toLocaleDateString("fa-IR")); const formattedTime = toPersianDigits(orderDate.toLocaleTimeString("fa-IR", { hour: '2-digit', minute: '2-digit' })); const trackingCode = orderToPrint.trackingNumber || orderToPrint.id.substring(0, 8); const items = orderToPrint.orderItems || orderToPrint.items || []; - const itemsSubtotal = items.reduce((sum: number, item: any) => { + const itemsSubtotal = items.reduce((sum: number, item: OrderItem) => { const price = Number(item.product?.priceValue || item.priceValue || 0); return sum + price * (item.quantity || 1); }, 0); @@ -150,7 +185,7 @@ export default function Orders() { const customerName = orderToPrint.user ? `${orderToPrint.user.firstName || ''} ${orderToPrint.user.lastName || ''}`.trim() : 'مشتری مهمان'; const paymentMethodText = orderToPrint.paymentMethod === 'wallet' ? 'پرداخت از کیف پول الکترونیک' : 'پرداخت آنلاین از درگاه شتاب'; - const itemsHtml = items.map((item: any) => { + const itemsHtml = items.map((item: OrderItem) => { const pName = item.product?.nameFa || item.product?.name || item.name || 'محصول کانینا'; const pImg = item.product?.imageUrl || item.product?.image || '/products/product-placeholder.png'; const pPrice = Number(item.product?.priceValue || item.priceValue || 0); @@ -545,7 +580,7 @@ export default function Orders() { اقلام خریده شده ({toPersianDigits((selectedOrder.orderItems || selectedOrder.items || []).length)})
- {(selectedOrder.orderItems || selectedOrder.items || []).map((item: any, idx: number) => { + {(selectedOrder.orderItems || selectedOrder.items || []).map((item: OrderItem, idx: number) => { const pName = item.product?.nameFa || item.product?.name || item.name || 'محصول کانینا'; const pImg = item.product?.imageUrl || item.product?.image || '/products/product-placeholder.png'; const pPrice = Number(item.product?.priceValue || item.priceValue || 0); diff --git a/frontend/admin-panel/src/pages/Pets.tsx b/frontend/admin-panel/src/pages/Pets.tsx index 98e324e5..b4e66cb8 100644 --- a/frontend/admin-panel/src/pages/Pets.tsx +++ b/frontend/admin-panel/src/pages/Pets.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { Search, Trash2, Heart, Image as ImageIcon } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api, { BASE_DOMAIN } from '../services/api'; @@ -6,8 +6,20 @@ import Spinner from '../components/ui/Spinner'; import Pagination from '../components/ui/Pagination'; import ConfirmModal from '../components/ui/ConfirmModal'; +export interface Pet { + id: string; + name: string; + species: string; + breed?: string; + age?: number; + weight?: number; + ownerName?: string; + avatarUrl?: string; + createdAt: string; +} + export default function Pets() { - const [pets, setPets] = useState([]); + const [pets, setPets] = useState([]); const [isLoading, setIsLoading] = useState(true); const [search, setSearch] = useState(''); const [page, setPage] = useState(1); @@ -16,7 +28,7 @@ export default function Pets() { const [deleteTargetId, setDeleteTargetId] = useState(null); - const fetchPets = async () => { + const fetchPets = useCallback(async () => { try { setIsLoading(true); const res = await api.get('/admin/pets', { params: { page, limit, search } }); @@ -29,14 +41,14 @@ export default function Pets() { } finally { setIsLoading(false); } - }; + }, [page, search]); useEffect(() => { const timer = setTimeout(() => { fetchPets(); }, 500); return () => clearTimeout(timer); - }, [search, page]); + }, [fetchPets]); const confirmDelete = async () => { if (!deleteTargetId) return; @@ -44,7 +56,7 @@ export default function Pets() { await api.delete(`/admin/pets/${deleteTargetId}`); toast.success('پروفایل حیوان خانگی با موفقیت حذف شد'); fetchPets(); - } catch (error: any) { + } catch (error) { console.error('Delete failed', error); toast.error('خطا در حذف پروفایل'); } finally { diff --git a/frontend/admin-panel/src/pages/Products.tsx b/frontend/admin-panel/src/pages/Products.tsx index fb431e50..7c990ac0 100644 --- a/frontend/admin-panel/src/pages/Products.tsx +++ b/frontend/admin-panel/src/pages/Products.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { Search, Filter, Box, Plus, Edit2, Trash2, Image as ImageIcon, X, HelpCircle } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api, { BASE_DOMAIN } from '../services/api'; @@ -7,16 +7,51 @@ import Pagination from '../components/ui/Pagination'; import MediaSelector from '../components/ui/MediaSelector'; import ConfirmModal from '../components/ui/ConfirmModal'; +export interface Category { + id: string; + nameFa: string; + nameEn?: string; +} + +export interface Product { + id: string; + artNo: string; + nameFa: string; + nameEn?: string; + scientificTagline?: string; + description?: string; + shortDescription?: string; + categoryId?: string; + priceValue?: number; + wholesalePrice?: number; + priceDisplay?: string; + unit?: string; + packageSize?: number; + dosageLogic?: string; + suitableFor?: string; + imageUrl?: string; + metaTitle?: string; + metaDescription?: string; + keywords?: string; + canonicalUrl?: string; + slug?: string; + images?: string[]; + podcastUrl?: string; + videoUrl?: string; + pdfUrl?: string; + symptoms?: Array<{ symptom: string } | string>; +} + export default function Products() { - const [products, setProducts] = useState([]); - const [categories, setCategories] = useState([]); + const [products, setProducts] = useState([]); + const [categories, setCategories] = useState([]); const [isLoading, setIsLoading] = useState(true); // URL and String Helper Functions const getProductImageUrl = (url: string) => { if (!url) return ''; if (url.startsWith('http')) { - const path = url.replace(/^https?:\/\/[^\/]+/, ''); + const path = url.replace(/^https?:\/\/[^/]+/, ''); return `${BASE_DOMAIN}${path}`; } return url.startsWith('/') ? `${BASE_DOMAIN}${url}` : `${BASE_DOMAIN}/${url}`; @@ -37,7 +72,7 @@ export default function Products() { .toLowerCase() .trim() .replace(/\s+/g, '-') - .replace(/[^a-z0-9\-]/g, '') + .replace(/[^a-z0-9-]/g, '') .replace(/-+/g, '-') .replace(/^-|-$/g, ''); }; @@ -54,7 +89,7 @@ export default function Products() { // Modal State const [isModalOpen, setIsModalOpen] = useState(false); const [isMediaSelectorOpen, setIsMediaSelectorOpen] = useState(false); - const [editingProduct, setEditingProduct] = useState(null); + const [editingProduct, setEditingProduct] = useState(null); const [deleteTargetId, setDeleteTargetId] = useState(null); const [activeTab, setActiveTab] = useState('general'); @@ -86,9 +121,8 @@ export default function Products() { symptoms: [] as string[] }); - const fetchData = async () => { + const fetchData = useCallback(async () => { try { - setIsLoading(true); // Fetch products first const prodRes = await api.get('/admin/products', { params: { page, limit, search, categoryId: categoryFilter } }); if (prodRes.data?.data) { @@ -107,22 +141,22 @@ export default function Products() { } catch (err) { console.warn('Could not fetch categories', err); } - } catch (err: any) { + } catch (err: unknown) { console.error(err); - toast.error('خطا در دریافت لیست محصولات: ' + (err.response?.data?.message || err.message)); + toast.error('خطا در دریافت لیست محصولات'); } finally { setIsLoading(false); } - }; + }, [page, search, categoryFilter]); useEffect(() => { const timer = setTimeout(() => { fetchData(); }, 500); return () => clearTimeout(timer); - }, [search, categoryFilter, page]); + }, [fetchData]); - const openModal = (product: any = null) => { + const openModal = (product: Product | null = null) => { setMediaImageError(false); if (product) { setEditingProduct(product); @@ -151,7 +185,7 @@ export default function Products() { podcastUrl: product.podcastUrl || '', videoUrl: product.videoUrl || '', pdfUrl: product.pdfUrl || '', - symptoms: product.symptoms ? product.symptoms.map((s: any) => s.symptom) : [] + symptoms: product.symptoms ? product.symptoms.map((s: { symptom: string } | string) => typeof s === 'string' ? s : s.symptom) : [] }); } else { setEditingProduct(null); @@ -189,9 +223,9 @@ export default function Products() { setIsModalOpen(false); setImageErrors({}); fetchData(); - } catch (error: any) { + } catch (error) { console.error('Save failed', error); - toast.error('خطا در ذخیره محصول: ' + (error.response?.data?.message || error.message || '')); + toast.error('خطا در ذخیره محصول'); } }; @@ -202,7 +236,7 @@ export default function Products() { toast.success('محصول با موفقیت حذف شد'); setImageErrors({}); fetchData(); - } catch (error: any) { + } catch (error) { console.error('Delete failed', error); toast.error('خطا در حذف محصول'); } finally { diff --git a/frontend/admin-panel/src/pages/Reports.tsx b/frontend/admin-panel/src/pages/Reports.tsx index eefce35f..ffc33c11 100644 --- a/frontend/admin-panel/src/pages/Reports.tsx +++ b/frontend/admin-panel/src/pages/Reports.tsx @@ -9,27 +9,72 @@ import { const COLORS = ['#8B5CF6', '#EC4899', '#3B82F6', '#10B981', '#F59E0B']; +interface CustomTooltipProps { + active?: boolean; + payload?: Array<{ value: number | string }>; + label?: string; +} + +const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => { + if (active && payload && payload.length) { + return ( +
+

{label}

+

{Number(payload[0].value).toLocaleString()} تومان

+
+ ); + } + return null; +}; + +export interface CategoryDistItem { + name: string; + value: number; +} + +export interface BestSellerItem { + name: string; + quantity: number; +} + +export interface TopCouponItem { + name: string; + usedCount: number; +} + +export interface ReportData { + overview?: { + totalRevenue: number; + totalOrders: number; + totalUsers: number; + avgOrderValue: number; + }; + salesTimeline?: Array<{ date: string; amount: number }>; + bestSellers?: BestSellerItem[]; + categoryDistribution?: CategoryDistItem[]; + topCoupons?: TopCouponItem[]; +} + export default function Reports() { - const [reportData, setReportData] = useState(null); + const [reportData, setReportData] = useState(null); const [isLoading, setIsLoading] = useState(true); useEffect(() => { - fetchData(); - }, []); - - const fetchData = async () => { - try { - setIsLoading(true); - const reportRes = await api.get('/admin/reports'); + let isSubscribed = true; + api.get('/admin/reports').then(reportRes => { + if (!isSubscribed) return; if (reportRes.data?.success) { setReportData(reportRes.data.data); } - } catch (err) { + }).catch(err => { console.error(err); - } finally { - setIsLoading(false); - } - }; + }).finally(() => { + if (isSubscribed) setIsLoading(false); + }); + return () => { + isSubscribed = false; + }; + }, []); if (isLoading) { return
; @@ -39,18 +84,6 @@ export default function Reports() { const { overview, salesTimeline, bestSellers, categoryDistribution, topCoupons } = reportData; - const CustomTooltip = ({ active, payload, label }: any) => { - if (active && payload && payload.length) { - return ( -
-

{label}

-

{Number(payload[0].value).toLocaleString()} تومان

-
- ); - } - return null; - }; - return (
@@ -133,11 +166,11 @@ export default function Reports() {

سهم فروش دسته‌بندی‌ها

- {categoryDistribution?.length > 0 ? ( + {categoryDistribution && categoryDistribution.length > 0 ? ( - {categoryDistribution.map((_: any, index: number) => ( + {categoryDistribution.map((_, index: number) => ( ))} @@ -177,8 +210,8 @@ export default function Reports() {

پرکاربردترین کدهای تخفیف

- {topCoupons?.length > 0 ? ( - topCoupons.map((coupon: any, idx: number) => ( + {topCoupons && topCoupons.length > 0 ? ( + topCoupons.map((coupon: TopCouponItem, idx: number) => (
diff --git a/frontend/admin-panel/src/pages/Settings.tsx b/frontend/admin-panel/src/pages/Settings.tsx index 79cf23a8..de32063c 100644 --- a/frontend/admin-panel/src/pages/Settings.tsx +++ b/frontend/admin-panel/src/pages/Settings.tsx @@ -30,10 +30,10 @@ export default function Settings() { const [isLoading, setIsLoading] = useState(true); const [isSaving, setIsSaving] = useState(false); - const fetchSettings = async () => { - try { - setIsLoading(true); - const response = await api.get('/admin/settings'); + useEffect(() => { + let isSubscribed = true; + api.get('/admin/settings').then(response => { + if (!isSubscribed) return; if (response.data?.success) { setSettings({ SHIPPING_FEE: response.data.data.SHIPPING_FEE || '0', @@ -58,15 +58,14 @@ export default function Settings() { BRAND_TYPOGRAPHY: response.data.data.BRAND_TYPOGRAPHY || 'vazirmatn', }); } - } catch (err) { + }).catch(err => { console.error('Failed to fetch settings', err); - } finally { - setIsLoading(false); - } - }; - - useEffect(() => { - fetchSettings(); + }).finally(() => { + if (isSubscribed) setIsLoading(false); + }); + return () => { + isSubscribed = false; + }; }, []); const handleSave = async (e: React.FormEvent) => { @@ -75,7 +74,7 @@ export default function Settings() { setIsSaving(true); await api.put('/admin/settings', settings); toast.success('تنظیمات با موفقیت بروزرسانی شد.'); - } catch (err: any) { + } catch (err) { console.error('Failed to update settings', err); toast.error('خطا در بروزرسانی تنظیمات'); } finally { diff --git a/frontend/admin-panel/src/pages/UITexts.tsx b/frontend/admin-panel/src/pages/UITexts.tsx index 57c958db..bc3afef1 100644 --- a/frontend/admin-panel/src/pages/UITexts.tsx +++ b/frontend/admin-panel/src/pages/UITexts.tsx @@ -1,5 +1,5 @@ import { useState, useEffect, useRef } from 'react'; -import { Languages, Save, Search, Loader2, Layout, Sliders, Image, Link as LinkIcon, FileText, Check, Upload, HelpCircle } from 'lucide-react'; +import { Languages, Save, Search, Loader2, Layout, Sliders, Link as LinkIcon, FileText, Check, Upload, HelpCircle } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api from '../services/api'; import Spinner from '../components/ui/Spinner'; @@ -94,19 +94,18 @@ export default function UITexts() { const currentKeyForUpload = useRef(null); useEffect(() => { - fetchTexts(); - }, []); - - const fetchTexts = async () => { - try { - const res = await api.get('/settings/ui-texts'); - setTexts(res.data || {}); - } catch (e) { + let isSubscribed = true; + api.get('/settings/ui-texts').then(res => { + if (isSubscribed) setTexts(res.data || {}); + }).catch(e => { console.error('Failed to load UI texts:', e); - } finally { - setLoading(false); - } - }; + }).finally(() => { + if (isSubscribed) setLoading(false); + }); + return () => { + isSubscribed = false; + }; + }, []); const handleSave = async (key: string) => { const value = edits[key] ?? texts[key] ?? ''; diff --git a/frontend/admin-panel/src/pages/Users.tsx b/frontend/admin-panel/src/pages/Users.tsx index 90710862..6affd45c 100644 --- a/frontend/admin-panel/src/pages/Users.tsx +++ b/frontend/admin-panel/src/pages/Users.tsx @@ -1,12 +1,22 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useCallback } from 'react'; import { Users as UsersIcon, CheckCircle, Search, Edit3, Check, X } from 'lucide-react'; import api from '../services/api'; import Skeleton from '../components/ui/Skeleton'; import Spinner from '../components/ui/Spinner'; import Pagination from '../components/ui/Pagination'; +export interface UserRecord { + id: string; + firstName?: string; + lastName?: string; + mobile?: string; + email?: string; + role?: string; + createdAt?: string; +} + export default function Users() { - const [users, setUsers] = useState([]); + const [users, setUsers] = useState([]); const [isLoading, setIsLoading] = useState(true); // Queries @@ -20,7 +30,7 @@ export default function Users() { const [editRole, setEditRole] = useState(''); const [isSaving, setIsSaving] = useState(false); - const fetchUsers = async () => { + const fetchUsers = useCallback(async () => { try { setIsLoading(true); const params = new URLSearchParams(); @@ -38,7 +48,7 @@ export default function Users() { } finally { setIsLoading(false); } - }; + }, [page, search, role]); useEffect(() => { const delayDebounceFn = setTimeout(() => { @@ -46,9 +56,9 @@ export default function Users() { }, 500); return () => clearTimeout(delayDebounceFn); - }, [page, search, role]); + }, [fetchUsers]); - const handleEditClick = (user: any) => { + const handleEditClick = (user: UserRecord) => { setEditingId(user.id); setEditRole(user.role || 'User_PetOwner'); }; diff --git a/frontend/admin-panel/src/pages/Videos.tsx b/frontend/admin-panel/src/pages/Videos.tsx index 849add00..aac4ef28 100644 --- a/frontend/admin-panel/src/pages/Videos.tsx +++ b/frontend/admin-panel/src/pages/Videos.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useRef } from 'react'; -import { Plus, Search, Edit2, Trash2, Video as VideoIcon, Star, CheckCircle, X, Upload, Image as ImageIcon, Film, Code } from 'lucide-react'; +import { Plus, Search, Edit2, Trash2, Video as VideoIcon, Star, X, Upload, Film } from 'lucide-react'; import { toast } from 'react-hot-toast'; import api from '../services/api'; import ConfirmModal from '../components/ui/ConfirmModal'; @@ -23,6 +23,7 @@ export default function Videos() { const [searchTerm, setSearchTerm] = useState(''); const [isModalOpen, setIsModalOpen] = useState(false); const [editingVideo, setEditingVideo] = useState