@riosst100/pwa-marketplace 1.2.6 → 1.2.7

package/src/components/SellerVerification/sellerVerification.js

@@ -1,198 +1,198 @@
-import React from 'react';
-import { FormattedMessage, useIntl } from 'react-intl';
-import { Form } from 'informed';
-import { func, shape, string, bool } from 'prop-types';
-import { useBecomeSeller } from '@riosst100/pwa-marketplace/src/talons/BecomeSeller/useBecomeSeller';
-
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import combine from '@magento/venia-ui/lib/util/combineValidators';
-import {
-    hasLengthAtLeast,
-    isRequired,
-    validatePassword
-} from '@magento/venia-ui/lib/util/formValidators';
-import Button from '@magento/venia-ui/lib/components/Button';
-import Checkbox from '@magento/venia-ui/lib/components/Checkbox';
-import Field from '@magento/venia-ui/lib/components/Field';
-import Select from '@magento/venia-ui/lib/components/Select';
-import TextInput from '@magento/venia-ui/lib/components/TextInput';
-import defaultClasses from './sellerVerification.module.css';
-import FormError from '@magento/venia-ui/lib/components/FormError';
-import Password from '@magento/venia-ui/lib/components/Password';
-import GoogleRecaptcha from '@magento/venia-ui/lib/components/GoogleReCaptcha';
-
-const BecomeSeller = props => {
-    const talonProps = useBecomeSeller({
-        initialValues: props.initialValues,
-        onSubmit: props.onSubmit,
-        onCancel: props.onCancel
-    });
-
-    const {
-        errors,
-        handleSubmit,
-        handleEnterKeyPress,
-        isDisabled,
-        initialValues,
-        recaptchaWidgetProps
-    } = talonProps;
-    const { formatMessage } = useIntl();
-    const classes = useStyle(defaultClasses, props.classes);
-    
-    const submitButton = (
-        <Button
-            className={classes.submitButton}
-            disabled={isDisabled}
-            type="submit"
-            priority="high"
-            onKeyDown={handleEnterKeyPress}
-            data-cy="BecomeSeller-submitButton"
-        >
-            <FormattedMessage
-                id={'sellerVerification.sellerVerificationText'}
-                defaultMessage={'Become a Seller'}
-            />
-        </Button>
-    );
-
-    const sellerTypeOptions = [
-        {
-            value: "individual",
-            label: "Individual"
-        },
-        {
-            value: "company",
-            label: "Company"
-        }
-    ];
-
-    return (
-        <Form
-            data-cy="BecomeSeller-form"
-            className={classes.root}
-            initialValues={initialValues}
-            onSubmit={handleSubmit}
-        >
-            <h2 data-cy="BecomeSeller-title" className={classes.title}>
-                <FormattedMessage
-                    id={'sellerVerification.sellerVerificationText'}
-                    defaultMessage={'Become a Seller'}
-                />
-            </h2>
-            <FormError errors={Array.from(errors.values())} />
-            <Field
-                id="sellerType"
-                label={formatMessage({
-                    id: 'sellerVerification.sellerTypeText',
-                    defaultMessage: 'Seller Type'
-                })}
-            >
-                <Select
-                    field="seller.seller_type"
-                    id={classes.root}
-                    items={sellerTypeOptions}
-                />
-            </Field>
-            <Field
-                id="sellerProfileName"
-                label={formatMessage({
-                    id: 'sellerVerification.sellerProfileNameText',
-                    defaultMessage: 'Seller Profile Name'
-                })}
-            >
-                <TextInput
-                    id="sellerProfileName"
-                    field="seller.seller_profile_name"
-                    validate={isRequired}
-                    validateOnBlur
-                    mask={value => value && value.trim()}
-                    maskOnBlur={true}
-                    data-cy="seller-profilename"
-                    aria-label={formatMessage({
-                        id: 'global.sellerProfileNameRequired',
-                        defaultMessage: 'Seller Profile Name is required.'
-                    })}
-                />
-            </Field>
-            <Field
-                id="companyName"
-                label={formatMessage({
-                    id: 'sellerVerification.companyNameText',
-                    defaultMessage: 'Company Name'
-                })}
-            >
-                <TextInput
-                    id="companyName"
-                    field="seller.company_name"
-                    validate={isRequired}
-                    validateOnBlur
-                    mask={value => value && value.trim()}
-                    maskOnBlur={true}
-                    data-cy="seller-companyname"
-                    aria-label={formatMessage({
-                        id: 'global.companyNameRequired',
-                        defaultMessage: 'Company Name Required'
-                    })}
-                />
-            </Field>
-            <Field
-                id="storeURL"
-                label={formatMessage({
-                    id: 'sellerVerification.storeURLText',
-                    defaultMessage: 'Store URL'
-                })}
-            >
-                <TextInput
-                    id="storeUrl"
-                    field="seller.store_url"
-                    validate={isRequired}
-                    validateOnBlur
-                    mask={value => value && value.trim()}
-                    maskOnBlur={true}
-                    data-cy="seller-storeurl"
-                    aria-label={formatMessage({
-                        id: 'global.storeUrlRequired',
-                        defaultMessage: 'Store URL is required.'
-                    })}
-                />
-            </Field>
-            <div className={classes.subscribe}>
-                <Checkbox
-                    field="become_seller_agreement"
-                    id="sellerVerificationAgreement"
-                    label={formatMessage({
-                        id: 'sellerVerification.sellerVerificationAgreementText',
-                        defaultMessage: 'I agree the Terms and Condition (Terms and Conditions)'
-                    })}
-                />
-            </div>
-            <GoogleRecaptcha {...recaptchaWidgetProps} />
-            <div className={classes.actions}>
-                {submitButton}
-            </div>
-        </Form>
-    );
-};
-
-BecomeSeller.propTypes = {
-    classes: shape({
-        actions: string,
-        lead: string,
-        root: string,
-        subscribe: string
-    }),
-    initialValues: shape({
-        sellerProfileName: string,
-        companyName: string
-    }),
-    isCancelButtonHidden: bool,
-    onSubmit: func,
-    onCancel: func
-};
-
-BecomeSeller.defaultProps = {
-    onCancel: () => {},
-    isCancelButtonHidden: true
-};
-
-export default BecomeSeller;
+import React from 'react';
+import { FormattedMessage, useIntl } from 'react-intl';
+import { Form } from 'informed';
+import { func, shape, string, bool } from 'prop-types';
+import { useBecomeSeller } from '@riosst100/pwa-marketplace/src/talons/BecomeSeller/useBecomeSeller';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import combine from '@magento/venia-ui/lib/util/combineValidators';
+import {
+    hasLengthAtLeast,
+    isRequired,
+    validatePassword
+} from '@magento/venia-ui/lib/util/formValidators';
+import Button from '@magento/venia-ui/lib/components/Button';
+import Checkbox from '@magento/venia-ui/lib/components/Checkbox';
+import Field from '@magento/venia-ui/lib/components/Field';
+import Select from '@magento/venia-ui/lib/components/Select';
+import TextInput from '@magento/venia-ui/lib/components/TextInput';
+import defaultClasses from './sellerVerification.module.css';
+import FormError from '@magento/venia-ui/lib/components/FormError';
+import Password from '@magento/venia-ui/lib/components/Password';
+import GoogleRecaptcha from '@magento/venia-ui/lib/components/GoogleReCaptcha';
+
+const BecomeSeller = props => {
+    const talonProps = useBecomeSeller({
+        initialValues: props.initialValues,
+        onSubmit: props.onSubmit,
+        onCancel: props.onCancel
+    });
+
+    const {
+        errors,
+        handleSubmit,
+        handleEnterKeyPress,
+        isDisabled,
+        initialValues,
+        recaptchaWidgetProps
+    } = talonProps;
+    const { formatMessage } = useIntl();
+    const classes = useStyle(defaultClasses, props.classes);
+    
+    const submitButton = (
+        <Button
+            className={classes.submitButton}
+            disabled={isDisabled}
+            type="submit"
+            priority="high"
+            onKeyDown={handleEnterKeyPress}
+            data-cy="BecomeSeller-submitButton"
+        >
+            <FormattedMessage
+                id={'sellerVerification.sellerVerificationText'}
+                defaultMessage={'Become a Seller'}
+            />
+        </Button>
+    );
+
+    const sellerTypeOptions = [
+        {
+            value: "individual",
+            label: "Individual"
+        },
+        {
+            value: "company",
+            label: "Company"
+        }
+    ];
+
+    return (
+        <Form
+            data-cy="BecomeSeller-form"
+            className={classes.root}
+            initialValues={initialValues}
+            onSubmit={handleSubmit}
+        >
+            <h2 data-cy="BecomeSeller-title" className={classes.title}>
+                <FormattedMessage
+                    id={'sellerVerification.sellerVerificationText'}
+                    defaultMessage={'Become a Seller'}
+                />
+            </h2>
+            <FormError errors={Array.from(errors.values())} />
+            <Field
+                id="sellerType"
+                label={formatMessage({
+                    id: 'sellerVerification.sellerTypeText',
+                    defaultMessage: 'Seller Type'
+                })}
+            >
+                <Select
+                    field="seller.seller_type"
+                    id={classes.root}
+                    items={sellerTypeOptions}
+                />
+            </Field>
+            <Field
+                id="sellerProfileName"
+                label={formatMessage({
+                    id: 'sellerVerification.sellerProfileNameText',
+                    defaultMessage: 'Seller Profile Name'
+                })}
+            >
+                <TextInput
+                    id="sellerProfileName"
+                    field="seller.seller_profile_name"
+                    validate={isRequired}
+                    validateOnBlur
+                    mask={value => value && value.trim()}
+                    maskOnBlur={true}
+                    data-cy="seller-profilename"
+                    aria-label={formatMessage({
+                        id: 'global.sellerProfileNameRequired',
+                        defaultMessage: 'Seller Profile Name is required.'
+                    })}
+                />
+            </Field>
+            <Field
+                id="companyName"
+                label={formatMessage({
+                    id: 'sellerVerification.companyNameText',
+                    defaultMessage: 'Company Name'
+                })}
+            >
+                <TextInput
+                    id="companyName"
+                    field="seller.company_name"
+                    validate={isRequired}
+                    validateOnBlur
+                    mask={value => value && value.trim()}
+                    maskOnBlur={true}
+                    data-cy="seller-companyname"
+                    aria-label={formatMessage({
+                        id: 'global.companyNameRequired',
+                        defaultMessage: 'Company Name Required'
+                    })}
+                />
+            </Field>
+            <Field
+                id="storeURL"
+                label={formatMessage({
+                    id: 'sellerVerification.storeURLText',
+                    defaultMessage: 'Store URL'
+                })}
+            >
+                <TextInput
+                    id="storeUrl"
+                    field="seller.store_url"
+                    validate={isRequired}
+                    validateOnBlur
+                    mask={value => value && value.trim()}
+                    maskOnBlur={true}
+                    data-cy="seller-storeurl"
+                    aria-label={formatMessage({
+                        id: 'global.storeUrlRequired',
+                        defaultMessage: 'Store URL is required.'
+                    })}
+                />
+            </Field>
+            <div className={classes.subscribe}>
+                <Checkbox
+                    field="become_seller_agreement"
+                    id="sellerVerificationAgreement"
+                    label={formatMessage({
+                        id: 'sellerVerification.sellerVerificationAgreementText',
+                        defaultMessage: 'I agree the Terms and Condition (Terms and Conditions)'
+                    })}
+                />
+            </div>
+            <GoogleRecaptcha {...recaptchaWidgetProps} />
+            <div className={classes.actions}>
+                {submitButton}
+            </div>
+        </Form>
+    );
+};
+
+BecomeSeller.propTypes = {
+    classes: shape({
+        actions: string,
+        lead: string,
+        root: string,
+        subscribe: string
+    }),
+    initialValues: shape({
+        sellerProfileName: string,
+        companyName: string
+    }),
+    isCancelButtonHidden: bool,
+    onSubmit: func,
+    onCancel: func
+};
+
+BecomeSeller.defaultProps = {
+    onCancel: () => {},
+    isCancelButtonHidden: true
+};
+
+export default BecomeSeller;

