@riosst100/pwa-marketplace 1.8.9 → 1.9.0

package/src/overwrites/venia-ui/lib/components/OrderHistoryPage/orderRow.js

@@ -0,0 +1,324 @@
+import React from 'react';
+import { arrayOf, number, shape, string } from 'prop-types';
+import { ChevronDown, ChevronUp } from 'react-feather';
+import { FormattedMessage, useIntl } from 'react-intl';
+import Price from '@magento/venia-ui/lib/components/Price';
+import { useOrderRow } from '@magento/peregrine/lib/talons/OrderHistoryPage/useOrderRow';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import Icon from '@magento/venia-ui/lib/components/Icon';
+import CollapsedImageGallery from './collapsedImageGallery';
+import OrderProgressBar from './orderProgressBar';
+import OrderDetails from './OrderDetails';
+import defaultClasses from './orderRow.module.css';
+import cn from 'classnames';
+import { Verify } from 'iconsax-react';
+import PlaceholderImage from '@magento/venia-ui/lib/components/Image/placeholderImage';
+
+const OrderRow = props => {
+    const { order } = props;
+    const { formatMessage } = useIntl();
+    const {
+        invoices,
+        items,
+        number: orderNumber,
+        order_date: orderDate,
+        shipments,
+        status,
+        total
+    } = order;
+    const { grand_total: grandTotal } = total;
+    const { currency, value: orderTotal } = grandTotal;
+
+    // Convert date to ISO-8601 format so Safari can also parse it
+    const isoFormattedDate = orderDate.replace(' ', 'T');
+    const formattedDate = new Date(isoFormattedDate).toLocaleDateString(
+        undefined,
+        {
+            year: 'numeric',
+            month: 'short',
+            day: 'numeric'
+        }
+    );
+
+    const hasInvoice = !!invoices.length;
+    const hasShipment = !!shipments.length;
+    let derivedStatus;
+    if (status === 'Complete') {
+        derivedStatus = formatMessage({
+            id: 'orderRow.deliveredText',
+            defaultMessage: 'Delivered'
+        });
+    } else if (hasShipment) {
+        derivedStatus = formatMessage({
+            id: 'orderRow.shippedText',
+            defaultMessage: 'Shipped'
+        });
+    } else if (hasInvoice) {
+        derivedStatus = formatMessage({
+            id: 'orderRow.readyToShipText',
+            defaultMessage: 'Ready to ship'
+        });
+    } else {
+        derivedStatus = formatMessage({
+            id: 'orderRow.processingText',
+            defaultMessage: 'Processing'
+        });
+    }
+
+    const talonProps = useOrderRow({ items });
+    const { loading, isOpen, handleContentToggle, imagesData } = talonProps;
+
+    const classes = useStyle(defaultClasses, props.classes);
+
+    const contentClass = isOpen ? classes.content : classes.content_collapsed;
+
+    const contentToggleIconSrc = isOpen ? ChevronUp : ChevronDown;
+
+    const contentToggleIcon = <Icon src={contentToggleIconSrc} size={24} />;
+
+    const collapsedImageGalleryElement = isOpen ? null : (
+        <CollapsedImageGallery items={imagesData} />
+    );
+
+    const orderDetails = loading ? null : (
+        <OrderDetails orderData={order} imagesData={imagesData} />
+    );
+
+    const orderTotalPrice =
+        currency && orderTotal !== null ? (
+            <Price currencyCode={currency} value={orderTotal} />
+        ) : (
+            '-'
+        );
+
+    const badgeStatusStyle = () => {
+        return 'bg-[#F1EFF6] text-blue-700 text-[14px] font-semibold rounded-full px-[30px] py-[5px] border-none';
+    }
+
+    const thumbnailProps = {
+        alt: items[0].product_name,
+        classes: { root: classes.thumbnail },
+        width: 50
+    };
+
+    return (
+        <li className={classes.root}>
+            <div className='flex flex-col md_flex-row justify-between mb-2.5'>
+                <div className='flex flex-col'>
+                    <div className="flex gap-x-[15px] flex-row">
+                        <span className="text-[14px] text-colorDefault">{formattedDate}</span>
+                        <span className="text-gray-200 text-[14px]">{orderNumber}</span>
+                    </div>
+                </div>
+                <div className='flex flex-col'>
+                    <div className='flex w-full justify-start mt-2.5 md_mt-0 md_justify-end'>
+                        <span className={cn(classes.orderStatusBadge, badgeStatusStyle())}>
+                            {derivedStatus}
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div className='flex flex-col md_flex-row justify-between mb-2.5'>
+                <div className='flex flex-col'>
+                    <div className='flex gap-x-[5px] mb-2.5'>
+                        <Verify size={17} className='text-blue-700' variant="Bold" />
+                        <span className='text-xs font-medium text-[rgba(25, 34, 42, 0.7)]'>
+                            Gundam Info
+                        </span>
+                    </div>
+                    <div className='flex flex-row'>
+                        <div>
+                            <PlaceholderImage {...thumbnailProps} />
+                        </div>
+                        <div className='flex flex-col max-w-[260px] gap-2.5'>
+                            <div className={cn(classes.productName, 'text-[14] font-medium')}>
+                                <span>
+                                    {items[0]?.product_name}
+                                </span>
+                            </div>
+                            <div className="text-[14] text-gray-200">
+                                <span>
+                                    {`${items[0]?.quantity_ordered}X`}
+                                </span>
+                                {' '}
+                                <span>
+                                    <Price currencyCode={items[0]?.product_sale_price?.currency} value={items[0]?.product_sale_price?.value} />
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div className='flex flex-col'>
+                    <div className="md_px-10 py-3 md_border-l border-gray-100">
+                        <span className="text-[14] text-gray-200 text-left md_text-center block mb-2">
+                            <FormattedMessage
+                                id={'orderRow.orderTotalText'}
+                                defaultMessage={'Order Total'}
+                            />
+                        </span>
+                        <div className="text-lg font-semibold text-left md_text-center block">{orderTotalPrice}</div>
+                    </div>
+                </div>
+            </div>
+            <div className='flex flex-row justify-end py-[5px]'>
+                <button
+                    className={cn(classes.contentToggleContainer, '!p-0 !border-0')}
+                    onClick={handleContentToggle}
+                    type="button"
+                    aria-expanded={isOpen}
+                >
+                    {/* {contentToggleIcon} */}
+                    <span className="text-[13px] font-medium text-blue-700 underline">
+                        <FormattedMessage
+                            id={'orderRow.ViewTransactionDetail'}
+                            defaultMessage={'View Transaction Detail'}
+                        />
+                    </span>
+                </button>
+            </div>
+
+            {/* <div className={classes.orderDateContainer}>
+                <span className={classes.orderDateLabel}>
+                    <FormattedMessage
+                        id={'orderRow.orderDateText'}
+                        defaultMessage={'Order Date'}
+                    />
+                </span>
+                <span className={classes.orderDate}>{formattedDate}</span>
+            </div> */}
+            {/* <div className={classes.orderItemsContainer}>
+                {collapsedImageGalleryElement}
+            </div> */}
+            {/* <div className={classes.orderStatusContainer}>
+                <span className={classes.orderStatusBadge}>
+                    {derivedStatus}
+                </span>
+                <OrderProgressBar status={derivedStatus} />
+            </div> */}
+            <div className={cn(contentClass, '!py-4 mt-4')}>{orderDetails}</div>
+        </li>
+    );
+};
+
+export default OrderRow;
+
+OrderRow.propTypes = {
+    classes: shape({
+        root: string,
+        cell: string,
+        stackedCell: string,
+        label: string,
+        value: string,
+        orderNumberContainer: string,
+        orderDateContainer: string,
+        orderTotalContainer: string,
+        orderStatusContainer: string,
+        orderItemsContainer: string,
+        contentToggleContainer: string,
+        orderNumberLabel: string,
+        orderDateLabel: string,
+        orderTotalLabel: string,
+        orderNumber: string,
+        orderDate: string,
+        orderTotal: string,
+        orderStatusBadge: string,
+        content: string,
+        content_collapsed: string
+    }),
+    order: shape({
+        billing_address: shape({
+            city: string,
+            country_code: string,
+            firstname: string,
+            lastname: string,
+            postcode: string,
+            region_id: string,
+            street: arrayOf(string)
+        }),
+        items: arrayOf(
+            shape({
+                id: string,
+                product_name: string,
+                product_sale_price: shape({
+                    currency: string,
+                    value: number
+                }),
+                product_sku: string,
+                selected_options: arrayOf(
+                    shape({
+                        label: string,
+                        value: string
+                    })
+                ),
+                quantity_ordered: number
+            })
+        ),
+        invoices: arrayOf(
+            shape({
+                id: string
+            })
+        ),
+        number: string,
+        order_date: string,
+        payment_methods: arrayOf(
+            shape({
+                type: string,
+                additional_data: arrayOf(
+                    shape({
+                        name: string,
+                        value: string
+                    })
+                )
+            })
+        ),
+        shipping_address: shape({
+            city: string,
+            country_code: string,
+            firstname: string,
+            lastname: string,
+            postcode: string,
+            region_id: string,
+            street: arrayOf(string),
+            telephone: string
+        }),
+        shipping_method: string,
+        shipments: arrayOf(
+            shape({
+                id: string,
+                tracking: arrayOf(
+                    shape({
+                        number: string
+                    })
+                )
+            })
+        ),
+        status: string,
+        total: shape({
+            discounts: arrayOf(
+                shape({
+                    amount: shape({
+                        currency: string,
+                        value: number
+                    })
+                })
+            ),
+            grand_total: shape({
+                currency: string,
+                value: number
+            }),
+            subtotal: shape({
+                currency: string,
+                value: number
+            }),
+            total_tax: shape({
+                currency: string,
+                value: number
+            }),
+            total_shipping: shape({
+                currency: string,
+                value: number
+            })
+        })
+    })
+};

