This commit is contained in:
1 parent
d73b2e51c6
commit
5afa2a37be
5 files changed
+24
-19
No files matched your search
@@ -39,9 +39,10 @@ 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);
|
||||
@@ -166,9 +167,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}
|
||||
@@ -177,23 +178,23 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
||||
<main className={`min-h-screen ${pathname === '/catalog' ? 'bg-slate-950' : ''}`}>
|
||||
{children}
|
||||
</main>
|
||||
<Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />
|
||||
|
||||
{!isUtilityRoute && <Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />}
|
||||
|
||||
{isB2BPortalOpen && isB2BEnabled && (
|
||||
<B2BPortal onClose={() => setB2BPortalOpen(false)} />
|
||||
)}
|
||||
<CartDrawer
|
||||
isOpen={isCartOpen}
|
||||
onClose={() => setCartOpen(false)}
|
||||
onCheckout={() => { setCartOpen(false); router.push('/checkout'); }}
|
||||
{!isUtilityRoute && <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) {
|
||||
@@ -219,14 +220,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}
|
||||
/>
|
||||
<AuthModal
|
||||
{!isUtilityRoute && <AuthModal
|
||||
isOpen={isAuthModalOpen}
|
||||
onClose={() => setAuthModalOpen(false)}
|
||||
/>
|
||||
/>}
|
||||
<PrescriptionUploadModal
|
||||
isOpen={isPrescriptionModalOpen}
|
||||
onClose={() => setIsPrescriptionModalOpen(false)}
|
||||
|
||||
@@ -16,7 +16,8 @@ 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("region", { name: "سبد خرید" })).toBeTruthy();
|
||||
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();
|
||||
});
|
||||
|
||||
@@ -7,6 +7,7 @@ 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("/")}
|
||||
|
||||
@@ -11,6 +11,7 @@ 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("dialog")).toBeTruthy();
|
||||
expect(screen.getByRole("heading", { name: "ورود یا ثبتنام" })).toBeTruthy();
|
||||
expect(screen.getAllByRole("dialog")).toHaveLength(1);
|
||||
});
|
||||
});
|
||||
@@ -7,6 +7,7 @@ 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>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user