package/src/components/SellerVerification/sellerVerification.module.css

@@ -1,47 +1,47 @@
-.root {
-    composes: gap-xs from global;
-    composes: grid from global;
-    composes: justify-items-stretch from global;
-    composes: px-sm from global;
-    composes: py-xs from global;
-}
-
-.message {
-    composes: bg-subtle from global;
-    composes: leading-tight from global;
-    composes: p-xs from global;
-    composes: rounded from global;
-    composes: text-sm from global;
-}
-
-/* TODO @TW: cannot compose */
-.message:empty {
-    display: none;
-}
-
-.actions {
-    composes: gap-xs from global;
-    composes: grid from global;
-    composes: grid-flow-row from global;
-    composes: justify-center from global;
-    composes: mt-xs from global;
-    composes: text-center from global;
-
-    composes: lg_grid-flow-col from global;
-}
-
-.cancelButton {
-    composes: root_lowPriority from '@magento/venia-ui/lib/components/Button/button.module.css';
-}
-
-.submitButton {
-    composes: root_highPriority from '@magento/venia-ui/lib/components/Button/button.module.css';
-
-    composes: col-start-auto from global;
-
-    composes: lg_col-start-2 from global;
-}
-
-.subscribe {
-    composes: -ml-1.5 from global;
-}
+.root {
+    composes: gap-xs from global;
+    composes: grid from global;
+    composes: justify-items-stretch from global;
+    composes: px-sm from global;
+    composes: py-xs from global;
+}
+
+.message {
+    composes: bg-subtle from global;
+    composes: leading-tight from global;
+    composes: p-xs from global;
+    composes: rounded from global;
+    composes: text-sm from global;
+}
+
+/* TODO @TW: cannot compose */
+.message:empty {
+    display: none;
+}
+
+.actions {
+    composes: gap-xs from global;
+    composes: grid from global;
+    composes: grid-flow-row from global;
+    composes: justify-center from global;
+    composes: mt-xs from global;
+    composes: text-center from global;
+
+    composes: lg_grid-flow-col from global;
+}
+
+.cancelButton {
+    composes: root_lowPriority from '@magento/venia-ui/lib/components/Button/button.module.css';
+}
+
+.submitButton {
+    composes: root_highPriority from '@magento/venia-ui/lib/components/Button/button.module.css';
+
+    composes: col-start-auto from global;
+
+    composes: lg_col-start-2 from global;
+}
+
+.subscribe {
+    composes: -ml-1.5 from global;
+}

