From fbf42b7551734e878e91a6fdbde3f62fa92a3754 Mon Sep 17 00:00:00 2001
From: Jieren Chen <jieren.chen@gmail.com>
Date: Mon, 23 Sep 2024 16:46:29 -0400
Subject: [PATCH] some more cleanup

---
 README.md                     |  2 +-
 app/api/revalidate/route.ts   |  6 -----
 app/page.tsx                  |  2 +-
 app/product/[handle]/page.tsx | 47 +++--------------------------------
 app/sitemap.ts                | 34 +++++++++----------------
 components/layout/footer.tsx  | 24 +++---------------
 components/welcome-toast.tsx  |  2 +-
 lib/constants.ts              |  2 +-
 lib/fourthwall/index.ts       | 37 +++++++++++++--------------
 lib/fourthwall/reshape.ts     | 13 ++++------
 lib/fourthwall/types.ts       | 15 +++++++++++
 lib/type-guards.ts            | 27 --------------------
 lib/types.ts                  | 37 +--------------------------
 lib/utils.ts                  | 13 ++--------
 next.config.js                |  5 ----
 15 files changed, 62 insertions(+), 204 deletions(-)
 delete mode 100644 app/api/revalidate/route.ts
 delete mode 100644 lib/type-guards.ts

diff --git a/README.md b/README.md
index 732990275..4bb78d68e 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Integrations enable upgraded or additional functionality for Next.js Commerce
 
 You will need to use the environment variables [defined in `.env.example`](.env.example) to run Next.js Commerce. It's recommended you use [Vercel Environment Variables](https://vercel.com/docs/concepts/projects/environment-variables) for this, but a `.env` file is all that is necessary.
 
-> Note: You should not commit your `.env` file or it will expose secrets that will allow others to control your Shopify store.
+> Note: You should not commit your `.env` file or it will expose secrets that will allow others to control your Fourthwall store.
 
 1. Install Vercel CLI: `npm i -g vercel`
 2. Link local instance with Vercel and GitHub accounts (creates `.vercel` directory): `vercel link`
