From a2c8ca6b61907915c856125de9a30d701df41798 Mon Sep 17 00:00:00 2001
From: Jieren Chen <jieren.chen@gmail.com>
Date: Fri, 20 Sep 2024 10:34:32 -0400
Subject: [PATCH] clean out all the stuff we don't use

---
 .env.example                                  |  14 +--
 app/[page]/layout.tsx                         |  12 ---
 app/[page]/opengraph-image.tsx                |  11 --
 app/[page]/page.tsx                           |  45 --------
 app/search/[collection]/opengraph-image.tsx   |  11 --
 app/search/[collection]/page.tsx              |  48 ---------
 app/search/children-wrapper.tsx               |  10 --
 app/search/layout.tsx                         |  24 -----
 app/search/loading.tsx                        |  18 ----
 app/search/page.tsx                           |  39 -------
 components/cart/add-to-cart.tsx               |   2 +-
 components/cart/cart-context.tsx              |   3 +-
 components/cart/delete-item-button.tsx        |   2 +-
 components/cart/edit-item-quantity-button.tsx |   2 +-
 components/cart/open-cart.tsx                 |   2 +-
 components/layout/footer-menu.tsx             |   2 +-
 components/layout/navbar/currency.tsx         |   2 +-
 components/layout/navbar/index.tsx            |  35 +-----
 components/layout/navbar/mobile-menu.tsx      | 100 ------------------
 components/layout/navbar/search.tsx           |  40 -------
 components/layout/product-grid-items.tsx      |   2 +-
 components/product/gallery.tsx                |   2 +-
 components/product/product-description.tsx    |   2 +-
 components/product/variant-selector.tsx       |   2 +-
 components/wrapper.tsx                        |   2 +-
 lib/fourthwall/index.ts                       |   2 +-
 26 files changed, 23 insertions(+), 411 deletions(-)
 delete mode 100644 app/[page]/layout.tsx
 delete mode 100644 app/[page]/opengraph-image.tsx
 delete mode 100644 app/[page]/page.tsx
 delete mode 100644 app/search/[collection]/opengraph-image.tsx
 delete mode 100644 app/search/[collection]/page.tsx
 delete mode 100644 app/search/children-wrapper.tsx
 delete mode 100644 app/search/layout.tsx
 delete mode 100644 app/search/loading.tsx
 delete mode 100644 app/search/page.tsx
 delete mode 100644 components/layout/navbar/mobile-menu.tsx
 delete mode 100644 components/layout/navbar/search.tsx