package/src/components/SellerVerificationPage/sellerVerificationPage.js

@@ -1,43 +1,43 @@
-import React from 'react';
-import { shape, string } from 'prop-types';
-import { FormattedMessage, useIntl } from 'react-intl';
-
-import { useBecomeSellerPage } from '@riosst100/pwa-marketplace/src/talons/BecomeSellerPage/useBecomeSellerPage';
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import BecomeSeller from '@riosst100/pwa-marketplace/src/components/BecomeSeller';
-import { StoreTitle } from '@magento/venia-ui/lib/components/Head';
-import defaultClasses from './sellerVerificationPage.module.css';
-
-const BecomeSellerPage = props => {
-    const classes = useStyle(defaultClasses, props.classes);
-    const { sellerVerificationProps } = useBecomeSellerPage(props);
-    const { formatMessage } = useIntl();
-
-    return (
-        <div className={classes.root}>
-            <StoreTitle>
-                {formatMessage({
-                    id: 'sellerVerificationPage.title',
-                    defaultMessage: 'Become a Seller'
-                })}
-            </StoreTitle>
-            <div className={classes.contentContainer}>
-                <BecomeSeller {...sellerVerificationProps} />
-            </div>
-        </div>
-    );
-}
-
-export default BecomeSellerPage;
-
-BecomeSellerPage.defaultProps = {
-    signedInRedirectUrl: '/seller-verification',
-    signInPageUrl: '/become-seller'
-};
-
-BecomeSellerPage.propTypes = {
-    classes: shape({
-        root: string
-    }),
-    signedInRedirectUrl: string
-};
+import React from 'react';
+import { shape, string } from 'prop-types';
+import { FormattedMessage, useIntl } from 'react-intl';
+
+import { useBecomeSellerPage } from '@riosst100/pwa-marketplace/src/talons/BecomeSellerPage/useBecomeSellerPage';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import BecomeSeller from '@riosst100/pwa-marketplace/src/components/BecomeSeller';
+import { StoreTitle } from '@magento/venia-ui/lib/components/Head';
+import defaultClasses from './sellerVerificationPage.module.css';
+
+const BecomeSellerPage = props => {
+    const classes = useStyle(defaultClasses, props.classes);
+    const { sellerVerificationProps } = useBecomeSellerPage(props);
+    const { formatMessage } = useIntl();
+
+    return (
+        <div className={classes.root}>
+            <StoreTitle>
+                {formatMessage({
+                    id: 'sellerVerificationPage.title',
+                    defaultMessage: 'Become a Seller'
+                })}
+            </StoreTitle>
+            <div className={classes.contentContainer}>
+                <BecomeSeller {...sellerVerificationProps} />
+            </div>
+        </div>
+    );
+}
+
+export default BecomeSellerPage;
+
+BecomeSellerPage.defaultProps = {
+    signedInRedirectUrl: '/seller-verification',
+    signInPageUrl: '/become-seller'
+};
+
+BecomeSellerPage.propTypes = {
+    classes: shape({
+        root: string
+    }),
+    signedInRedirectUrl: string
+};

