From bc6cafaffa939f7536d88ab60527d9ec6c58ffc4 Mon Sep 17 00:00:00 2001 From: "amirhosein.ashourloo" Date: Tue, 15 Sep 2026 17:41:46 +0330 Subject: [PATCH] Make homepage carousels fully dynamic, drop brand carousels, dynamic logo/favicon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace the two hardcoded homepage carousels (SpecialSaleCarousel pinned to store-specials group 0 only, TopSellingCarousel reading from an unrelated plain product query) with StoreSpecialCarousels: loops over every group GET /store-specials returns, using each group's own title. A new carousel created in the admin panel (e.g. the "بهترین‌ها از نگاه شما" one just added) shows up automatically, no code change needed. - Remove the brand-groups integration and its "سامسونگ" carousel entirely (getBrandGroups, BrandGroupCarousels) — brand-name carousels aren't wanted on this site per explicit instruction. - SectionTitle's enTitle is now optional, since dynamic store-specials groups only have one title string, not a Persian/English pair. - Move featured categories above the hero-adjacent special carousels per the requested homepage order; drop the "دسته‌بندی‌های پرطرفدار" heading and its "همه دسته‌ها" button, per request. - Wire the header/footer logo and the favicon to the real business data (logoUrl/logoDarkUrl/faviconUrl from GET business-info) instead of static files; removed src/app/favicon.ico, which was silently winning over the new dynamic . - CONTEXT.md: document the dynamic-carousel contract and the logo/favicon wiring so neither regresses to hardcoded. Co-Authored-By: Claude Sonnet 5 --- CONTEXT.md | 44 ++++++++++++ src/app/favicon.ico | Bin 25931 -> 0 bytes src/app/layout.tsx | 14 ++-- src/app/page.tsx | 25 ++----- src/components/home/FeaturedCategories.tsx | 6 -- src/components/home/Footer.tsx | 18 +++-- src/components/home/Header.tsx | 15 ++-- src/components/home/SpecialSaleCarousel.tsx | 65 ------------------ ...arousels.tsx => StoreSpecialCarousels.tsx} | 29 ++++---- src/components/home/TopSellingCarousel.tsx | 46 ------------- src/components/ui/SectionTitle.tsx | 18 ++--- src/lib/meshkee.ts | 32 +++++---- 12 files changed, 118 insertions(+), 194 deletions(-) delete mode 100644 src/app/favicon.ico delete mode 100644 src/components/home/SpecialSaleCarousel.tsx rename src/components/home/{BrandGroupCarousels.tsx => StoreSpecialCarousels.tsx} (63%) delete mode 100644 src/components/home/TopSellingCarousel.tsx diff --git a/CONTEXT.md b/CONTEXT.md index 64cd20c..f0b1473 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -195,6 +195,50 @@ them in the dashboard; the code path just needs to fall back to whatever the `FeaturedCategories.tsx` for the pattern: real slot images when present, else the pre-existing UI unchanged). +## Homepage product carousels — fully dynamic, don't hardcode a name/key + +`GET /tenants/{domain}/store-specials` returns **every** admin-managed named +carousel as one flat list — e.g. "Special Sale", "پرفروش‌ها", "بهترین‌ها از +نگاه شما" all come back from this one call, each with its own `title` and +`items`. `StoreSpecialCarousels.tsx` maps over the **whole list** (sorted by +`sortOrder`, empty groups skipped) and renders one titled carousel section +per group, using `group.title` from the API as the heading — no group +id/key/title is special-cased in code. This means a brand-new carousel +created in the Meshkee dashboard (any name) appears on the homepage the next +time the page renders, with zero code changes. + +**Do not**: +- Hardcode a Persian/English title pair for one of these carousels (that was + the old `SpecialSaleCarousel`/`TopSellingCarousel` mistake — two separate + components each pinned to one group, with a made-up title instead of the + API's own `title`, and `TopSellingCarousel` didn't even read from + store-specials, it re-queried the plain product list). +- Reintroduce a **brand-name carousel** (`GET /website/brand-groups` — used + to render a "سامسونگ" section). The user explicitly removed this: brand + carousels aren't wanted on this site at all. If similar per-brand curation + is wanted later, it should go through admin-managed store-specials groups + (a group can be curated by brand already), not a separate brand-groups + integration. + +`SectionTitle`'s `enTitle` prop is optional for exactly this reason — these +dynamic groups only have one `title` string from the API, not a Persian/ +English pair, so the small English-caps subtitle just doesn't render for them. + +## Branding: logo & favicon are dynamic, not static files + +`BusinessInfo` (`getBusinessInfo()`, already fetched in `layout.tsx`) carries +`logoUrl`, `logoDarkUrl`, `faviconUrl` straight from the API — the same +values `GET /tenants/{domain}` and `GET .../website/favicon` also expose. +`Header`'s `Logo` takes a `src` prop (falls back to `public/images/logo.png` +only if the API value is null) threaded down from `layout.tsx`; `Footer` +prefers `logoDarkUrl` (falls back to `logoUrl`) since it sits on a dark +background. The favicon is set via `generateMetadata()`'s `icons` field — +**there is no `src/app/favicon.ico` file** (deliberately removed): Next.js's +static-file favicon convention and a dynamic `metadata.icons` entry both +render a `` and browsers aren't guaranteed to prefer the +second one, so keeping both was silently serving the stale static icon. +Don't add `app/favicon.ico` (or `public/favicon.ico`) back. + ## Route map | Route | Notes | diff --git a/src/app/favicon.ico b/src/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/src/app/layout.tsx b/src/app/layout.tsx index a42697e..d5910ad 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -27,10 +27,14 @@ const syne = Syne({ weight: ["600", "700", "800"], }); -export const metadata: Metadata = { - title: "سانی‌هوم | فروشگاه لوازم خانگی", - description: "فروشگاه آنلاین لوازم خانگی — یخچال، لباسشویی، تلویزیون و بیشتر", -}; +export async function generateMetadata(): Promise { + const businessInfo = await getBusinessInfo(); + return { + title: "سانی‌هوم | فروشگاه لوازم خانگی", + description: "فروشگاه آنلاین لوازم خانگی — یخچال، لباسشویی، تلویزیون و بیشتر", + icons: businessInfo?.faviconUrl ? [{ url: businessInfo.faviconUrl }] : undefined, + }; +} export default async function RootLayout({ children }: LayoutProps<"/">) { const [categoryTree, categories, businessInfo] = await Promise.all([ @@ -48,7 +52,7 @@ export default async function RootLayout({ children }: LayoutProps<"/">) { -
+
{children}
diff --git a/src/app/page.tsx b/src/app/page.tsx index 8ee47cb..55f5a3e 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,19 +1,15 @@ import { FeatureBar } from "@/components/home/FeatureBar"; import { HeroSlider } from "@/components/home/HeroSlider"; import { FeaturedCategories } from "@/components/home/FeaturedCategories"; -import { SpecialSaleCarousel } from "@/components/home/SpecialSaleCarousel"; +import { StoreSpecialCarousels } from "@/components/home/StoreSpecialCarousels"; import { TwoBanners } from "@/components/home/TwoBanners"; -import { TopSellingCarousel } from "@/components/home/TopSellingCarousel"; import { ThreeBanners } from "@/components/home/ThreeBanners"; -import { BrandGroupCarousels } from "@/components/home/BrandGroupCarousels"; import { AboutSanihome } from "@/components/home/AboutSanihome"; import { BlogCarousel } from "@/components/home/BlogCarousel"; import { getBlogs, getBusinessInfo, getCategories, - getProducts, - getBrandGroups, getStoreSpecials, getStaticImageSlots, imagesForSlot, @@ -21,26 +17,15 @@ import { } from "@/lib/meshkee"; export default async function Home() { - const [ - categories, - storeSpecials, - productsResult, - brandGroups, - staticImageSlots, - businessInfo, - blogsResult, - ] = await Promise.all([ + const [categories, storeSpecials, staticImageSlots, businessInfo, blogsResult] = await Promise.all([ getCategories(), getStoreSpecials(), - getProducts({ pageSize: 12 }), - getBrandGroups(), getStaticImageSlots(), getBusinessInfo(), getBlogs({ pageSize: 8 }), ]); const contactPhone = businessInfo?.phoneNumbers[0]; - const specialSaleProducts = storeSpecials[0]?.items ?? []; const twoBannerSlot = staticImageSlots.find((slot) => slot.key === STATIC_IMAGE_KEYS.twoBanner); const threeBannerSlot = staticImageSlots.find( (slot) => slot.key === STATIC_IMAGE_KEYS.threeBannerRow, @@ -51,19 +36,17 @@ export default async function Home() { return ( <> - - + + - - diff --git a/src/components/home/FeaturedCategories.tsx b/src/components/home/FeaturedCategories.tsx index a7c89c3..9cecae2 100644 --- a/src/components/home/FeaturedCategories.tsx +++ b/src/components/home/FeaturedCategories.tsx @@ -4,7 +4,6 @@ import { Swiper, SwiperSlide } from "swiper/react"; import { FreeMode } from "swiper/modules"; import "swiper/css"; import "swiper/css/free-mode"; -import { SectionTitle } from "@/components/ui/SectionTitle"; import { EmptyState } from "@/components/ui/EmptyState"; import type { Category, StaticImageWithUrl } from "@/lib/meshkee"; @@ -36,11 +35,6 @@ export function FeaturedCategories({ return (
- {images.length > 0 ? (
-
- S -
- - SANIHOME - + {businessInfo?.logoDarkUrl || businessInfo?.logoUrl ? ( + // eslint-disable-next-line @next/next/no-img-element + {businessInfo.nameFa + ) : ( + + SANIHOME + + )}
{businessInfo?.about && (

{businessInfo.about}

diff --git a/src/components/home/Header.tsx b/src/components/home/Header.tsx index 483213d..e8c2488 100644 --- a/src/components/home/Header.tsx +++ b/src/components/home/Header.tsx @@ -17,12 +17,12 @@ const navLinks = [ const LOGIN_URL = "https://customer.sanihome.ir"; -function Logo({ large = false }: { large?: boolean }) { +function Logo({ src, large = false }: { src?: string | null; large?: boolean }) { return ( {/* eslint-disable-next-line @next/next/no-img-element */} سانی‌هوم void; categoryTree: CategoryTreeGroup[]; + logoUrl?: string | null; }) { const [categoriesOpen, setCategoriesOpen] = useState(false); const [mounted, setMounted] = useState(false); @@ -100,7 +102,7 @@ function MobileDrawer({ }`} >
- +
- +
- +
@@ -360,6 +364,7 @@ export function Header({ open={drawerOpen} onClose={() => setDrawerOpen(false)} categoryTree={categoryTree} + logoUrl={logoUrl} />
); diff --git a/src/components/home/SpecialSaleCarousel.tsx b/src/components/home/SpecialSaleCarousel.tsx deleted file mode 100644 index 66ff990..0000000 --- a/src/components/home/SpecialSaleCarousel.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { Carousel } from "@/components/ui/Carousel"; -import { Placeholder } from "@/components/ui/Placeholder"; -import { ProductCard } from "@/components/ui/ProductCard"; -import { SectionTitle } from "@/components/ui/SectionTitle"; -import { EmptyState } from "@/components/ui/EmptyState"; -import { productHref, type Product } from "@/lib/meshkee"; - -function SpecialSaleBanner() { - return ( - - - - ); -} - -export function SpecialSaleCarousel({ - products, - contactPhone, -}: { - products: Product[]; - contactPhone?: string; -}) { - return ( -
-
- - {products.length === 0 ? ( - - ) : ( - - - {products.map((product) => ( - - ))} - - )} -
-
- ); -} diff --git a/src/components/home/BrandGroupCarousels.tsx b/src/components/home/StoreSpecialCarousels.tsx similarity index 63% rename from src/components/home/BrandGroupCarousels.tsx rename to src/components/home/StoreSpecialCarousels.tsx index 6174403..717fc3d 100644 --- a/src/components/home/BrandGroupCarousels.tsx +++ b/src/components/home/StoreSpecialCarousels.tsx @@ -1,33 +1,29 @@ import { Carousel } from "@/components/ui/Carousel"; import { ProductCard } from "@/components/ui/ProductCard"; import { SectionTitle } from "@/components/ui/SectionTitle"; -import { EmptyState } from "@/components/ui/EmptyState"; import { productHref, type ProductGroup } from "@/lib/meshkee"; -export function BrandGroupCarousels({ - brandGroups, +// Renders every admin-managed carousel from GET /store-specials — whatever +// groups exist there, in their configured order. Nothing here is keyed off +// a specific group id/key/title, so a new carousel created in the Meshkee +// dashboard (any name) shows up on the homepage automatically, with no code +// change. Groups with no items are skipped (honest empty state — no heading +// over nothing). +export function StoreSpecialCarousels({ + groups, contactPhone, }: { - brandGroups: ProductGroup[]; + groups: ProductGroup[]; contactPhone?: string; }) { - if (brandGroups.length === 0) { - return ( -
-
- - -
-
- ); - } + const visibleGroups = groups.filter((group) => group.items.length > 0); return ( <> - {brandGroups.map((group) => ( + {visibleGroups.map((group) => (
- + {group.items.map((product) => ( -
- - {products.length === 0 ? ( - - ) : ( - - {products.map((product) => ( - - ))} - - )} -
-
- ); -} diff --git a/src/components/ui/SectionTitle.tsx b/src/components/ui/SectionTitle.tsx index 12047d2..4339b4f 100644 --- a/src/components/ui/SectionTitle.tsx +++ b/src/components/ui/SectionTitle.tsx @@ -1,6 +1,6 @@ type SectionTitleProps = { title: string; - enTitle: string; + enTitle?: string; subtitle?: string; action?: string; }; @@ -11,13 +11,15 @@ export function SectionTitle({ title, enTitle, subtitle, action }: SectionTitleP

{title}

- - {enTitle} - + {enTitle && ( + + {enTitle} + + )}
{subtitle && (

{subtitle}

diff --git a/src/lib/meshkee.ts b/src/lib/meshkee.ts index 37b1847..e3b7ca9 100644 --- a/src/lib/meshkee.ts +++ b/src/lib/meshkee.ts @@ -51,6 +51,7 @@ export type BusinessInfo = { about: string; vision: string; logoUrl: string | null; + logoDarkUrl: string | null; faviconUrl: string | null; emails: string[]; phoneNumbers: string[]; @@ -490,27 +491,28 @@ export type ProductGroup = { id: string; key: string; title: string; + sortOrder: number; items: Product[]; }; function normalizeProductGroups(items: Record[] | undefined): ProductGroup[] { - return (items ?? []).map((group) => ({ - id: String(group.id ?? group.key ?? ""), - key: String(group.key ?? group.id ?? ""), - title: String(group.title ?? ""), - items: Array.isArray(group.items) - ? (group.items as Record[]).map(normalizeProduct) - : [], - })); -} - -export async function getBrandGroups(): Promise { - const res = await apiGet<{ items: Record[] }>( - `/tenants/${DOMAIN}/website/brand-groups`, - ); - return normalizeProductGroups(res?.items); + return (items ?? []) + .map((group) => ({ + id: String(group.id ?? group.key ?? ""), + key: String(group.key ?? group.id ?? ""), + title: String(group.title ?? ""), + sortOrder: Number(group.sortOrder ?? 0), + items: Array.isArray(group.items) + ? (group.items as Record[]).map(normalizeProduct) + : [], + })) + .sort((a, b) => a.sortOrder - b.sortOrder); } +// Admin-managed, named product carousels ("Special Sale", "پرفروش‌ها", +// "بهترین‌ها از نگاه شما", ...) — the whole list, not a fixed set of known +// keys, so a new one created in the dashboard shows up on the homepage +// automatically. See StoreSpecialCarousels.tsx. export async function getStoreSpecials(): Promise { const res = await apiGet<{ items: Record[] }>( `/tenants/${DOMAIN}/store-specials`,