diff --git a/.env.example b/.env.example
index 9ff0463db..292128a6a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,7 @@
-COMPANY_NAME="Vercel Inc."
-TWITTER_CREATOR="@vercel"
-TWITTER_SITE="https://nextjs.org/commerce"
-SITE_NAME="Next.js Commerce"
-SHOPIFY_REVALIDATION_SECRET=""
-SHOPIFY_STOREFRONT_ACCESS_TOKEN=""
-SHOPIFY_STORE_DOMAIN="[your-shopify-store-subdomain].myshopify.com"
+# API specifics
+NEXT_PUBLIC_FW_API_URL="https://api.staging.fourthwall.com"
+
+# Site specifics
+NEXT_PUBLIC_FW_COLLECTION="launch"
+NEXT_PUBLIC_FW_PUBLIC_TOKEN=""
+NEXT_PUBLIC_FW_CHECKOUT="https://jieren-shop.staging.fourthwall.com"
diff --git a/app/[page]/layout.tsx b/app/[page]/layout.tsx
deleted file mode 100644
index 50614b5b1..000000000
--- a/app/[page]/layout.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import Footer from 'components/layout/footer';
-
-export default function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <>
-      <div className="w-full">
-        <div className="mx-8 max-w-2xl py-20 sm:mx-auto">{children}</div>
-      </div>
-      <Footer />
-    </>
-  );
-}
diff --git a/app/[page]/opengraph-image.tsx b/app/[page]/opengraph-image.tsx
deleted file mode 100644
index 2fd59281e..000000000
--- a/app/[page]/opengraph-image.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import OpengraphImage from 'components/opengraph-image';
-import { getPage } from 'lib/shopify';
-
-export const runtime = 'edge';
-
-export default async function Image({ params }: { params: { page: string } }) {
-  const page = await getPage(params.page);
-  const title = page.seo?.title || page.title;
-
-  return await OpengraphImage({ title });
-}
diff --git a/app/[page]/page.tsx b/app/[page]/page.tsx
deleted file mode 100644
index 02aaf1366..000000000
--- a/app/[page]/page.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { Metadata } from 'next';
-
-import Prose from 'components/prose';
-import { getPage } from 'lib/shopify';
-import { notFound } from 'next/navigation';
-
-export async function generateMetadata({
-  params
-}: {
-  params: { page: string };
-}): Promise<Metadata> {
-  const page = await getPage(params.page);
-
-  if (!page) return notFound();
-
-  return {
-    title: page.seo?.title || page.title,
-    description: page.seo?.description || page.bodySummary,
-    openGraph: {
-      publishedTime: page.createdAt,
-      modifiedTime: page.updatedAt,
-      type: 'article'
-    }
-  };
-}
-
-export default async function Page({ params }: { params: { page: string } }) {
-  const page = await getPage(params.page);
-
-  if (!page) return notFound();
-
-  return (
-    <>
-      <h1 className="mb-8 text-5xl font-bold">{page.title}</h1>
-      <Prose className="mb-8" html={page.body as string} />
-      <p className="text-sm italic">
-        {`This document was last updated on ${new Intl.DateTimeFormat(undefined, {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric'
-        }).format(new Date(page.updatedAt))}.`}
-      </p>
-    </>
-  );
-}
diff --git a/app/search/[collection]/opengraph-image.tsx b/app/search/[collection]/opengraph-image.tsx
deleted file mode 100644
index 9eb9c47f7..000000000
--- a/app/search/[collection]/opengraph-image.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import OpengraphImage from 'components/opengraph-image';
-import { getCollection } from 'lib/shopify';
-
-export const runtime = 'edge';
-
-export default async function Image({ params }: { params: { collection: string } }) {
-  const collection = await getCollection(params.collection);
-  const title = collection?.seo?.title || collection?.title;
-
-  return await OpengraphImage({ title });
-}
diff --git a/app/search/[collection]/page.tsx b/app/search/[collection]/page.tsx
deleted file mode 100644
index c0fc6816f..000000000
--- a/app/search/[collection]/page.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { getCollection } from 'lib/shopify';
-import { Metadata } from 'next';
-import { notFound } from 'next/navigation';
-
-import Grid from 'components/grid';
-import ProductGridItems from 'components/layout/product-grid-items';
-import { defaultSort, sorting } from 'lib/constants';
-import { getCollectionProducts } from 'lib/fourthwall';
-
-export async function generateMetadata({
-  params
-}: {
-  params: { collection: string };
-}): Promise<Metadata> {
-  const collection = await getCollection(params.collection);
-
-  if (!collection) return notFound();
-
-  return {
-    title: collection.seo?.title || collection.title,
-    description:
-      collection.seo?.description || collection.description || `${collection.title} products`
-  };
-}
-
-export default async function CategoryPage({
-  params,
-  searchParams
-}: {
-  params: { collection: string };
-  searchParams?: { [key: string]: string | string[] | undefined };
-}) {
-  const { sort } = searchParams as { [key: string]: string };
-  const { sortKey, reverse } = sorting.find((item) => item.slug === sort) || defaultSort;
-  const products = await getCollectionProducts({ collection: params.collection, sortKey, reverse });
-
-  return (
-    <section>
-      {products.length === 0 ? (
-        <p className="py-3 text-lg">{`No products found in this collection`}</p>
-      ) : (
-        <Grid className="grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
-          <ProductGridItems products={products} />
-        </Grid>
-      )}
-    </section>
-  );
-}
diff --git a/app/search/children-wrapper.tsx b/app/search/children-wrapper.tsx
deleted file mode 100644
index 8d345b511..000000000
--- a/app/search/children-wrapper.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-'use client';
-
-import { useSearchParams } from 'next/navigation';
-import { Fragment } from 'react';
-
-// Ensure children are re-rendered when the search query changes
-export default function ChildrenWrapper({ children }: { children: React.ReactNode }) {
-  const searchParams = useSearchParams();
-  return <Fragment key={searchParams.get('q')}>{children}</Fragment>;
-}
diff --git a/app/search/layout.tsx b/app/search/layout.tsx
deleted file mode 100644
index 1af30ab58..000000000
--- a/app/search/layout.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import Footer from 'components/layout/footer';
-import Collections from 'components/layout/search/collections';
-import FilterList from 'components/layout/search/filter';
-import { sorting } from 'lib/constants';
-import ChildrenWrapper from './children-wrapper';
-
-export default function SearchLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <>
-      <div className="mx-auto flex max-w-screen-2xl flex-col gap-8 px-4 pb-4 text-black md:flex-row dark:text-white">
-        <div className="order-first w-full flex-none md:max-w-[125px]">
-          <Collections />
-        </div>
-        <div className="order-last min-h-screen w-full md:order-none">
-          <ChildrenWrapper>{children}</ChildrenWrapper>
-        </div>
-        <div className="order-none flex-none md:order-last md:w-[125px]">
-          <FilterList list={sorting} title="Sort by" />
-        </div>
-      </div>
-      <Footer />
-    </>
-  );
-}
diff --git a/app/search/loading.tsx b/app/search/loading.tsx
deleted file mode 100644
index fa87c53f3..000000000
--- a/app/search/loading.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import Grid from 'components/grid';
-
-export default function Loading() {
-  return (
-    <>
-      <div className="mb-4 h-6" />
-      <Grid className="grid-cols-2 lg:grid-cols-3">
-        {Array(12)
-          .fill(0)
-          .map((_, index) => {
-            return (
-              <Grid.Item key={index} className="animate-pulse bg-neutral-100 dark:bg-neutral-800" />
-            );
-          })}
-      </Grid>
-    </>
-  );
-}
diff --git a/app/search/page.tsx b/app/search/page.tsx
deleted file mode 100644
index 60f11b189..000000000
--- a/app/search/page.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import Grid from 'components/grid';
-import ProductGridItems from 'components/layout/product-grid-items';
-import { defaultSort, sorting } from 'lib/constants';
-import { getProducts } from 'lib/shopify';
-
-export const metadata = {
-  title: 'Search',
-  description: 'Search for products in the store.'
-};
-
-export default async function SearchPage({
-  searchParams
-}: {
-  searchParams?: { [key: string]: string | string[] | undefined };
-}) {
-  const { sort, q: searchValue } = searchParams as { [key: string]: string };
-  const { sortKey, reverse } = sorting.find((item) => item.slug === sort) || defaultSort;
-
-  const products = await getProducts({ sortKey, reverse, query: searchValue });
-  const resultsText = products.length > 1 ? 'results' : 'result';
-
-  return (
-    <>
-      {searchValue ? (
-        <p className="mb-4">
-          {products.length === 0
-            ? 'There are no products that match '
-            : `Showing ${products.length} ${resultsText} for `}
-          <span className="font-bold">&quot;{searchValue}&quot;</span>
-        </p>
-      ) : null}
-      {products.length > 0 ? (
-        <Grid className="grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
-          <ProductGridItems products={products} />
-        </Grid>
-      ) : null}
-    </>
-  );
-}
diff --git a/components/cart/add-to-cart.tsx b/components/cart/add-to-cart.tsx
index 22cb62893..c77261ce9 100644
--- a/components/cart/add-to-cart.tsx
+++ b/components/cart/add-to-cart.tsx
@@ -4,7 +4,7 @@ import { PlusIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
 import { addItem } from 'components/cart/actions';
 import { useProduct } from 'components/product/product-context';
-import { Product, ProductVariant } from 'lib/shopify/types';
+import { Product, ProductVariant } from 'lib/types';
 import { useFormState } from 'react-dom';
 import { useCart } from './cart-context';
 
diff --git a/components/cart/cart-context.tsx b/components/cart/cart-context.tsx
index a310d4dc7..29ece7779 100644
--- a/components/cart/cart-context.tsx
+++ b/components/cart/cart-context.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import type { Cart, CartItem, Product, ProductVariant } from 'lib/shopify/types';
+import type { Cart, CartItem, Product, ProductVariant } from 'lib/types';
 import React, { createContext, use, useContext, useMemo, useOptimistic } from 'react';
 
 type UpdateType = 'plus' | 'minus' | 'delete';
@@ -94,6 +94,7 @@ function createEmptyCart(): Cart {
     checkoutUrl: '',
     totalQuantity: 0,
     lines: [],
+    currency: 'USD',
     cost: {
       subtotalAmount: { amount: '0', currencyCode: 'USD' },
       totalAmount: { amount: '0', currencyCode: 'USD' },
diff --git a/components/cart/delete-item-button.tsx b/components/cart/delete-item-button.tsx
index fb2aa310b..6763453ad 100644
--- a/components/cart/delete-item-button.tsx
+++ b/components/cart/delete-item-button.tsx
@@ -2,7 +2,7 @@
 
 import { XMarkIcon } from '@heroicons/react/24/outline';
 import { removeItem } from 'components/cart/actions';
-import type { CartItem } from 'lib/shopify/types';
+import type { CartItem } from 'lib/types';
 import { useFormState } from 'react-dom';
 
 export function DeleteItemButton({
diff --git a/components/cart/edit-item-quantity-button.tsx b/components/cart/edit-item-quantity-button.tsx
index 28ac78ba5..ea7604323 100644
--- a/components/cart/edit-item-quantity-button.tsx
+++ b/components/cart/edit-item-quantity-button.tsx
@@ -3,7 +3,7 @@
 import { MinusIcon, PlusIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
 import { updateItemQuantity } from 'components/cart/actions';
-import type { CartItem } from 'lib/shopify/types';
+import type { CartItem } from 'lib/types';
 import { useFormState } from 'react-dom';
 
 function SubmitButton({ type }: { type: 'plus' | 'minus' }) {
diff --git a/components/cart/open-cart.tsx b/components/cart/open-cart.tsx
index 902dc4f98..bbe989ac6 100644
--- a/components/cart/open-cart.tsx
+++ b/components/cart/open-cart.tsx
@@ -9,7 +9,7 @@ export default function OpenCart({
   quantity?: number;
 }) {
   return (
-    <div className="relative flex h-11 w-11 items-center justify-center rounded-md border border-neutral-200 text-black transition-colors dark:border-neutral-700 dark:text-white">
+    <div className="relative flex h-11 w-11 items-center justify-center rounded-md border border-neutral-200 text-black transition-colors hover:bg-gray-50 dark:border-neutral-700 dark:text-white">
       <ShoppingCartIcon
         className={clsx('h-4 transition-all ease-in-out hover:scale-110', className)}
       />
diff --git a/components/layout/footer-menu.tsx b/components/layout/footer-menu.tsx
index 8b6c722f2..c5cd61035 100644
--- a/components/layout/footer-menu.tsx
+++ b/components/layout/footer-menu.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import clsx from 'clsx';
-import { Menu } from 'lib/shopify/types';
+import { Menu } from 'lib/types';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 import { useEffect, useState } from 'react';
diff --git a/components/layout/navbar/currency.tsx b/components/layout/navbar/currency.tsx
index cafcd57ee..b26189d9f 100644
--- a/components/layout/navbar/currency.tsx
+++ b/components/layout/navbar/currency.tsx
@@ -30,7 +30,7 @@ export function CurrencySelector({ currency }: { currency: string; }) {
       <div>
         <button
           type="button"
-          className="inline-flex justify-center w-full rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-indigo-500"
+          className="inline-flex h-11 justify-center items-center w-full rounded-md border border-neutral-200 px-4 py-2 bg-white text-sm font-medium text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-indigo-500"
           onClick={() => setIsOpen(!isOpen)}
         >
           {selectedCurrency}
diff --git a/components/layout/navbar/index.tsx b/components/layout/navbar/index.tsx
index 6b4d1ecc2..329911ec6 100644
--- a/components/layout/navbar/index.tsx
+++ b/components/layout/navbar/index.tsx
@@ -1,24 +1,11 @@
 import CartModal from 'components/cart/modal';
 import LogoSquare from 'components/logo-square';
-import { Menu } from 'lib/shopify/types';
 import Link from 'next/link';
-import { Suspense } from 'react';
 import { CurrencySelector } from './currency';
-import MobileMenu from './mobile-menu';
-import Search, { SearchSkeleton } from './search';
-
-const { SITE_NAME } = process.env;
 
 export function Navbar({currency}: {currency: string}) {
-  const menu: any[] = [];
-  
   return (
     <nav className="relative flex items-center justify-between p-4 lg:px-6">
-      <div className="block flex-none md:hidden">
-        <Suspense fallback={null}>
-          <MobileMenu menu={menu} />
-        </Suspense>
-      </div>
       <div className="flex w-full items-center">
         <div className="flex w-full md:w-1/3">
           <Link
@@ -28,31 +15,13 @@ export function Navbar({currency}: {currency: string}) {
           >
             <LogoSquare />
             <div className="ml-2 flex-none text-sm font-medium uppercase md:hidden lg:block">
-              {SITE_NAME}
+              Launch on Fourthwall!
             </div>
           </Link>
-          {menu.length ? (
-            <ul className="hidden gap-6 text-sm md:flex md:items-center">
-              {menu.map((item: Menu) => (
-                <li key={item.title}>
-                  <Link
-                    href={item.path}
-                    prefetch={true}
-                    className="text-neutral-500 underline-offset-4 hover:text-black hover:underline dark:text-neutral-400 dark:hover:text-neutral-300"
-                  >
-                    {item.title}
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          ) : null}
         </div>
         <div className="hidden justify-center md:flex md:w-1/3">
-          <Suspense fallback={<SearchSkeleton />}>
-            <Search />
-          </Suspense>
         </div>
-        <div className="flex justify-end md:w-1/3">
+        <div className="flex justify-end md:w-1/3 gap-4">
           <CurrencySelector currency={currency} />
           <CartModal />
         </div>
diff --git a/components/layout/navbar/mobile-menu.tsx b/components/layout/navbar/mobile-menu.tsx
deleted file mode 100644
index ea59f8da9..000000000
--- a/components/layout/navbar/mobile-menu.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-'use client';
-
-import { Dialog, Transition } from '@headlessui/react';
-import Link from 'next/link';
-import { usePathname, useSearchParams } from 'next/navigation';
-import { Fragment, Suspense, useEffect, useState } from 'react';
-
-import { Bars3Icon, XMarkIcon } from '@heroicons/react/24/outline';
-import { Menu } from 'lib/shopify/types';
-import Search, { SearchSkeleton } from './search';
-
-export default function MobileMenu({ menu }: { menu: Menu[] }) {
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const [isOpen, setIsOpen] = useState(false);
-  const openMobileMenu = () => setIsOpen(true);
-  const closeMobileMenu = () => setIsOpen(false);
-
-  useEffect(() => {
-    const handleResize = () => {
-      if (window.innerWidth > 768) {
-        setIsOpen(false);
-      }
-    };
-    window.addEventListener('resize', handleResize);
-    return () => window.removeEventListener('resize', handleResize);
-  }, [isOpen]);
-
-  useEffect(() => {
-    setIsOpen(false);
-  }, [pathname, searchParams]);
-
-  return (
-    <>
-      <button
-        onClick={openMobileMenu}
-        aria-label="Open mobile menu"
-        className="flex h-11 w-11 items-center justify-center rounded-md border border-neutral-200 text-black transition-colors md:hidden dark:border-neutral-700 dark:text-white"
-      >
-        <Bars3Icon className="h-4" />
-      </button>
-      <Transition show={isOpen}>
-        <Dialog onClose={closeMobileMenu} className="relative z-50">
-          <Transition.Child
-            as={Fragment}
-            enter="transition-all ease-in-out duration-300"
-            enterFrom="opacity-0 backdrop-blur-none"
-            enterTo="opacity-100 backdrop-blur-[.5px]"
-            leave="transition-all ease-in-out duration-200"
-            leaveFrom="opacity-100 backdrop-blur-[.5px]"
-            leaveTo="opacity-0 backdrop-blur-none"
-          >
-            <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
-          </Transition.Child>
-          <Transition.Child
-            as={Fragment}
-            enter="transition-all ease-in-out duration-300"
-            enterFrom="translate-x-[-100%]"
-            enterTo="translate-x-0"
-            leave="transition-all ease-in-out duration-200"
-            leaveFrom="translate-x-0"
-            leaveTo="translate-x-[-100%]"
-          >
-            <Dialog.Panel className="fixed bottom-0 left-0 right-0 top-0 flex h-full w-full flex-col bg-white pb-6 dark:bg-black">
-              <div className="p-4">
-                <button
-                  className="mb-4 flex h-11 w-11 items-center justify-center rounded-md border border-neutral-200 text-black transition-colors dark:border-neutral-700 dark:text-white"
-                  onClick={closeMobileMenu}
-                  aria-label="Close mobile menu"
-                >
-                  <XMarkIcon className="h-6" />
-                </button>
-
-                <div className="mb-4 w-full">
-                  <Suspense fallback={<SearchSkeleton />}>
-                    <Search />
-                  </Suspense>
-                </div>
-                {menu.length ? (
-                  <ul className="flex w-full flex-col">
-                    {menu.map((item: Menu) => (
-                      <li
-                        className="py-2 text-xl text-black transition-colors hover:text-neutral-500 dark:text-white"
-                        key={item.title}
-                      >
-                        <Link href={item.path} prefetch={true} onClick={closeMobileMenu}>
-                          {item.title}
-                        </Link>
-                      </li>
-                    ))}
-                  </ul>
-                ) : null}
-              </div>
-            </Dialog.Panel>
-          </Transition.Child>
-        </Dialog>
-      </Transition>
-    </>
-  );
-}
diff --git a/components/layout/navbar/search.tsx b/components/layout/navbar/search.tsx
deleted file mode 100644
index a590db6a3..000000000
--- a/components/layout/navbar/search.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-'use client';
-
-import { MagnifyingGlassIcon } from '@heroicons/react/24/outline';
-import Form from 'next/form';
-import { useSearchParams } from 'next/navigation';
-
-export default function Search() {
-  const searchParams = useSearchParams();
-
-  return (
-    <Form action="/search" className="w-max-[550px] relative w-full lg:w-80 xl:w-full">
-      <input
-        key={searchParams?.get('q')}
-        type="text"
-        name="q"
-        placeholder="Search for products..."
-        autoComplete="off"
-        defaultValue={searchParams?.get('q') || ''}
-        className="text-md w-full rounded-lg border bg-white px-4 py-2 text-black placeholder:text-neutral-500 md:text-sm dark:border-neutral-800 dark:bg-transparent dark:text-white dark:placeholder:text-neutral-400"
-      />
-      <div className="absolute right-0 top-0 mr-3 flex h-full items-center">
-        <MagnifyingGlassIcon className="h-4" />
-      </div>
-    </Form>
-  );
-}
-
-export function SearchSkeleton() {
-  return (
-    <form className="w-max-[550px] relative w-full lg:w-80 xl:w-full">
-      <input
-        placeholder="Search for products..."
-        className="w-full rounded-lg border bg-white px-4 py-2 text-sm text-black placeholder:text-neutral-500 dark:border-neutral-800 dark:bg-transparent dark:text-white dark:placeholder:text-neutral-400"
-      />
-      <div className="absolute right-0 top-0 mr-3 flex h-full items-center">
-        <MagnifyingGlassIcon className="h-4" />
-      </div>
-    </form>
-  );
-}
diff --git a/components/layout/product-grid-items.tsx b/components/layout/product-grid-items.tsx
index 5dee98368..a19b4bf66 100644
--- a/components/layout/product-grid-items.tsx
+++ b/components/layout/product-grid-items.tsx
@@ -1,6 +1,6 @@
 import Grid from 'components/grid';
 import { GridTileImage } from 'components/grid/tile';
-import { Product } from 'lib/shopify/types';
+import { Product } from 'lib/types';
 import Link from 'next/link';
 
 export default function ProductGridItems({ products }: { products: Product[] }) {
diff --git a/components/product/gallery.tsx b/components/product/gallery.tsx
index feb9c7ff6..80ad57807 100644
--- a/components/product/gallery.tsx
+++ b/components/product/gallery.tsx
@@ -3,7 +3,7 @@
 import { ArrowLeftIcon, ArrowRightIcon } from '@heroicons/react/24/outline';
 import { GridTileImage } from 'components/grid/tile';
 import { useProduct, useUpdateURL } from 'components/product/product-context';
-import { Product } from 'lib/shopify/types';
+import { Product } from 'lib/types';
 import Image from 'next/image';
 
 export function Gallery({ product }: { product: Product }) {
diff --git a/components/product/product-description.tsx b/components/product/product-description.tsx
index 427916a84..fa2ffb89e 100644
--- a/components/product/product-description.tsx
+++ b/components/product/product-description.tsx
@@ -1,7 +1,7 @@
 import { AddToCart } from 'components/cart/add-to-cart';
 import Price from 'components/price';
 import Prose from 'components/prose';
-import { Product } from 'lib/shopify/types';
+import { Product } from 'lib/types';
 import { VariantSelector } from './variant-selector';
 
 export function ProductDescription({ product }: { product: Product }) {
diff --git a/components/product/variant-selector.tsx b/components/product/variant-selector.tsx
index e4b1dd0c5..5a2e4d96e 100644
--- a/components/product/variant-selector.tsx
+++ b/components/product/variant-selector.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 import { useProduct, useUpdateURL } from 'components/product/product-context';
-import { ProductOption, ProductVariant } from 'lib/shopify/types';
+import { ProductOption, ProductVariant } from 'lib/types';
 
 type Combination = {
   id: string;
diff --git a/components/wrapper.tsx b/components/wrapper.tsx
index f36d30119..29cbf6f8b 100644
--- a/components/wrapper.tsx
+++ b/components/wrapper.tsx
@@ -1,4 +1,4 @@
-import { Cart } from "lib/shopify/types";
+import { Cart } from "lib/types";
 import { ReactNode } from "react";
 import { Toaster } from "sonner";
 import { CartProvider } from "./cart/cart-context";
diff --git a/lib/fourthwall/index.ts b/lib/fourthwall/index.ts
index a933d3e78..5e11b51f6 100644
--- a/lib/fourthwall/index.ts
+++ b/lib/fourthwall/index.ts
@@ -1,4 +1,4 @@
-import { Cart, Menu, Product } from "lib/shopify/types";
+import { Cart, Menu, Product } from "lib/types";
 import { reshapeCart, reshapeProduct, reshapeProducts } from "./reshape";
 import { FourthwallCart, FourthwallCheckout, FourthwallProduct } from "./types";