diff --git a/app/globals.css b/app/globals.css index 21bbc4a01..dd16d793c 100644 --- a/app/globals.css +++ b/app/globals.css @@ -13,3 +13,16 @@ input, button { @apply focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 focus-visible:ring-offset-neutral-50 dark:focus-visible:ring-neutral-600 dark:focus-visible:ring-offset-neutral-900; } + +@layer utilities { + /* Hide scrollbar for WebKit browsers */ + .hide-scrollbar::-webkit-scrollbar { + display: none; + } + + /* Hide scrollbar for Firefox */ + .hide-scrollbar { + -ms-overflow-style: none; /* Internet Explorer 10+ */ + scrollbar-width: none; /* Firefox */ + } +} diff --git a/app/layout.tsx b/app/layout.tsx index 0ffff8bd6..a5cd58c84 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -35,7 +35,7 @@ export const metadata = { export default async function RootLayout({ children }: { children: ReactNode }) { return ( - +
diff --git a/app/page.tsx b/app/page.tsx index 453a47708..a71d8df8f 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -34,7 +34,7 @@ export default async function HomePage() { - + diff --git a/app/product/[handle]/page.tsx b/app/product/[handle]/page.tsx index 8a9ef69b5..29e07422c 100644 --- a/app/product/[handle]/page.tsx +++ b/app/product/[handle]/page.tsx @@ -81,12 +81,16 @@ export default async function ProductPage({ params }: { params: { handle: string __html: JSON.stringify(productJsonLd) }} /> -
+
-
+
+ +
+ +
@@ -100,18 +104,12 @@ export default async function ProductPage({ params }: { params: { handle: string />
- -
- -
- -
- +
); } diff --git a/app/search/[collection]/page.tsx b/app/search/[collection]/page.tsx index f0504c129..cc8615ac5 100644 --- a/app/search/[collection]/page.tsx +++ b/app/search/[collection]/page.tsx @@ -4,8 +4,10 @@ import { notFound } from 'next/navigation'; import Breadcrumb from 'components/breadcrumb'; import BreadcrumbHome from 'components/breadcrumb/breadcrumb-home'; +import FAQ from 'components/faq'; import YMMFilters, { YMMFiltersPlaceholder } from 'components/filters'; import Grid from 'components/grid'; +import Manufacturers from 'components/home-page/manufacturers'; import ProductsList from 'components/layout/products-list'; import { getProductsInCollection } from 'components/layout/products-list/actions'; import FiltersContainer, { @@ -14,6 +16,7 @@ import FiltersContainer, { import MobileFilters from 'components/layout/search/filters/mobile-filters'; import SubMenu from 'components/layout/search/filters/sub-menu'; import Header, { HeaderPlaceholder } from 'components/layout/search/header'; +import HelpfulLinks from 'components/layout/search/helpful-links'; import ProductsGridPlaceholder from 'components/layout/search/placeholder'; import SortingMenu from 'components/layout/search/sorting-menu'; import { Suspense } from 'react'; @@ -58,7 +61,7 @@ async function CategoryPage({ } />
- + {products.length === 0 ? (

{`No products found in this collection`}

) : ( @@ -80,37 +83,53 @@ export default async function CategorySearchPage(props: { searchParams?: { [key: string]: string | string[] | undefined }; }) { return ( -
- +
+
+ } key={`breadcrumb-${props.params.collection}`}> + + +
+ } key={`header-${props.params.collection}`}> +
+ - } - key={`products-${props.params.collection}`} - > - - + } + key={`products-${props.params.collection}`} + > + + +
+
- + + + + + ); } diff --git a/app/search/layout.tsx b/app/search/layout.tsx index a3ebd12a5..6e94144e3 100644 --- a/app/search/layout.tsx +++ b/app/search/layout.tsx @@ -1,12 +1,10 @@ import Footer from 'components/layout/footer'; -import { Suspense } from 'react'; export default function SearchLayout({ children }: { children: React.ReactNode }) { return ( <> -
- {children} -
+
{children}
+