bump next & fixes from UAT

app/[locale]/bar/sagyobar-detail.tsx

@@ -62,7 +62,9 @@ export default function SagyobarDetail() {
 
         <div className="flex-row justify-end md:flex">
           <div className="md:md:w-1/2">
-            <p className="text-base leading-loose">{t('bar.002')}</p>
+            <p className="font-multilingual text-base font-extralight leading-loose">
+              {t('bar.002')}
+            </p>
           </div>
         </div>
 
@@ -127,7 +129,7 @@ export default function SagyobarDetail() {
             <p className="pb-6 text-[15px] leading-relaxed">
               <Link
                 href="https://cdn.shopify.com/s/files/1/0578/5570/5261/files/sagyobar_menu.pdf?v=1692861259"
-                className="transition-opacity duration-150 hover:opacity-90"
+                className="transition-opacity duration-150 hover:opacity-60"
               >
                 {t('bar.menu.para001')}
               </Link>
@@ -141,7 +143,8 @@ export default function SagyobarDetail() {
           </div>
           <div className="font-multilingual max-w-xl font-extralight">
             <p className="text-[15px]">{t('bar.clerk.title')}</p>
-            <p className="text-[15px] leading-relaxed">{t('bar.clerk.body')}</p>
+            <p className="text-[15px] leading-relaxed">{t('bar.clerk.001')}</p>
+            <p className="text-[15px] leading-relaxed">{t('bar.clerk.002')}</p>
           </div>
 
           <Image

app/[locale]/concept/concept-detail.tsx

@@ -28,21 +28,23 @@ export default function ConceptDetail() {
         )}
       >
         <div className="md:w-1/2">
-          <h2 className="max-w-sm pb-12 text-4xl md:text-5xl">{t('concept.title')}</h2>
+          <div className="flex flex-col space-y-6">
-          <p className="font-multilingual text-base font-extralight">
+            <h2 className="max-w-sm pb-12 text-4xl md:text-5xl">{t('concept.title')}</h2>
-            <div>{t('concept.para001')}</div>
+            <p className="font-multilingual text-base font-extralight">
-            <div>{t('concept.para002')}</div>
+              <span>{t('concept.para001')}</span>
-            <div>{t('concept.para003')}</div>
+              <span>{t('concept.para002')}</span>
-          </p>
+              <span>{t('concept.para003')}</span>
-          <div className="font-multilingual pt-24 font-extralight">
-            <p className="pb-6 text-xl font-normal">{t('concept.subtitle001')}</p>
-            <p className="pb-24 text-base leading-relaxed">{t('concept.para004')}</p>
-            <p className="pb-4 text-base leading-relaxed">{t('concept.para005')}</p>
-            <p className="pb-4 text-base leading-relaxed">
-              {t('concept.para006')} {t('concept.para007')} {t('concept.para008')}
             </p>
-            <p className="pb-4 text-base leading-relaxed">{t('concept.para009')}</p>
+            <div className="font-multilingual pt-24 font-extralight">
-            <p className="text-base leading-relaxed">{t('concept.para010')}</p>
+              <p className="pb-6 text-xl font-normal">{t('concept.subtitle001')}</p>
+              <p className="pb-24 text-base leading-relaxed">{t('concept.para004')}</p>
+              <p className="pb-4 text-base leading-relaxed">{t('concept.para005')}</p>
+              <p className="pb-4 text-base leading-relaxed">
+                {t('concept.para006')} {t('concept.para007')} {t('concept.para008')}
+              </p>
+              <p className="pb-4 text-base leading-relaxed">{t('concept.para009')}</p>
+              <p className="text-base leading-relaxed">{t('concept.para010')}</p>
+            </div>
           </div>
         </div>
         <div className="flex flex-row items-start justify-end md:w-1/2">

app/[locale]/product/[handle]/page.tsx

@@ -29,6 +29,8 @@ export async function generateMetadata({
     language: params?.locale?.toUpperCase()
   });
 
+  console.debug({ product });
+
   if (!product) return notFound();
 
   const { url, width, height, altText: alt } = product.featuredImage || {};

app/[locale]/shop-list/page.tsx

@@ -48,10 +48,12 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
 
   return (
     <div>
-      <Navbar cart={cart} locale={params?.locale} compact />
+      <Navbar cart={cart} locale={params?.locale} compact showTop />
       <div className="mx-auto max-w-xl px-6 pb-24 pt-12 md:pb-48 md:pt-24">
-        <ShopsNav />
+        <div className="pb-12">
-        <h2 className="font-multilingual mb-8 text-3xl font-medium">{page.title}</h2>
+          <ShopsNav />
+        </div>
+        {/* <h2 className="font-multilingual mb-8 text-3xl font-medium">{page.title}</h2> */}
         <Prose html={page.body as string} />
       </div>
 

app/[locale]/shop-list/shops-nav.tsx

@@ -8,14 +8,14 @@ export default function ShopsNav() {
   return (
     <div>
       <div className="font-multilingual flex flex-row items-baseline space-x-6 pb-12">
-        <Link href="/#shops">
+        <Link href="/#shops" className="transition-opacity duration-150 hover:opacity-60">
-          <span className="flex flex-row items-center space-x-1.5">
+          <span className="flex flex-row items-center space-x-4">
             <span>←</span>
-            <span>{t('shops.all')}</span>
+            <span>{t('shops.title')}</span>
           </span>
         </Link>
         <div>|</div>
-        <div className="font-multilingual font-medium">{t('shops.title')}</div>
+        <div className="font-multilingual font-medium">{t('company.name.value')}</div>
       </div>
     </div>
   );

components/layout/footer-menu.tsx

@@ -41,11 +41,11 @@ export default function FooterMenu() {
             </Link>
           </div>
 
-          <div>
+          {/* <div>
             <Link href="/stories" className="transition-opacity duration-150 hover:opacity-50">
               {t('footer.menu.stories')}
             </Link>
-          </div>
+          </div> */}
 
           <div>
             <Link href="/company" className="transition-opacity duration-150 hover:opacity-50">

components/layout/menu/modal.tsx

@@ -120,14 +120,14 @@ export function MenuModal({ scrolled }: { scrolled: boolean }) {
                           </Link>
                         </div>
 
-                        <div>
+                        {/* <div>
                           <Link
                             href="/stories"
                             className="font-serif text-4xl font-normal transition-opacity duration-150 hover:opacity-50"
                           >
                             {t('menu.stories')}
                           </Link>
-                        </div>
+                        </div> */}
 
                         <div>
                           <Link

components/layout/navbar/index.tsx

@@ -1,6 +1,7 @@
 'use client';
 
 import { Transition } from '@headlessui/react';
+import { ChevronUpIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
 import CartModal from 'components/cart/modal';
 import OpenCart from 'components/cart/open-cart';
@@ -15,11 +16,13 @@ import { LanguageControl, SupportedLocale } from './language-control';
 export default function Navbar({
   cart,
   locale,
-  compact
+  compact,
+  showTop = false
 }: {
   cart?: Cart;
   locale?: SupportedLocale;
   compact?: boolean;
+  showTop?: boolean;
 }) {
   const { ref, inView } = useInView({
     threshold: 0,
@@ -28,6 +31,19 @@ export default function Navbar({
 
   return (
     <div ref={ref}>
+      {showTop && !inView && (
+        <div className="fixed left-6 top-32 z-20 animate-fadeIn">
+          <Link href="#" className="transition-opacity duration-150 hover:opacity-60">
+            <span className="flex flex-row items-center space-x-2">
+              <ChevronUpIcon
+                className="h-6 w-6 stroke-subtle transition-colors duration-150 group-hover:stroke-white"
+                strokeWidth={2}
+              />
+              <span className="text-sm font-medium tracking-wider">TOP</span>
+            </span>
+          </Link>
+        </div>
+      )}
       <div className="fixed top-0 z-20 w-full bg-dark/90 backdrop-blur-sm">
         <Transition
           show={!!ref && !inView}

lib/shopify/fragments/product.ts

@@ -10,7 +10,27 @@ const productFragment = /* GraphQL */ `
     description
     descriptionHtml
     summary: metafield(namespace: "custom", key: "product_summary") {
+      key
       value
+      type
+    }
+    notes: metafield(namespace: "custom", key: "tasting_notes_text") {
+      key
+      value
+      type
+    }
+    notesImage: metafield(namespace: "custom", key: "tasting_notes_image") {
+      key
+      value
+      type
+      reference {
+        ... on MediaImage {
+          id
+          image {
+            ...image
+          }
+        }
+      }
     }
     options {
       id

messages/en.json

@@ -58,7 +58,7 @@
       }
     },
     "shops": {
-      "title": "Shop list",
+      "title": "shop list",
       "subtitle": "",
       "all": "All shops",
       "hokkaido": "Hokkaido / North",
@@ -169,7 +169,7 @@
           "line002": "",
           "line003": ""
         },
-        "para001": "ntroducing sagyobar: a place where brewery operations (sagyo) and drinking (bar) come together. We have combined our brewery workspace, where we pack boxes and fulfill orders, with a place to enjoy sake served from our very own suginomori wagon.",
+        "para001": "Introducing sagyobar: a place where brewery operations (sagyo) and drinking (bar) come together. We have combined our brewery workspace, where we pack boxes and fulfill orders, with a place to enjoy sake served from our very own suginomori wagon.",
         "para002": "The renovated warehouse was originally used for storing equipment and business supplies left from our predecessor, the old Suginomori Shuzo. While maintaining its original structure, we have revamped its entrance and installed new systems such as lighting and air conditioning. We utilize “P-boxes” – containers used to transport sake bottles – that can be flexibly arranged to transform the space into standing bar."
       },
       "002": "sagyobar is a place where visitors to Narai-juku can enjoy narai, freshly brewed at our brewery just a short walk away. We also plan to host music events, workshops, and other various activities, and turn sagyobar into a new tourist hub in Narai-juku.",
@@ -199,7 +199,8 @@
       },
       "clerk": {
         "title": "Banto (Head Clerk): Masaki Nishikawa",
-        "body": "From Hiroshima. Nishikawa is engaged in manufacturing management, sales management, liquor tax management, general affairs and sales administration. A trustworthy and dependable presence, it is often said that “if you need anything, just ask Nishikawa.” Nishikawa joined Matsumoto Sake Brewery in Kyoto in 2006. After serving as head clerk there for many years, Nishikawa joined suginomori brewery in 2021. He strives to create an environment in which the brewer can fully concentrate on their craft."
+        "001": "From Hiroshima. Nishikawa is engaged in manufacturing management, sales management, liquor tax management, general affairs and sales administration.",
+        "002": "A trustworthy and dependable presence, it is often said that “if you need anything, just ask Nishikawa.” Nishikawa joined Matsumoto Sake Brewery in Kyoto in 2006. After serving as head clerk there for many years, Nishikawa joined suginomori brewery in 2021. He strives to create an environment in which the brewer can fully concentrate on their craft."
       }
     },
     "concept": {

messages/ja.json

@@ -197,7 +197,8 @@
       },
       "clerk": {
         "title": "番頭：西川正貴",
-        "body": "広島出身。製造管理、販売管理、酒税管理、総務、営業事務に携わる。「何かあれば西川に」が合言葉の頼れる存在。2006年に京都府の松本酒造に入社し、長年番頭を務めたのち、2021年より杉の森酒造に着任。製造者が最も集中できる環境づくりを心掛け、日々業務に取り組んでいる。"
+        "001": "広島出身。製造管理、販売管理、酒税管理、総務、営業事務に携わる。",
+        "002": "「何かあれば西川に」が合言葉の頼れる存在。2006年に京都府の松本酒造に入社し、長年番頭を務めたのち、2021年より杉の森酒造に着任。製造者が最も集中できる環境づくりを心掛け、日々業務に取り組んでいる。"
       }
     },
     "concept": {

yarn.lock

@@ -292,10 +292,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/env@npm:13.4.13":
+"@next/env@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/env@npm:13.4.13"
+  resolution: "@next/env@npm:13.4.19"
-  checksum: 94935ff1730de9fe00be238256ad1af3e5da7ae737e6ce5d261404ccc9245f2a18fee24afa7f3b27d7f7d1c16e2715c8eccb70260ab0c0a08e7bbaa95ed36211
+  checksum: ace4f82890954ade0164fbe2b7ff988268d2b99b2e80caa6707c51fa4cbfaaa31e48fbbcecd4fd142af3503c544e1b4c91e8185d4af253c8fb46550e9e70ad7e
   languageName: node
   linkType: hard
 
@@ -308,65 +308,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-arm64@npm:13.4.13":
+"@next/swc-darwin-arm64@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-darwin-arm64@npm:13.4.13"
+  resolution: "@next/swc-darwin-arm64@npm:13.4.19"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-x64@npm:13.4.13":
+"@next/swc-darwin-x64@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-darwin-x64@npm:13.4.13"
+  resolution: "@next/swc-darwin-x64@npm:13.4.19"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-gnu@npm:13.4.13":
+"@next/swc-linux-arm64-gnu@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-linux-arm64-gnu@npm:13.4.13"
+  resolution: "@next/swc-linux-arm64-gnu@npm:13.4.19"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-musl@npm:13.4.13":
+"@next/swc-linux-arm64-musl@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-linux-arm64-musl@npm:13.4.13"
+  resolution: "@next/swc-linux-arm64-musl@npm:13.4.19"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-gnu@npm:13.4.13":
+"@next/swc-linux-x64-gnu@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-linux-x64-gnu@npm:13.4.13"
+  resolution: "@next/swc-linux-x64-gnu@npm:13.4.19"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-musl@npm:13.4.13":
+"@next/swc-linux-x64-musl@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-linux-x64-musl@npm:13.4.13"
+  resolution: "@next/swc-linux-x64-musl@npm:13.4.19"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-win32-arm64-msvc@npm:13.4.13":
+"@next/swc-win32-arm64-msvc@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-win32-arm64-msvc@npm:13.4.13"
+  resolution: "@next/swc-win32-arm64-msvc@npm:13.4.19"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-win32-ia32-msvc@npm:13.4.13":
+"@next/swc-win32-ia32-msvc@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-win32-ia32-msvc@npm:13.4.13"
+  resolution: "@next/swc-win32-ia32-msvc@npm:13.4.19"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@next/swc-win32-x64-msvc@npm:13.4.13":
+"@next/swc-win32-x64-msvc@npm:13.4.19":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "@next/swc-win32-x64-msvc@npm:13.4.13"
+  resolution: "@next/swc-win32-x64-msvc@npm:13.4.19"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -3508,19 +3508,19 @@ __metadata:
   linkType: hard
 
 "next@npm:latest":
-  version: 13.4.13
+  version: 13.4.19
-  resolution: "next@npm:13.4.13"
+  resolution: "next@npm:13.4.19"
   dependencies:
-    "@next/env": 13.4.13
+    "@next/env": 13.4.19
-    "@next/swc-darwin-arm64": 13.4.13
+    "@next/swc-darwin-arm64": 13.4.19
-    "@next/swc-darwin-x64": 13.4.13
+    "@next/swc-darwin-x64": 13.4.19
-    "@next/swc-linux-arm64-gnu": 13.4.13
+    "@next/swc-linux-arm64-gnu": 13.4.19
-    "@next/swc-linux-arm64-musl": 13.4.13
+    "@next/swc-linux-arm64-musl": 13.4.19
-    "@next/swc-linux-x64-gnu": 13.4.13
+    "@next/swc-linux-x64-gnu": 13.4.19
-    "@next/swc-linux-x64-musl": 13.4.13
+    "@next/swc-linux-x64-musl": 13.4.19
-    "@next/swc-win32-arm64-msvc": 13.4.13
+    "@next/swc-win32-arm64-msvc": 13.4.19
-    "@next/swc-win32-ia32-msvc": 13.4.13
+    "@next/swc-win32-ia32-msvc": 13.4.19
-    "@next/swc-win32-x64-msvc": 13.4.13
+    "@next/swc-win32-x64-msvc": 13.4.19
     "@swc/helpers": 0.5.1
     busboy: 1.6.0
     caniuse-lite: ^1.0.30001406
@@ -3559,7 +3559,7 @@ __metadata:
       optional: true
   bin:
     next: dist/bin/next
-  checksum: 49c161ffafa0f63ee07d37720431aa92dd95b1f593519d729116904b1d61e8fd2b51ed97546f9ac4406132f74198010277022948fa27cac1c82571abeba2a6cd
+  checksum: f4873dab8888ed4dae14d36d7cf8dc54cd042695cf7ee41d05e8757f463d11952a594eb066143cc2f7253ea1d41c6efe681cdc3ab8c2fa6eb0815fa5a94de3dc
   languageName: node
   linkType: hard