feat: add advisor/contact flow tables and make Blog.authorId required
Deploy Canina / deploy (push) Successful in 25m44s

This commit is contained in:
devops committed 2026-11-05 08:33:30 +00:00
1 parent bb81f2c944
commit d881dc491e
86 files changed
+507 -4111

No files matched your search

+56 -128
View File
@@ -17,9 +17,7 @@ import {
Pin,
Eye,
Filter,
SlidersHorizontal,
} from "lucide-react";
import { toPersian } from "../lib/utils";
import { toast } from "sonner";
import { Product } from "../lib/data/products";
import { productService } from "../lib/services/productService";
@@ -65,14 +63,11 @@ export default function BlogPage({
const [selectedCategory, setSelectedCategory] = useState<string>(initialCategoryId);
const [searchQuery, setSearchQuery] = useState<string>("");
const [selectedTag, setSelectedTag] = useState<string | null>(null);
const [sortBy, setSortBy] = useState<"newest" | "oldest" | "most_viewed">("newest");
const [visibleCount, setVisibleCount] = useState<number>(6);
React.useEffect(() => {
if (initialCategoryId) {
setSelectedCategory(initialCategoryId);
}
setVisibleCount(6);
}, [initialCategoryId]);
React.useEffect(() => {
@@ -95,16 +90,8 @@ export default function BlogPage({
(b.tags && b.tags.some((t) => t.name === selectedTag));
return matchCategory && matchSearch && matchTag;
}).sort((a, b) => {
if (sortBy === "most_viewed") {
return (b.viewCount ?? 0) - (a.viewCount ?? 0);
}
if (sortBy === "oldest") {
return new Date(a.date).getTime() - new Date(b.date).getTime();
}
return new Date(b.date).getTime() - new Date(a.date).getTime();
});
}, [blogs, selectedCategory, searchQuery, selectedTag, sortBy]);
}, [blogs, selectedCategory, searchQuery, selectedTag]);
// Featured post (prioritize featured flag, otherwise the first item)
const featuredPost = useMemo(() => {
@@ -119,12 +106,6 @@ export default function BlogPage({
return filteredBlogs.filter((b) => b.id !== featuredPost.id);
}, [filteredBlogs, featuredPost]);
const slicedRegularPosts = useMemo(() => {
return regularPosts.slice(0, visibleCount);
}, [regularPosts, visibleCount]);
const hasMore = visibleCount < regularPosts.length;
// Extract all unique tags
const allTags = useMemo(() => {
const map = new Map<string, string>();
@@ -172,57 +153,35 @@ export default function BlogPage({
</p>
</div>
{/* Search & Category Filter Section - Styled like /shop filters */}
<div className="bg-white p-3.5 sm:p-6 rounded-2xl sm:rounded-3xl border border-medical-gray-200 shadow-xs mb-8 space-y-3 sm:space-y-4">
<div className="flex flex-col sm:flex-row items-center gap-2 sm:gap-4">
{/* Search & Category Filter Section */}
<div className="bg-white p-6 rounded-3xl border border-medical-gray-200 shadow-sm mb-12 space-y-5">
<div className="flex flex-col md:flex-row items-center gap-4">
{/* Search Input */}
<div className="relative flex-1 w-full">
<Search className="w-4 h-4 absolute right-3.5 top-1/2 -translate-y-1/2 text-medical-gray-400" />
<Search className="w-4 h-4 absolute right-4 top-1/2 -translate-y-1/2 text-medical-gray-400" />
<input
type="text"
placeholder="جستجو در موضوعات، بیماری‌ها، ویتامین‌ها..."
value={searchQuery}
onChange={(e) => {
setSearchQuery(e.target.value);
setVisibleCount(6);
}}
className="w-full pl-4 pr-10 py-2.5 rounded-xl sm:rounded-2xl bg-medical-gray-50 border border-medical-gray-200 focus:border-canina-blue focus:bg-white text-xs sm:text-sm font-bold outline-none transition-all"
onChange={(e) => setSearchQuery(e.target.value)}
className="w-full pl-4 pr-11 py-3 rounded-2xl bg-medical-gray-50 border border-medical-gray-200 focus:border-canina-blue focus:bg-white text-xs sm:text-sm font-bold outline-none transition-all"
/>
{searchQuery && (
<button
onClick={() => setSearchQuery("")}
className="absolute left-3 top-1/2 -translate-y-1/2 text-xs font-bold text-medical-gray-400 hover:text-medical-gray-600 cursor-pointer"
className="absolute left-3 top-1/2 -translate-y-1/2 text-xs font-bold text-medical-gray-400 hover:text-medical-gray-600"
>
پاک کردن
</button>
)}
</div>
{/* Sort Dropdown */}
<div className="relative w-full sm:w-auto flex-shrink-0">
<div className="flex items-center bg-white border border-medical-gray-200 rounded-xl px-3 py-2 shadow-2xs text-xs font-bold text-medical-gray-700 w-full sm:w-auto justify-between sm:justify-start">
<div className="flex items-center gap-1.5">
<SlidersHorizontal className="w-3.5 h-3.5 text-canina-blue shrink-0" />
<span className="text-medical-gray-400 text-[10px] whitespace-nowrap">مرتب‌سازی:</span>
</div>
<select
value={sortBy}
onChange={(e) => setSortBy(e.target.value as any)}
className="bg-transparent text-xs font-black text-medical-gray-900 outline-none cursor-pointer pr-1"
>
<option value="newest">جدیدترین مقالات</option>
<option value="oldest">قدیمی‌ترین</option>
<option value="most_viewed">پربازدیدترین‌ها</option>
</select>
</div>
</div>
{selectedTag && (
<div className="flex items-center gap-2 px-3 py-1.5 bg-purple-50 text-purple-700 border border-purple-200 rounded-xl text-xs font-bold self-start sm:self-auto">
<span>تگ: #{selectedTag}</span>
<div className="flex items-center gap-2 px-3 py-2 bg-purple-50 text-purple-700 border border-purple-200 rounded-xl text-xs font-bold">
<span>تگ انتخاب شده: #{selectedTag}</span>
<button
onClick={() => setSelectedTag(null)}
className="text-purple-500 hover:text-purple-900 cursor-pointer"
className="text-purple-500 hover:text-purple-900"
>
✕
</button>
@@ -230,61 +189,54 @@ export default function BlogPage({
)}
</div>
{/* Category Filter Pills with smooth edge mask */}
<div className="relative -mx-3.5 sm:mx-0 px-3.5 sm:px-0">
<div className="flex items-center gap-1.5 sm:gap-2 overflow-x-auto pb-1 micro-hscroll select-none mobile-filter-mask">
{/* Category Filter Pills */}
<div className="flex items-center gap-2 overflow-x-auto pb-1 scrollbar-none">
<button
onClick={() => {
setSelectedCategory("ALL");
router.replace('/blog', { scroll: false });
}}
className={`px-4 py-2 rounded-2xl text-xs font-black transition-all cursor-pointer whitespace-nowrap ${
selectedCategory === "ALL"
? "bg-canina-blue text-white shadow-md shadow-canina-blue/20 scale-102"
: "bg-medical-gray-100 text-medical-gray-600 hover:bg-medical-gray-200"
}`}
>
همه دسته‌ها ({blogs.length})
</button>
{categories.map((c) => (
<button
key={c.id}
onClick={() => {
setSelectedCategory("ALL");
setVisibleCount(6);
router.replace('/blog', { scroll: false });
setSelectedCategory(c.id);
router.replace(`/blog?categoryId=${c.id}`, { scroll: false });
}}
className={`px-3.5 py-1.5 sm:px-4 sm:py-2 rounded-xl sm:rounded-2xl text-xs font-black transition-all cursor-pointer whitespace-nowrap border shrink-0 ${
selectedCategory === "ALL"
? "bg-canina-blue text-white border-canina-blue shadow-xs"
: "bg-medical-gray-50 border-medical-gray-200 text-medical-gray-600 hover:border-canina-blue/40"
className={`px-4 py-2 rounded-2xl text-xs font-black transition-all cursor-pointer whitespace-nowrap ${
selectedCategory === c.id
? "bg-canina-blue text-white shadow-md shadow-canina-blue/20 scale-102"
: "bg-medical-gray-100 text-medical-gray-600 hover:bg-medical-gray-200"
}`}
>
همه دسته‌ها ({blogs.length})
{c.name}
</button>
{categories.map((c) => (
<button
key={c.id}
onClick={() => {
setSelectedCategory(c.id);
setVisibleCount(6);
router.replace(`/blog?categoryId=${c.id}`, { scroll: false });
}}
className={`px-3.5 py-1.5 sm:px-4 sm:py-2 rounded-xl sm:rounded-2xl text-xs font-black transition-all cursor-pointer whitespace-nowrap border shrink-0 ${
selectedCategory === c.id
? "bg-canina-blue text-white border-canina-blue shadow-xs"
: "bg-medical-gray-50 border-medical-gray-200 text-medical-gray-600 hover:border-canina-blue/40"
}`}
>
{c.name}
</button>
))}
</div>
))}
</div>
{/* Quick Tag Cloud */}
{allTags.length > 0 && (
<div className="flex flex-wrap items-center gap-1.5 pt-2 border-t border-medical-gray-100">
<span className="text-[10px] sm:text-[11px] font-bold text-medical-gray-400 flex items-center gap-1 ml-1">
<span className="text-[11px] font-bold text-medical-gray-400 flex items-center gap-1 ml-2">
<Tag className="w-3 h-3" />
تگ‌های محبوب:
محبوب‌ترین تگ‌ها:
</span>
{allTags.slice(0, 8).map((tag) => (
{allTags.slice(0, 10).map((tag) => (
<button
key={tag}
onClick={() => {
setSelectedTag(selectedTag === tag ? null : tag);
setVisibleCount(6);
}}
className={`text-[10px] sm:text-[11px] font-bold px-2 py-0.5 sm:px-2.5 sm:py-1 rounded-lg transition-all cursor-pointer border ${
onClick={() => setSelectedTag(selectedTag === tag ? null : tag)}
className={`text-[11px] font-bold px-2.5 py-1 rounded-lg transition-all cursor-pointer ${
selectedTag === tag
? "bg-purple-600 text-white border-purple-600"
: "bg-medical-gray-50 text-medical-gray-600 border-medical-gray-200 hover:bg-medical-gray-100"
? "bg-purple-600 text-white"
: "bg-medical-gray-100 text-medical-gray-600 hover:bg-medical-gray-200"
}`}
>
#{tag}
@@ -297,11 +249,11 @@ export default function BlogPage({
{/* Featured Post Banner */}
{featuredPost && (
<div className="mb-16">
<motion.a
href={`/blog/${encodeURIComponent(featuredPost.slug || featuredPost.id)}`}
<motion.div
initial={{ opacity: 0, y: 20 }}
animate={{ opacity: 1, y: 0 }}
className="bg-white rounded-[3.5rem] overflow-hidden border border-medical-gray-200 shadow-2xl flex flex-col lg:flex-row cursor-pointer group hover:border-canina-blue/30 transition-all"
onClick={() => router.push(`/blog/${encodeURIComponent(featuredPost.slug || featuredPost.id)}`)}
>
<div className="lg:w-1/2 aspect-video lg:aspect-auto relative overflow-hidden bg-medical-gray-100">
<SafeImage
@@ -359,30 +311,22 @@ export default function BlogPage({
</div>
</div>
</div>
</motion.a>
</motion.div>
</div>
)}
{/* Regular Posts Grid - Mobile-Optimized */}
{slicedRegularPosts.length > 0 ? (
<>
<div className="flex items-center justify-between mb-4">
<h2 className="text-base sm:text-xl font-black text-medical-gray-900 font-vazir">همه مقالات تخصصی</h2>
<span className="text-xs font-bold text-medical-gray-400">
{toPersian(regularPosts.length)} مقاله
</span>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-8">
{slicedRegularPosts.map((post, idx) => (
<motion.a
{/* Regular Posts Grid */}
{regularPosts.length > 0 ? (
<div className="grid md:grid-cols-2 lg:grid-cols-3 gap-8">
{regularPosts.map((post, idx) => (
<motion.div
key={post.id}
href={`/blog/${encodeURIComponent(post.slug || post.id)}`}
initial={{ opacity: 0, y: 20 }}
whileInView={{ opacity: 1, y: 0 }}
viewport={{ once: true }}
transition={{ delay: idx * 0.05 }}
className="bg-white rounded-2xl sm:rounded-[2.5rem] overflow-hidden border border-medical-gray-200 shadow-xs sm:shadow-lg group hover:shadow-xl hover:border-canina-blue/30 transition-all cursor-pointer flex flex-col justify-between"
className="bg-white rounded-[2.5rem] overflow-hidden border border-medical-gray-200 shadow-lg group hover:shadow-2xl hover:border-canina-blue/30 transition-all cursor-pointer flex flex-col justify-between"
onClick={() => router.push(`/blog/${encodeURIComponent(post.slug || post.id)}`)}
>
<div>
<div className="aspect-[16/10] overflow-hidden relative bg-medical-gray-100">
@@ -404,7 +348,7 @@ export default function BlogPage({
<span>{(post.viewCount ?? 0).toLocaleString('fa-IR')}</span>
</span>
</div>
<div className="p-4 sm:p-7">
<div className="p-6 sm:p-7">
<div className="flex items-center justify-between text-[11px] font-bold text-medical-gray-400 mb-3">
<div className="flex items-center gap-1">
<Calendar className="w-3 h-3" />
@@ -430,7 +374,7 @@ export default function BlogPage({
</div>
</div>
<div className="px-4 sm:px-7 pb-4 sm:pb-6 pt-2.5 border-t border-medical-gray-100 flex items-center justify-between">
<div className="px-6 sm:px-7 pb-6 pt-3 border-t border-medical-gray-100 flex items-center justify-between">
<div className="text-[11px] font-bold text-medical-gray-500 flex items-center gap-1.5">
<User className="w-3.5 h-3.5 text-medical-gray-400" />
<span>{post.author}</span>
@@ -440,25 +384,9 @@ export default function BlogPage({
<ArrowLeft className="w-3.5 h-3.5 group-hover:-translate-x-1 transition-transform" />
</div>
</div>
</motion.a>
</motion.div>
))}
</div>
{hasMore && (
<div className="mt-8 mb-4 text-center">
<button
type="button"
onClick={() => setVisibleCount(prev => prev + 6)}
className="inline-flex items-center gap-2 px-6 py-3 bg-white border border-medical-gray-200 hover:border-canina-blue text-canina-blue font-black text-xs sm:text-sm rounded-2xl shadow-xs hover:shadow-md active:scale-95 transition-all cursor-pointer font-vazir"
>
<span>مشاهده ۶ مقاله بیشتر</span>
<span className="text-xs text-medical-gray-400 font-bold">
(نمایش {toPersian(slicedRegularPosts.length)} از {toPersian(regularPosts.length)})
</span>
</button>
</div>
)}
</>
) : (
<div className="text-center py-16 bg-white rounded-3xl border border-medical-gray-200">
<p className="text-medical-gray-500 font-bold text-sm">