From 51431f7fa3f7cd2a6f389ca66a09507095f211d8 Mon Sep 17 00:00:00 2001 From: StephDietz Date: Wed, 12 Jul 2023 10:40:08 -0500 Subject: [PATCH] tile merge --- app/layout.tsx | 2 +- components/carousel.tsx | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/layout.tsx b/app/layout.tsx index 74bbc1866..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 2a8d2526f..9607229e5 100644 --- a/components/carousel.tsx +++ b/components/carousel.tsx @@ -1,7 +1,11 @@ import { getCollectionProducts } from 'lib/shopify'; import Image from 'next/image'; import Link from 'next/link'; +<<<<<<< HEAD import Label from './label'; +======= +import Price from './price'; +>>>>>>> 27a839e (home page updated UI design) export async function Carousel() { // Collections that start with `hidden-*` are hidden from the search page. @@ -10,8 +14,8 @@ export async function Carousel() { if (!products?.length) return null; return ( -
-
+
+
{[...products, ...products].map((product, i) => (