diff --git a/app/layout.tsx b/app/layout.tsx index dca2c624f..95e62e5bc 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -33,7 +33,7 @@ const inter = Inter({ export default async function RootLayout({ children }: { children: ReactNode }) { return ( - +
{children}
diff --git a/components/carousel.tsx b/components/carousel.tsx index d86d17f45..b6b7a1271 100644 --- a/components/carousel.tsx +++ b/components/carousel.tsx @@ -1,6 +1,7 @@ import { getCollectionProducts } from 'lib/shopify'; import Image from 'next/image'; import Link from 'next/link'; +import Price from './price'; export async function Carousel() { // Collections that start with `hidden-*` are hidden from the search page. @@ -9,27 +10,32 @@ export async function Carousel() { if (!products?.length) return null; return ( -
-
+
+
{[...products, ...products].map((product, i) => ( {product.featuredImage ? ( {product.title} ) : null} -
-
+
+

{product.title} -

+ +
))} diff --git a/components/grid/index.tsx b/components/grid/index.tsx index 07dc0d2a9..346a7833b 100644 --- a/components/grid/index.tsx +++ b/components/grid/index.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; function Grid(props: React.ComponentProps<'ul'>) { return ( -
    +
      {props.children}
    ); diff --git a/components/grid/three-items.tsx b/components/grid/three-items.tsx index 2280de26e..f0a34a375 100644 --- a/components/grid/three-items.tsx +++ b/components/grid/three-items.tsx @@ -3,26 +3,18 @@ import { getCollectionProducts } from 'lib/shopify'; import type { Product } from 'lib/shopify/types'; import Link from 'next/link'; -function ThreeItemGridItem({ - item, - size, - background -}: { - item: Product; - size: 'full' | 'half'; - background: 'white' | 'pink' | 'purple' | 'black'; -}) { +function ThreeItemGridItem({ item, size }: { item: Product; size: 'full' | 'half' }) { return (
    - + - - - +
    + + +
    ); } diff --git a/components/grid/tile.tsx b/components/grid/tile.tsx index b2f219276..d8b5589fd 100644 --- a/components/grid/tile.tsx +++ b/components/grid/tile.tsx @@ -5,14 +5,14 @@ import Price from 'components/price'; export function GridTileImage({ isInteractive = true, - background, active, + labelPosition, labels, ...props }: { isInteractive?: boolean; - background?: 'white' | 'pink' | 'purple' | 'black' | 'purple-dark' | 'blue' | 'cyan' | 'gray'; active?: boolean; + labelPosition?: 'bottom' | 'center'; labels?: { title: string; amount: string; @@ -22,21 +22,15 @@ export function GridTileImage({ } & React.ComponentProps) { return (
    {active !== undefined && active ? ( - + ) : null} {props.src ? ( ) : null} {labels ? ( -
    +

    {labels.title}