package/src/overwrites/venia-ui/lib/components/OrderHistoryPage/orderRow.module.css

@@ -0,0 +1,146 @@
+.root {
+    composes: border from global;
+    composes: border-gray-100 from global;
+    /* composes: grid from global;
+    composes: grid-cols-2 from global; */
+    composes: rounded-md from global;
+    composes: p-[15px] from global;
+}
+
+@media (min-width: 960px) {
+    .root {
+        /* grid-template-columns:
+            minmax(9rem, 1fr) minmax(9rem, 1fr) minmax(9rem, 1fr) 16rem 2fr 3rem; */
+    }
+}
+
+.orderNumberContainer {}
+
+.orderDateContainer {
+    composes: gap-y-1 from global;
+    composes: grid from global;
+    composes: overflow-hidden from global;
+    composes: p-sm from global;
+}
+
+.orderTotalContainer {
+    composes: border-0 from global;
+    composes: border-b from global;
+    composes: border-l from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: gap-y-1 from global;
+    composes: grid from global;
+    composes: overflow-hidden from global;
+    composes: p-sm from global;
+
+    composes: lg_border-b-0 from global;
+}
+
+.orderStatusContainer {
+    composes: border-0 from global;
+    composes: border-l-0 from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: col-end-span2 from global;
+    composes: gap-y-1 from global;
+    composes: grid from global;
+    composes: overflow-hidden from global;
+    composes: p-sm from global;
+
+    composes: lg_border-b-0 from global;
+    composes: lg_border-l from global;
+    composes: lg_col-end-auto from global;
+    composes: lg_gap-y-3 from global;
+}
+
+.orderItemsContainer {
+    composes: border-0 from global;
+    composes: border-b from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: col-end-span2 from global;
+    composes: overflow-hidden from global;
+    composes: p-0 from global;
+    composes: py-sm from global;
+
+    composes: lg_border-0 from global;
+    composes: lg_border-l from global;
+    composes: lg_col-end-auto from global;
+    composes: lg_p-0 from global;
+}
+
+.contentToggleContainer {
+    composes: border-0 from global;
+    composes: border-l from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: col-start-2 from global;
+    composes: justify-self-end from global;
+    composes: overflow-hidden from global;
+    composes: px-xs from global;
+    composes: py-0 from global;
+    composes: row-start-1 from global;
+
+    composes: lg_border-l from global;
+    composes: lg_col-start-6 from global;
+    composes: lg_px-xs from global;
+    composes: lg_row-start-1 from global;
+}
+
+.orderNumberLabel,
+.orderDateLabel,
+.orderTotalLabel {
+    composes: text-2xs from global;
+}
+
+.orderNumber,
+.orderDate,
+.orderTotal {
+    composes: font-bold from global;
+}
+
+.orderStatusBadge {
+    composes: border from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: font-bold from global;
+    composes: justify-self-start from global;
+    composes: px-xs from global;
+    composes: py-1 from global;
+    composes: rounded-md from global;
+    composes: text-2xs from global;
+}
+
+.content {
+    composes: border-t from global;
+    composes: border-solid from global;
+    composes: border-gray-100 from global;
+    /* composes: p-sm from global; */
+    grid-column: 1 / -1;
+}
+
+.content_collapsed {
+    composes: hidden from global;
+}
+
+@media (max-width: 959px) {
+
+    /* TODO @TW: cannot compose */
+    .orderItemsContainer:empty {
+        display: none;
+    }
+
+    .orderNumberContainer {
+        grid-column: 1 / span 2;
+        grid-row: 1;
+    }
+}
+
+.productName {
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    line-height: normal;
+}

