mirror of
https://github.com/vercel/commerce.git
synced 2025-05-19 07:56:59 +00:00
Update modal.tsx
This commit is contained in:
Sol Irvine
parent
8c194a6ca1
commit
1a9f6bb802
@ -62,175 +62,179 @@ export default function CartModal({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<button aria-label="Open cart" onClick={openCart}>
|
<div>
|
||||||
<OpenCart quantity={cart?.totalQuantity} />
|
<button aria-label="Open cart" onClick={openCart} className="w-20">
|
||||||
</button>
|
<OpenCart quantity={cart?.totalQuantity} />
|
||||||
<Transition show={isOpen}>
|
</button>
|
||||||
<Dialog onClose={closeCart} className="relative z-50">
|
<Transition show={isOpen}>
|
||||||
<Transition.Child
|
<Dialog onClose={closeCart} className="relative z-50 w-0">
|
||||||
as={Fragment}
|
<Transition.Child
|
||||||
enter="transition-all ease-in-out duration-300"
|
as={Fragment}
|
||||||
enterFrom="opacity-0 backdrop-blur-none"
|
enter="transition-all ease-in-out duration-300"
|
||||||
enterTo="opacity-100 backdrop-blur-[.5px]"
|
enterFrom="opacity-0 backdrop-blur-none"
|
||||||
leave="transition-all ease-in-out duration-200"
|
enterTo="opacity-100 backdrop-blur-[.5px]"
|
||||||
leaveFrom="opacity-100 backdrop-blur-[.5px]"
|
leave="transition-all ease-in-out duration-200"
|
||||||
leaveTo="opacity-0 backdrop-blur-none"
|
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>
|
<div className="fixed inset-0 bg-black/30" aria-hidden="true" />
|
||||||
<Transition.Child
|
</Transition.Child>
|
||||||
as={Fragment}
|
<Transition.Child
|
||||||
enter="transition-all ease-in-out duration-300"
|
as={Fragment}
|
||||||
enterFrom="translate-x-full"
|
enter="transition-all ease-in-out duration-300"
|
||||||
enterTo="translate-x-0"
|
enterFrom="translate-x-full"
|
||||||
leave="transition-all ease-in-out duration-200"
|
enterTo="translate-x-0"
|
||||||
leaveFrom="translate-x-0"
|
leave="transition-all ease-in-out duration-200"
|
||||||
leaveTo="translate-x-full"
|
leaveFrom="translate-x-0"
|
||||||
>
|
leaveTo="translate-x-full"
|
||||||
<Dialog.Panel className="fixed inset-y-0 right-0 flex h-full w-full flex-col border-l border-white/20 bg-dark p-6 font-sans text-white backdrop-blur-xl md:w-[390px]">
|
>
|
||||||
<div className="flex items-center justify-between">
|
<Dialog.Panel className="fixed inset-y-0 right-0 flex h-full w-full flex-col border-l border-white/20 bg-dark p-6 font-sans text-white backdrop-blur-xl md:w-[390px]">
|
||||||
<p className="text-lg font-semibold">Cart</p>
|
<div className="flex items-center justify-between">
|
||||||
|
<p className="text-lg font-semibold">Cart</p>
|
||||||
|
|
||||||
<button aria-label="Close cart" onClick={closeCart}>
|
<button aria-label="Close cart" onClick={closeCart}>
|
||||||
<CloseCart />
|
<CloseCart />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{!!isConfirming && !!cart && cart?.checkoutUrl ? (
|
{!!isConfirming && !!cart && cart?.checkoutUrl ? (
|
||||||
<AgeGateForm
|
<AgeGateForm
|
||||||
didCancel={() => setIsConfirming(false)}
|
didCancel={() => setIsConfirming(false)}
|
||||||
checkoutUrl={cart.checkoutUrl}
|
checkoutUrl={cart.checkoutUrl}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{!cart || cart.lines.length === 0 ? (
|
{!cart || cart.lines.length === 0 ? (
|
||||||
<div className="mt-20 flex w-full flex-col items-center justify-center overflow-hidden">
|
<div className="mt-20 flex w-full flex-col items-center justify-center overflow-hidden">
|
||||||
<ShoppingBagIcon className="h-16" strokeWidth={1} />
|
<ShoppingBagIcon className="h-16" strokeWidth={1} />
|
||||||
<p className="mt-6 text-center font-serif text-xl">
|
<p className="mt-6 text-center font-serif text-xl">
|
||||||
Your shopping bag is empty.
|
Your shopping bag is empty.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="flex h-full flex-col justify-between overflow-hidden p-1">
|
|
||||||
<ul className="grow overflow-auto py-4">
|
|
||||||
{cart.lines.map((item, i) => {
|
|
||||||
const merchandiseSearchParams = {} as MerchandiseSearchParams;
|
|
||||||
|
|
||||||
item.merchandise.selectedOptions.forEach(({ name, value }) => {
|
|
||||||
if (value !== DEFAULT_OPTION) {
|
|
||||||
merchandiseSearchParams[name.toLowerCase()] = value;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const merchandiseUrl = createUrl(
|
|
||||||
`/product/${item.merchandise.product.handle}`,
|
|
||||||
new URLSearchParams(merchandiseSearchParams)
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li key={i} className="flex w-full flex-col border-b border-white/20">
|
|
||||||
<div className="relative flex w-full flex-row justify-between px-1 py-4">
|
|
||||||
<div className="absolute z-40 -mt-2 ml-[55px]">
|
|
||||||
<DeleteItemButton item={item} />
|
|
||||||
</div>
|
|
||||||
<Link
|
|
||||||
href={merchandiseUrl}
|
|
||||||
onClick={closeCart}
|
|
||||||
className="z-30 flex flex-row space-x-4"
|
|
||||||
>
|
|
||||||
<div className="relative h-16 w-16 cursor-pointer overflow-hidden rounded-md border border-white/20 bg-white/40">
|
|
||||||
<Image
|
|
||||||
className="h-full w-full object-cover"
|
|
||||||
width={64}
|
|
||||||
height={64}
|
|
||||||
alt={
|
|
||||||
item.merchandise.product.featuredImage.altText ||
|
|
||||||
item.merchandise.product.title
|
|
||||||
}
|
|
||||||
src={item.merchandise.product.featuredImage.url}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex flex-1 flex-col text-base">
|
|
||||||
<span className="leading-tight">
|
|
||||||
{item.merchandise.product.title}
|
|
||||||
</span>
|
|
||||||
{item.merchandise.title !== DEFAULT_OPTION ? (
|
|
||||||
<p className="text-sm text-white">{item.merchandise.title}</p>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
</Link>
|
|
||||||
<div className="flex h-16 flex-col justify-between">
|
|
||||||
<Price
|
|
||||||
className="flex justify-end space-y-2 text-right text-sm"
|
|
||||||
amount={item.cost.totalAmount.amount}
|
|
||||||
currencyCode={item.cost.totalAmount.currencyCode}
|
|
||||||
/>
|
|
||||||
<div className="ml-auto flex h-9 flex-row items-center rounded-full border border-white/20">
|
|
||||||
<EditItemQuantityButton item={item} type="minus" />
|
|
||||||
<p className="w-6 text-center">
|
|
||||||
<span className="w-full text-sm">{item.quantity}</span>
|
|
||||||
</p>
|
|
||||||
<EditItemQuantityButton item={item} type="plus" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</ul>
|
|
||||||
{!!promotedItem && (
|
|
||||||
<PromotedCartItem
|
|
||||||
product={promotedItem}
|
|
||||||
availableForSale={promotedItem.availableForSale}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<div className="pb-4 pt-12 text-sm text-neutral-500 dark:text-neutral-400">
|
|
||||||
<div className="mb-3 flex items-center justify-between border-b border-white/20 pb-1">
|
|
||||||
<p>Taxes</p>
|
|
||||||
<p className="text-right text-white/50">Calculated at checkout</p>
|
|
||||||
</div>
|
|
||||||
<div className="mb-3 flex items-center justify-between border-b border-white/20 py-1">
|
|
||||||
<p>Shipping</p>
|
|
||||||
<p className="text-right text-white/50">Calculated at checkout</p>
|
|
||||||
</div>
|
|
||||||
<div className="mb-3 flex items-center justify-between border-b border-white/20 py-1">
|
|
||||||
<p>Total</p>
|
|
||||||
<Price
|
|
||||||
className="text-right text-base text-white"
|
|
||||||
amount={cart.cost.totalAmount.amount}
|
|
||||||
currencyCode={cart.cost.totalAmount.currencyCode}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{ageConfirmed ? (
|
) : (
|
||||||
<>
|
<div className="flex h-full flex-col justify-between overflow-hidden p-1">
|
||||||
<Link
|
<ul className="grow overflow-auto py-4">
|
||||||
href={cart.checkoutUrl}
|
{cart.lines.map((item, i) => {
|
||||||
className="block w-full border border-white/20 bg-dark px-12 py-6 text-center font-sans font-medium uppercase tracking-wider text-white transition-colors duration-300 hover:bg-white hover:text-black"
|
const merchandiseSearchParams = {} as MerchandiseSearchParams;
|
||||||
>
|
|
||||||
{t('cart.proceed')}
|
item.merchandise.selectedOptions.forEach(({ name, value }) => {
|
||||||
</Link>
|
if (value !== DEFAULT_OPTION) {
|
||||||
</>
|
merchandiseSearchParams[name.toLowerCase()] = value;
|
||||||
) : (
|
}
|
||||||
<>
|
});
|
||||||
<button
|
|
||||||
type="button"
|
const merchandiseUrl = createUrl(
|
||||||
onClick={() => checkoutWithAgeCheck()}
|
`/product/${item.merchandise.product.handle}`,
|
||||||
className="block w-full border border-white/20 bg-dark px-12 py-6 text-center font-sans font-medium uppercase tracking-wider text-white transition-colors duration-300 hover:bg-white hover:text-black"
|
new URLSearchParams(merchandiseSearchParams)
|
||||||
>
|
);
|
||||||
{t('cart.proceed')}
|
|
||||||
</button>
|
return (
|
||||||
</>
|
<li key={i} className="flex w-full flex-col border-b border-white/20">
|
||||||
)}
|
<div className="relative flex w-full flex-row justify-between px-1 py-4">
|
||||||
</div>
|
<div className="absolute z-40 -mt-2 ml-[55px]">
|
||||||
)}
|
<DeleteItemButton item={item} />
|
||||||
</>
|
</div>
|
||||||
)}
|
<Link
|
||||||
</Dialog.Panel>
|
href={merchandiseUrl}
|
||||||
</Transition.Child>
|
onClick={closeCart}
|
||||||
</Dialog>
|
className="z-30 flex flex-row space-x-4"
|
||||||
</Transition>
|
>
|
||||||
|
<div className="relative h-16 w-16 cursor-pointer overflow-hidden rounded-md border border-white/20 bg-white/40">
|
||||||
|
<Image
|
||||||
|
className="h-full w-full object-cover"
|
||||||
|
width={64}
|
||||||
|
height={64}
|
||||||
|
alt={
|
||||||
|
item.merchandise.product.featuredImage.altText ||
|
||||||
|
item.merchandise.product.title
|
||||||
|
}
|
||||||
|
src={item.merchandise.product.featuredImage.url}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex flex-1 flex-col text-base">
|
||||||
|
<span className="leading-tight">
|
||||||
|
{item.merchandise.product.title}
|
||||||
|
</span>
|
||||||
|
{item.merchandise.title !== DEFAULT_OPTION ? (
|
||||||
|
<p className="text-sm text-white">
|
||||||
|
{item.merchandise.title}
|
||||||
|
</p>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
<div className="flex h-16 flex-col justify-between">
|
||||||
|
<Price
|
||||||
|
className="flex justify-end space-y-2 text-right text-sm"
|
||||||
|
amount={item.cost.totalAmount.amount}
|
||||||
|
currencyCode={item.cost.totalAmount.currencyCode}
|
||||||
|
/>
|
||||||
|
<div className="ml-auto flex h-9 flex-row items-center rounded-full border border-white/20">
|
||||||
|
<EditItemQuantityButton item={item} type="minus" />
|
||||||
|
<p className="w-6 text-center">
|
||||||
|
<span className="w-full text-sm">{item.quantity}</span>
|
||||||
|
</p>
|
||||||
|
<EditItemQuantityButton item={item} type="plus" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
{!!promotedItem && (
|
||||||
|
<PromotedCartItem
|
||||||
|
product={promotedItem}
|
||||||
|
availableForSale={promotedItem.availableForSale}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<div className="pb-4 pt-12 text-sm text-neutral-500 dark:text-neutral-400">
|
||||||
|
<div className="mb-3 flex items-center justify-between border-b border-white/20 pb-1">
|
||||||
|
<p>Taxes</p>
|
||||||
|
<p className="text-right text-white/50">Calculated at checkout</p>
|
||||||
|
</div>
|
||||||
|
<div className="mb-3 flex items-center justify-between border-b border-white/20 py-1">
|
||||||
|
<p>Shipping</p>
|
||||||
|
<p className="text-right text-white/50">Calculated at checkout</p>
|
||||||
|
</div>
|
||||||
|
<div className="mb-3 flex items-center justify-between border-b border-white/20 py-1">
|
||||||
|
<p>Total</p>
|
||||||
|
<Price
|
||||||
|
className="text-right text-base text-white"
|
||||||
|
amount={cart.cost.totalAmount.amount}
|
||||||
|
currencyCode={cart.cost.totalAmount.currencyCode}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{ageConfirmed ? (
|
||||||
|
<>
|
||||||
|
<Link
|
||||||
|
href={cart.checkoutUrl}
|
||||||
|
className="block w-full border border-white/20 bg-dark px-12 py-6 text-center font-sans font-medium uppercase tracking-wider text-white transition-colors duration-300 hover:bg-white hover:text-black"
|
||||||
|
>
|
||||||
|
{t('cart.proceed')}
|
||||||
|
</Link>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => checkoutWithAgeCheck()}
|
||||||
|
className="block w-full border border-white/20 bg-dark px-12 py-6 text-center font-sans font-medium uppercase tracking-wider text-white transition-colors duration-300 hover:bg-white hover:text-black"
|
||||||
|
>
|
||||||
|
{t('cart.proceed')}
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Dialog.Panel>
|
||||||
|
</Transition.Child>
|
||||||
|
</Dialog>
|
||||||
|
</Transition>
|
||||||
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user