From e8be366eaa86b68cc979bd69c70cbe4402c70ae6 Mon Sep 17 00:00:00 2001
From: Sol Irvine <sol@zenzen.io>
Date: Sun, 20 Aug 2023 21:05:57 +0900
Subject: [PATCH] wip: Saving work

---
 app/[locale]/shop-list/layout.tsx | 12 +-----------
 app/[locale]/shop-list/page.tsx   | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/[locale]/shop-list/layout.tsx b/app/[locale]/shop-list/layout.tsx
index 43d187830..16fd7989e 100644
--- a/app/[locale]/shop-list/layout.tsx
+++ b/app/[locale]/shop-list/layout.tsx
@@ -1,15 +1,5 @@
-import Footer from 'components/layout/footer';
 import { Suspense } from 'react';
 
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <Suspense>
-      <div className="w-full">
-        <div className="mx-8 max-w-screen-xl py-20 sm:mx-auto">
-          <Suspense>{children}</Suspense>
-        </div>
-      </div>
-      <Footer />
-    </Suspense>
-  );
+  return <Suspense>{children}</Suspense>;
 }
diff --git a/app/[locale]/shop-list/page.tsx b/app/[locale]/shop-list/page.tsx
index ece352e8d..9f927d149 100644
--- a/app/[locale]/shop-list/page.tsx
+++ b/app/[locale]/shop-list/page.tsx
@@ -1,10 +1,13 @@
 import type { Metadata } from 'next';
 
-import LogoNamemark from 'components/icons/namemark';
+import Footer from 'components/layout/footer';
+import Navbar from 'components/layout/navbar';
 import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Prose from 'components/prose';
-import { getPage } from 'lib/shopify';
+import { getCart, getPage } from 'lib/shopify';
+import { cookies } from 'next/headers';
 import { notFound } from 'next/navigation';
+import { Suspense } from 'react';
 import ShopsTitle from './ShopsTitle';
 
 export const runtime = 'edge';
@@ -32,18 +35,29 @@ export async function generateMetadata({
 }
 
 export default async function Page({ params }: { params: { locale?: SupportedLocale } }) {
+  const cartId = cookies().get('cartId')?.value;
+  let cart;
+
+  if (cartId) {
+    cart = await getCart(cartId);
+  }
+
   const page = await getPage({ handle: 'shop-list', language: params?.locale?.toUpperCase() });
 
   if (!page) return notFound();
 
   return (
-    <div className="font-multilingual mx-auto min-h-screen max-w-screen-xl px-4 text-white">
-      <div className="pb-12">
-        <LogoNamemark className="w-[260px] fill-current md:w-[320px]" />
+    <div>
+      <Navbar cart={cart} locale={params?.locale} compact />
+      <div className="mx-auto max-w-xl px-6 pb-24 pt-12 md:pb-48 md:pt-24">
+        <ShopsTitle />
+        <h2 className="mb-8 text-3xl font-medium">{page.title}</h2>
+        <Prose className="" html={page.body as string} />
       </div>
-      <ShopsTitle />
-      <h2 className="mb-8 text-3xl font-medium">{page.title}</h2>
-      <Prose className="mx-auto mb-8 max-w-xl" html={page.body as string} />
+
+      <Suspense>
+        <Footer cart={cart} />
+      </Suspense>
     </div>
   );
 }