package/src/overwrites/venia-ui/lib/components/OrderHistoryPage/resetButton.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import { useFormApi } from 'informed';
+import { useIntl } from 'react-intl';
+import { func } from 'prop-types';
+import { X as ClearIcon } from 'react-feather';
+
+import Icon from '@magento/venia-ui/lib/components/Icon';
+import Trigger from '@magento/venia-ui/lib/components/Trigger';
+
+const clearIcon = <Icon src={ClearIcon} size={24} />;
+
+const ResetButton = props => {
+    const { onReset } = props;
+    const formApi = useFormApi();
+
+    const handleReset = () => {
+        formApi.reset();
+
+        if (onReset) {
+            onReset();
+        }
+    };
+    const { formatMessage } = useIntl();
+    return (
+        <Trigger
+            action={handleReset}
+            addLabel={formatMessage({
+                id: 'global.clearText',
+                defaultMessage: 'Clear Text'
+            })}
+        >
+            {clearIcon}
+        </Trigger>
+    );
+};
+
+export default ResetButton;
+
+ResetButton.propTypes = {
+    onReset: func
+};

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

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

package/src/overwrites/venia-ui/lib/components/Password/password.js

@@ -0,0 +1,102 @@
+import React from 'react';
+import { string, bool, shape, func } from 'prop-types';
+import { Eye, EyeOff } from 'react-feather';
+import { useIntl } from 'react-intl';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import { usePassword } from '@magento/peregrine/lib/talons/Password/usePassword';
+
+import Button from '@magento/venia-ui/lib/components/Button';
+import Field from '@magento/venia-ui/lib/components/Field';
+import TextInput from '@magento/venia-ui/lib/components/TextInput';
+import { isRequired } from '@magento/venia-ui/lib/util/formValidators';
+
+import defaultClasses from './password.module.css';
+
+const Password = props => {
+    const {
+        classes: propClasses,
+        label,
+        fieldName,
+        isToggleButtonHidden,
+        autoComplete,
+        validate,
+        ...otherProps
+    } = props;
+
+    const talonProps = usePassword();
+    const { handleBlur, togglePasswordVisibility, visible } = talonProps;
+    const classes = useStyle(defaultClasses, propClasses);
+
+    const handleKeypress = e => {
+        if (e.code == 'Enter') {
+            togglePasswordVisibility;
+        }
+    };
+    const { formatMessage } = useIntl();
+    const hidePassword = formatMessage({
+        id: 'password.hide',
+        defaultMessage: 'Hide Password'
+    });
+    const viewPassword = formatMessage({
+        id: 'password.view',
+        defaultMessage: 'View Password'
+    });
+    const speak = visible ? hidePassword : viewPassword;
+
+    const passwordButton = (
+        <Button
+            className={classes.passwordButton}
+            onClick={togglePasswordVisibility}
+            onKeyDown={handleKeypress}
+            onKey
+            type="button"
+        >
+            {visible ? (
+                <Eye aria-label={speak} />
+            ) : (
+                <EyeOff aria-label={speak} />
+            )}
+        </Button>
+    );
+
+    const fieldType = visible ? 'text' : 'password';
+
+    return (
+        <Field
+            id="Password"
+            label={label}
+            classes={{
+                root: classes.root,
+                label: "font-normal text-left mb-2 text-[14px] block"
+            }}
+        >
+            <TextInput
+                after={!isToggleButtonHidden && passwordButton}
+                autoComplete={autoComplete}
+                field={fieldName}
+                type={fieldType}
+                validate={validate}
+                onBlur={handleBlur}
+                {...otherProps}
+            />
+        </Field>
+    );
+};
+
+Password.propTypes = {
+    autoComplete: string,
+    classes: shape({
+        root: string
+    }),
+    label: string,
+    fieldName: string,
+    isToggleButtonHidden: bool,
+    validate: func
+};
+
+Password.defaultProps = {
+    isToggleButtonHidden: true,
+    validate: isRequired
+};
+
+export default Password;