diff --git a/app/api/revalidate/route.ts b/app/api/revalidate/route.ts
deleted file mode 100644
index 4ecc0b45d..000000000
--- a/app/api/revalidate/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { revalidate } from 'lib/shopify';
-import { NextRequest, NextResponse } from 'next/server';
-
-export async function POST(req: NextRequest): Promise<NextResponse> {
-  return revalidate(req);
-}
diff --git a/app/page.tsx b/app/page.tsx
index 3e12b7af3..e63fea3e4 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -6,7 +6,7 @@ import { getCart } from 'lib/fourthwall';
 import { cookies } from 'next/headers';
 
 export const metadata = {
-  description: 'High-performance ecommerce store built with Next.js, Vercel, and Shopify.',
+  description: 'High-performance ecommerce store built with Next.js, Vercel, and Fourthwall.',
   openGraph: {
     type: 'website'
   }
diff --git a/app/product/[handle]/page.tsx b/app/product/[handle]/page.tsx
index 557ebb6e6..ebaac2b1e 100644
--- a/app/product/[handle]/page.tsx
+++ b/app/product/[handle]/page.tsx
@@ -1,16 +1,14 @@
 import type { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 
-import { GridTileImage } from 'components/grid/tile';
 import Footer from 'components/layout/footer';
 import { Gallery } from 'components/product/gallery';
 import { ProductProvider } from 'components/product/product-context';
 import { ProductDescription } from 'components/product/product-description';
 import { Wrapper } from 'components/wrapper';
 import { HIDDEN_PRODUCT_TAG } from 'lib/constants';
-import { getCart, getProduct, getProductRecommendations } from 'lib/fourthwall';
+import { getCart, getProduct } from 'lib/fourthwall';
 import { cookies } from 'next/headers';
-import Link from 'next/link';
 import { Suspense } from 'react';
 
 export async function generateMetadata({
@@ -26,8 +24,8 @@ export async function generateMetadata({
   const indexable = !product.tags.includes(HIDDEN_PRODUCT_TAG);
 
   return {
-    title: product.seo.title || product.title,
-    description: product.seo.description || product.description,
+    title: product.title,
+    description: product.description,
     robots: {
       index: indexable,
       follow: indexable,
@@ -110,48 +108,9 @@ export default async function ProductPage({ params, searchParams }: { params: {
               </Suspense>
             </div>
           </div>
-          <RelatedProducts id={product.id} />
         </div>
         <Footer />
       </ProductProvider>
     </Wrapper>
   );
 }
-
-async function RelatedProducts({ id }: { id: string }) {
-  const relatedProducts = await getProductRecommendations(id);
-
-  if (!relatedProducts.length) return null;
-
-  return (
-    <div className="py-8">
-      <h2 className="mb-4 text-2xl font-bold">Related Products</h2>
-      <ul className="flex w-full gap-4 overflow-x-auto pt-1">
-        {relatedProducts.map((product) => (
-          <li
-            key={product.handle}
-            className="aspect-square w-full flex-none min-[475px]:w-1/2 sm:w-1/3 md:w-1/4 lg:w-1/5"
-          >
-            <Link
-              className="relative h-full w-full"
-              href={`/product/${product.handle}`}
-              prefetch={true}
-            >
-              <GridTileImage
-                alt={product.title}
-                label={{
-                  title: product.title,
-                  amount: product.priceRange.maxVariantPrice.amount,
-                  currencyCode: product.priceRange.maxVariantPrice.currencyCode
-                }}
-                src={product.featuredImage?.url}
-                fill
-                sizes="(min-width: 1024px) 20vw, (min-width: 768px) 25vw, (min-width: 640px) 33vw, (min-width: 475px) 50vw, 100vw"
-              />
-            </Link>
-          </li>
-        ))}
-      </ul>
-    </div>
-  );
-}
diff --git a/app/sitemap.ts b/app/sitemap.ts
index 8f31ee94f..c3e124a86 100644
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -1,4 +1,4 @@
-import { getCollections, getPages, getProducts } from 'lib/shopify';
+import { getCollectionProducts, getCollections } from 'lib/fourthwall';
 import { validateEnvironmentVariables } from 'lib/utils';
 import { MetadataRoute } from 'next';
 
@@ -21,31 +21,21 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     lastModified: new Date().toISOString()
   }));
 
-  const collectionsPromise = getCollections().then((collections) =>
-    collections.map((collection) => ({
-      url: `${baseUrl}${collection.path}`,
-      lastModified: collection.updatedAt
-    }))
-  );
-
-  const productsPromise = getProducts({}).then((products) =>
-    products.map((product) => ({
-      url: `${baseUrl}/product/${product.handle}`,
-      lastModified: product.updatedAt
-    }))
-  );
-
-  const pagesPromise = getPages().then((pages) =>
-    pages.map((page) => ({
-      url: `${baseUrl}/${page.handle}`,
-      lastModified: page.updatedAt
-    }))
-  );
+  const collections = await getCollections();
 
+  const productsPromises = collections.map((collection) => {
+    return getCollectionProducts({ collection: collection.handle, currency: 'USD' }).then((products) =>
+      products.map((product) => ({
+        url: `${baseUrl}/product/${product.handle}`,
+        lastModified: product.updatedAt
+      }))
+    );
+  });
+  
   let fetchedRoutes: Route[] = [];
 
   try {
-    fetchedRoutes = (await Promise.all([collectionsPromise, productsPromise, pagesPromise])).flat();
+    fetchedRoutes = (await Promise.all([...productsPromises])).flat();
   } catch (error) {
     throw JSON.stringify(error, null, 2);
   }
diff --git a/components/layout/footer.tsx b/components/layout/footer.tsx
index 12fa8d67f..4ca6ad928 100644
--- a/components/layout/footer.tsx
+++ b/components/layout/footer.tsx
@@ -1,9 +1,6 @@
 import Link from 'next/link';
 
-import FooterMenu from 'components/layout/footer-menu';
 import LogoSquare from 'components/logo-square';
-import { getMenu } from 'lib/fourthwall';
-import { Suspense } from 'react';
 
 const { COMPANY_NAME, SITE_NAME } = process.env;
 
@@ -11,7 +8,6 @@ export default async function Footer() {
   const currentYear = new Date().getFullYear();
   const copyrightDate = 2023 + (currentYear > 2023 ? `-${currentYear}` : '');
   const skeleton = 'w-full h-6 animate-pulse rounded bg-neutral-200 dark:bg-neutral-700';
-  const menu = await getMenu('next-js-frontend-footer-menu');
   const copyrightName = COMPANY_NAME || SITE_NAME || '';
 
   return (
@@ -23,20 +19,6 @@ export default async function Footer() {
             <span className="uppercase">{SITE_NAME}</span>
           </Link>
         </div>
-        <Suspense
-          fallback={
-            <div className="flex h-[188px] w-[200px] flex-col gap-2">
-              <div className={skeleton} />
-              <div className={skeleton} />
-              <div className={skeleton} />
-              <div className={skeleton} />
-              <div className={skeleton} />
-              <div className={skeleton} />
-            </div>
-          }
-        >
-          <FooterMenu menu={menu} />
-        </Suspense>
         <div className="md:ml-auto">
           <a
             className="flex h-8 w-max flex-none items-center justify-center rounded-md border border-neutral-200 bg-white text-xs text-black dark:border-neutral-700 dark:bg-black dark:text-white"
@@ -57,11 +39,11 @@ export default async function Footer() {
           </p>
           <hr className="mx-4 hidden h-4 w-[1px] border-l border-neutral-400 md:inline-block" />
           <p>
-            <a href="https://github.com/vercel/commerce">View the source</a>
+            <a href="https://github.com/FourthwallHQ/vercel-commerce">View the source</a>
           </p>
           <p className="md:ml-auto">
-            <a href="https://vercel.com" className="text-black dark:text-white">
-              Created by ▲ Vercel
+            <a href="https://fourthwall.com" className="text-black dark:text-white">
+              Created by Fourthwall
             </a>
           </p>
         </div>
diff --git a/components/welcome-toast.tsx b/components/welcome-toast.tsx
index e49d5f0db..95f90ee64 100644
--- a/components/welcome-toast.tsx
+++ b/components/welcome-toast.tsx
@@ -16,7 +16,7 @@ export function WelcomeToast() {
         },
         description: (
           <>
-            This is a high-performance, SSR storefront powered by Shopify, Next.js, and Vercel.{' '}
+            This is a high-performance, SSR storefront powered by Fourthwall, Next.js, and Vercel.{' '}
             <a
               href="https://vercel.com/templates/next.js/nextjs-commerce"
               className="text-blue-600 hover:underline"
diff --git a/lib/constants.ts b/lib/constants.ts
index 56bc6cd12..4fed51005 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -28,4 +28,4 @@ export const TAGS = {
 
 export const HIDDEN_PRODUCT_TAG = 'nextjs-frontend-hidden';
 export const DEFAULT_OPTION = 'Default Title';
-export const SHOPIFY_GRAPHQL_API_ENDPOINT = '/api/2023-01/graphql.json';
+
diff --git a/lib/fourthwall/index.ts b/lib/fourthwall/index.ts
index 5e11b51f6..e6f875433 100644
--- a/lib/fourthwall/index.ts
+++ b/lib/fourthwall/index.ts
@@ -1,6 +1,6 @@
-import { Cart, Menu, Product } from "lib/types";
+import { Cart, Collection, Product } from "lib/types";
 import { reshapeCart, reshapeProduct, reshapeProducts } from "./reshape";
-import { FourthwallCart, FourthwallCheckout, FourthwallProduct } from "./types";
+import { FourthwallCart, FourthwallCheckout, FourthwallCollection, FourthwallProduct } from "./types";
 
 const API_URL = process.env.NEXT_PUBLIC_FW_API_URL;
 const FW_PUBLIC_TOKEN = process.env.NEXT_PUBLIC_FW_PUBLIC_TOKEN;
@@ -68,16 +68,26 @@ async function fourthwallPost<T>(url: string, data: any, options: RequestInit =
 /**
  * Collection operations
  */
+export async function getCollections(): Promise<Collection[]> {
+  const res = await fourthwallGet<{ results: FourthwallCollection[] }>(`${API_URL}/api/public/v1.0/collections`, {
+    headers: {
+      'X-ShopId': process.env.FW_SHOPID || ''
+    }
+  });
+
+  return res.body.results.map((collection) => ({
+    handle: collection.slug,
+    title: collection.name,
+    description: collection.description,
+  }));
+}
+
 export async function getCollectionProducts({
   collection,
   currency,
-  reverse,
-  sortKey
 }: {
   collection: string;
   currency: string;
-  reverse?: boolean;
-  sortKey?: string;
 }): Promise<Product[]> {
   const res = await fourthwallGet<{results: FourthwallProduct[]}>(`${API_URL}/api/public/v1.0/collections/${collection}/products?&currency=${currency}`, {
     headers: {
@@ -98,17 +108,11 @@ export async function getCollectionProducts({
  * Product operations
  */
 export async function getProduct({ handle, currency } : { handle: string, currency: string }): Promise<Product | undefined> {
-  // TODO: replace with real URL
   const res = await fourthwallGet<FourthwallProduct>(`${API_URL}/api/public/v1.0/products/${handle}?&currency=${currency}`);
 
   return reshapeProduct(res.body);
 }
 
-export async function getProductRecommendations(productId: string): Promise<Product[]> {
-  // TODO: replace with real URL
-  return [];
-}
-
 /**
  * Cart operations
  */
@@ -125,7 +129,7 @@ export async function getCart(cartId: string | undefined, currency: string): Pro
 }
 
 export async function createCart(): Promise<Cart> {
-  const res = await fourthwallPost<FourthwallCart>(`https://api.staging.fourthwall.com/api/public/v1.0/carts`, {
+  const res = await fourthwallPost<FourthwallCart>(`${API_URL}/api/public/v1.0/carts`, {
     items: []
   });
 
@@ -194,10 +198,3 @@ export async function createCheckout(
 
   return res.body;
 }
-
-/**
- * TODO: Stubbed out
- */
-export async function getMenu(handle: string): Promise<Menu[]> {
-  return [];
-}
diff --git a/lib/fourthwall/reshape.ts b/lib/fourthwall/reshape.ts
index 1f5e4369d..284c3d3bc 100644
--- a/lib/fourthwall/reshape.ts
+++ b/lib/fourthwall/reshape.ts
@@ -53,6 +53,8 @@ export const reshapeProduct = (product: FourthwallProduct): Product | undefined
   const sizes = new Set(variants.map((v) => v.attributes.size.name));
   const colors = new Set(variants.map((v) => v.attributes.color.name));
 
+  const reshapedVariants = reshapeVariants(variants);
+
   return {
     ...rest,
     handle: product.slug,
@@ -60,7 +62,7 @@ export const reshapeProduct = (product: FourthwallProduct): Product | undefined
     descriptionHtml: product.description,
     description: product.description,
     images: reshapeImages(images, product.name),
-    variants: reshapeVariants(variants),
+    variants: reshapedVariants,
     priceRange: {
       minVariantPrice: {
         amount: minPrice.toString(),
@@ -81,12 +83,7 @@ export const reshapeProduct = (product: FourthwallProduct): Product | undefined
       name: 'Size',
       values: [...sizes]
     }],    
-    // TODO: stubbed out
-    availableForSale: true,
-    seo: {
-      title: product.name,
-      description: product.description,
-    },
+    availableForSale: reshapedVariants.some((v) => v.availableForSale),
     tags: [],
     updatedAt: new Date().toISOString(),
   };
@@ -106,7 +103,7 @@ const reshapeVariants = (variants: FourthwallProductVariant[]): ProductVariant[]
   return variants.map((v) => ({
     id: v.id,
     title: v.name,
-    availableForSale: true,
+    availableForSale: v.stock.type === 'UNLIMITED' || (v.stock.inStock || 0) > 0,
     images: reshapeImages(v.images, v.name),
     selectedOptions: [{
       name: 'Size',
diff --git a/lib/fourthwall/types.ts b/lib/fourthwall/types.ts
index 72fc4cd52..07a4eefe1 100644
--- a/lib/fourthwall/types.ts
+++ b/lib/fourthwall/types.ts
@@ -3,6 +3,14 @@ export type FourthwallMoney = {
   currency: string;
 }
 
+export type FourthwallCollection = {
+  id: string;
+  name: string;
+  slug: string;
+  description: string;
+  updatedAt: string;
+};
+
 export type FourthwallProduct = {
   id: string;
   name: string;
@@ -11,6 +19,8 @@ export type FourthwallProduct = {
 
   images: FourthwallProductImage[];
   variants: FourthwallProductVariant[];
+
+  updatedAt: string;
 };
 
 export type FourthwallProductImage = {
@@ -28,6 +38,11 @@ export type FourthwallProductVariant = {
 
   images: FourthwallProductImage[];
 
+  stock: {
+    type: 'UNLIMITED' | 'LIMITED';
+    inStock?: number;
+  }
+
   // other attr
   attributes: {
     description: string;
diff --git a/lib/type-guards.ts b/lib/type-guards.ts
deleted file mode 100644
index 6f920d1f6..000000000
--- a/lib/type-guards.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export interface ShopifyErrorLike {
-  status: number;
-  message: Error;
-  cause?: Error;
-}
-
-export const isObject = (object: unknown): object is Record<string, unknown> => {
-  return typeof object === 'object' && object !== null && !Array.isArray(object);
-};
-
-export const isShopifyError = (error: unknown): error is ShopifyErrorLike => {
-  if (!isObject(error)) return false;
-
-  if (error instanceof Error) return true;
-
-  return findError(error);
-};
-
-function findError<T extends object>(error: T): boolean {
-  if (Object.prototype.toString.call(error) === '[object Error]') {
-    return true;
-  }
-
-  const prototype = Object.getPrototypeOf(error) as T | null;
-
-  return prototype === null ? false : findError(prototype);
-}
diff --git a/lib/types.ts b/lib/types.ts
index 70004dee2..252ff959a 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -1,13 +1,3 @@
-export type Maybe<T> = T | null;
-
-export type Connection<T> = {
-  edges: Array<Edge<T>>;
-};
-
-export type Edge<T> = {
-  node: T;
-};
-
 export type Cart = {
   id: string | undefined;
   checkoutUrl: string;
@@ -48,9 +38,6 @@ export type Collection = {
   handle: string;
   title: string;
   description: string;
-  seo: SEO;
-  updatedAt: string;  
-  path: string;
 };
 
 export type Image = {
@@ -60,27 +47,11 @@ export type Image = {
   height: number;
 };
 
-export type Menu = {
-  title: string;
-  path: string;
-};
-
 export type Money = {
   amount: string;
   currencyCode: string;
 };
 
-export type Page = {
-  id: string;
-  title: string;
-  handle: string;
-  body: string;
-  bodySummary: string;
-  seo?: SEO;
-  createdAt: string;
-  updatedAt: string;
-};
-
 export type Product = {
   id: string;
   handle: string;
@@ -94,9 +65,8 @@ export type Product = {
     minVariantPrice: Money;
   };
   featuredImage: Image;
-  seo: SEO;
   tags: string[];
-  updatedAt: string;  
+  updatedAt: string;
   variants: ProductVariant[];
   images: Image[];
 };
@@ -118,8 +88,3 @@ export type ProductVariant = {
   price: Money;
   images: Image[];
 };
-
-export type SEO = {
-  title: string;
-  description: string;
-};
diff --git a/lib/utils.ts b/lib/utils.ts
index 69b76d29b..d1ff068ca 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -11,7 +11,7 @@ export const ensureStartsWith = (stringToCheck: string, startsWith: string) =>
   stringToCheck.startsWith(startsWith) ? stringToCheck : `${startsWith}${stringToCheck}`;
 
 export const validateEnvironmentVariables = () => {
-  const requiredEnvironmentVariables = ['SHOPIFY_STORE_DOMAIN', 'SHOPIFY_STOREFRONT_ACCESS_TOKEN'];
+  const requiredEnvironmentVariables = ['NEXT_PUBLIC_FW_API_URL', 'NEXT_PUBLIC_FW_PUBLIC_TOKEN', 'NEXT_PUBLIC_FW_COLLECTION', 'NEXT_PUBLIC_FW_CHECKOUT'];
   const missingEnvironmentVariables = [] as string[];
 
   requiredEnvironmentVariables.forEach((envVar) => {
@@ -22,18 +22,9 @@ export const validateEnvironmentVariables = () => {
 
   if (missingEnvironmentVariables.length) {
     throw new Error(
-      `The following environment variables are missing. Your site will not work without them. Read more: https://vercel.com/docs/integrations/shopify#configure-environment-variables\n\n${missingEnvironmentVariables.join(
+      `The following environment variables are missing. Your site will not work without them. Read more: https://vercel.com/docs/integrations/fourthwall#configure-environment-variables\n\n${missingEnvironmentVariables.join(
         '\n'
       )}\n`
     );
   }
-
-  if (
-    process.env.SHOPIFY_STORE_DOMAIN?.includes('[') ||
-    process.env.SHOPIFY_STORE_DOMAIN?.includes(']')
-  ) {
-    throw new Error(
-      'Your `SHOPIFY_STORE_DOMAIN` environment variable includes brackets (ie. `[` and / or `]`). Your site will not work with them there. Please remove them.'
-    );
-  }
 };
diff --git a/next.config.js b/next.config.js
index 5455e9e34..750a81193 100644
--- a/next.config.js
+++ b/next.config.js
@@ -3,11 +3,6 @@ module.exports = {
   images: {
     formats: ['image/avif', 'image/webp'],
     remotePatterns: [
-      {
-        protocol: 'https',
-        hostname: 'cdn.shopify.com',
-        pathname: '/s/files/**'
-      },
       {
         protocol: 'https',
         hostname: 'storage.googleapis.com',