updates from preview comments

This commit is contained in:
Sol Irvine 2023-10-08 16:06:07 +09:00
parent 5790828546
commit 38e1a047be
3 changed files with 16 additions and 10 deletions

View File

@ -2,6 +2,7 @@ import type { Metadata } from 'next';
import { notFound } from 'next/navigation'; import { notFound } from 'next/navigation';
import { Suspense } from 'react'; import { Suspense } from 'react';
import { ChevronDoubleRightIcon } from '@heroicons/react/24/outline';
import clsx from 'clsx'; import clsx from 'clsx';
import { AddManyToCart } from 'components/cart/add-many-to-cart'; import { AddManyToCart } from 'components/cart/add-many-to-cart';
import { GridTileImage } from 'components/grid/tile'; import { GridTileImage } from 'components/grid/tile';
@ -152,18 +153,18 @@ export default async function ProductPage({
</div> </div>
{!!product?.notes && ( {!!product?.notes && (
<div className="bg-base p-12 text-dark"> <div className="bg-base py-4 text-dark md:p-12">
<ProductTastingNotes product={product} /> <ProductTastingNotes product={product} />
</div> </div>
)} )}
{!!product?.galleryIntro?.value && ( {!!product?.galleryIntro?.value && (
<div className="font-multilingual flex w-full flex-row justify-end whitespace-pre-line"> <div className="font-multilingual flex w-full flex-row justify-end whitespace-pre-line px-4 md:px-0">
<div className="md:w-1/2">{product.galleryIntro.value}</div> <div className="md:w-1/2">{product.galleryIntro.value}</div>
</div> </div>
)} )}
<div className="grid grid-cols-1 gap-4 md:grid-cols-2"> <div className="grid grid-cols-1 gap-4 px-4 md:grid-cols-2 md:px-0">
{!!otherImages && {!!otherImages &&
otherImages?.length > 0 && otherImages?.length > 0 &&
otherImages.map((image, index) => { otherImages.map((image, index) => {
@ -174,7 +175,7 @@ export default async function ProductPage({
<div <div
key={image.url} key={image.url}
className={clsx( className={clsx(
isOddAndLast ? 'col-span-2' : 'col-span-1 aspect-square', isOddAndLast ? 'col-span-1 md:col-span-2' : 'col-span-1 aspect-square',
'relative h-full w-full bg-gray-900/10' 'relative h-full w-full bg-gray-900/10'
)} )}
> >
@ -191,7 +192,7 @@ export default async function ProductPage({
</div> </div>
{!!product?.lower?.value && ( {!!product?.lower?.value && (
<div className="font-multilingual flex w-full flex-row justify-end whitespace-pre-line"> <div className="font-multilingual flex w-full flex-row justify-end whitespace-pre-line px-4 md:px-0">
<div className="md:w-1/2">{product.lower.value}</div> <div className="md:w-1/2">{product.lower.value}</div>
</div> </div>
)} )}
@ -211,7 +212,12 @@ async function RelatedProducts({ id }: { id: string }) {
if (!relatedProducts.length) return null; if (!relatedProducts.length) return null;
return ( return (
<div className="border-t border-white/20 px-6 py-12 md:py-24"> <div className="relative border-t border-white/20 px-6 py-12 md:py-24">
{relatedProducts.length > 1 && (
<div className="absolute right-0 top-0 h-full translate-y-1/2">
<ChevronDoubleRightIcon className="h-6 w-6 animate-pulse text-white" />
</div>
)}
<h2 className="pb-8 font-japan text-[20px]">other products</h2> <h2 className="pb-8 font-japan text-[20px]">other products</h2>
<ul className="flex w-full gap-12 overflow-x-auto pt-1"> <ul className="flex w-full gap-12 overflow-x-auto pt-1">
{relatedProducts.map((product) => ( {relatedProducts.map((product) => (

View File

@ -551,11 +551,11 @@
}, },
"003": { "003": {
"label": "Date of attendance of the Liquor Sales Management Training", "label": "Date of attendance of the Liquor Sales Management Training",
"value": "September 11, 2020" "value": "September 6, 2023"
}, },
"004": { "004": {
"label": "Attendance Deadline of the next Liquor Sales Management Training", "label": "Attendance Deadline of the next Liquor Sales Management Training",
"value": "August 31, 2023" "value": "September 5, 2026"
}, },
"005": { "005": {
"label": "Implementing Agency of the Liquor Sales Management Training", "label": "Implementing Agency of the Liquor Sales Management Training",

View File

@ -549,11 +549,11 @@
}, },
"003": { "003": {
"label": "酒類販売管理研修受講年月日", "label": "酒類販売管理研修受講年月日",
"value": "令和2年9月11日" "value": "令和5年9月6日"
}, },
"004": { "004": {
"label": "次回研修の受講期限", "label": "次回研修の受講期限",
"value": "令和5年8月31日" "value": "令和8年9月5日"
}, },
"005": { "005": {
"label": "研修実施団体名", "label": "研修実施団体名",