package/src/overwrites/venia-ui/lib/components/Password/password.module.css

@@ -0,0 +1,26 @@
+.root:active {
+    --stroke: var(--venia-global-color-gray-700);
+}
+
+.passwordButton {
+    composes: root from '@magento/venia-ui/lib/components/Button/button.module.css';
+
+    --stroke: var(--venia-global-color-gray-500);
+
+    composes: bg-transparent from global;
+    composes: border-none from global;
+    composes: border-0 from global;
+    composes: min-w-0 from global;
+    composes: p-0 from global;
+    composes: rounded-none from global;
+
+    composes: focus_shadow-none from global;
+}
+
+.passwordButton:hover {
+    --stroke: var(--venia-global-color-gray-700);
+}
+
+.passwordButton:focus {
+    --stroke: var(--venia-global-color-gray-700);
+}

package/src/overwrites/venia-ui/lib/components/ProductFullDetail/productFullDetail.js

@@ -71,6 +71,7 @@ const ProductFullDetail = props => {
         wishlistButtonProps,
         sellerDetails
     } = talonProps;
+    console.log("🚀 ~ ProductFullDetail ~ talonProps:", talonProps)
 
     const { formatMessage } = useIntl();
 
@@ -496,20 +497,34 @@ const ProductFullDetail = props => {
                         )}
                     >
                         <div className='flex flex-col gap-y-5 max-w-[448px]'>
