chore: add changes from main

This commit is contained in:
Björn Meyer 2023-10-27 15:01:22 +02:00
parent aa14b7bb42
commit 899e10bf56
9 changed files with 225 additions and 142 deletions

View File

@ -1,8 +1,10 @@
'use server';
import { TAGS } from 'lib/constants';
import { ApiClientError } from '@shopware/api-client';
import { getApiClient } from 'lib/shopware/api';
import { ExtendedCart, ExtendedLineItem, messageKeys } from 'lib/shopware/api-extended';
import { revalidateTag } from 'next/cache';
import { cookies } from 'next/headers';
export const fetchCart = async function (cartId?: string): Promise<ExtendedCart | undefined> {
@ -21,24 +23,16 @@ export const fetchCart = async function (cartId?: string): Promise<ExtendedCart
}
};
export const addItem = async (variantId: string | undefined): Promise<Error | undefined> => {
let cartId = cookies().get('sw-context-token')?.value;
let cart;
if (cartId) {
cart = await fetchCart(cartId);
export async function addItem(prevState: any, selectedVariantId: string | undefined) {
const cart = await getCart();
if (!cart) {
return 'Could not get cart';
}
updateCartCookie(cart);
const cartId = cookies().get('sw-context-token')?.value;
if (!cartId || !cart) {
cart = await fetchCart();
if (cart && cart.token) {
cartId = cart.token;
cookies().set('sw-context-token', cartId);
}
}
if (!variantId) {
return { message: 'Missing product variant ID' } as Error;
if (!selectedVariantId) {
return 'Missing product variant ID';
}
try {
@ -46,7 +40,7 @@ export const addItem = async (variantId: string | undefined): Promise<Error | un
const apiClient = getApiClient(cartId);
// this part allows us to click multiple times on addToCart and increase the qty with that
const itemInCart = cart?.lineItems?.filter((item) => item.id === variantId) as
const itemInCart = cart?.lineItems?.filter((item) => item.id === selectedVariantId) as
| ExtendedLineItem
| undefined;
if (itemInCart && itemInCart.quantity) {
@ -56,17 +50,18 @@ export const addItem = async (variantId: string | undefined): Promise<Error | un
const response = await apiClient.invoke('addLineItem post /checkout/cart/line-item', {
items: [
{
id: variantId,
id: selectedVariantId,
quantity: quantity,
referencedId: variantId,
referencedId: selectedVariantId,
type: 'product'
}
]
});
revalidateTag(TAGS.cart);
const errorMessage = alertErrorMessages(response);
if (errorMessage !== '') {
return { message: errorMessage } as Error;
return errorMessage;
}
} catch (error) {
if (error instanceof ApiClientError) {
@ -76,7 +71,25 @@ export const addItem = async (variantId: string | undefined): Promise<Error | un
console.error('==>', error);
}
}
};
}
async function getCart() {
const cartId = cookies().get('sw-context-token')?.value;
if (cartId) {
return await fetchCart(cartId);
}
return await fetchCart();
}
function updateCartCookie(cart: ExtendedCart) {
const cartId = cookies().get('sw-context-token')?.value;
if (cartId && cart && cart.token && cart.token !== cartId) {
cookies().set('sw-context-token', cart.token);
}
}
function alertErrorMessages(response: ExtendedCart): string {
let errorMessages: string = '';
@ -92,11 +105,46 @@ function alertErrorMessages(response: ExtendedCart): string {
return errorMessages;
}
export const removeItem = async (lineId: string): Promise<Error | undefined> => {
export async function updateItemQuantity(
prevState: any,
payload: {
lineId: string;
variantId: string;
quantity: number;
}
) {
const cartId = cookies().get('sw-context-token')?.value;
if (!cartId) {
return { message: 'Missing cart ID' } as Error;
return 'Missing cart ID';
}
const { lineId, variantId, quantity } = payload;
try {
if (quantity === 0) {
await removeItem(null, lineId);
revalidateTag(TAGS.cart);
return;
}
await updateLineItem(lineId, variantId, quantity);
revalidateTag(TAGS.cart);
} catch (error) {
if (error instanceof ApiClientError) {
console.error(error);
console.error('Details:', error.details);
} else {
return 'Error updating item quantity';
}
}
}
export async function removeItem(prevState: any, lineId: string) {
const cartId = cookies().get('sw-context-token')?.value;
if (!cartId) {
return 'Missing cart ID';
}
try {
@ -104,6 +152,7 @@ export const removeItem = async (lineId: string): Promise<Error | undefined> =>
await apiClient.invoke('deleteLineItem delete /checkout/cart/line-item?id[]={ids}', {
ids: [lineId]
});
revalidateTag(TAGS.cart);
} catch (error) {
if (error instanceof ApiClientError) {
console.error(error);
@ -112,17 +161,9 @@ export const removeItem = async (lineId: string): Promise<Error | undefined> =>
console.error('==>', error);
}
}
};
}
export const updateItemQuantity = async ({
lineId,
variantId,
quantity
}: {
lineId: string;
variantId: string;
quantity: number;
}): Promise<Error | undefined> => {
async function updateLineItem(lineId: string, variantId: string, quantity: number) {
const cartId = cookies().get('sw-context-token')?.value;
if (!cartId) {
@ -148,4 +189,4 @@ export const updateItemQuantity = async ({
console.error('==>', error);
}
}
};
}

View File

@ -5,21 +5,79 @@ import clsx from 'clsx';
import { addItem } from 'components/cart/actions';
import LoadingDots from 'components/loading-dots';
import { ProductVariant, Product } from 'lib/shopware/types';
import { useRouter, useSearchParams } from 'next/navigation';
import { useTransition } from 'react';
import { useSearchParams } from 'next/navigation';
import {
// @ts-ignore
experimental_useFormState as useFormState,
experimental_useFormStatus as useFormStatus
} from 'react-dom';
function SubmitButton({
availableForSale,
selectedVariantId
}: {
availableForSale: boolean;
selectedVariantId: string | undefined;
}) {
const { pending } = useFormStatus();
const buttonClasses =
'relative flex w-full items-center justify-center rounded-full bg-blue-600 p-4 tracking-wide text-white';
const disabledClasses = 'cursor-not-allowed opacity-60 hover:opacity-60';
if (!availableForSale) {
return (
<button aria-disabled className={clsx(buttonClasses, disabledClasses)}>
Out Of Stock
</button>
);
}
if (!selectedVariantId) {
return (
<button
aria-label="Please select an option"
aria-disabled
className={clsx(buttonClasses, disabledClasses)}
>
<div className="absolute left-0 ml-4">
<PlusIcon className="h-5" />
</div>
Add To Cart
</button>
);
}
return (
<button
onClick={(e: React.FormEvent<HTMLButtonElement>) => {
if (pending) e.preventDefault();
}}
aria-label="Add to cart"
aria-disabled={pending}
className={clsx(buttonClasses, {
'hover:opacity-90': true,
disabledClasses: pending
})}
>
<div className="absolute left-0 ml-4">
{pending ? <LoadingDots className="mb-3 bg-white" /> : <PlusIcon className="h-5" />}
</div>
Add To Cart
</button>
);
}
export function AddToCart({
product,
variants,
availableForSale
}: {
product: Product;
variants: ProductVariant[];
availableForSale: boolean;
product: Product;
}) {
const router = useRouter();
const [message, formAction] = useFormState(addItem, null);
const searchParams = useSearchParams();
const [isPending, startTransition] = useTransition();
const defaultVariantId = variants.length === 1 ? variants[0]?.id : product.id;
const variant = variants.find((variant: ProductVariant) =>
variant.selectedOptions.every(
@ -27,46 +85,14 @@ export function AddToCart({
)
);
const selectedVariantId = variant?.id || defaultVariantId;
const title = !availableForSale
? 'Out of stock'
: !selectedVariantId
? 'Please select options'
: undefined;
const actionWithVariant = formAction.bind(null, selectedVariantId);
return (
<button
aria-label="Add item to cart"
disabled={isPending || !availableForSale || !selectedVariantId}
title={title}
onClick={() => {
// Safeguard in case someone messes with `disabled` in devtools.
if (!availableForSale || !selectedVariantId) return;
startTransition(async () => {
const error = await addItem(selectedVariantId);
if (error) {
alert(error.message); // this is not a real error, this can be also out of stock message for the user
// Example to trigger the error boundary in the root error.js
// throw new Error(error.toString());
}
router.refresh();
});
}}
className={clsx(
'relative flex w-full items-center justify-center rounded-full bg-blue-600 p-4 tracking-wide text-white hover:opacity-90',
{
'cursor-not-allowed opacity-60 hover:opacity-60': !availableForSale || !selectedVariantId,
'cursor-not-allowed': isPending
}
)}
>
<div className="absolute left-0 ml-4">
{!isPending ? <PlusIcon className="h-5" /> : <LoadingDots className="mb-3 bg-white" />}
</div>
<span>{availableForSale ? 'Add To Cart' : 'Out Of Stock'}</span>
</button>
<form action={actionWithVariant}>
<SubmitButton availableForSale={availableForSale} selectedVariantId={selectedVariantId} />
<p aria-live="polite" className="sr-only" role="status">
{message}
</p>
</form>
);
}

View File

@ -1,40 +1,35 @@
import { XMarkIcon } from '@heroicons/react/24/outline';
import LoadingDots from 'components/loading-dots';
import { useRouter } from 'next/navigation';
'use client';
import { XMarkIcon } from '@heroicons/react/24/outline';
import clsx from 'clsx';
import { removeItem } from 'components/cart/actions';
import LoadingDots from 'components/loading-dots';
import type { CartItem } from 'lib/shopware/types';
import { useTransition } from 'react';
import {
// @ts-ignore
experimental_useFormState as useFormState,
experimental_useFormStatus as useFormStatus
} from 'react-dom';
export default function DeleteItemButton({ item }: { item: CartItem }) {
const router = useRouter();
const [isPending, startTransition] = useTransition();
function SubmitButton() {
const { pending } = useFormStatus();
return (
<button
aria-label="Remove cart item"
onClick={() => {
startTransition(async () => {
const error = await removeItem(item.id);
if (error) {
// Trigger the error boundary in the root error.js
throw new Error(error.toString());
}
router.refresh();
});
type="submit"
onClick={(e: React.FormEvent<HTMLButtonElement>) => {
if (pending) e.preventDefault();
}}
disabled={isPending}
aria-label="Remove cart item"
aria-disabled={pending}
className={clsx(
'ease flex h-[17px] w-[17px] items-center justify-center rounded-full bg-neutral-500 transition-all duration-200',
{
'cursor-not-allowed px-0': isPending
'cursor-not-allowed px-0': pending
}
)}
>
{isPending ? (
{pending ? (
<LoadingDots className="bg-white" />
) : (
<XMarkIcon className="hover:text-accent-3 mx-[1px] h-4 w-4 text-white dark:text-black" />
@ -42,3 +37,18 @@ export default function DeleteItemButton({ item }: { item: CartItem }) {
</button>
);
}
export function DeleteItemButton({ item }: { item: CartItem }) {
const [message, formAction] = useFormState(removeItem, null);
const itemId = item.id;
const actionWithVariant = formAction.bind(null, itemId);
return (
<form action={actionWithVariant}>
<SubmitButton />
<p aria-live="polite" className="sr-only" role="status">
{message}
</p>
</form>
);
}

View File

@ -1,54 +1,34 @@
import { useRouter } from 'next/navigation';
import { useTransition } from 'react';
import { MinusIcon, PlusIcon } from '@heroicons/react/24/outline';
import clsx from 'clsx';
import { removeItem, updateItemQuantity } from 'components/cart/actions';
import { updateItemQuantity } from 'components/cart/actions';
import LoadingDots from 'components/loading-dots';
import type { CartItem } from 'lib/shopware/types';
import {
// @ts-ignore
experimental_useFormState as useFormState,
experimental_useFormStatus as useFormStatus
} from 'react-dom';
export default function EditItemQuantityButton({
item,
type
}: {
item: CartItem;
type: 'plus' | 'minus';
}) {
const router = useRouter();
const [isPending, startTransition] = useTransition();
function SubmitButton({ type }: { type: 'plus' | 'minus' }) {
const { pending } = useFormStatus();
return (
<button
aria-label={type === 'plus' ? 'Increase item quantity' : 'Reduce item quantity'}
onClick={() => {
startTransition(async () => {
const error =
type === 'minus' && item.quantity - 1 === 0
? await removeItem(item.id)
: await updateItemQuantity({
lineId: item.id,
variantId: item.merchandise.id,
quantity: type === 'plus' ? item.quantity + 1 : item.quantity - 1
});
if (error) {
// Trigger the error boundary in the root error.js
throw new Error(error.toString());
}
router.refresh();
});
type="submit"
onClick={(e: React.FormEvent<HTMLButtonElement>) => {
if (pending) e.preventDefault();
}}
disabled={isPending}
aria-label={type === 'plus' ? 'Increase item quantity' : 'Reduce item quantity'}
aria-disabled={pending}
className={clsx(
'ease flex h-full min-w-[36px] max-w-[36px] flex-none items-center justify-center rounded-full px-2 transition-all duration-200 hover:border-neutral-800 hover:opacity-80',
{
'cursor-not-allowed': isPending,
'cursor-not-allowed': pending,
'ml-auto': type === 'minus'
}
)}
>
{isPending ? (
{pending ? (
<LoadingDots className="bg-black dark:bg-white" />
) : type === 'plus' ? (
<PlusIcon className="h-4 w-4 dark:text-neutral-500" />
@ -58,3 +38,22 @@ export default function EditItemQuantityButton({
</button>
);
}
export function EditItemQuantityButton({ item, type }: { item: CartItem; type: 'plus' | 'minus' }) {
const [message, formAction] = useFormState(updateItemQuantity, null);
const payload = {
lineId: item.id,
variantId: item.merchandise.id,
quantity: type === 'plus' ? item.quantity + 1 : item.quantity - 1
};
const actionWithVariant = formAction.bind(null, payload);
return (
<form action={actionWithVariant}>
<SubmitButton type={type} />
<p aria-live="polite" className="sr-only" role="status">
{message}
</p>
</form>
);
}

View File

@ -11,8 +11,8 @@ import Image from 'next/image';
import Link from 'next/link';
import { Fragment, useEffect, useRef, useState } from 'react';
import CloseCart from './close-cart';
import DeleteItemButton from './delete-item-button';
import EditItemQuantityButton from './edit-item-quantity-button';
import { DeleteItemButton } from './delete-item-button';
import { EditItemQuantityButton } from './edit-item-quantity-button';
import OpenCart from './open-cart';
type MerchandiseSearchParams = {

View File

@ -50,7 +50,7 @@ export default function Pagination({
<li
key={currentPage + '-prev'}
onClick={() => handlePageClick(currentPage - 1)}
className="m-2 rounded-lg border border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white sm:m-0 sm:mx-2"
className="m-2 cursor-pointer rounded-lg border border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white sm:m-0 sm:mx-2"
>
<a
className="ml-0 flex h-10 items-center justify-center px-4 leading-tight"
@ -65,7 +65,7 @@ export default function Pagination({
<li
key={i}
onClick={() => handlePageClick(i)}
className={`m-2 rounded-lg border border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white sm:m-0 sm:mx-2 [&.active]:bg-gray-100${
className={`m-2 rounded-lg border border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white sm:m-0 sm:mx-2 [&.active]:bg-gray-100 cursor-pointer${
i === currentPage ? ' active ' : ''
}`}
>
@ -85,7 +85,7 @@ export default function Pagination({
<li
key={currentPage + '-next'}
onClick={() => handlePageClick(currentPage + 1)}
className="m-2 rounded-lg border border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white sm:m-0 sm:mx-2"
className="m-2 cursor-pointer rounded-lg border border-gray-300 bg-white text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white sm:m-0 sm:mx-2"
>
<a
className="ml-0 flex h-10 items-center justify-center px-4 leading-tight"

View File

@ -27,6 +27,7 @@ export default function Search() {
return (
<form onSubmit={onSubmit} className="w-max-[550px] relative w-full lg:w-80 xl:w-full">
<input
key={searchParams?.get('q')}
type="text"
name="search"
placeholder="Search for products..."

View File

@ -19,7 +19,11 @@ export default function FilterList({ list, title }: { list: ListItem[]; title?:
return (
<>
<nav>
{title ? <h3 className="hidden text-xs text-neutral-500 md:block">{title}</h3> : null}
{title ? (
<h3 className="hidden text-xs text-neutral-500 dark:text-neutral-400 md:block">
{title}
</h3>
) : null}
<ul className="hidden md:block">
<FilterItemList list={list} />
</ul>

View File

@ -22,8 +22,10 @@ export const sorting: SortFilterItem[] = [
export const TAGS = {
collections: 'collections',
products: 'products'
products: 'products',
cart: 'cart'
};
// ToDo: Should work with visability from product data
export const HIDDEN_PRODUCT_TAG = 'nextjs-frontend-hidden';
export const DEFAULT_OPTION = 'Default Title';