package/src/components/SellerVerificationPage/sellerVerificationPage.module.css

@@ -1,21 +1,21 @@
-.root {
-    composes: gap-y-md from global;
-    composes: grid from global;
-    composes: justify-center from global;
-    composes: px-0 from global;
-    composes: py-md from global;
-    composes: text-center from global;
-    grid-template-columns: minmax(auto, 512px);
-}
-
-.header {
-    composes: font-serif from global;
-}
-
-.contentContainer {
-    composes: lg_border-2 from global;
-    composes: lg_border-solid from global;
-    composes: lg_border-subtle from global;
-    composes: lg_pb-md from global;
-    composes: lg_rounded-md from global;
-}
+.root {
+    composes: gap-y-md from global;
+    composes: grid from global;
+    composes: justify-center from global;
+    composes: px-0 from global;
+    composes: py-md from global;
+    composes: text-center from global;
+    grid-template-columns: minmax(auto, 512px);
+}
+
+.header {
+    composes: font-serif from global;
+}
+
+.contentContainer {
+    composes: lg_border-2 from global;
+    composes: lg_border-solid from global;
+    composes: lg_border-subtle from global;
+    composes: lg_pb-md from global;
+    composes: lg_rounded-md from global;
+}

package/src/components/SortBy/index.js

@@ -1,17 +1,25 @@
-import React from 'react';
-import { ArrowDown2 } from 'iconsax-react';
-
-const Sort = () => {
-    return (
-        <>
-            <div class="inline-flex flex-col items-start gap-[10px] px-[15px] py-[10px] relative flex-[0_0_auto] bg-white rounded-[30px] border border-solid border-[#e6e9ea]">
-                <div class="inline-flex items-center gap-[20px] relative flex-[0_0_auto]">
-                    <div class="relative w-fit [font-family:'Frederik-Regular',Helvetica] font-normal text-[#1b1b1b] text-[14px] tracking-[0] leading-[normal] whitespace-nowrap">Most relevant</div>
-                    <ArrowDown2 color="#292D32" size={14} variant="Outline" className='stroke-[#292D32]' />
-                </div>
-            </div>
-        </>
-    )
-}
-
+import React from 'react';
+import { ArrowDown2, Filter } from 'iconsax-react';
+
+const Sort = () => {
+    return (
+        <>
+            <div className='x-container xs_flex xs_justify-between xs_w-full xl_w-fit'>
+                <div class="xs_flex xl_hidden flex-col items-start gap-[10px] px-[15px] py-[10px] relative flex-[0_0_auto] bg-white rounded-[30px] border border-solid border-gray-100">
+                    <div class="inline-flex items-center gap-[20px] relative flex-[0_0_auto]">
+                        <Filter color="#292D32" size={14} variant="Outline" className='stroke-[#292D32]' />
+                        <div class="relative w-fit text-[14px] tracking-[0] leading-[normal] whitespace-nowrap">Filter</div>
+                    </div>
+                </div>
+                <div class="inline-flex flex-col items-start gap-[10px] px-[15px] py-[10px] relative flex-[0_0_auto] bg-white rounded-[30px] border border-solid border-gray-100">
+                    <div class="inline-flex items-center gap-[20px] relative flex-[0_0_auto]">
+                        <div class="relative w-fit text-[14px] tracking-[0] leading-[normal] whitespace-nowrap">Most relevant</div>
+                        <ArrowDown2 color="#292D32" size={14} variant="Outline" className='stroke-[#292D32]' />
+                    </div>
+                </div>
+            </div>
+        </>
+    )
+}
+
 export default Sort;