-                            <p
-                                data-cy="ProductFullDetail-productPrice"
-                                className={cn(
-                                    classes.productPrice,
-                                    'text-[32px] font-semibold leading-[32px] mb-0',
-                                )}
-                            >
-                                <Price
-                                    currencyCode={productDetails.price.currency}
-                                    value={productDetails.price.value}
-                                />
-                            </p>
-                            <AuctionDetail productDetails={productDetails} className="auction_detail-container" />
-                            <PreorderDetail productDetails={productDetails} className={'preorder_detail-container'} />
+                            <div className='flex flex-col gap-y-3'>
+                                <p
+                                    data-cy="ProductFullDetail-productPrice"
+                                    className={cn(
+                                        classes.productPrice,
+                                        'text-[32px] font-semibold leading-[32px] mb-0',
+                                    )}
+                                >
+                                    <Price
+                                        currencyCode={productDetails.price.currency}
+                                        value={productDetails.price.value}
+                                    />
+                                </p>
+                                <p
+                                    data-cy="ProductFullDetail-productOldPrice"
+                                    className={cn(
+                                        classes.productPrice,
+                                        'text-lg font-normal leading-none text-gray-400 mb-0 line-through',
+                                    )}
+                                >
+                                    <Price
+                                        currencyCode={productDetails.price.currency}
+                                        value={productDetails.price.value}
+                                    />
+                                </p>
+                            </div>
+                            <AuctionDetail className="auction_detail-container" />
+                            <PreorderDetail className={'preorder_detail-container'} />
                             <small className='shipping-calculation-notes text-gray-200 text-xs'>
                                 Shipping method is calculated on checkout
                             </small>