diff --git a/core/app/[locale]/(default)/_components/slideshow/commercia-slide.png b/core/app/[locale]/(default)/_components/slideshow/commercia-slide.png new file mode 100644 index 0000000000..2d792923da Binary files /dev/null and b/core/app/[locale]/(default)/_components/slideshow/commercia-slide.png differ diff --git a/core/app/[locale]/(default)/_components/slideshow/index.tsx b/core/app/[locale]/(default)/_components/slideshow/index.tsx index 7e47520989..57aa3ecb35 100644 --- a/core/app/[locale]/(default)/_components/slideshow/index.tsx +++ b/core/app/[locale]/(default)/_components/slideshow/index.tsx @@ -2,9 +2,7 @@ import { useTranslations } from 'next-intl'; import { Slideshow as SlideshowSection } from '~/vibes/soul/sections/slideshow'; -import SlideBg01 from './slide-bg-01.jpg'; -import SlideBg02 from './slide-bg-02.jpg'; -import SlideBg03 from './slide-bg-03.jpg'; +import SlideBg01 from './commercia-slide.png'; export function Slideshow() { const t = useTranslations('Home.Slideshow'); @@ -23,32 +21,6 @@ export function Slideshow() { label: t('Slide01.cta'), }, }, - { - title: t('Slide02.title'), - image: { - src: SlideBg02.src, - alt: t('Slide02.alt'), - blurDataUrl: SlideBg02.blurDataURL, - }, - description: t('Slide02.description'), - cta: { - href: '/shop-all', - label: t('Slide02.cta'), - }, - }, - { - title: t('Slide03.title'), - image: { - src: SlideBg03.src, - alt: t('Slide03.alt'), - blurDataUrl: SlideBg03.blurDataURL, - }, - description: t('Slide03.description'), - cta: { - href: '/shop-all', - label: t('Slide03.cta'), - }, - }, ]; return ; diff --git a/core/app/[locale]/(default)/cart/page-data.ts b/core/app/[locale]/(default)/cart/page-data.ts index c6e47636dc..9c00df8d75 100644 --- a/core/app/[locale]/(default)/cart/page-data.ts +++ b/core/app/[locale]/(default)/cart/page-data.ts @@ -115,6 +115,12 @@ export const DigitalItemFragment = graphql(` } } url + stockPosition { + backorderMessage + quantityOnHand + quantityBackordered + quantityOutOfStock + } } `); diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx index bc07f3d473..fd4111dea6 100644 --- a/core/app/[locale]/(default)/cart/page.tsx +++ b/core/app/[locale]/(default)/cart/page.tsx @@ -127,43 +127,40 @@ export default async function Cart({ params }: Props) { let inventoryMessages; - if (item.__typename === 'CartPhysicalItem') { - if (item.stockPosition?.quantityOutOfStock === item.quantity) { - inventoryMessages = { - outOfStockMessage: data.site.settings?.inventory?.showOutOfStockMessage - ? data.site.settings.inventory.defaultOutOfStockMessage + if (item.stockPosition?.quantityOutOfStock === item.quantity) { + inventoryMessages = { + outOfStockMessage: data.site.settings?.inventory?.showOutOfStockMessage + ? data.site.settings.inventory.defaultOutOfStockMessage + : undefined, + }; + } else { + inventoryMessages = { + quantityReadyToShipMessage: + data.site.settings?.inventory?.showQuantityOnHand && !!item.stockPosition?.quantityOnHand + ? t('quantityReadyToShip', { + quantity: Number(item.stockPosition.quantityOnHand), + }) : undefined, - }; - } else { - inventoryMessages = { - quantityReadyToShipMessage: - data.site.settings?.inventory?.showQuantityOnHand && - !!item.stockPosition?.quantityOnHand - ? t('quantityReadyToShip', { - quantity: Number(item.stockPosition.quantityOnHand), - }) - : undefined, - quantityBackorderedMessage: - data.site.settings?.inventory?.showQuantityOnBackorder && - !!item.stockPosition?.quantityBackordered - ? t('quantityOnBackorder', { - quantity: Number(item.stockPosition.quantityBackordered), - }) - : undefined, - quantityOutOfStockMessage: - data.site.settings?.inventory?.showOutOfStockMessage && - !!item.stockPosition?.quantityOutOfStock - ? t('partiallyAvailable', { - quantity: item.quantity - Number(item.stockPosition.quantityOutOfStock), - }) - : undefined, - backorderMessage: - data.site.settings?.inventory?.showBackorderMessage && - !!item.stockPosition?.quantityBackordered - ? (item.stockPosition.backorderMessage ?? undefined) - : undefined, - }; - } + quantityBackorderedMessage: + data.site.settings?.inventory?.showQuantityOnBackorder && + !!item.stockPosition?.quantityBackordered + ? t('quantityOnBackorder', { + quantity: Number(item.stockPosition.quantityBackordered), + }) + : undefined, + quantityOutOfStockMessage: + data.site.settings?.inventory?.showOutOfStockMessage && + !!item.stockPosition?.quantityOutOfStock + ? t('partiallyAvailable', { + quantity: item.quantity - Number(item.stockPosition.quantityOutOfStock), + }) + : undefined, + backorderMessage: + data.site.settings?.inventory?.showBackorderMessage && + !!item.stockPosition?.quantityBackordered + ? (item.stockPosition.backorderMessage ?? undefined) + : undefined, + }; } return { diff --git a/core/messages/en.json b/core/messages/en.json index 1f09a50589..35768135b9 100644 --- a/core/messages/en.json +++ b/core/messages/en.json @@ -2,9 +2,9 @@ "Home": { "Slideshow": { "Slide01": { - "title": "Fresh finds for every occasion", - "description": "Explore our latest arrivals, curated to bring you style, functionality, and inspiration. Shop now and discover your next favorite.", - "alt": "Five small potted plants displayed on beige stacked blocks, featuring a variety of green foliage in dark gray pots against a neutral background.", + "title": "WELCOME TO COMMERCIA!", + "description": "A new nation state, structured for stability.", + "alt": "A new nation state, structured for stability.", "cta": "Shop Now" }, "Slide02": { diff --git a/core/vibes/soul/sections/slideshow/index.tsx b/core/vibes/soul/sections/slideshow/index.tsx index f98a1c5fa3..e5e17d95d9 100644 --- a/core/vibes/soul/sections/slideshow/index.tsx +++ b/core/vibes/soul/sections/slideshow/index.tsx @@ -225,52 +225,58 @@ export function Slideshow({ slides, playOnInit = true, interval = 5000, classNam resetAutoplay(); }} > -
- {/* White Bar - Current Index Indicator / Progress Bar */} -
- {/* Grey Bar BG */} -
-
+ {slides.length > 1 && ( +
+ {/* White Bar - Current Index Indicator / Progress Bar */} +
+ {/* Grey Bar BG */} +
+
+ )} ); })} {/* Carousel Count - "01/03" */} - - {selectedIndex + 1 < 10 ? `0${selectedIndex + 1}` : selectedIndex + 1}/ - {slides.length < 10 ? `0${slides.length}` : slides.length} - + {slides.length > 1 && ( + + {selectedIndex + 1 < 10 ? `0${selectedIndex + 1}` : selectedIndex + 1}/ + {slides.length < 10 ? `0${slides.length}` : slides.length} + + )} {/* Stop / Start Button */} - + {slides.length > 1 && ( + + )}
);