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

@@ -1,194 +0,0 @@
import React from "react";
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import { render, screen, cleanup } from "@testing-library/react";
// Mock next/navigation
let currentPathname = "/";
const mockRouter = {
push: vi.fn(),
replace: vi.fn(),
back: vi.fn(),
prefetch: vi.fn(),
};
vi.mock("next/navigation", () => ({
usePathname: () => currentPathname,
useRouter: () => mockRouter,
useSearchParams: () => new URLSearchParams(),
}));
// Mock dynamic components to render test identifiers
vi.mock("next/dynamic", () => ({
default: (loader: any) => {
const str = loader.toString();
const isCart = str.includes("CartDrawer");
const isAuth = str.includes("AuthModal");
const isLogin = str.includes("LoginModal");
return function MockDynamic(props: any) {
if (props.isOpen === false) return null;
if (isCart) return <div data-testid="shell-cart-drawer" data-open={String(props.isOpen)} />;
if (isAuth) return <div data-testid="shell-auth-modal" data-open={String(props.isOpen)} />;
if (isLogin) return <div data-testid="shell-login-modal" data-open={String(props.isOpen)} />;
return <div data-testid="shell-dynamic-other" />;
};
},
}));
vi.mock("../components/Header", () => ({
default: () => <header data-testid="shell-header">Header</header>,
}));
vi.mock("../components/Footer", () => ({
default: () => <footer data-testid="shell-footer">Footer</footer>,
}));
vi.mock("../components/NetworkBanner", () => ({
NetworkBanner: () => null,
}));
vi.mock("../components/NavigationProgressBar", () => ({
default: () => null,
}));
vi.mock("../components/MobileBottomNav", () => ({
default: () => null,
}));
vi.mock("../components/PrescriptionUploadModal", () => ({
default: () => null,
}));
vi.mock("sonner", () => ({
Toaster: () => null,
toast: { success: vi.fn(), error: vi.fn() },
}));
// Mock real components used inside page routes
vi.mock("../components/AuthModal", () => ({
default: (props: any) => (
<div data-testid="page-auth-modal" data-isopen={String(props.isOpen)} />
),
}));
vi.mock("../components/CartDrawer", () => ({
default: (props: any) => (
<div data-testid="page-cart-drawer" data-isopen={String(props.isOpen)} />
),
}));
// Mock stores
const mockUserStoreState: any = {
isAuthModalOpen: false,
setAuthModalOpen: vi.fn(),
fetchProfile: vi.fn().mockResolvedValue({}),
user: null,
};
vi.mock("../lib/store/userStore", () => {
const store = (selector?: any) => (typeof selector === "function" ? selector(mockUserStoreState) : mockUserStoreState);
store.getState = () => mockUserStoreState;
return { useUserStore: store };
});
const mockSettingsStoreState: any = {
fetchSettings: vi.fn().mockResolvedValue({}),
getText: vi.fn().mockReturnValue(""),
getBoolean: vi.fn().mockReturnValue(false),
};
vi.mock("../lib/store/settingsStore", () => {
const store = (selector?: any) => (typeof selector === "function" ? selector(mockSettingsStoreState) : mockSettingsStoreState);
store.getState = () => mockSettingsStoreState;
return { useSettingsStore: store };
});
const mockUIStoreState: any = {
isCartOpen: false,
isLoginModalOpen: false,
isB2BPortalOpen: false,
advisorData: null,
setCartOpen: vi.fn(),
setLoginModalOpen: vi.fn(),
setB2BPortalOpen: vi.fn(),
clearAdvisorData: vi.fn(),
};
vi.mock("../lib/store/uiStore", () => {
const store = (selector?: any) => (typeof selector === "function" ? selector(mockUIStoreState) : mockUIStoreState);
store.getState = () => mockUIStoreState;
return { useUIStore: store };
});
import ClientLayout from "../app/ClientLayout";
import LoginPage from "../app/login/page";
import CartPage from "../app/cart/page";
describe("ClientLayout Shell & Singleton Modals Integration (UX-28)", () => {
beforeEach(() => {
vi.clearAllMocks();
mockUserStoreState.isAuthModalOpen = false;
mockUIStoreState.isCartOpen = false;
currentPathname = "/";
});
afterEach(() => {
cleanup();
});
it("renders singleton CartDrawer and AuthModal in ClientLayout on normal routes when opened", () => {
mockUIStoreState.isCartOpen = true;
mockUserStoreState.isAuthModalOpen = true;
render(
<ClientLayout>
<div>Content</div>
</ClientLayout>
);
// On normal route, Header, Footer, and active drawers are rendered
expect(screen.getByTestId("shell-header")).toBeTruthy();
expect(screen.getByTestId("shell-footer")).toBeTruthy();
expect(screen.getByTestId("shell-cart-drawer")).toBeTruthy();
expect(screen.getByTestId("shell-auth-modal")).toBeTruthy();
});
it("ensures no duplicate CartDrawer exists when user visits /cart utility route", () => {
currentPathname = "/cart";
mockUIStoreState.isCartOpen = true; // Even if UI store flag was left open
const { container } = render(
<ClientLayout>
<CartPage />
</ClientLayout>
);
// Footer and shell-level CartDrawer must be suppressed on /cart
expect(screen.queryByTestId("shell-footer")).toBeNull();
// Page level cart drawer is present
expect(screen.getByTestId("page-cart-drawer")).toBeTruthy();
// Shell level dynamic cart drawer is NOT rendered because isUtilityRoute is true
expect(screen.queryByTestId("shell-cart-drawer")).toBeNull();
});
it("ensures no duplicate AuthModal exists when user visits /login utility route", () => {
currentPathname = "/login";
mockUserStoreState.isAuthModalOpen = true; // Even if userStore auth flag was left open
const { container } = render(
<ClientLayout>
<LoginPage />
</ClientLayout>
);
// Footer and shell-level AuthModal must be suppressed on /login
expect(screen.queryByTestId("shell-footer")).toBeNull();
// Page level auth modal is present
expect(screen.getByTestId("page-auth-modal")).toBeTruthy();
// Shell level dynamic auth modal is NOT rendered because isUtilityRoute is true
expect(screen.queryByTestId("shell-auth-modal")).toBeNull();
});
});
+17 -18
View File
@@ -39,10 +39,9 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen);
const clearAdvisorData = useUIStore((state) => state.clearAdvisorData);
const [isPrescriptionModalOpen, setIsPrescriptionModalOpen] = useState(false);
const pathname = usePathname();
const router = useRouter();
const isUtilityRoute = pathname === "/login" || pathname === "/cart";
const fetchProfile = useUserStore((state) => state.fetchProfile);
const role = useUserStore((state) => state.role);
@@ -167,9 +166,9 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
<>
<NavigationProgressBar />
<NetworkBanner />
<Header
onNavigate={handleNavigate}
onShopNavigate={navigateToShop}
<Header
onNavigate={handleNavigate}
onShopNavigate={navigateToShop}
currentView={currentView}
onCartOpen={() => setCartOpen(true)}
onSearch={handleSearch}
@@ -178,23 +177,23 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
<main className={`min-h-screen ${pathname === '/catalog' ? 'bg-slate-950' : ''}`}>
{children}
</main>
{!isUtilityRoute && <Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />}
<Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />
{isB2BPortalOpen && isB2BEnabled && (
<B2BPortal onClose={() => setB2BPortalOpen(false)} />
)}
{!isUtilityRoute && <CartDrawer
isOpen={isCartOpen}
onClose={() => setCartOpen(false)}
onCheckout={() => { setCartOpen(false); router.push('/checkout'); }}
<CartDrawer
isOpen={isCartOpen}
onClose={() => setCartOpen(false)}
onCheckout={() => { setCartOpen(false); router.push('/checkout'); }}
onShopNavigate={navigateToShop}
/>}
<LoginModal
isOpen={isLoginModalOpen}
/>
<LoginModal
isOpen={isLoginModalOpen}
onClose={() => {
setLoginModalOpen(false);
clearAdvisorData();
}}
}}
onLogin={async () => {
setLoginModalOpen(false);
if (advisorData) {
@@ -220,14 +219,14 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
console.error("Auto pet registration after login failed:", e);
}
}
}}
}}
petName={advisorData?.name as string | undefined}
isAdvisorContext={!!advisorData}
/>
{!isUtilityRoute && <AuthModal
<AuthModal
isOpen={isAuthModalOpen}
onClose={() => setAuthModalOpen(false)}
/>}
/>
<PrescriptionUploadModal
isOpen={isPrescriptionModalOpen}
onClose={() => setIsPrescriptionModalOpen(false)}
+4 -4
View File
@@ -72,12 +72,12 @@ export default function HomeClient({ initialData }: HomeClientProps) {
{/* Navigation to Sections */}
<section className="py-5 sm:py-14 bg-medical-gray-50 border-y border-medical-gray-100 font-sans">
<section className="py-8 sm:py-14 bg-medical-gray-50 border-y border-medical-gray-100 font-sans">
<div className="max-w-7xl mx-auto px-4 grid md:grid-cols-2 gap-5 sm:gap-8">
{/* Specialty Shop Card */}
<Link
href="/shop"
className="group relative overflow-hidden rounded-2xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-blue-50/50 to-canina-blue/10 p-4 sm:p-10 border border-blue-200/70 shadow-xs sm:shadow-md hover:shadow-2xl hover:border-canina-blue/50 hover:-translate-y-1 transition-all duration-500 block"
className="group relative overflow-hidden rounded-3xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-blue-50/50 to-canina-blue/10 p-6 sm:p-10 border border-blue-200/70 shadow-md hover:shadow-2xl hover:border-canina-blue/50 hover:-translate-y-1 transition-all duration-500 block"
>
{/* Ambient Glows */}
<div className="absolute -top-16 -left-16 w-44 h-44 bg-canina-blue/15 rounded-full blur-3xl group-hover:scale-150 transition-transform duration-700 pointer-events-none" />
@@ -112,7 +112,7 @@ export default function HomeClient({ initialData }: HomeClientProps) {
{/* Scientific Wiki Card */}
<Link
href="/wiki"
className="group relative overflow-hidden rounded-2xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-emerald-50/50 to-teal-500/10 p-4 sm:p-10 border border-emerald-200/70 shadow-xs sm:shadow-md hover:shadow-2xl hover:border-emerald-500/50 hover:-translate-y-1 transition-all duration-500 block"
className="group relative overflow-hidden rounded-3xl sm:rounded-[2.5rem] bg-gradient-to-br from-white via-emerald-50/50 to-teal-500/10 p-6 sm:p-10 border border-emerald-200/70 shadow-md hover:shadow-2xl hover:border-emerald-500/50 hover:-translate-y-1 transition-all duration-500 block"
>
{/* Ambient Glows */}
<div className="absolute -top-16 -left-16 w-44 h-44 bg-emerald-500/15 rounded-full blur-3xl group-hover:scale-150 transition-transform duration-700 pointer-events-none" />
@@ -147,7 +147,7 @@ export default function HomeClient({ initialData }: HomeClientProps) {
</section>
{/* About Section Teaser */}
<section className="py-5 sm:py-16 bg-white overflow-hidden font-sans">
<section className="py-8 sm:py-16 bg-white overflow-hidden font-sans">
<div className="max-w-7xl mx-auto px-4 grid lg:grid-cols-2 gap-8 lg:gap-24 items-center">
<div className="relative overflow-hidden rounded-2xl sm:rounded-[3rem]">
<div className="absolute -top-10 -right-10 w-40 h-40 bg-canina-blue/5 rounded-full blur-3xl" />
@@ -1,33 +0,0 @@
import { NextResponse } from 'next/server';
export const dynamic = 'force-dynamic';
export async function GET() {
const commitSha =
process.env.NEXT_PUBLIC_GIT_COMMIT ||
process.env.GIT_COMMIT_SHA ||
process.env.COMMIT_SHA ||
'local-build';
const buildTime =
process.env.BUILD_TIMESTAMP ||
process.env.NEXT_PUBLIC_BUILD_TIME ||
new Date().toISOString();
const environment = process.env.NODE_ENV || 'production';
const service = 'frontend';
return NextResponse.json({
status: 'ok',
service,
commitSha,
buildTime,
environment,
}, {
status: 200,
headers: {
'Cache-Control': 'no-store, no-cache, must-revalidate',
'X-Commit-Sha': commitSha,
},
});
}
@@ -1,19 +0,0 @@
import { describe, it, expect } from 'vitest';
import { GET } from './route';
describe('Deployment Metadata Endpoint Gate (UX-37)', () => {
it('returns valid deployment signature, status and commit header', async () => {
const response = await GET();
expect(response.status).toBe(200);
const data = await response.json();
expect(data.status).toBe('ok');
expect(data.service).toBe('frontend');
expect(data).toHaveProperty('commitSha');
expect(data).toHaveProperty('buildTime');
expect(data).toHaveProperty('environment');
expect(response.headers.get('Cache-Control')).toBe('no-store, no-cache, must-revalidate');
expect(response.headers.get('X-Commit-Sha')).toBeDefined();
});
});
@@ -1,104 +0,0 @@
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import React from 'react';
import BlogPostPage from './page';
vi.mock('../../../lib/seo', () => ({
getSeoConfig: vi.fn().mockResolvedValue({
brandNameFa: 'کنینا ایران',
canonicalBaseUrl: 'https://canina.ir',
ogImageUrl: '/assets/og.jpg',
defaultMetaDescription: 'توضیحات پیش‌فرض',
titleSeparator: '|',
titlePosition: 'suffix',
}),
formatPageTitle: vi.fn((title) => `${title} | کنینا ایران`),
}));
vi.mock('../../../components/BlogPostClient', () => ({
default: () => <div data-testid="blog-post-client" />,
}));
describe('BlogPostPage FAQPage Schema injection (SEO-P1-07)', () => {
beforeEach(() => {
vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api');
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
});
afterEach(() => {
vi.unstubAllGlobals();
vi.unstubAllEnvs();
});
it('injects FAQPage JSON-LD schema when article contains questions and answers', async () => {
const blogData = {
slug: 'joint-health',
title: 'سلامت مفاصل سگ',
content: `
<article>
<p>مقدمه‌ای درباره مفاصل سگ.</p>
<details>
<summary>آیا این مکمل برای سگ مسن مناسب است؟</summary>
<p>بله، بسیار توصیه می‌شود و روند تخریب مفصل را کند می‌کند.</p>
</details>
</article>
`,
createdAt: '2026-01-01',
publishedAt: '2026-01-01',
};
vi.stubGlobal(
'fetch',
vi.fn().mockResolvedValue({
ok: true,
json: async () => blogData,
})
);
const jsx = await BlogPostPage({ params: Promise.resolve({ slug: 'joint-health' }) });
expect(jsx).toBeDefined();
// Verify scripts in JSX tree
const scripts = React.Children.toArray(jsx.props.children).filter(
(child: any) => child?.type === 'script' && child?.props?.['type'] === 'application/ld+json'
);
// There should be 3 schemas: Article, Breadcrumb, and FAQPage
expect(scripts.length).toBe(3);
const faqScript: any = scripts.find((s: any) => s.props['data-testid'] === 'faq-schema');
expect(faqScript).toBeDefined();
const faqJson = JSON.parse(faqScript.props.dangerouslySetInnerHTML.__html);
expect(faqJson['@type']).toBe('FAQPage');
expect(faqJson.mainEntity).toHaveLength(1);
expect(faqJson.mainEntity[0].name).toBe('آیا این مکمل برای سگ مسن مناسب است؟');
});
it('does not inject FAQPage schema when article does not have FAQs', async () => {
const blogData = {
slug: 'nutrition',
title: 'تغذیه سگ',
content: '<p>یک مقاله ساده بدون سوال و جواب یا آکاردئون.</p>',
createdAt: '2026-01-01',
publishedAt: '2026-01-01',
};
vi.stubGlobal(
'fetch',
vi.fn().mockResolvedValue({
ok: true,
json: async () => blogData,
})
);
const jsx = await BlogPostPage({ params: Promise.resolve({ slug: 'nutrition' }) });
const scripts = React.Children.toArray(jsx.props.children).filter(
(child: any) => child?.type === 'script' && child?.props?.['type'] === 'application/ld+json'
);
// Only Article and Breadcrumb schemas
expect(scripts.length).toBe(2);
const faqScript = scripts.find((s: any) => s.props['data-testid'] === 'faq-schema');
expect(faqScript).toBeUndefined();
});
});
+1 -16
View File
@@ -4,8 +4,6 @@ import type { Metadata } from 'next';
import BlogPostClient from "../../../components/BlogPostClient";
import { getSeoConfig, formatPageTitle } from "../../../lib/seo";
import { safeJsonLd } from "../../../lib/schema";
import { sanitizeBlogHtml } from "../../../lib/sanitizeBlogHtml";
import { extractFaqsFromHtml, generateFAQPageSchema } from "../../../lib/extractFaqs";
function safeIso(val: any, fallback?: string): string | undefined {
if (!val) return fallback;
@@ -83,7 +81,7 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
const ogTitle = blog.ogTitle || title;
const ogDesc = blog.ogDescription || description;
const isStaging =
const isStaging =
process.env.NEXT_PUBLIC_APP_ENV === 'staging' ||
process.env.NODE_ENV !== 'production' ||
siteUrl.includes('stage') ||
@@ -184,7 +182,6 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
const publishedIso = safeIso(blog.publishedAt) || safeIso(blog.createdAt) || new Date().toISOString();
const modifiedIso = safeIso(blog.updatedAt) || publishedIso;
const sanitizedContent = sanitizeBlogHtml(blog.content);
const schemaType = blog.schemaType || 'BlogPosting';
const authorSchema = blog.author && (blog.author.firstName || blog.author.lastName)
@@ -268,10 +265,6 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
],
};
// SEO-P1-07: Auto-detect and inject FAQPage Schema when article content contains Q&As or accordion structures
const extractedFaqs = extractFaqsFromHtml(blog.content || '');
const faqPageSchema = generateFAQPageSchema(extractedFaqs);
return (
<>
<script
@@ -282,18 +275,10 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
type="application/ld+json"
dangerouslySetInnerHTML={{ __html: safeJsonLd(breadcrumbJsonLd) }}
/>
{faqPageSchema && (
<script
type="application/ld+json"
data-testid="faq-schema"
dangerouslySetInnerHTML={{ __html: safeJsonLd(faqPageSchema) }}
/>
)}
<BlogPostClient
blog={blog}
publishedDate={publishedDate}
authorName={authorName}
sanitizedContent={sanitizedContent}
/>
</>
);
@@ -1,24 +0,0 @@
import React from "react";
import { describe, expect, it, vi } from "vitest";
import { render, screen } from "@testing-library/react";
import CartPage from "./page";
vi.mock("../../components/CartDrawer", () => ({
default: ({ isOpen, onCheckout, onShopNavigate }: { isOpen: boolean; onCheckout: () => void; onShopNavigate: () => void }) => isOpen ? (
<div role="region" aria-label="سبد خرید">
<button onClick={onCheckout}>تکمیل سفارش</button>
<button onClick={onShopNavigate}>مشاهده محصولات</button>
</div>
) : null,
}));
vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
describe("/cart route", () => {
it("renders the cart experience and provides journey actions", () => {
render(<CartPage />);
expect(screen.getByRole("heading", { name: "سبد خرید" })).toBeTruthy();
expect(screen.getAllByRole("region", { name: "سبد خرید" })).toHaveLength(1);
expect(screen.getByRole("button", { name: "تکمیل سفارش" })).toBeTruthy();
expect(screen.getByRole("button", { name: "مشاهده محصولات" })).toBeTruthy();
});
});
-19
View File
@@ -1,19 +0,0 @@
"use client";
import { useRouter } from "next/navigation";
import CartDrawer from "../../components/CartDrawer";
export default function CartPage() {
const router = useRouter();
return (
<main className="min-h-screen bg-medical-gray-50" dir="rtl">
<h1 className="sr-only">سبد خرید</h1>
<CartDrawer
isOpen
onClose={() => router.push("/")}
onCheckout={() => router.push("/checkout")}
onShopNavigate={() => router.push("/shop")}
/>
</main>
);
}
+1 -1
View File
@@ -42,7 +42,7 @@ export default async function ContactPage() {
type="application/ld+json"
dangerouslySetInnerHTML={{ __html: safeJsonLd(breadcrumbs) }}
/>
<div className="bg-medical-gray-50 pt-10 pb-28 sm:py-16 px-4 sm:px-6 lg:px-8 font-vazir" dir="rtl">
<div className="bg-medical-gray-50 py-16 px-4 sm:px-6 lg:px-8 font-vazir" dir="rtl">
<div className="max-w-6xl mx-auto space-y-16">
{/* Title */}
+1 -7
View File
@@ -41,7 +41,7 @@
html, body {
font-family: var(--font-vazir), "Vazirmatn", sans-serif !important;
@apply bg-medical-gray-50 text-medical-gray-900 antialiased w-full max-w-full overflow-x-clip;
@apply bg-medical-gray-50 text-medical-gray-900 antialiased max-w-[100vw] overflow-x-hidden;
font-feature-settings: "ss01", "ss02", "cv01", "cv11";
}
@@ -140,12 +140,6 @@
background: var(--color-canina-blue);
}
/* Mobile catalog filter edge affordances (clean mask-based fade) */
.mobile-filter-mask {
-webkit-mask-image: linear-gradient(to right, transparent, black 24px, black calc(100% - 24px), transparent 100%);
mask-image: linear-gradient(to right, transparent, black 24px, black calc(100% - 24px), transparent 100%);
}
/* Micro horizontal scrollbar for dark backgrounds (catalog etc.) */
.micro-hscroll-dark {
scrollbar-width: thin;
@@ -1,82 +0,0 @@
import React from "react";
import { describe, it, expect, vi } from "vitest";
import { render, screen } from "@testing-library/react";
// Mock child components to verify presence without side-effects
vi.mock("../components/Hero", () => ({
default: () => <section data-testid="hero-section">Hero</section>,
}));
vi.mock("../components/SmartAdvisor", () => ({
default: () => <section data-testid="smart-advisor-section">SmartAdvisor</section>,
}));
vi.mock("../components/BannerPlacement", () => ({
default: ({ position }: { position: string }) => (
<section data-testid={`banner-placement-${position}`}>BannerPlacement {position}</section>
),
}));
vi.mock("../components/FeaturedProducts", () => ({
default: () => <section data-testid="featured-products-section">FeaturedProducts</section>,
}));
vi.mock("../components/VetGallery", () => ({
default: () => <section data-testid="vet-gallery-section">VetGallery</section>,
}));
vi.mock("../components/TestimonialsSection", () => ({
default: () => <section data-testid="testimonials-section">TestimonialsSection</section>,
}));
vi.mock("../components/BlogPreviewSection", () => ({
default: () => <section data-testid="blog-preview-section">BlogPreviewSection</section>,
}));
vi.mock("../components/FAQSection", () => ({
default: () => <section data-testid="faq-section">FAQSection</section>,
}));
vi.mock("next/link", () => ({
default: ({ children, href, ...props }: any) => <a href={href} {...props}>{children}</a>,
}));
vi.mock("next/image", () => ({
default: ({ src, alt, ...props }: any) => <img src={src} alt={alt} {...props} />,
}));
vi.mock("../lib/services/api", () => ({
default: {
get: vi.fn().mockReturnValue(new Promise(() => {})), // Avoid triggering state updates during test
},
}));
vi.mock("../lib/store/settingsStore", () => ({
useSettingsStore: (selector?: any) => {
const s = { getText: (k: string, d: string) => d };
return typeof selector === "function" ? selector(s) : s;
},
}));
import HomeClient from "./HomeClient";
describe("Home Sections Mobile Retention Gate (UX-35)", () => {
it("strictly retains 100% of all core Home sections and feature cards without mobile exclusion or deletion", () => {
const { container } = render(<HomeClient initialData={null} />);
// Verify presence of all major sections
expect(screen.getByTestId("hero-section")).toBeTruthy();
expect(screen.getByTestId("smart-advisor-section")).toBeTruthy();
expect(screen.getByTestId("banner-placement-home_middle")).toBeTruthy();
expect(screen.getByTestId("featured-products-section")).toBeTruthy();
expect(screen.getByTestId("vet-gallery-section")).toBeTruthy();
expect(screen.getByTestId("testimonials-section")).toBeTruthy();
expect(screen.getByTestId("blog-preview-section")).toBeTruthy();
expect(screen.getByTestId("faq-section")).toBeTruthy();
// Verify navigation specialty cards
expect(screen.getByText("داروخانه تخصصی مکمل‌ها")).toBeTruthy();
expect(screen.getByText("دانشنامه علمی و مقالات")).toBeTruthy();
// Ensure none of the sections have `hidden` alone as a display class on mobile
const sections = container.querySelectorAll("section");
expect(sections.length).toBeGreaterThanOrEqual(10);
sections.forEach((sec) => {
const classList = sec.className.split(/\s+/);
expect(classList).not.toContain("hidden");
});
});
});
+1 -10
View File
@@ -71,10 +71,6 @@ export async function generateMetadata(): Promise<Metadata> {
},
alternates: {
canonical: '/',
languages: {
'fa-IR': `${siteUrl}/`,
'x-default': `${siteUrl}/`,
},
},
formatDetection: {
email: false,
@@ -152,12 +148,7 @@ export default async function RootLayout({
},
};
const rootSchemaGraph = {
'@context': 'https://schema.org',
'@graph': [orgSchema, webSiteSchema],
};
const safeJsonLd = JSON.stringify(rootSchemaGraph).replace(/</g, '\\u003c');
const safeJsonLd = JSON.stringify([orgSchema, webSiteSchema]).replace(/</g, '\\u003c');
const gaId = config.googleAnalyticsId?.trim();
const isGaEnabled = Boolean(gaId && config.enableGoogleAnalytics !== false);
@@ -1,17 +0,0 @@
import React from "react";
import { describe, expect, it, vi } from "vitest";
import { render, screen } from "@testing-library/react";
import LoginPage from "./page";
vi.mock("../../components/AuthModal", () => ({
default: ({ isOpen }: { isOpen: boolean }) => isOpen ? <div role="dialog">ورود به حساب</div> : null,
}));
vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
describe("/login route", () => {
it("renders the authentication experience instead of a missing-page route", () => {
render(<LoginPage />);
expect(screen.getByRole("heading", { name: "ورود یا ثبت‌نام" })).toBeTruthy();
expect(screen.getAllByRole("dialog")).toHaveLength(1);
});
});
-14
View File
@@ -1,14 +0,0 @@
"use client";
import { useRouter } from "next/navigation";
import AuthModal from "../../components/AuthModal";
export default function LoginPage() {
const router = useRouter();
return (
<main className="min-h-screen bg-medical-gray-50 px-4 py-12" dir="rtl">
<h1 className="sr-only">ورود یا ثبت‌نام</h1>
<AuthModal isOpen onClose={() => router.push("/")} />
</main>
);
}
@@ -1,95 +0,0 @@
import React from "react";
import { describe, it, expect, vi } from "vitest";
import { render, screen } from "@testing-library/react";
// Mock next/navigation
vi.mock("next/navigation", () => ({
usePathname: () => "/login",
useRouter: () => ({ push: vi.fn(), replace: vi.fn(), back: vi.fn() }),
useSearchParams: () => new URLSearchParams(),
}));
vi.mock("next/link", () => ({
default: ({ children, href, ...props }: any) => <a href={href} {...props}>{children}</a>,
}));
vi.mock("next/image", () => ({
default: (props: any) => <img {...props} />,
}));
// Mock sub-components with exact path matching
vi.mock("../components/AuthModal", () => ({
default: ({ isOpen, onClose }: any) => (
<div data-testid="auth-modal" data-isopen={String(isOpen)}>
<button onClick={onClose}>بستن</button>
</div>
),
}));
vi.mock("../components/CartDrawer", () => ({
default: ({ isOpen, onCheckout, onShopNavigate }: any) => (
<div data-testid="cart-drawer" data-isopen={String(isOpen)}>
<button onClick={onCheckout}>تکمیل سفارش</button>
<button onClick={onShopNavigate}>فروشگاه</button>
</div>
),
}));
vi.mock("../components/PetProfile", () => ({
default: () => <div data-testid="pet-profile-component">Pet Profile</div>,
}));
vi.mock("../components/VideosPage", () => ({
default: ({ initialVideos }: any) => (
<div data-testid="videos-page-component">Videos: {initialVideos?.length || 0}</div>
),
}));
vi.mock("../components/SmartAdvisor", () => ({
default: () => <div data-testid="smart-advisor-component">Smart Advisor</div>,
}));
import LoginPage from "./login/page";
import CartPage from "./cart/page";
import ProfilePage from "./profile/page";
import VideosPage from "./videos/page";
import SmartAdvisorPage from "./smart-advisor/page";
describe("Lightweight Utility Routes and Responsive Layouts (UX-29)", () => {
it("renders LoginPage with minimal semantic wrapper and single accessible h1", () => {
const { container } = render(<LoginPage />);
const h1 = screen.getByRole("heading", { level: 1 });
expect(h1.textContent).toContain("ورود یا ثبت‌نام");
expect(screen.getByTestId("auth-modal")).toBeTruthy();
const main = container.querySelector("main");
expect(main).not.toBeNull();
expect(main?.getAttribute("dir")).toBe("rtl");
});
it("renders CartPage with semantic main wrapper and single accessible h1", () => {
const { container } = render(<CartPage />);
const h1 = screen.getByRole("heading", { level: 1 });
expect(h1.textContent).toContain("سبد خرید");
expect(screen.getByTestId("cart-drawer")).toBeTruthy();
const main = container.querySelector("main");
expect(main).not.toBeNull();
});
it("renders ProfilePage cleanly delegating to PetProfile component", () => {
render(<ProfilePage />);
expect(screen.getByTestId("pet-profile-component")).toBeTruthy();
});
it("renders VideosPage cleanly passing initial videos dataset", async () => {
const component = await VideosPage();
render(component);
expect(screen.getByTestId("videos-page-component")).toBeTruthy();
});
it("renders SmartAdvisorPage with semantic breadcrumbs, h1 and advisor container", () => {
render(<SmartAdvisorPage />);
const h1 = screen.getByRole("heading", { level: 1 });
expect(h1.textContent).toMatch(/مشاوره تخصصی و راهنمای/);
expect(screen.getByTestId("smart-advisor-component")).toBeTruthy();
});
});
-2
View File
@@ -37,8 +37,6 @@ export default function robots(): MetadataRoute.Robots {
`${baseUrl}/sitemap.xml`,
`${baseUrl}/sitemap-products.xml`,
`${baseUrl}/sitemap-categories.xml`,
`${baseUrl}/sitemap-blog.xml`,
`${baseUrl}/sitemap-wiki.xml`,
],
};
}
@@ -1,4 +1,3 @@
import { notFound } from 'next/navigation';
import ProductPage from "../../../components/ProductPage";
import { productService } from "../../../lib/services/productService";
import type { Metadata } from 'next';
@@ -134,7 +133,7 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl
const product = await productService.getProductBySlug(resolvedParams.slug);
if (!product) {
notFound();
return <ProductPage productSlug={resolvedParams.slug} />;
}
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
@@ -350,7 +349,7 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl
</div>
</div>
}>
<ProductPage productSlug={resolvedParams.slug} initialProduct={product} />
<ProductPage productSlug={resolvedParams.slug} />
</Suspense>
</>
);
-7
View File
@@ -1,8 +1,6 @@
import type { Metadata } from "next";
import ArchivePage from "../../components/ArchivePage";
import { getPageMetadata } from "../../lib/seo";
import { productService } from "../../lib/services/productService";
import type { PetType } from "../../lib/data/products";
export async function generateMetadata({
searchParams,
@@ -43,9 +41,6 @@ export default async function Shop({ searchParams }: { searchParams: Promise<{ [
const symptomsParam = typeof resolvedParams.symptoms === 'string' ? resolvedParams.symptoms : "";
const symptomSingle = typeof resolvedParams.symptom === 'string' ? resolvedParams.symptom : "";
const symptoms = symptomsParam || (symptomSingle ? symptomSingle : "");
const pageParam = typeof resolvedParams.page === "string" ? parseInt(resolvedParams.page, 10) : 1;
const initialPage = isNaN(pageParam) || pageParam < 1 ? 1 : pageParam;
const { data: initialProducts } = await productService.getProducts({ category, petType: petType as PetType | "all", query: search, symptom: symptomSingle, limit: 999 });
return (
<ArchivePage
@@ -53,8 +48,6 @@ export default async function Shop({ searchParams }: { searchParams: Promise<{ [
initialSearch={search}
initialPetType={petType}
initialSymptoms={symptoms}
initialProducts={initialProducts}
initialPage={initialPage}
/>
);
}
@@ -1,78 +0,0 @@
import { NextResponse } from 'next/server';
export const dynamic = 'force-dynamic';
export const revalidate = 3600; // Revalidate every hour
type SitemapBlog = {
slug: string;
noIndex?: boolean;
status: string;
updatedAt?: string;
createdAt?: string;
featured?: boolean;
title?: string;
imageUrl?: string;
ogImage?: string;
};
export async function GET() {
const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
const apiUrl =
process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api';
const normalizedApiUrl = apiUrl.replace(/\/$/, '');
const apiBase = normalizedApiUrl.endsWith('/api') ? normalizedApiUrl : `${normalizedApiUrl}/api`;
const blogRoutes: SitemapBlog[] = [];
try {
let page = 1;
let lastPage = 1;
do {
const res = await fetch(`${apiBase}/blogs?page=${page}&limit=20`, { cache: 'no-store' });
if (!res.ok) throw new Error(`Blog sitemap request failed: ${res.status}`);
const data = await res.json();
const blogsList: SitemapBlog[] = data.data || [];
if (!blogsList.length) break;
const validBlogs = blogsList.filter((b) => !b.noIndex && b.status === 'PUBLISHED');
blogRoutes.push(...validBlogs);
lastPage = Number(data.meta?.lastPage) || 1;
page += 1;
} while (page <= lastPage);
} catch (err) {
console.error('Failed to fetch blogs for sitemap-blog.xml:', err);
}
const urlsXml = blogRoutes
.map((blog) => {
const loc = `${baseUrl}/blog/${encodeURIComponent(blog.slug)}`;
const lastmod = blog.updatedAt
? new Date(blog.updatedAt).toISOString()
: blog.createdAt
? new Date(blog.createdAt).toISOString()
: new Date().toISOString();
const priority = blog.featured ? '0.9' : '0.7';
const primaryImg = blog.ogImage || blog.imageUrl;
const title = blog.title || 'مقاله وبلاگ تخصصی کنینا';
const imageTag = primaryImg
? `\n <image:image>\n <image:loc>${
primaryImg.startsWith('http') ? primaryImg : `${baseUrl}${primaryImg.startsWith('/') ? '' : '/'}${primaryImg}`
}</image:loc>\n <image:title><![CDATA[${title}]]></image:title>\n </image:image>`
: '';
return ` <url>\n <loc>${loc}</loc>\n <lastmod>${lastmod}</lastmod>\n <changefreq>weekly</changefreq>\n <priority>${priority}</priority>${imageTag}\n </url>`;
})
.join('\n');
const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>\n<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"\n xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">\n${urlsXml}\n</urlset>`;
return new NextResponse(xmlContent, {
status: 200,
headers: {
'Content-Type': 'application/xml; charset=utf-8',
'Cache-Control': 'public, max-age=3600, s-maxage=3600, stale-while-revalidate=86400',
},
});
}
@@ -1,64 +0,0 @@
import { NextResponse } from 'next/server';
export const dynamic = 'force-dynamic';
export const revalidate = 86400; // Revalidate daily
type SitemapWikiTerm = {
key: string;
term: string;
definition?: string;
updatedAt?: string;
createdAt?: string;
};
export async function GET() {
const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://canina.ir';
const apiUrl =
process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api';
const normalizedApiUrl = apiUrl.replace(/\/$/, '');
const apiBase = normalizedApiUrl.endsWith('/api') ? normalizedApiUrl : `${normalizedApiUrl}/api`;
const wikiRoutes: SitemapWikiTerm[] = [];
try {
let page = 1;
let lastPage = 1;
do {
const res = await fetch(`${apiBase}/wiki?page=${page}&limit=50`, { cache: 'no-store' });
if (!res.ok) throw new Error(`Wiki sitemap request failed: ${res.status}`);
const data = await res.json();
const wikiList: SitemapWikiTerm[] = data.data || [];
if (!wikiList.length) break;
wikiRoutes.push(...wikiList);
lastPage = Number(data.meta?.lastPage) || 1;
page += 1;
} while (page <= lastPage);
} catch (err) {
console.error('Failed to fetch wiki terms for sitemap-wiki.xml:', err);
}
const urlsXml = wikiRoutes
.map((item) => {
const loc = `${baseUrl}/wiki/${encodeURIComponent(item.key)}`;
const lastmod = item.updatedAt
? new Date(item.updatedAt).toISOString()
: item.createdAt
? new Date(item.createdAt).toISOString()
: new Date().toISOString();
return ` <url>\n <loc>${loc}</loc>\n <lastmod>${lastmod}</lastmod>\n <changefreq>weekly</changefreq>\n <priority>0.8</priority>\n </url>`;
})
.join('\n');
const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>\n<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n${urlsXml}\n</urlset>`;
return new NextResponse(xmlContent, {
status: 200,
headers: {
'Content-Type': 'application/xml; charset=utf-8',
'Cache-Control': 'public, max-age=86400, s-maxage=86400, stale-while-revalidate=604800',
},
});
}
-91
View File
@@ -1,91 +0,0 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
import robots from './robots';
import { GET as getBlogSitemap } from './sitemap-blog.xml/route';
import { GET as getWikiSitemap } from './sitemap-wiki.xml/route';
afterEach(() => {
vi.unstubAllGlobals();
vi.unstubAllEnvs();
});
describe('Sub-sitemaps and robots.ts integration (SEO-P1-10)', () => {
it('registers sitemap-blog.xml and sitemap-wiki.xml in robots.ts', () => {
vi.stubEnv('NEXT_PUBLIC_APP_ENV', 'production');
vi.stubEnv('NODE_ENV', 'production');
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
const config = robots();
const sitemaps = Array.isArray(config.sitemap) ? config.sitemap : [config.sitemap];
expect(sitemaps).toContain('https://canina.ir/sitemap.xml');
expect(sitemaps).toContain('https://canina.ir/sitemap-products.xml');
expect(sitemaps).toContain('https://canina.ir/sitemap-categories.xml');
expect(sitemaps).toContain('https://canina.ir/sitemap-blog.xml');
expect(sitemaps).toContain('https://canina.ir/sitemap-wiki.xml');
});
it('generates sitemap-blog.xml correctly with published blogs and image tags', async () => {
vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api');
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
const fetchMock = vi.fn().mockResolvedValue({
ok: true,
json: async () => ({
data: [
{
slug: 'puppy-nutrition',
title: 'تغذیه توله سگ',
status: 'PUBLISHED',
updatedAt: '2026-10-10T12:00:00.000Z',
featured: true,
imageUrl: '/uploads/puppy.jpg',
},
{
slug: 'hidden-blog',
title: 'مقاله پیش‌نویس',
status: 'DRAFT',
},
],
meta: { lastPage: 1 },
}),
});
vi.stubGlobal('fetch', fetchMock);
const res = await getBlogSitemap();
expect(res.status).toBe(200);
const xml = await res.text();
expect(xml).toContain('<loc>https://canina.ir/blog/puppy-nutrition</loc>');
expect(xml).toContain('<priority>0.9</priority>');
expect(xml).toContain('<image:loc>https://canina.ir/uploads/puppy.jpg</image:loc>');
expect(xml).toContain('تغذیه توله سگ');
expect(xml).not.toContain('hidden-blog');
});
it('generates sitemap-wiki.xml correctly with scientific terms', async () => {
vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api');
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://canina.ir');
const fetchMock = vi.fn().mockResolvedValue({
ok: true,
json: async () => ({
data: [
{
key: 'omega-3',
term: 'امگا ۳',
updatedAt: '2026-09-01T10:00:00.000Z',
},
],
meta: { lastPage: 1 },
}),
});
vi.stubGlobal('fetch', fetchMock);
const res = await getWikiSitemap();
expect(res.status).toBe(200);
const xml = await res.text();
expect(xml).toContain('<loc>https://canina.ir/wiki/omega-3</loc>');
expect(xml).toContain('<priority>0.8</priority>');
});
});
@@ -1,4 +1,3 @@
import { notFound } from 'next/navigation';
import Link from 'next/link';
import { ChevronRight, Sparkles, Package, ArrowLeft, ShieldCheck } from 'lucide-react';
import type { Metadata } from 'next';
@@ -82,7 +81,15 @@ export default async function WikiTermPage({ params }: { params: Promise<{ slug:
const term = await getWikiTerm(slug);
if (!term) {
notFound();
return (
<div className="min-h-[50vh] flex flex-col items-center justify-center font-vazir text-center px-4" dir="rtl">
<h1 className="text-3xl font-black text-medical-gray-900 mb-4">ترکیب علمی یافت نشد</h1>
<Link href="/wiki" className="text-canina-blue font-bold flex items-center gap-2">
<ChevronRight className="w-4 h-4" />
بازگشت به دانشنامه
</Link>
</div>
);
}
const relatedProducts = await getRelatedProducts(term.term);