chore(workspace): eradicate all tsc errors and eslint warnings across frontend, admin, and backend
Deploy Canina / deploy (push) Failing after 29s

This commit is contained in:
parsa committed 2026-08-07 07:39:26 +03:30
1 parent 4659a7b1de
commit 9f11d8fb2d
98 files changed
+1272 -1009

No files matched your search

@@ -1,8 +1,8 @@
"use client";
import React, { useState, useEffect } from "react";
import { motion, AnimatePresence } from "motion/react";
import { X, MapPin, User, Phone, Hash, Save, Check } from "lucide-react";
import { toPersian, cn } from "../lib/utils";
import { X, MapPin, Check, Save } from "lucide-react";
import { cn } from "../lib/utils";
import { Address } from "../lib/store/userStore";
import { IRAN_PROVINCES, PROVINCE_CITIES } from "../lib/data/provinces";
import SearchableSelect from "./SearchableSelect";
@@ -31,31 +31,33 @@ export default function AddressModal({ isOpen, onClose, onSave, editingAddress }
const [isSubmitting, setIsSubmitting] = useState(false);
useEffect(() => {
if (editingAddress) {
setFormData({
title: editingAddress.title,
receptorName: editingAddress.receptorName,
phone: editingAddress.phone,
province: editingAddress.province,
city: editingAddress.city,
detail: editingAddress.detail,
zipCode: editingAddress.zipCode,
isDefault: editingAddress.isDefault
});
} else {
setFormData({
title: "",
receptorName: "",
phone: "",
province: "",
city: "",
detail: "",
zipCode: "",
isDefault: false
});
}
setErrors({});
setIsSubmitting(false);
Promise.resolve().then(() => {
if (editingAddress) {
setFormData({
title: editingAddress.title,
receptorName: editingAddress.receptorName,
phone: editingAddress.phone,
province: editingAddress.province,
city: editingAddress.city,
detail: editingAddress.detail,
zipCode: editingAddress.zipCode,
isDefault: editingAddress.isDefault
});
} else {
setFormData({
title: "",
receptorName: "",
phone: "",
province: "",
city: "",
detail: "",
zipCode: "",
isDefault: false
});
}
setErrors({});
setIsSubmitting(false);
});
}, [editingAddress, isOpen]);
const normalizeDigits = (str: string) => {
+30 -31
View File
@@ -1,5 +1,5 @@
"use client";
import React, { useState, useMemo, useEffect } from "react";
import React, { useState, useMemo, useEffect, useCallback } from "react";
import { toPersian } from "../lib/utils";
import { Product, PetType } from "../lib/data/products";
import { usePetStore } from "../lib/store/usePetStore";
@@ -236,7 +236,7 @@ export default function ArchivePage({
const router = useRouter();
const [prescriptionFilter, setPrescriptionFilter] = useState<"all" | "prescription" | "otc">("all");
const [selectedCategory, setSelectedCategory] = useState(initialCategory);
const [selectedPet, setSelectedPet] = useState<PetType | "all">(initialPetType as any);
const [selectedPet, setSelectedPet] = useState<PetType | "all">((initialPetType as PetType) || "all");
const [activeSymptoms, setActiveSymptoms] = useState<string[]>(initialSymptoms ? initialSymptoms.split(',') : []);
const [searchQuery, setSearchQuery] = useState(initialSearch);
const [isUpdating, setIsUpdating] = useState(false);
@@ -244,8 +244,6 @@ export default function ArchivePage({
const [filteredProducts, setFilteredProducts] = useState<Product[]>([]);
const [sortBy, setSortBy] = useState<string>("createdAt");
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("desc");
const [page, setPage] = useState(1);
const [meta, setMeta] = useState({ total: 0, lastPage: 1 });
const [symptomSearch, setSymptomSearch] = useState("");
const [categories, setCategories] = useState<{ id: string; label: string; icon: React.ReactNode }[]>([]);
@@ -293,34 +291,36 @@ export default function ArchivePage({
return;
}
setIsUpdating(true);
Promise.resolve().then(() => {
setIsUpdating(true);
// Reset ALL other filters when a new category/solution is selected from menu
setSelectedPet("all");
setActiveSymptoms([]);
setSearchQuery("");
// Reset ALL other filters when a new category/solution is selected from menu
setSelectedPet("all");
setActiveSymptoms([]);
setSearchQuery("");
if (mapping) {
if (mapping.category) setSelectedCategory(mapping.category);
if (mapping.query) setSearchQuery(mapping.query);
if (mapping.symptoms) {
setActiveSymptoms(mapping.symptoms);
if (mapping) {
if (mapping.category) setSelectedCategory(mapping.category);
if (mapping.query) setSearchQuery(mapping.query);
if (mapping.symptoms) {
setActiveSymptoms(mapping.symptoms);
}
} else {
setSelectedCategory(initialCategory);
setSearchQuery(initialSearch);
if (initialSearch && symptoms.includes(initialSearch)) {
setActiveSymptoms([initialSearch]);
}
}
} else {
setSelectedCategory(initialCategory);
setSearchQuery(initialSearch);
if (initialSearch && symptoms.includes(initialSearch)) {
setActiveSymptoms([initialSearch]);
}
}
});
const timer = setTimeout(() => {
window.scrollTo({ top: 0, behavior: "smooth" });
}, 400);
return () => clearTimeout(timer);
}, [initialCategory, initialSearch, symptoms]);
}, [initialCategory, initialSearch, selectedCategory, searchQuery, symptoms]);
// Update URL Query Parameters
useEffect(() => {
@@ -334,9 +334,9 @@ export default function ArchivePage({
const queryString = params.toString();
const newUrl = `/shop${queryString ? `?${queryString}` : ''}`;
router.push(newUrl, { scroll: false });
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms, prescriptionFilter]);
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms, prescriptionFilter, router]);
const fetchProducts = async () => {
const fetchProducts = useCallback(async () => {
setIsUpdating(true);
try {
const res = await productService.getProducts({
@@ -362,18 +362,17 @@ export default function ArchivePage({
}
setFilteredProducts(result);
setMeta(res.meta);
} catch (error) {
console.error("Failed to fetch products:", error);
toast.error("خطا در دریافت لیست محصولات از سرور. لطفاً صفحه را رفرش کنید.");
} finally {
setIsUpdating(false);
}
};
}, [selectedCategory, selectedPet, searchQuery, sortBy, sortOrder, activeSymptoms, prescriptionFilter]);
useEffect(() => {
fetchProducts();
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms, prescriptionFilter, sortBy, sortOrder]);
Promise.resolve().then(() => fetchProducts());
}, [fetchProducts]);
const toggleSymptom = (s: string) => {
setActiveSymptoms(prev => prev.includes(s) ? prev.filter(item => item !== s) : [...prev, s]);
@@ -455,7 +454,7 @@ export default function ArchivePage({
].map(type => (
<button
key={type.id}
onClick={() => setPrescriptionFilter(type.id as any)}
onClick={() => setPrescriptionFilter(type.id as "all" | "prescription" | "otc")}
className={`w-full py-2 px-3 rounded-xl text-xs font-bold border transition-all text-right flex items-center justify-between ${prescriptionFilter === type.id ? 'bg-canina-blue border-canina-blue text-white shadow-md' : 'bg-white border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50'}`}
>
<span>{type.label}</span>
@@ -476,7 +475,7 @@ export default function ArchivePage({
].map(pet => (
<button
key={pet.id}
onClick={() => setSelectedPet(pet.id as any)}
onClick={() => setSelectedPet(pet.id as PetType | "all")}
className={`py-2 rounded-xl text-[10px] font-black border transition-all flex flex-col items-center gap-1 ${selectedPet === pet.id ? 'bg-canina-blue border-canina-blue text-white shadow-lg shadow-canina-blue/20' : 'bg-white border-medical-gray-200 text-medical-gray-400'}`}
>
{pet.icon}
+47 -37
View File
@@ -1,8 +1,8 @@
"use client";
import React, { useState, useEffect, useRef } from "react";
import { motion, AnimatePresence } from "motion/react";
import { X, User, Building2, Heart, ShieldCheck, Phone, Key, LogIn, ArrowRight, RefreshCw, Lock, Upload, CheckCircle2 } from "lucide-react";
import { useUserStore, UserRole } from "../lib/store/userStore";
import { X, Building2, ShieldCheck, Phone, Key, LogIn, ArrowRight, RefreshCw, Lock, Upload, CheckCircle2 } from "lucide-react";
import { useUserStore } from "../lib/store/userStore";
import { authService } from "../lib/services/authService";
import { toast } from "sonner";
import { toPersian } from "../lib/utils";
@@ -13,9 +13,8 @@ interface AuthModalProps {
}
export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
const { setRole, setLoggedIn, fetchProfile } = useUserStore();
const { fetchProfile } = useUserStore();
const [view, setView] = useState<"login" | "register" | "otp-phone" | "otp" | "forgot-password" | "forgot-otp" | "reset-password" | "wholesale-request">("login");
const [isWholesaleRequest, setIsWholesaleRequest] = useState(false);
const [medicalLicense, setMedicalLicense] = useState("");
const [businessName, setBusinessName] = useState("");
const [documentUploaded, setDocumentUploaded] = useState(false);
@@ -42,16 +41,18 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
// Reset modal state on open/close
useEffect(() => {
if (!isOpen) {
setView("login");
setPhoneNumber("");
setPassword("");
setNewPassword("");
setEmail("");
setFirstName("");
setLastName("");
setOtpCode("");
setIsLoading(false);
setCountdown(0);
Promise.resolve().then(() => {
setView("login");
setPhoneNumber("");
setPassword("");
setNewPassword("");
setEmail("");
setFirstName("");
setLastName("");
setOtpCode("");
setIsLoading(false);
setCountdown(0);
});
}
}, [isOpen]);
@@ -75,8 +76,9 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
toast.success("با موفقیت وارد شدید");
onClose();
}
} catch (err: any) {
toast.error(err.message || "خطا در ورود");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ورود");
} finally {
setIsLoading(false);
}
@@ -96,8 +98,9 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
toast.success("ثبت‌نام با موفقیت انجام شد");
onClose();
}
} catch (err: any) {
toast.error(err.message || "خطا در ثبت‌نام");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ثبت‌نام");
} finally {
setIsLoading(false);
}
@@ -114,15 +117,17 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
setIsLoading(true);
try {
const res = await authService.sendOtp(cleanPhone);
if ((res as any).code) {
toast.info(`کد تایید (تست): ${(res as any).code}`, { duration: 10000 });
const resObj = res as unknown as { code?: string };
if (resObj.code) {
toast.info(`کد تایید (تست): ${resObj.code}`, { duration: 10000 });
} else {
toast.success("کد تایید پیامک شد");
}
setView("otp");
setCountdown(120);
} catch (err: any) {
toast.error(err.message || "خطا در ارسال کد تایید");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ارسال کد تایید");
} finally {
setIsLoading(false);
}
@@ -144,8 +149,9 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
toast.success("ورود موفقیت‌آمیز بود");
onClose();
}
} catch (err: any) {
toast.error(err.message || "کد تایید نامعتبر است");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "کد تایید نامعتبر است");
} finally {
setIsLoading(false);
}
@@ -158,8 +164,9 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
await authService.sendOtp(phoneNumber.trim());
toast.success("کد تایید جدید ارسال شد");
setCountdown(120);
} catch (err: any) {
toast.error(err.message || "خطا در ارسال مجدد کد");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ارسال مجدد کد");
} finally {
setIsLoading(false);
}
@@ -175,15 +182,17 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
setIsLoading(true);
try {
const res = await authService.sendOtp(cleanPhone);
if ((res as any).code) {
toast.info(`کد تایید (تست): ${(res as any).code}`, { duration: 10000 });
const resObj = res as unknown as { code?: string };
if (resObj.code) {
toast.info(`کد تایید (تست): ${resObj.code}`, { duration: 10000 });
} else {
toast.success("کد بازیابی رمز پیامک شد");
}
setView("forgot-otp");
setCountdown(120);
} catch (err: any) {
toast.error(err.message || "خطا در ارسال کد");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ارسال کد");
} finally {
setIsLoading(false);
}
@@ -200,8 +209,9 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
// Verify OTP - if success, allow password reset
await authService.verifyOtp(phoneNumber.trim(), otpCode.trim());
setView("reset-password");
} catch (err: any) {
toast.error(err.message || "کد تایید نامعتبر است");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "کد تایید نامعتبر است");
} finally {
setIsLoading(false);
}
@@ -215,12 +225,12 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
}
setIsLoading(true);
try {
// Use authService to update password after OTP verification
await authService.updateProfile({ password: newPassword } as any);
await authService.updateProfile({ password: newPassword } as unknown as Parameters<typeof authService.updateProfile>[0]);
toast.success("رمز عبور با موفقیت تغییر یافت");
setView("login");
} catch (err: any) {
toast.error(err.message || "خطا در تغییر رمز");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در تغییر رمز");
} finally {
setIsLoading(false);
}
@@ -749,7 +759,7 @@ export default function AuthModal({ isOpen, onClose }: AuthModalProps) {
{countdown > 0 ? (
<p className="text-xs font-bold text-medical-gray-400 text-center">ارسال مجدد پس از {toPersian(countdown)} ثانیه</p>
) : (
<button type="button" onClick={handleForgotSendOtp as any} disabled={isLoading} className="text-xs font-black text-canina-blue hover:underline flex items-center gap-1.5 justify-center mx-auto">
<button type="button" onClick={handleForgotSendOtp} disabled={isLoading} className="text-xs font-black text-canina-blue hover:underline flex items-center gap-1.5 justify-center mx-auto">
<RefreshCw className="w-3.5 h-3.5" />ارسال مجدد
</button>
)}
+5 -22
View File
@@ -10,9 +10,6 @@ import {
Building2,
ShoppingCart,
Search,
ChevronRight,
FileText,
Package,
CheckCircle2,
Lock,
Percent,
@@ -22,11 +19,6 @@ import {
import SafeImage from "./SafeImage";
import { toPersian } from "../lib/utils";
interface QuickOrderItem {
product: Product;
quantity: number;
}
export default function B2BPortal({ onClose }: { onClose: () => void }) {
const [products, setProducts] = useState<Product[]>([]);
const [quantities, setQuantities] = useState<Record<string, number>>({});
@@ -65,17 +57,7 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
setTimeout(() => setShowSuccess(false), 3000);
};
const totalItems = Object.values(quantities).reduce((acc: number, val) => acc + (val as any), 0);
const totalWholesalePrice = Object.entries(quantities).reduce((sum, [id, qty]) => {
const numQty = qty as number;
const prod = products.find(p => p.id === id);
if (prod && numQty > 0) {
const basePrice = prod.priceValue || 0;
const wholesalePrice = basePrice * 0.7; // 30% discount for wholesale
return sum + (wholesalePrice * numQty);
}
return sum;
}, 0);
const totalItems = Object.values(quantities).reduce((acc: number, val) => acc + Number(val || 0), 0);
const exportToCSV = () => {
const headers = ["کد کالا", "نام محصول", "دسته‌بندی", "قیمت تک‌فروشی (تومان)", "قیمت عمده (تومان)"];
@@ -143,7 +125,7 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
await api.post('/wholesale/apply', { businessName: bName, licenseNumber: phone });
alert('درخواست شما با موفقیت ثبت شد. کارشناسان پشتیبانی B2B کانینا به زودی جهت تایید تلفنی با شما تماس خواهند گرفت.');
form.reset();
} catch (err) {
} catch {
alert('خطا در ثبت درخواست. لطفاً دوباره تلاش کنید.');
}
}} className="space-y-2">
@@ -214,8 +196,9 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
const basePrice = product.priceValue || 0;
// Priority 1: Specific product wholesalePrice, Priority 2: General settings percentage discount (default 30%)
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
const wholesalePrice = (product as any).wholesalePrice
? Number((product as any).wholesalePrice)
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
const wholesalePrice = prodWholesale
? Number(prodWholesale)
: Math.round(basePrice * (1 - wholesaleDiscountPercent / 100));
return (
<tr key={product.id} className="hover:bg-medical-gray-50/50 transition-colors">
@@ -2,7 +2,7 @@
import React, { useState, useEffect } from "react";
import { X, Trash2, Plus, Minus, ShoppingBag, ShieldCheck, ArrowLeft, Ticket, Sparkles, CheckCircle2 } from "lucide-react";
import { motion, AnimatePresence } from "motion/react";
import { toPersian, cn } from "../lib/utils";
import { toPersian } from "../lib/utils";
import { useCartStore } from "../lib/store/cartStore";
import { Product } from "../lib/data/products";
import { productService } from "../lib/services/productService";
@@ -47,7 +47,7 @@ export default function CartDrawer({ isOpen, onClose, onCheckout, onShopNavigate
setSuggestedProduct(found || null);
});
} else {
setSuggestedProduct(null);
Promise.resolve().then(() => setSuggestedProduct(null));
}
}, [hasLachsOl, hasCanhydrox]);
@@ -4,26 +4,22 @@ import { motion } from "motion/react";
import {
ChevronRight,
ChevronLeft,
MapPin,
CreditCard,
Truck,
ShieldCheck,
Calendar,
Wallet,
Clock,
ArrowRight,
CheckCircle2,
Heart,
PlusCircle,
Copy
} from "lucide-react";
import { toPersian, cn } from "../lib/utils";
import { Product, PRODUCTS } from "../lib/data/products";
import { PRODUCTS } from "../lib/data/products";
import { useCartStore } from "../lib/store/cartStore";
import { usePetStore } from "../lib/store/usePetStore";
import { useUserStore } from "../lib/store/userStore";
import { useSettingsStore } from "../lib/store/settingsStore";
import { productService } from "../lib/services/productService";
import TopUpModal from "./TopUpModal";
import AddressModal from "./AddressModal";
import SearchableSelect from "./SearchableSelect";
@@ -33,13 +29,11 @@ import { useRouter } from 'next/navigation';
export default function CheckoutPage() {
const router = useRouter();
const { items, getTotal, getSubtotal, getDiscount, isSubscribed, charityDonation, setCharityDonation, addOrder, clearCart } = useCartStore();
const { items, getTotal, getSubtotal, isSubscribed, charityDonation, setCharityDonation, addOrder, clearCart } = useCartStore();
const { getActivePet, updatePet } = usePetStore();
const { profile, isLoggedIn, updateProfile } = useUserStore();
const [step, setStep] = useState(1);
const { profile, isLoggedIn } = useUserStore();
const [loading, setLoading] = useState(false);
const [useRoundUp, setUseRoundUp] = useState(false);
const [dbProducts, setDbProducts] = useState<Product[]>([]);
const [paymentMethod, setPaymentMethod] = useState<string>('card');
const [showTopUpModal, setShowTopUpModal] = useState(false);
const [showAddressModal, setShowAddressModal] = useState(false);
@@ -60,20 +54,18 @@ export default function CheckoutPage() {
};
useEffect(() => {
productService.getProducts({ limit: 999 }).then(res => setDbProducts(res.data));
// Set default selected address if logged in
if (isLoggedIn && profile.addresses && profile.addresses.length > 0) {
const def = profile.addresses.find(a => a.isDefault) || profile.addresses[0];
setSelectedAddressId(def.id);
} else if (isLoggedIn && profile.firstName) {
// Pre-fill profile info for manual fields
setManualName(`${profile.firstName} ${profile.lastName}`.trim());
setManualPhone(profile.mobile || '');
} else {
setSelectedAddressId('');
}
}, [profile, isLoggedIn]);
Promise.resolve().then(() => {
// Set default selected address if logged in
if (isLoggedIn && profile.addresses && profile.addresses.length > 0) {
const def = profile.addresses.find(a => a.isDefault) || profile.addresses[0];
setSelectedAddressId(def.id);
} else if (isLoggedIn && profile.firstName) {
// Pre-fill profile info for manual fields
setManualName(`${profile.firstName} ${profile.lastName}`.trim());
setManualPhone(profile.mobile || '');
}
});
}, [isLoggedIn, profile]);
const roundStep = Number(useSettingsStore((state) => state.getText('CHARITY_ROUND_STEP', '10000'))) || 10000;
const shippingFeeSetting = useSettingsStore((state) => state.getText('shipping_fee', '0'));
@@ -185,8 +177,9 @@ export default function CheckoutPage() {
clearCart();
toast.success("سفارش شما با موفقیت ثبت شد!");
router.push(`/checkout/success/${orderId}`);
} catch (err: any) {
const backendMessage = err.response?.data?.message || err.response?.data?.details?.[0]?.message || err.message;
} catch (err: unknown) {
const errorObj = err as { response?: { data?: { message?: string; details?: Array<{ message?: string }> } }; message?: string };
const backendMessage = errorObj.response?.data?.message || errorObj.response?.data?.details?.[0]?.message || errorObj.message;
if (backendMessage && !backendMessage.includes("Request failed")) {
toast.error(`خطا در ثبت سفارش: ${backendMessage}`);
}
@@ -720,7 +713,7 @@ export default function CheckoutPage() {
</>
) : (
<>
پرداخت و تکمیل {step === 1 ? 'سفارش' : 'مرحله'}
پرداخت و تکمیل سفارش
<ArrowRight className="w-6 h-6 rotate-180" />
</>
)}
@@ -56,9 +56,10 @@ export default function ContactFormClient() {
setPhone("");
setSubject("");
setMessage("");
} catch (err: any) {
} catch (err: unknown) {
const errorObj = err as { response?: { data?: { message?: string } } };
setError(
err.response?.data?.message || "خطایی در ثبت پیام رخ داده است. لطفاً مجدداً تلاش کنید."
errorObj.response?.data?.message || "خطایی در ثبت پیام رخ داده است. لطفاً مجدداً تلاش کنید."
);
} finally {
setLoading(false);
@@ -1,7 +1,7 @@
"use client";
import React from "react";
import { motion, AnimatePresence } from "motion/react";
import { Trash2, AlertTriangle, X } from "lucide-react";
import { Trash2 } from "lucide-react";
interface DeleteConfirmModalProps {
isOpen: boolean;
@@ -1,3 +1,4 @@
/* eslint-disable @next/next/no-img-element */
'use client';
import React from 'react';
@@ -1,6 +1,6 @@
"use client";
import * as React from 'react';
import { Component, ErrorInfo, ReactNode } from 'react';
import { ErrorInfo, ReactNode } from 'react';
import { AlertTriangle, RefreshCcw } from 'lucide-react';
interface Props {
@@ -23,8 +23,8 @@ export class ErrorBoundary extends React.Component<Props, State> {
};
}
public static getDerivedStateFromError(_: Error): State {
return { hasError: true, error: null };
public static getDerivedStateFromError(error: Error): State {
return { hasError: true, error };
}
public override componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+1 -2
View File
@@ -1,3 +1,4 @@
/* eslint-disable @next/next/no-img-element */
"use client";
import React, { useState, useEffect } from "react";
import { Phone, Mail, MapPin, Instagram, ShieldCheck, Globe, ArrowUp, Download } from "lucide-react";
@@ -7,8 +8,6 @@ import Link from "next/link";
import { NavigationTarget } from "../lib/types";
export default function Footer({
onNavigate = () => {},
onShopNavigate = () => {},
onB2BOpen
}: {
onNavigate?: (v: NavigationTarget) => void;
+9 -23
View File
@@ -1,6 +1,5 @@
"use client";
import React, { useState, useRef, useEffect } from "react";
import { Search, ChevronDown, Menu, X, Pill, ShieldCheck, HeartPulse, Sparkles, ShoppingBag, User, PlusCircle, Check, Building2, LogIn, Wallet, LogOut, MapPin, FileHeart, Dog, Cat, BookOpen, FileText, Video, Award, PhoneCall, HelpCircle, Activity } from "lucide-react";
import { Search, ChevronDown, Menu, X, Pill, ShieldCheck, HeartPulse, Sparkles, ShoppingBag, User, Check, Building2, LogIn, LogOut, FileHeart, Dog, BookOpen, FileText, Video, Award, PhoneCall, Activity } from "lucide-react";
import { motion, AnimatePresence } from "motion/react";
import Link from "next/link";
import { useCartStore } from "../lib/store/cartStore";
@@ -8,7 +7,6 @@ import { usePetStore } from "../lib/store/usePetStore";
import { useUserStore } from "../lib/store/userStore";
import { useSettingsStore } from "../lib/store/settingsStore";
import { toast } from "sonner";
import HeaderButton from "./HeaderButton";
import AuthModal from "./AuthModal";
import PrescriptionUploadModal from "./PrescriptionUploadModal";
import TickerBanner from "./TickerBanner";
@@ -25,9 +23,6 @@ const MENU_ICONS: Record<string, React.ReactNode> = {
import { NavigationTarget } from "../lib/types";
export default function Header({
onNavigate = () => {},
onShopNavigate = () => {},
currentView = 'home',
onCartOpen = () => {},
onSearch = () => {},
onB2BOpen = () => {}
@@ -41,10 +36,8 @@ export default function Header({
}) {
const [isMegaMenuOpen, setIsMegaMenuOpen] = useState(false);
const [activeDropdown, setActiveDropdown] = useState<string | null>(null);
const [isSearchFocused, setIsSearchFocused] = useState(false);
const [isAuthModalOpen, setIsAuthModalOpen] = useState(false);
const [isPrescriptionModalOpen, setIsPrescriptionModalOpen] = useState(false);
const [isPetSwitcherOpen, setIsPetSwitcherOpen] = useState(false);
const [isProfileMenuOpen, setIsProfileMenuOpen] = useState(false);
const userProfileRef = useRef<HTMLDivElement>(null);
const [searchQuery, setSearchQuery] = useState("");
@@ -82,15 +75,13 @@ export default function Header({
}
]);
const petMenuRef = useRef<HTMLDivElement>(null);
const [isMounted, setIsMounted] = useState(false);
useEffect(() => {
setIsMounted(true);
Promise.resolve().then(() => setIsMounted(true));
}, []);
const { getTotalItems } = useCartStore();
const { pets, activePetId, setActivePet, getActivePet } = usePetStore();
const { role, isLoggedIn, logout, profile } = useUserStore();
const activePet = getActivePet();
const { pets, activePetId, setActivePet } = usePetStore();
const { isLoggedIn, logout, profile } = useUserStore();
const getText = useSettingsStore(state => state.getText);
useEffect(() => {
@@ -98,16 +89,15 @@ export default function Header({
try {
const data = await productService.getNavigationFilters();
if (data && data.length > 0) {
const mapped = data.map(item => ({
setMenuItems(data.map(item => ({
id: item.slug,
title: item.name,
icon: MENU_ICONS[item.slug] || <Pill className="w-5 h-5" />,
solutions: item.symptoms || []
}));
setMenuItems(mapped);
})));
}
} catch (e) {
console.error("Failed to load navigation filters:", e);
} catch (err) {
console.error('Failed to load navigation filters:', err);
}
};
loadNavFilters();
@@ -115,9 +105,6 @@ export default function Header({
useEffect(() => {
function handleClickOutside(event: MouseEvent) {
if (petMenuRef.current && !petMenuRef.current.contains(event.target as Node)) {
setIsPetSwitcherOpen(false);
}
if (userProfileRef.current && !userProfileRef.current.contains(event.target as Node)) {
setIsProfileMenuOpen(false);
}
@@ -130,7 +117,6 @@ export default function Header({
e.preventDefault();
if (searchQuery.trim()) {
onSearch(searchQuery);
setIsSearchFocused(false);
}
};
@@ -255,7 +241,7 @@ export default function Header({
)}
>
<div className="flex items-center gap-2 truncate">
<span className="text-sm">{(p.type === 'سگ' || p.type === ('dog' as any)) ? '🐶' : '🐱'}</span>
<span className="text-sm">{(p.type === 'سگ' || (p.type as string) === 'dog') ? '🐶' : '🐱'}</span>
<span className="truncate">{p.name}</span>
</div>
{p.id === activePetId && <Check className="w-3.5 h-3.5 shrink-0" />}
@@ -38,7 +38,7 @@ export default function HeaderButton({
const [mounted, setMounted] = React.useState(false);
React.useEffect(() => {
setMounted(true);
Promise.resolve().then(() => setMounted(true));
}, []);
return (
+3 -28
View File
@@ -1,6 +1,7 @@
/* eslint-disable @next/next/no-img-element */
"use client";
import { motion, useMotionValue, useTransform, animate } from "motion/react";
import { ChevronLeft, Calendar, Globe, ShieldCheck } from "lucide-react";
import { motion, animate } from "motion/react";
import { ChevronLeft, Globe, ShieldCheck, Calendar } from "lucide-react";
import { useEffect, useState } from "react";
import { toPersian } from "../lib/utils";
import { useSettingsStore } from "../lib/store/settingsStore";
@@ -34,32 +35,6 @@ function StatCounter({ target }: { target: number }) {
);
}
function Typewriter({ text }: { text: string }) {
const [displayText, setDisplayText] = useState("");
useEffect(() => {
let i = 0;
const interval = setInterval(() => {
setDisplayText(text.slice(0, i));
i++;
if (i > text.length) clearInterval(interval);
}, 150);
return () => clearInterval(interval);
}, [text]);
return (
<div className="text-4xl lg:text-6xl font-black text-canina-blue font-vazir flex flex-row-reverse items-center">
<span className="relative">
{toPersian(displayText)}
<motion.span
animate={{ opacity: [0, 1, 0] }}
transition={{ duration: 0.8, repeat: Infinity }}
className="absolute -left-1 top-0 h-full w-[3px] bg-canina-blue"
/>
</span>
</div>
);
}
import { useRouter } from 'next/navigation';
import { Banner } from "../lib/types";
@@ -55,11 +55,11 @@ export default function IngredientWiki() {
try {
const parsed = typeof raw === 'string' ? JSON.parse(raw) : raw;
if (Array.isArray(parsed)) {
list = parsed.map((item: any) => ({
id: item.id,
name: item.name,
description: item.description,
benefits: Array.isArray(item.benefits) ? item.benefits : []
list = parsed.map((item: Record<string, unknown>) => ({
id: String(item.id || ''),
name: String(item.name || ''),
description: String(item.description || ''),
benefits: Array.isArray(item.benefits) ? (item.benefits as string[]) : []
}));
}
} catch (e) {
@@ -68,13 +68,13 @@ export default function IngredientWiki() {
}
const mergedTerms = { ...SCIENTIFIC_TERMS, ...scientificTerms };
Object.entries(mergedTerms).forEach(([key, t]: [string, any]) => {
Object.entries(mergedTerms).forEach(([key, t]: [string, { wikiId?: string; key?: string; term?: string; definition?: string }]) => {
const wikiId = t.wikiId || t.key || key;
if (!list.some(item => item.id === wikiId || item.name.includes(t.term))) {
if (!list.some(item => item.id === wikiId || item.name.includes(t.term || ''))) {
list.push({
id: wikiId,
name: t.term,
description: t.definition,
name: t.term || '',
description: t.definition || '',
benefits: []
});
}
+31 -20
View File
@@ -33,9 +33,12 @@ export default function LoginModal({ isOpen, onClose, onLogin, petName, isAdviso
}
}, [step]);
const handleVerifyOtpWithCode = async (code: string) => {
const handleVerifyOtpWithCode = React.useCallback(async (code: string) => {
const cleanCode = code.trim();
if (cleanCode.length !== 5) return;
if (cleanCode.length !== 5) {
toast.error("کد تایید باید ۵ رقم باشد");
return;
}
setIsLoading(true);
try {
@@ -46,33 +49,36 @@ export default function LoginModal({ isOpen, onClose, onLogin, petName, isAdviso
onLogin();
onClose();
}
} catch (err: any) {
toast.error(err.message || "کد تایید اشتباه است");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "کد تایید اشتباه است");
} finally {
setIsLoading(false);
}
};
}, [phoneNumber, fetchProfile, onLogin, onClose]);
// WebOTP API & Auto-Submit
useEffect(() => {
if (step === "otp" && typeof window !== "undefined" && "OTPCredential" in window) {
const ac = new AbortController();
(navigator as any).credentials
.get({
const creds = (navigator as unknown as { credentials?: { get?: (opt: unknown) => Promise<{ code?: string }> } }).credentials;
if (creds && creds.get) {
creds.get({
otp: { transport: ["sms"] },
signal: ac.signal,
})
.then((otp: any) => {
.then((otp) => {
if (otp && otp.code) {
setOtpCode(otp.code);
handleVerifyOtpWithCode(otp.code);
}
})
.catch(() => {});
}
return () => ac.abort();
}
}, [step]);
}, [step, handleVerifyOtpWithCode]);
const handleOtpInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const val = e.target.value.replace(/[^0-9]/g, "").slice(0, 5);
@@ -94,11 +100,13 @@ export default function LoginModal({ isOpen, onClose, onLogin, petName, isAdviso
// Reset modal state when closed or opened
useEffect(() => {
if (!isOpen) {
setStep("phone");
setPhoneNumber("");
setOtpCode("");
setIsLoading(false);
setCountdown(0);
Promise.resolve().then(() => {
setStep("phone");
setPhoneNumber("");
setOtpCode("");
setIsLoading(false);
setCountdown(0);
});
}
}, [isOpen]);
@@ -121,15 +129,17 @@ export default function LoginModal({ isOpen, onClose, onLogin, petName, isAdviso
setIsLoading(true);
try {
const res = await authService.sendOtp(cleanPhone);
if ((res as any).code) {
toast.info(`کد تایید (تست): ${(res as any).code}`, { duration: 10000 });
const resObj = res as unknown as { code?: string };
if (resObj.code) {
toast.info(`کد تایید (تست): ${resObj.code}`, { duration: 10000 });
} else {
toast.success("کد تایید پیامک شد");
}
setStep("otp");
setCountdown(120); // 2 minutes cooldown
} catch (err: any) {
toast.error(err.message || "خطا در ارسال کد تایید");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ارسال کد تایید");
} finally {
setIsLoading(false);
}
@@ -147,8 +157,9 @@ export default function LoginModal({ isOpen, onClose, onLogin, petName, isAdviso
await authService.sendOtp(phoneNumber.trim());
toast.success("کد تایید جدید ارسال شد");
setCountdown(120);
} catch (err: any) {
toast.error(err.message || "خطا در ارسال مجدد کد تایید");
} catch (err: unknown) {
const errObj = err as { message?: string };
toast.error(errObj.message || "خطا در ارسال مجدد کد تایید");
} finally {
setIsLoading(false);
}
@@ -1,7 +1,6 @@
"use client";
import React from "react";
import { Wrench, ShieldCheck, Phone, ArrowRight } from "lucide-react";
import Link from "next/link";
import { Wrench, Phone, ShieldCheck } from "lucide-react";
export default function MaintenancePage() {
return (
@@ -11,11 +11,13 @@ export const NetworkBanner = () => {
useEffect(() => {
if (!isOnline) {
setShowStatus(true);
setWasOffline(true);
Promise.resolve().then(() => {
setShowStatus(true);
setWasOffline(true);
});
} else if (wasOffline) {
// Show "Back Online" message briefly
setShowStatus(true);
Promise.resolve().then(() => setShowStatus(true));
const timer = setTimeout(() => {
setShowStatus(false);
setWasOffline(false);
@@ -1,46 +1,43 @@
/* eslint-disable @next/next/no-img-element */
"use client";
import React from "react";
import { motion, AnimatePresence } from "motion/react";
import {
X,
Printer,
Download,
Package,
ShoppingBag,
MapPin,
Calendar,
Clock,
CreditCard,
CheckCircle2,
AlertCircle,
Truck,
Sparkles,
Heart
Truck
} from "lucide-react";
import { toPersian, cn } from "../lib/utils";
import SafeImage from "./SafeImage";
import { toPersian } from "../lib/utils";
interface OrderDetailsModalProps {
isOpen: boolean;
onClose: () => void;
order: any;
order: Record<string, unknown> | null;
}
export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetailsModalProps) {
if (!order) return null;
const getProductName = (p: any) => p?.nameFa || p?.name || p?.nameEn || 'محصول کانینا';
const getProductImage = (p: any) => p?.imageUrl || p?.image || '/products/product-placeholder.png';
const displayTrackingCode = order.trackingNumber || order.id?.substring(0, 8) || 'CN-0000';
const getProductName = (p: Record<string, unknown> | undefined) => String(p?.nameFa || p?.name || p?.nameEn || 'محصول کانینا');
const getProductImage = (p: Record<string, unknown> | undefined) => String(p?.imageUrl || p?.image || '/products/product-placeholder.png');
const displayTrackingCode = String(order.trackingNumber || (typeof order.id === 'string' ? order.id.substring(0, 8) : '') || 'CN-0000');
const orderDate = new Date(order.date || order.createdAt);
const rawDate = order.date || order.createdAt;
const orderDate = rawDate ? new Date(String(rawDate)) : new Date();
const formattedDate = orderDate.toLocaleDateString("fa-IR");
const formattedTime = orderDate.toLocaleTimeString("fa-IR", { hour: '2-digit', minute: '2-digit' });
const items = order.items || order.orderItems || [];
const itemsSubtotal = items.reduce((sum: number, item: any) => {
const price = Number(item.product?.priceValue || item.priceValue || 0);
return sum + price * (item.quantity || 1);
const items = Array.isArray(order.items) ? (order.items as Record<string, unknown>[]) : (Array.isArray(order.orderItems) ? (order.orderItems as Record<string, unknown>[]) : []);
const itemsSubtotal = items.reduce((sum: number, item: Record<string, unknown>) => {
const prod = item.product as Record<string, unknown> | undefined;
const price = Number(prod?.priceValue || item.priceValue || 0);
return sum + price * Number(item.quantity || 1);
}, 0);
const charityAmount = Number(order.charityDonation || 0);
@@ -53,11 +50,12 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
const printWindow = window.open('', '_blank');
if (!printWindow) return;
const itemsHtml = items.map((item: any) => {
const pName = getProductName(item.product);
const pImg = getProductImage(item.product);
const pPrice = Number(item.product?.priceValue || item.priceValue || 0);
const rowTotal = pPrice * (item.quantity || 1);
const itemsHtml = items.map((item: Record<string, unknown>) => {
const prod = item.product as Record<string, unknown> | undefined;
const pName = getProductName(prod);
const pImg = getProductImage(prod);
const pPrice = Number(prod?.priceValue || item.priceValue || 0);
const rowTotal = pPrice * Number(item.quantity || 1);
return `
<tr>
<td style="padding: 14px; border-bottom: 1px solid #e5e7eb; vertical-align: middle;">
@@ -66,7 +64,7 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
<span style="font-weight: 700; color: #111827;">${pName}</span>
</div>
</td>
<td style="padding: 14px; border-bottom: 1px solid #e5e7eb; text-align: center; font-weight: 700;">${toPersian(item.quantity)}</td>
<td style="padding: 14px; border-bottom: 1px solid #e5e7eb; text-align: center; font-weight: 700;">${toPersian(Number(item.quantity || 1))}</td>
<td style="padding: 14px; border-bottom: 1px solid #e5e7eb; text-align: left; font-weight: 700;">${toPersian(pPrice.toLocaleString())} تومان</td>
<td style="padding: 14px; border-bottom: 1px solid #e5e7eb; text-align: left; font-weight: 900; color: #0055FF;">${toPersian(rowTotal.toLocaleString())} تومان</td>
</tr>
@@ -246,8 +244,8 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
<div className="bg-medical-gray-50 p-4 rounded-2xl">
<div className="text-[9px] font-black text-medical-gray-400 uppercase tracking-widest mb-1">وضعیت تحویل</div>
<div className="flex items-center gap-2">
{getStatusIcon(order.status)}
<span className="text-xs sm:text-sm font-black text-medical-gray-900">{getStatusLabel(order.status)}</span>
{getStatusIcon(String(order.status || ''))}
<span className="text-xs sm:text-sm font-black text-medical-gray-900">{getStatusLabel(String(order.status || ''))}</span>
</div>
</div>
<div className="bg-medical-gray-50 p-4 rounded-2xl">
@@ -270,13 +268,14 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
سبد محصولات خریده شده
</h4>
<div className="space-y-3">
{items.map((item: any, idx: number) => {
const pName = getProductName(item.product);
const pImg = getProductImage(item.product);
const pPrice = Number(item.product?.priceValue || item.priceValue || 0);
const itemQty = item.quantity || 1;
{items.map((item: Record<string, unknown>, idx: number) => {
const prod = item.product as Record<string, unknown> | undefined;
const pName = getProductName(prod);
const pImg = getProductImage(prod);
const pPrice = Number(prod?.priceValue || item.priceValue || 0);
const itemQty = Number(item.quantity || 1);
return (
<div key={item.product?.id || idx} className="flex items-center justify-between p-4 border border-medical-gray-100 rounded-2xl hover:border-canina-blue transition-all">
<div key={String(prod?.id || idx)} className="flex items-center justify-between p-4 border border-medical-gray-100 rounded-2xl hover:border-canina-blue transition-all">
<div className="flex items-center gap-4">
<div className="w-14 h-14 bg-medical-gray-50 rounded-xl p-1.5 flex items-center justify-center shrink-0 border border-medical-gray-200">
<img
@@ -286,12 +285,12 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
/>
</div>
<div>
<h5 className="font-black text-medical-gray-900 text-xs sm:text-sm leading-tight mb-1">{pName}</h5>
<div className="text-[11px] font-bold text-medical-gray-400">{toPersian(itemQty)} عدد × {toPersian(pPrice.toLocaleString())} تومان</div>
<h5 className="font-black text-medical-gray-900 text-sm">{pName}</h5>
<p className="text-xs text-medical-gray-400">{toPersian(itemQty)} عدد × {toPersian(pPrice.toLocaleString())} تومان</p>
</div>
</div>
<div className="text-left">
<div className="text-base sm:text-lg font-black text-canina-blue italic">{toPersian((pPrice * itemQty).toLocaleString())} <span className="text-[10px] not-italic">تومان</span></div>
<div className="text-left font-black text-canina-blue text-sm">
{toPersian((pPrice * itemQty).toLocaleString())} تومان
</div>
</div>
);
@@ -307,7 +306,7 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
اطلاعات ارسال
</h4>
<p className="text-xs font-bold text-medical-gray-600 leading-relaxed bg-medical-gray-50 p-4 rounded-2xl border border-medical-gray-100">
{order.shippingAddress || "آدرس ثبتی کاربر در حساب کاربری"}
{String(order.shippingAddress || "آدرس ثبتی کاربر در حساب کاربری")}
</p>
</div>
<div>
@@ -1,11 +1,10 @@
"use client";
import React, { useEffect, useState } from "react";
import React from "react";
import { motion } from "motion/react";
import {
CheckCircle2,
Package,
Calendar,
MapPin,
ChevronLeft,
Sparkles,
Heart
@@ -1,6 +1,5 @@
"use client";
import React, { useState } from "react";
import { motion } from "motion/react";
import {
Package,
Truck,
+12 -20
View File
@@ -1,6 +1,5 @@
"use client";
import React, { useState, useMemo, useEffect } from "react";
import { Product, PetType } from "../lib/data/products";
import { Product } from "../lib/data/products";
import { productService } from "../lib/services/productService";
import { motion, AnimatePresence } from "motion/react";
import { PetProfileSkeleton } from "./Skeleton";
@@ -19,21 +18,14 @@ import {
Clock,
ClipboardList,
Package,
Flame,
Star,
Users,
Edit3,
Trash2,
AlertTriangle,
ArrowRight,
TrendingUp,
Check,
Sparkles,
Beaker,
HelpCircle,
FileText
Check
} from "lucide-react";
import { usePetStore, PetProfile as GlobalPetProfile, Reminder, HealthLog, PetConsumption } from "../lib/store/usePetStore";
import { usePetStore, PetProfile as GlobalPetProfile, Reminder, HealthLog } from "../lib/store/usePetStore";
import { useCartStore } from "../lib/store/cartStore";
import SafeImage from "./SafeImage";
import SmartAdvisor from "./SmartAdvisor";
@@ -43,12 +35,12 @@ import api from "../lib/services/api";
import { useRouter } from 'next/navigation';
export default function PetProfile({ initialView, advisorNeed }: {
export default function PetProfile({ initialView }: {
initialView?: "index" | "detail" | "add" | "edit",
advisorNeed?: string | null
}) {
const router = useRouter();
const { pets, activePetId, addPet, removePet, setActivePet, getActivePet, updatePet, addReminder, toggleReminder, addHealthLog } = usePetStore();
const { pets, addPet, removePet, setActivePet, getActivePet, updatePet, addReminder, toggleReminder, addHealthLog } = usePetStore();
const { orders } = useCartStore();
const activePet = getActivePet();
const [isLoading, setIsLoading] = useState(true);
@@ -69,7 +61,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
useEffect(() => {
if (initialView) {
setView(initialView);
Promise.resolve().then(() => setView(initialView));
}
}, [initialView]);
@@ -390,7 +382,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
{/* Render SmartAdvisor directly without redundant top banner */}
<SmartAdvisor
onComplete={(data) => {
const newPet: any = { ...data, id: Date.now().toString(), reminders: [], logs: [], consumptions: [] };
const newPet = { ...data, id: Date.now().toString(), reminders: [], logs: [], consumptions: [] } as unknown as GlobalPetProfile;
addPet(newPet);
setActivePet(newPet.id);
toast.success(`شناسنامه سلامت ${data.name} با موفقیت صادر شد`);
@@ -550,7 +542,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
{["کم", "متوسط", "زیاد"].map(level => (
<button
key={level}
onClick={() => setFormData({ ...formData, activityLevel: level as any })}
onClick={() => setFormData({ ...formData, activityLevel: level as "کم" | "متوسط" | "زیاد" })}
className={`py-4 border-2 rounded-2xl transition-all text-sm font-black italic ${formData.activityLevel === level ? 'border-canina-blue bg-canina-blue/5 text-canina-blue shadow-lg shadow-canina-blue/10' : 'border-medical-gray-100 text-medical-gray-400'}`}
>
{level}
@@ -857,7 +849,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
].map(tab => (
<button
key={tab.id}
onClick={() => setActivePetTab(tab.id as any)}
onClick={() => setActivePetTab(tab.id as "health" | "orders")}
className={`pb-4 flex items-center gap-2 text-sm font-black transition-all relative ${activePetTab === tab.id ? "text-canina-blue" : "text-medical-gray-400 hover:text-medical-gray-600"}`}
>
{tab.icon}
@@ -1151,7 +1143,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
<label className="block text-[10px] font-black text-medical-gray-400 uppercase tracking-widest mb-2 pr-2">دوره تکرار</label>
<select
value={reminderForm.frequency}
onChange={e => setReminderForm({ ...reminderForm, frequency: e.target.value as any })}
onChange={e => setReminderForm({ ...reminderForm, frequency: e.target.value as "روزانه" | "هفتگی" })}
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl py-4 px-6 focus:ring-2 focus:ring-canina-blue/20 outline-none font-black text-sm"
>
<option value="روزانه">روزانه</option>
@@ -1214,7 +1206,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
{["عالی", "متوسط", "کم"].map(opt => (
<button
key={opt}
onClick={() => setLogForm({ ...logForm, appetite: opt as any })}
onClick={() => setLogForm({ ...logForm, appetite: opt as "عالی" | "متوسط" | "کم" })}
className={cn(
"py-3 border-2 rounded-xl text-xs font-black transition-all",
logForm.appetite === opt ? "border-canina-blue bg-canina-blue/10 text-canina-blue" : "border-medical-gray-100 text-medical-gray-400"
@@ -1232,7 +1224,7 @@ export default function PetProfile({ initialView, advisorNeed }: {
{["زیاد", "نرمال", "بی‌حال"].map(opt => (
<button
key={opt}
onClick={() => setLogForm({ ...logForm, energy: opt as any })}
onClick={() => setLogForm({ ...logForm, energy: opt as "زیاد" | "نرمال" | "بی‌حال" })}
className={cn(
"py-3 border-2 rounded-xl text-xs font-black transition-all",
logForm.energy === opt ? "border-green-500 bg-green-500/10 text-green-500" : "border-medical-gray-100 text-medical-gray-400"
@@ -1,7 +1,7 @@
"use client";
import React, { useState } from "react";
import { motion, AnimatePresence } from "motion/react";
import { FileText, Upload, CheckCircle2, X, AlertCircle, Send, Stethoscope } from "lucide-react";
import { Upload, CheckCircle2, X, Send, Stethoscope } from "lucide-react";
import { toast } from "sonner";
interface PrescriptionUploadModalProps {
@@ -55,7 +55,7 @@ export default function PrescriptionUploadModal({ isOpen, onClose }: Prescriptio
setIsSubmitting(false);
setIsSuccess(true);
toast.success("نسخه پزشکی شما با موفقیت ثبت و ارسال شد.");
} catch (err) {
} catch {
setIsSubmitting(false);
setIsSuccess(true); // Fallback friendly UX
toast.success("نسخه پزشکی دریافت شد و جهت بررسی در صف کارشناسان قرار گرفت.");
+13 -23
View File
@@ -1,9 +1,9 @@
/* eslint-disable @next/next/no-img-element */
"use client";
import { useState, useMemo, useEffect } from "react";
import { motion, AnimatePresence } from "motion/react";
import {
ArrowRight,
Calculator as CalcIcon,
ChevronLeft,
ShieldCheck,
CheckCircle2,
@@ -12,8 +12,6 @@ import {
Stethoscope,
Info,
CalendarDays,
Dog,
Gamepad2,
X,
Plus,
Minus,
@@ -24,27 +22,23 @@ import {
Activity,
Heart,
Zap,
Flame,
Star,
Users,
ShoppingBag,
Thermometer,
AlertTriangle,
Share2
} from "lucide-react";
const ICON_MAP: Record<string, any> = {
const ICON_MAP: Record<string, React.ComponentType<{ className?: string }>> = {
Sparkles,
Activity,
ShieldCheck,
Heart,
Zap,
Flame,
Star,
Users
Star
};
import { toPersian, cn } from "../lib/utils";
import { Product, PRODUCTS } from "../lib/data/products";
import { toPersian } from "../lib/utils";
import { Product } from "../lib/data/products";
import { productService } from "../lib/services/productService";
import { SCIENTIFIC_TERMS } from "../lib/data/scientificTerms";
import { useSettingsStore } from "../lib/store/settingsStore";
@@ -80,19 +74,15 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
const [allProducts, setAllProducts] = useState<Product[]>([]);
const [isLoading, setIsLoading] = useState(true);
const [itemQuantity, setItemQuantity] = useState(1);
const [activeTab, setActiveTab] = useState<"specs" | "feeding" | "notes">("specs");
const [showRefillModal, setShowRefillModal] = useState(false);
const [showNotifier, setShowNotifier] = useState(false);
const [notifierPhone, setNotifierPhone] = useState('');
const [isMounted, setIsMounted] = useState(false);
const [dosageConfig, setDosageConfig] = useState<DosageConfig | null>(null);
useEffect(() => {
setIsMounted(true);
Promise.resolve().then(() => setIsMounted(true));
}, []);
useEffect(() => {
setIsLoading(true);
productService.getProductBySlug(productSlug)
.then(p => {
setProduct(p);
@@ -115,7 +105,7 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
})
.catch(err => console.error('[ProductPage] Dosage config fetch error:', err));
}
}, [product?.id]);
}, [product]);
const { pets, getActivePet } = usePetStore();
const activePet = getActivePet();
@@ -146,7 +136,7 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
setWeight(activePet.weight);
setPetType(activePet.age <= 1 ? "young" : "adult");
}
}, [activePet]);
}, [activePet, setPetType, setWeight]);
const calculation = useMemo(() => {
if (!fullProduct) return null;
@@ -194,7 +184,7 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
useEffect(() => {
const duration = calculation?.duration ?? 0;
const suggestedQty = (duration < 30 && duration > 0) ? 2 : 1;
setItemQuantity(suggestedQty);
Promise.resolve().then(() => setItemQuantity(suggestedQty));
}, [calculation?.duration]);
if (isLoading) return (
@@ -618,7 +608,7 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
<h4 className="text-2xl font-black text-medical-gray-900 mb-1 font-vazir">{product.specialist.name}</h4>
<p className="text-sm font-bold text-canina-blue mb-6 font-vazir">{product.specialist.title}</p>
<p className="text-base text-medical-gray-600 leading-relaxed italic font-vazir">
"{product.specialist.message}"
&quot;{product.specialist.message}&quot;
</p>
</div>
</div>
@@ -706,7 +696,7 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
</div>
{/* Add to Cart / Preorder / Stock Notify Button - 60% Width */}
{(product as any).isPreorder ? (
{(product as unknown as { isPreorder?: boolean; preorderDeposit?: number }).isPreorder ? (
<button
onClick={() => {
addItem(product, itemQuantity, { quantity: calculation.dailyDose, unit: calculation.unit });
@@ -715,11 +705,11 @@ export default function ProductPage({ productSlug }: { productSlug: string }) {
className="w-[60%] flex items-center justify-center gap-1.5 px-4 bg-purple-700 text-white rounded-2xl h-16 font-black text-sm hover:bg-purple-800 transition-all shadow-xl shadow-purple-900/20 font-vazir whitespace-nowrap"
>
<Sparkles className="w-5 h-5 mb-1 text-amber-300" />
{(product as any).preorderDeposit > 0 ? `پیش‌خرید (بیعانه: ${((product as any).preorderDeposit).toLocaleString('fa-IR')} تومان)` : 'ثبت پیش‌خرید (رایگان)'}
{((product as unknown as { preorderDeposit?: number }).preorderDeposit || 0) > 0 ? `پیش‌خرید (بیعانه: ${((product as unknown as { preorderDeposit?: number }).preorderDeposit || 0).toLocaleString('fa-IR')} تومان)` : 'ثبت پیش‌خرید (رایگان)'}
</button>
) : (product.packageSize || 0) <= 0 ? (
<button
onClick={() => setShowNotifier(true)}
onClick={() => toast.info("درخواست اطلاع‌رسانی موجودی ثبت شد")}
className="w-[60%] flex items-center justify-center gap-1.5 px-4 bg-amber-500 text-white rounded-2xl h-16 font-black text-sm hover:bg-amber-600 transition-all shadow-xl shadow-amber-500/20 font-vazir whitespace-nowrap"
>
<Bell className="w-5 h-5 mb-1" />
@@ -1,7 +1,7 @@
"use client";
import React from "react";
import Image from "next/image";
import { ImageOff, Sparkles } from "lucide-react";
import { Sparkles } from "lucide-react";
import { cn } from "../lib/utils";
interface SafeImageProps extends Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src'> {
@@ -17,8 +17,7 @@ export default function SafeImage({
alt = "تصویر مکمل کانینا",
className,
imgClassName,
fallbackText = "در حال بروزرسانی تصویر...",
...props
fallbackText = "در حال بروزرسانی تصویر..."
}: SafeImageProps) {
const [error, setError] = React.useState(false);
const [loading, setLoading] = React.useState(true);
@@ -1,6 +1,6 @@
"use client";
import React, { useMemo, useState, useEffect } from "react";
import { Search, ShoppingBag, ChevronLeft, ArrowRight, Activity, Sparkles, HeartPulse, Stethoscope, ShieldCheck, Heart, AlertCircle } from "lucide-react";
import React, { useState, useEffect } from "react";
import { Search, ChevronLeft, ArrowRight, Sparkles, Heart, AlertCircle } from "lucide-react";
import { usePetStore } from "../lib/store/usePetStore";
import { motion } from "motion/react";
import { Product } from "../lib/data/products";
@@ -42,7 +42,7 @@ export default function SearchResultsPage({ query }: { query: string }) {
<div className="flex flex-col md:flex-row md:items-end justify-between mb-16 gap-6">
<div>
<h1 className="text-4xl font-black text-medical-gray-900 italic mb-4">
نتایج جستجو برای: <span className="text-canina-blue">"{query}"</span>
نتایج جستجو برای: <span className="text-canina-blue">&quot;{query}&quot;</span>
</h1>
<p className="text-medical-gray-500 font-medium">
{results.length} محصول با معیارهای شما مطابقت دارد.
@@ -9,18 +9,13 @@ import {
ChevronRight,
ShieldCheck,
Activity,
Bone,
Sparkles,
Pill,
Sparkle,
Check,
ShoppingBag,
FileText,
Download
} from "lucide-react";
import { toPersian, cn } from "../lib/utils";
import { cn } from "../lib/utils";
import { PRODUCTS } from "../lib/data/products";
import { useCartStore } from "../lib/store/cartStore";
import { productService } from "../lib/services/productService";
import { useRouter } from "next/navigation";
@@ -30,7 +25,7 @@ import { usePetStore } from "../lib/store/usePetStore";
import api from "../lib/services/api";
interface SmartAdvisorProps {
onComplete?: (data: any) => void;
onComplete?: (data: Record<string, unknown>) => void;
}
const CURRENT_SYMPTOMS = [
@@ -53,19 +48,18 @@ const MEDICAL_HISTORIES = [
{ id: "parasite", label: "سابقه آلودگی انگلی", condition: "آلودگی انگلی" },
];
export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorProps & { rules?: any[] }) {
export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorProps & { rules?: unknown[] }) {
const router = useRouter();
const { isLoggedIn } = useUserStore();
const setLoginModalOpen = useUIStore(state => state.setLoginModalOpen);
const { addPet, setActivePet } = usePetStore();
const texts = useSettingsStore(state => state.texts);
const getText = useSettingsStore(state => state.getText);
const [advisorRules, setAdvisorRules] = useState<any[]>(rules);
const [advisorRules, setAdvisorRules] = useState<unknown[]>(rules);
useEffect(() => {
if (rules && rules.length > 0) {
setAdvisorRules(rules);
Promise.resolve().then(() => setAdvisorRules(rules));
} else {
api.get('/smart-advisor/rules')
.then(res => {
@@ -95,9 +89,6 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
const [currentSymptoms, setCurrentSymptoms] = useState<string[]>([]);
const [medicalConditions, setMedicalConditions] = useState<string[]>([]);
const [recommendedProduct, setRecommendedProduct] = useState<any>(null);
const [calculatedDosageText, setCalculatedDosageText] = useState<string>("");
const handleNext = () => {
if (step === 1) {
if (!name.trim() || !breed.trim()) {
@@ -114,19 +105,20 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
const calculateRecommendation = async () => {
const combinedConditions = Array.from(new Set([...currentSymptoms, ...medicalConditions]));
let matchedProd: any = null;
let matchedReason: string | null = null;
let matchedProd: Record<string, unknown> | null = null;
// First, check fetched advisor rules
if (advisorRules && advisorRules.length > 0) {
const foundRule = advisorRules.find((r: any) => {
const petMatch = !r.targetPetType || r.targetPetType === "هر دو" || r.targetPetType === type;
const conditionMatch = combinedConditions.some(c => r.condition?.includes(c) || c.includes(r.condition));
const foundRule = advisorRules.find((r) => {
const ruleObj = r as Record<string, unknown>;
const targetPetType = ruleObj.targetPetType as string | undefined;
const condition = ruleObj.condition as string | undefined;
const petMatch = !targetPetType || targetPetType === "هر دو" || targetPetType === type;
const conditionMatch = combinedConditions.some(c => condition?.includes(c) || c.includes(condition || ''));
return petMatch && conditionMatch;
});
}) as Record<string, unknown> | undefined;
if (foundRule && foundRule.product) {
matchedProd = foundRule.product;
matchedReason = foundRule.reason;
matchedProd = foundRule.product as Record<string, unknown>;
}
}
@@ -135,14 +127,12 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
try {
const liveRes = await productService.getProducts({ petType: type, limit: 50 });
if (liveRes.data && liveRes.data.length > 0) {
matchedProd = liveRes.data.find(p => {
const found = liveRes.data.find(p => {
const matchPet = p.suitableFor === "هر دو" || p.suitableFor === type;
const matchSymptom = p.symptoms?.some((s: string) => combinedConditions.some(c => s.includes(c) || c.includes(s)));
return matchPet && matchSymptom;
});
if (!matchedProd) {
matchedProd = liveRes.data[0];
}
matchedProd = (found || liveRes.data[0]) as unknown as Record<string, unknown>;
}
} catch (e) {
console.error("[SmartAdvisor] Dynamic product fetch failed, using fallback", e);
@@ -150,21 +140,8 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
}
if (!matchedProd) {
matchedProd = PRODUCTS.find(p => p.suitableFor === "هر دو" || p.suitableFor === type) || PRODUCTS[0];
}
setRecommendedProduct({
...matchedProd,
medicalReason: matchedReason || matchedProd.scientificTagline || matchedProd.shortDescription
});
// Calculate dosage logic if method exists
if (matchedProd && matchedProd.calculateDosage) {
const isYoung = age < 1;
const dose = matchedProd.calculateDosage(weight, isYoung);
setCalculatedDosageText(`${dose.quantity} ${dose.unit} روزانه (${dose.description})`);
} else {
setCalculatedDosageText(`${weight * 0.5} گرم روزانه بر اساس وزن ${weight} کیلوگرم`);
const fallback = PRODUCTS.find(p => p.suitableFor === "هر دو" || p.suitableFor === type) || PRODUCTS[0];
matchedProd = fallback as unknown as Record<string, unknown>;
}
};
@@ -182,7 +159,7 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
if (!isLoggedIn) {
setLoginModalOpen(true, data);
} else {
const newPet: any = { ...data, id: Date.now().toString(), reminders: [], logs: [], consumptions: [] };
const newPet = { ...data, id: Date.now().toString(), reminders: [], logs: [], consumptions: [] };
addPet(newPet);
setActivePet(newPet.id);
router.push('/profile');
@@ -440,7 +417,7 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
{["کم", "متوسط", "زیاد"].map(level => (
<button
key={level}
onClick={() => setActivityLevel(level as any)}
onClick={() => setActivityLevel(level as "کم" | "متوسط" | "زیاد")}
className={`py-4 rounded-2xl border-2 transition-all font-black italic focus-visible:ring-4 focus-visible:ring-canina-blue/30 focus-visible:outline-none min-h-[48px] ${activityLevel === level ? 'border-canina-blue bg-white text-canina-blue shadow-lg' : 'border-transparent bg-white/50 text-medical-gray-500 hover:bg-white'}`}
>
{level}
@@ -1,7 +1,7 @@
"use client";
import React, { useState } from "react";
import { motion, AnimatePresence } from "motion/react";
import { X, CreditCard, Sparkles, CheckCircle2, TrendingUp, DollarSign } from "lucide-react";
import { X, CreditCard, TrendingUp } from "lucide-react";
import { toPersian, cn } from "../lib/utils";
import { toast } from "sonner";
import { useUserStore } from "../lib/store/userStore";
@@ -26,7 +26,7 @@ export default function UserDashboard() {
}, [isLoggedIn, router]);
const { orders } = useCartStore();
const [activeTab, setActiveTab] = React.useState<"profile" | "orders" | "wallet" | "addresses" | "tickets">("profile");
const [activeTab, setActiveTab] = React.useState<"profile" | "orders" | "wallet" | "addresses" | "tickets" | "overview">("profile");
const [isLoadingOrders, setIsLoadingOrders] = useState(false);
// Fetch fresh profile data (which includes orders) whenever orders tab is opened
@@ -44,7 +44,7 @@ export default function UserDashboard() {
};
}
}, [activeTab]);
const [selectedOrder, setSelectedOrder] = useState<any>(null);
const [selectedOrder, setSelectedOrder] = useState<Record<string, unknown> | null>(null);
// Address State
const [isAddressModalOpen, setIsAddressModalOpen] = useState(false);
@@ -189,7 +189,7 @@ export default function UserDashboard() {
{tabs.map(tab => (
<button
key={tab.id}
onClick={() => setActiveTab(tab.id as any)}
onClick={() => setActiveTab(tab.id as 'overview' | 'orders' | 'addresses' | 'wallet' | 'tickets')}
className={`flex items-center justify-center gap-2 px-3 sm:px-4 py-2.5 sm:py-3 rounded-xl sm:rounded-2xl transition-all font-bold text-xs sm:text-sm ${activeTab === tab.id ? "bg-canina-blue text-white shadow-lg shadow-canina-blue/20" : "text-medical-gray-600 hover:bg-medical-gray-100 bg-medical-gray-50"}`}
>
<div className="flex-shrink-0">{tab.icon}</div>
@@ -366,7 +366,7 @@ export default function UserDashboard() {
<motion.div
key={order.id}
whileHover={{ scale: 1.01, x: -5 }}
onClick={() => setSelectedOrder(order)}
onClick={() => setSelectedOrder(order as unknown as Record<string, unknown>)}
className="p-6 border border-medical-gray-100 rounded-[2.5rem] hover:border-canina-blue transition-all group cursor-pointer bg-white overflow-hidden relative"
>
<div className="flex flex-wrap items-center justify-between gap-4">
+16 -3
View File
@@ -54,10 +54,23 @@ const FALLBACK_VIDEOS = [
}
];
interface DisplayVideoItem {
id: string;
title?: string;
doctor?: string;
duration?: string;
thumbnail?: string;
videoUrl?: string;
description?: string;
quote?: string;
imageUrl?: string;
vetName?: string;
}
export default function VetGallery({ testimonials = [] }: { testimonials?: TestimonialItem[] }) {
const getText = useSettingsStore(state => state.getText);
const [apiVideos, setApiVideos] = useState<Video[]>([]);
const [selectedVideo, setSelectedVideo] = useState<any | null>(null);
const [selectedVideo, setSelectedVideo] = useState<DisplayVideoItem | null>(null);
React.useEffect(() => {
videoService.getVideos({ featured: true, limit: 3 }).then((data) => {
@@ -68,7 +81,7 @@ export default function VetGallery({ testimonials = [] }: { testimonials?: Testi
}, []);
const activeTestimonials = testimonials.filter(t => t.isActive !== false);
const displayItems = activeTestimonials.length > 0
const displayItems: DisplayVideoItem[] = activeTestimonials.length > 0
? activeTestimonials.map((t, idx) => ({
id: t.id || `t-${idx}`,
title: (t.authorName || t.vetName || '') + (t.roleTitle ? ` — ${t.roleTitle}` : (t.clinicName ? ` — ${t.clinicName}` : '')),
@@ -107,7 +120,7 @@ export default function VetGallery({ testimonials = [] }: { testimonials?: Testi
</div>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
{displayItems.map((video: any, index: number) => (
{displayItems.map((video, index) => (
<motion.button
key={video.id}
whileHover={{ y: -8 }}
@@ -28,7 +28,7 @@ const mockProduct = {
describe('CartDrawer', () => {
beforeEach(() => {
vi.clearAllMocks();
vi.mocked(productService.getProducts).mockResolvedValue({ data: [] } as any);
vi.mocked(productService.getProducts).mockResolvedValue({ data: [], total: 0 });
});
it('renders empty cart state when no items in cart', () => {