@riosst100/pwa-marketplace 1.8.8 → 1.9.0

package/src/overwrites/venia-ui/lib/components/CartPage/cartPage.js

@@ -0,0 +1,126 @@
+import React, { useEffect } from 'react';
+import { FormattedMessage, useIntl } from 'react-intl';
+import { Check } from 'react-feather';
+import { useCartPage } from '@magento/peregrine/lib/talons/CartPage/useCartPage';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import { useToasts } from '@magento/peregrine';
+
+import Icon from '@magento/venia-ui/lib/components/Icon';
+import { StoreTitle } from '@magento/venia-ui/lib/components/Head';
+import { fullPageLoadingIndicator } from '@magento/venia-ui/lib/components/LoadingIndicator';
+import StockStatusMessage from '@magento/venia-ui/lib/components/StockStatusMessage';
+import PriceAdjustments from './PriceAdjustments';
+import PriceSummary from './PriceSummary';
+import ProductListing from './ProductListing';
+import defaultClasses from './cartPage.module.css';
+import cn from 'classnames';
+
+const CheckIcon = <Icon size={20} src={Check} />;
+
+/**
+ * Structural page component for the shopping cart.
+ * This is the main component used in the `/cart` route in Venia.
+ * It uses child components to render the different pieces of the cart page.
+ *
+ * @see {@link https://venia.magento.com/cart}
+ *
+ * @param {Object} props
+ * @param {Object} props.classes CSS className overrides for the component.
+ * See [cartPage.module.css]{@link https://github.com/magento/pwa-studio/blob/develop/packages/venia-ui/lib/components/CartPage/cartPage.module.css}
+ * for a list of classes you can override.
+ *
+ * @returns {React.Element}
+ *
+ * @example <caption>Importing into your project</caption>
+ * import CartPage from "@magento/venia-ui/lib/components/CartPage";
+ */
+const CartPage = props => {
+    const talonProps = useCartPage();
+
+    const {
+        cartItems,
+        hasItems,
+        isCartUpdating,
+        fetchCartDetails,
+        onAddToWishlistSuccess,
+        setIsCartUpdating,
+        shouldShowLoadingIndicator,
+        wishlistSuccessProps
+    } = talonProps;
+
+    const classes = useStyle(defaultClasses, props.classes);
+    const { formatMessage } = useIntl();
+    const [, { addToast }] = useToasts();
+
+    useEffect(() => {
+        if (wishlistSuccessProps) {
+            addToast({ ...wishlistSuccessProps, icon: CheckIcon });
+        }
+    }, [addToast, wishlistSuccessProps]);
+
+    if (shouldShowLoadingIndicator) {
+        return fullPageLoadingIndicator;
+    }
+
+    const productListing = hasItems ? (
+        <ProductListing
+            onAddToWishlistSuccess={onAddToWishlistSuccess}
+            setIsCartUpdating={setIsCartUpdating}
+            fetchCartDetails={fetchCartDetails}
+        />
+    ) : (
+        <h3>
+            <FormattedMessage
+                id={'cartPage.emptyCart'}
+                defaultMessage={'There are no items in your cart.'}
+            />
+        </h3>
+    );
+
+    const priceAdjustments = hasItems ? (
+        <PriceAdjustments setIsCartUpdating={setIsCartUpdating} />
+    ) : null;
+
+    const priceSummary = hasItems ? (
+        <PriceSummary isUpdating={isCartUpdating} />
+    ) : null;
+
+    return (
+        <div className={classes.root} data-cy="CartPage-root">
+            <StoreTitle>
+                {formatMessage({
+                    id: 'cartPage.title',
+                    defaultMessage: 'Cart'
+                })}
+            </StoreTitle>
+            <div className={cn(classes.heading_container, 'mb-[30px]')}>
+                <h1
+                    aria-live="polite"
+                    data-cy="CartPage-heading"
+                    className={cn(classes.heading, 'text-xl font-medium')}
+                >
+                    <FormattedMessage
+                        id={'cartPage.heading'}
+                        defaultMessage={'Cart'}
+                    />
+                </h1>
+                <div className={classes.stockStatusMessageContainer}>
+                    <StockStatusMessage cartItems={cartItems} />
+                </div>
+            </div>
+            <div className={classes.body}>
+                <div className={classes.items_container}>{productListing}</div>
+                <div className={classes.price_adjustments_container}>
+                    {priceAdjustments}
+                </div>
+                <div className={classes.summary_container}>
+                    <div className={classes.summary_contents}>
+                        {priceSummary}
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default CartPage;

package/src/overwrites/venia-ui/lib/components/CartPage/cartPage.module.css

@@ -0,0 +1,64 @@
+.root {
+    composes: mx-auto from global;
+    composes: my-[26px] from global;
+}
+
+.body {
+    composes: grid from global;
+    composes: gap-md from global;
+    grid-template-columns: 1fr 18rem;
+    /* The summary grid item spans the entire right column. */
+    grid-template-areas:
+        'items summary'
+        'adjustments summary';
+}
+
+.heading_container {
+    composes: gap-y-xs from global;
+    composes: grid from global;
+    composes: mb-xs from global;
+}
+
+.heading {
+    composes: leading-tight from global;
+}
+
+/* TODO @TW: cannot compose */
+.stockStatusMessageContainer:empty {
+    display: none;
+}
+
+.items_container {
+    grid-area: items;
+}
+
+.price_adjustments_container {
+    grid-area: adjustments;
+}
+
+.summary_container {
+    composes: h-full from global;
+    grid-area: summary;
+}
+
+.summary_contents {
+    composes: sticky from global;
+    /*
+     * TODO: Use CSS Properties (variables) or something instead of hardcoding this.
+     *  - 3.5rem = min-height of nav header. See the "toolbar" class in header.css.
+     *  - 2rem = padding-top of the cart page.
+     */
+    composes: top-[9rem] from global;
+    /* TODO @TW: review */
+}
+
+@media (max-width: 959px) {
+    .body {
+        /* Only one column in mobile view. */
+        grid-template-columns: 100%;
+        grid-template-areas:
+            'items'
+            'adjustments'
+            'summary';
+    }
+}

package/src/overwrites/venia-ui/lib/components/CartPage/index.js

@@ -0,0 +1 @@
+export { default } from './cartPage';

package/src/overwrites/venia-ui/lib/components/CheckoutPage/AddressBook/addressBook.js

@@ -0,0 +1,190 @@
+import React, { Fragment, useEffect, useMemo, Suspense } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { shape, string, func } from 'prop-types';
+import { PlusSquare, AlertCircle as AlertCircleIcon } from 'react-feather';
+import { useToasts } from '@magento/peregrine';
+import { useAddressBook } from '@magento/peregrine/lib/talons/CheckoutPage/AddressBook/useAddressBook';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import Button from '@magento/venia-ui/lib/components/Button';
+import defaultClasses from './addressBook.module.css';
+import AddressCard from './addressCard';
+import Icon from '@magento/venia-ui/lib/components/Icon';
+import LinkButton from '@magento/venia-ui/lib/components/LinkButton';
+
+const EditModal = React.lazy(() => import('../ShippingInformation/editModal'));
+
+const errorIcon = (
+    <Icon
+        src={AlertCircleIcon}
+        attrs={{
+            width: 18
+        }}
+    />
+);
+
+const AddressBook = props => {
+    const {
+        activeContent,
+        classes: propClasses,
+        toggleActiveContent,
+        onSuccess
+    } = props;
+
+    const talonProps = useAddressBook({
+        toggleActiveContent,
+        onSuccess
+    });
+
+    const {
+        activeAddress,
+        customerAddresses,
+        errorMessage,
+        handleAddAddress,
+        handleApplyAddress,
+        handleCancel,
+        handleEditAddress,
+        handleSelectAddress,
+        isLoading,
+        selectedAddress
+    } = talonProps;
+
+    const classes = useStyle(defaultClasses, propClasses);
+
+    const [, { addToast }] = useToasts();
+
+    useEffect(() => {
+        if (errorMessage) {
+            addToast({
+                type: 'error',
+                icon: errorIcon,
+                message: errorMessage,
+                dismissable: true,
+                timeout: 10000
+            });
+        }
+    }, [addToast, errorMessage]);
+
+    const rootClass =
+        activeContent === 'addressBook' ? classes.root_active : classes.root;
+
+    const addAddressButton = useMemo(
+        () => (
+            <LinkButton
+                className={classes.addButton}
+                key="addAddressButton"
+                onClick={handleAddAddress}
+            >
+                <Icon
+                    size={24}
+                    src={PlusSquare}
+                    classes={{
+                        icon: classes.addIcon
+                    }}
+                />
+                <span className={classes.addText}>
+                    <FormattedMessage
+                        id={'addressBook.addNewAddresstext'}
+                        defaultMessage={'Add New Address'}
+                    />
+                </span>
+            </LinkButton>
+        ),
+        [classes.addButton, classes.addIcon, classes.addText, handleAddAddress]
+    );
+
+    const addressElements = useMemo(() => {
+        let defaultIndex;
+        const addresses = customerAddresses.map((address, index) => {
+            const isSelected = selectedAddress === address.id;
+
+            if (address.default_shipping) {
+                defaultIndex = index;
+            }
+
+            return (
+                <AddressCard
+                    address={address}
+                    isSelected={isSelected}
+                    key={address.id}
+                    onSelection={handleSelectAddress}
+                    onEdit={handleEditAddress}
+                />
+            );
+        });
+
+        // Position the default address first in the elements list
+        if (defaultIndex) {
+            [addresses[0], addresses[defaultIndex]] = [
+                addresses[defaultIndex],
+                addresses[0]
+            ];
+        }
+
+        return [...addresses, addAddressButton];
+    }, [
+        addAddressButton,
+        customerAddresses,
+        handleEditAddress,
+        handleSelectAddress,
+        selectedAddress
+    ]);
+
+    return (
+        <Fragment>
+            <div className={rootClass}>
+                <h1 aria-live="polite" className={classes.headerText}>
+                    <FormattedMessage
+                        id={'addressBook.headerText'}
+                        defaultMessage={'Change Shipping Information'}
+                    />
+                </h1>
+                <div className={classes.buttonContainer}>
+                    <Button
+                        disabled={isLoading}
+                        onClick={handleCancel}
+                        priority="low"
+                    >
+                        <FormattedMessage
+                            id={'addressBook.cancelButtonText'}
+                            defaultMessage={'Cancel'}
+                        />
+                    </Button>
+                    <Button
+                        disabled={isLoading}
+                        onClick={handleApplyAddress}
+                        priority="high"
+                    >
+                        <FormattedMessage
+                            id={'addressBook.applyButtonText'}
+                            defaultMessage={'Apply'}
+                        />
+                    </Button>
+                </div>
+
+                <div className={classes.content}>{addressElements}</div>
+            </div>
+            <Suspense fallback={null}>
+                <EditModal onSuccess={onSuccess} shippingData={activeAddress} />
+            </Suspense>
+        </Fragment>
+    );
+};
+
+export default AddressBook;
+
+AddressBook.propTypes = {
+    activeContent: string.isRequired,
+    classes: shape({
+        root: string,
+        root_active: string,
+        headerText: string,
+        buttonContainer: string,
+        content: string,
+        addButton: string,
+        addIcon: string,
+        addText: string
+    }),
+    onSuccess: func.isRequired,
+    toggleActiveContent: func.isRequired
+};

package/src/overwrites/venia-ui/lib/components/CheckoutPage/AddressBook/addressBook.module.css

@@ -0,0 +1,78 @@
+.root {
+    composes: hidden from global;
+}
+
+/* prettier-ignore */
+.root_active {
+    composes: gap-y-xs from global;
+    composes: grid from global;
+    composes: grid-cols-1 from global;
+    composes: items-center from global;
+    composes: justify-between from global;
+
+    composes: lg_grid-cols-autoAuto from global;
+}
+
+.headerText {
+    composes: flex from global;
+    composes: items-center from global;
+    composes: leading-tight from global;
+    composes: min-h-[3.5rem] from global;
+    composes: row-start-1 from global;
+    composes: text-subtle from global;
+}
+
+.buttonContainer {
+    composes: gap-x-xs from global;
+    composes: grid from global;
+    composes: grid-cols-2 from global;
+    composes: grid-flow-col from global;
+    composes: items-center from global;
+    composes: justify-center from global;
+    composes: min-h-[3.5rem] from global;
+    composes: row-start-3 from global;
+
+    composes: xs_grid-cols-auto from global;
+    composes: lg_justify-end from global;
+    composes: lg_row-start-1 from global;
+}
+
+@media (max-width: 479px) {
+    /* TODO @TW: cannot compose */
+    .buttonContainer button {
+        min-width: 8rem;
+    }
+}
+
+.content {
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: border-t-0 from global;
+    composes: grid from global;
+    composes: grid-cols-1 from global;
+    composes: gap-xs from global;
+    composes: pt-0 from global;
+    composes: row-start-2 from global;
+    grid-auto-rows: minmax(6rem, max-content);
+
+    composes: lg_border-top-1 from global;
+    composes: lg_col-span-2 from global;
+    composes: lg_grid-cols-3 from global;
+    composes: lg_pt-md from global;
+}
+
+.addButton {
+    composes: border-2 from global;
+    composes: border-dashed from global;
+    composes: border-subtle from global;
+    composes: font-semibold from global;
+    composes: rounded-md from global;
+    composes: text-brand-dark from global;
+    composes: text-sm from global;
+    transition: border-color 384ms var(--venia-global-anim-standard);
+
+    composes: focus_outline-none from global;
+    composes: focus_shadow-buttonFocus from global;
+
+    composes: hover_border-brand-dark from global;
+}

package/src/overwrites/venia-ui/lib/components/CheckoutPage/AddressBook/addressCard.js

@@ -0,0 +1,125 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { shape, string, bool, func, arrayOf } from 'prop-types';
+import { Edit2 as EditIcon } from 'react-feather';
+import { useAddressCard } from '@magento/peregrine/lib/talons/CheckoutPage/AddressBook/useAddressCard';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import Icon from '@magento/venia-ui/lib/components/Icon';
+import defaultClasses from './addressCard.module.css';
+
+const AddressCard = props => {
+    const {
+        address,
+        classes: propClasses,
+        isSelected,
+        onEdit,
+        onSelection
+    } = props;
+
+    const talonProps = useAddressCard({
+        address,
+        onEdit,
+        onSelection
+    });
+    const {
+        handleClick,
+        handleEditAddress,
+        handleKeyPress,
+        hasUpdate
+    } = talonProps;
+
+    const {
+        city,
+        country_code,
+        default_shipping,
+        firstname,
+        lastname,
+        postcode,
+        region: { region },
+        street
+    } = address;
+
+    const streetRows = street.map((row, index) => {
+        return <span key={index}>{row}</span>;
+    });
+
+    const classes = useStyle(defaultClasses, propClasses);
+
+    const rootClass = isSelected
+        ? hasUpdate
+            ? classes.root_updated
+            : classes.root_selected
+        : classes.root;
+
+    const editButton = isSelected ? (
+        <button className={classes.editButton} onClick={handleEditAddress}>
+            <Icon
+                classes={{
+                    icon: classes.editIcon
+                }}
+                size={16}
+                src={EditIcon}
+            />
+        </button>
+    ) : null;
+
+    const defaultBadge = default_shipping ? (
+        <span className={classes.defaultBadge}>
+            <FormattedMessage
+                id={'addressCard.defaultText'}
+                defaultMessage={'Default'}
+            />
+        </span>
+    ) : null;
+
+    const nameString = `${firstname} ${lastname}`;
+    const additionalAddressString = `${city}, ${region} ${postcode} ${country_code}`;
+
+    return (
+        <div
+            className={rootClass}
+            onClick={handleClick}
+            onKeyPress={handleKeyPress}
+            role="button"
+            tabIndex="0"
+        >
+            {editButton}
+            {defaultBadge}
+            <span className={classes.name}>{nameString}</span>
+            {streetRows}
+            <span>{additionalAddressString}</span>
+        </div>
+    );
+};
+
+export default AddressCard;
+
+AddressCard.propTypes = {
+    address: shape({
+        city: string,
+        country_code: string,
+        default_shipping: bool,
+        firstname: string,
+        lastname: string,
+        postcode: string,
+        region: shape({
+            region_code: string,
+            region: string
+        }),
+        street: arrayOf(string)
+    }).isRequired,
+    classes: shape({
+        root: string,
+        root_selected: string,
+        root_updated: string,
+        editButton: string,
+        editIcon: string,
+        defaultBadge: string,
+        name: string,
+        address: string
+    }),
+    isSelected: bool.isRequired,
+    onEdit: func.isRequired,
+    onSelection: func.isRequired
+};

package/src/overwrites/venia-ui/lib/components/CheckoutPage/AddressBook/addressCard.module.css

@@ -0,0 +1,94 @@
+.root {
+    composes: border-2 from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: content-start from global;
+    composes: cursor-pointer from global;
+    composes: gap-y-2xs from global;
+    composes: grid from global;
+    composes: outline-none from global;
+    composes: px-5 from global;
+    composes: py-xs from global;
+    composes: relative from global;
+    composes: rounded-md from global;
+    composes: shadow-none from global;
+    composes: text-colorDefault from global;
+    transition: border-color 384ms var(--venia-global-anim-in);
+
+    composes: focus_shadow-buttonFocus from global;
+
+    composes: hover_border-brand-dark from global;
+
+    composes: lg_px-md from global;
+    composes: lg_py-xs from global;
+}
+
+.root_selected {
+    composes: root;
+
+    composes: border-brand-dark from global;
+    composes: cursor-default from global;
+}
+
+.root_updated {
+    composes: root_selected;
+    animation: flash var(--venia-global-anim-bounce) 640ms 2;
+}
+
+.defaultCard {
+    grid-area: 1 / 1;
+}
+
+.editButton {
+    composes: absolute from global;
+    composes: p-xs from global;
+    composes: right-0 from global;
+    composes: top-0 from global;
+
+    composes: lg_right-1.5 from global;
+    composes: lg_top-1.5 from global;
+}
+
+.editButton:hover {
+    --fill: rgb(var(--venia-brand-color-1-700));
+}
+
+.editIcon {
+    composes: stroke-brand-base from global;
+    fill: var(--fill, white);
+    transition: fill 384ms var(--venia-global-anim-standard);
+}
+
+.defaultBadge {
+    composes: border from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: font-semibold from global;
+    composes: mb-1 from global;
+    composes: px-sm from global;
+    composes: py-1.5 from global;
+    composes: rounded-md from global;
+    composes: text-xs from global;
+    composes: w-max from global;
+}
+
+.name {
+    composes: font-semibold from global;
+}
+
+.address {
+    composes: gap-2xs from global;
+    composes: grid from global;
+}
+
+@keyframes flash {
+    0% {
+        opacity: 1;
+    }
+    50% {
+        opacity: 0.5;
+    }
+    100% {
+        opacity: 1;
+    }
+}

package/src/overwrites/venia-ui/lib/components/CheckoutPage/AddressBook/index.js

@@ -0,0 +1 @@
+export { default } from './addressBook';