@riosst100/pwa-marketplace 1.8.9 → 1.9.1

package/i18n/en_US.json

@@ -82,9 +82,9 @@
     "checkoutPage.loadingPaymentInformation": "Fetching Payment Information",
     "checkoutPage.noPaymentAvailable": "Payment is currently unavailable.",
     "checkoutPage.orderNumber": "Order Number: {orderNumber}",
-    "checkoutPage.orderSummary": "Order Summary",
+    "checkoutPage.orderSummary": "Summary",
     "checkoutPage.paymentInformation": "Payment Information",
-    "checkoutPage.paymentInformationStep": "3. Payment Information",
+    "checkoutPage.paymentInformationStep": "Payment Information",
     "checkoutPage.paymentLoadingError": "There was an error loading payments.",
     "checkoutPage.paymentMethodStatus": "{selectedPaymentMethod} is not supported for editing.",
     "checkoutPage.paymentSummary": "{cardType} ending in {lastFour}",
@@ -97,7 +97,7 @@
     "checkoutPage.reviewAndPlaceOrder": "Review and Place Order",
     "checkoutPage.reviewOrder": "Review Order",
     "checkoutPage.setAPasswordAndSave": "Set a password and save your information for next time in one easy step!",
-    "checkoutPage.shippingMethodStep": "2. Shipping Method",
+    "checkoutPage.shippingMethodStep": "Shipping Method",
     "checkoutPage.showAllItems": "SHOW ALL ITEMS",
     "checkoutPage.signInButton": "Sign In",
     "checkoutPage.signInLabel": "Sign in for Express Checkout",
@@ -143,7 +143,7 @@
     "couponCode.errorContainer": "Something went wrong. Please refresh and try again.",
     "couponCode.removeButton": "Remove",
     "createAccount.cancelText": "Cancel",
-    "createAccount.createAccountText": "Create an Account",
+    "createAccount.createAccountText": "Sign Up",
     "createAccount.emailText": "Email",
     "createAccount.firstNameText": "First Name",
     "createAccount.lastNameText": "Last Name",
@@ -276,7 +276,7 @@
     "miniCart.totalQuantity": "{totalQuantity} Items",
     "navHeader.accountText": "Account",
     "navHeader.createAccountText": "Create Account",
-    "navHeader.forgotPasswordText": "Forgot Password",
+    "navHeader.forgotPasswordText": "Forgot your password",
     "navHeader.mainMenuText": "Main Menu",
     "navHeader.myAccountText": "My Account",
     "navHeader.signInText": "Sign In",
@@ -334,7 +334,7 @@
     "priceAdjustments.couponCode": "Enter Coupon Code",
     "priceAdjustments.giftOptions": "See Gift Options",
     "priceAdjustments.shippingMethod": "Estimate your Shipping",
-    "priceSummary.checkoutButton": "Proceed to Checkout",
+    "priceSummary.checkoutButton": "Checkout",
     "priceSummary.discountSummary.hideDiscounts": "Hide individual discounts.",
     "priceSummary.discountSummary.showDiscounts": "Show individual discounts.",
     "priceSummary.errorText": "Something went wrong. Please refresh and try again.",
@@ -414,7 +414,7 @@
     "shippingForm.zip": "Postal Code",
     "shippingForm.shippingEmail": "Shipping Email",
     "shippingInformation.cardTitle": "Shipping Information",
-    "shippingInformation.editTitle": "1. Shipping Information",
+    "shippingInformation.editTitle": "Shipping Information",
     "shippingInformation.loading": "Fetching Shipping Information...",
     "shippingMethod.continueToNextStep": "Continue to Payment Information",
     "shippingMethod.heading": "Shipping Method",
@@ -427,8 +427,8 @@
     "shippingSummary.shipping": "Shipping",
     "Sign In": "Sign In",
     "signIn.createAccountText": "Create an Account",
-    "signIn.emailAddressText": "Email address",
-    "signIn.forgotPasswordText": "Forgot Password?",
+    "signIn.emailAddressText": "Email",
+    "signIn.forgotPasswordText": "Forgot your password?",
     "signIn.loadingText": "Signing In",
     "signIn.passwordText": "Password",
     "signIn.signInText": "Sign In",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "1.8.9",
+  "version": "1.9.1",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/componentOverrideMapping.js

@@ -49,4 +49,18 @@ module.exports = componentOverrideMapping = {
     [`@magento/venia-ui/lib/RootComponents/CMS/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/RootComponents/CMS/index.js',
     [`@magento/pagebuilder/lib/ContentTypes/Slider/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/pagebuilder/lib/ContentTypes/Slider/index.js',
     [`@magento/venia-ui/lib/components/App/app.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/App/app.js',
-};
+    [`@magento/venia-ui/lib/components/SignIn/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/SignIn/index.js',
+    [`@magento/venia-ui/lib/components/SignInPage/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/SignInPage/index.js',
+    [`@magento/venia-ui/lib/components/Password/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Password/index.js',
+    [`@magento/venia-ui/lib/components/Password/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Password/index.js',
+    [`@magento/venia-ui/lib/components/CreateAccount/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/CreateAccount/index.js',
+    [`@magento/venia-ui/lib/components/CreateAccountPage/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/CreateAccountPage/index.js',
+    [`@magento/venia-ui/lib/components/Select/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Select/index.js',
+    [`@magento/venia-ui/lib/components/AccountMenu/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/AccountMenu/index.js',
+    [`@magento/venia-ui/lib/components/AccountInformationPage/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/AccountInformationPage/index.js',
+    [`@magento/venia-ui/lib/components/MyAccount/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/MyAccount/index.js',
+    [`@magento/venia-ui/lib/components/CartPage/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/CartPage/index.js',
+    [`@magento/venia-ui/lib/components/CheckoutPage/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/CheckoutPage/index.js',
+    [`@magento/venia-ui/lib/components/Dialog/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Dialog/index.js',
+    [`@magento/venia-ui/lib/components/OrderHistoryPage/index.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/OrderHistoryPage/index.js',
+};

package/src/components/AccountLayout/accountlayout.module.css

@@ -0,0 +1,3 @@
+.menu {
+    flex-basis: 260px;
+}

package/src/components/AccountLayout/index.js

@@ -0,0 +1,147 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { FormattedMessage } from 'react-intl';
+import defaultClasses from './accountlayout.module.css';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import { ArrowDown2 } from 'iconsax-react';
+import { useWindowSize } from '@magento/peregrine';
+import cn from 'classnames';
+
+const AccountLayout = (props) => {
+    const { children } = props;
+    const [isOpen, setIsOpen] = React.useState(false);
+    const toggleDropdown = () => setIsOpen(!isOpen);
+    const windowSize = useWindowSize();
+    const isTablet = windowSize.innerWidth <= 1023;
+
+    const classes = useStyle(defaultClasses, props.classes);
+    return (
+        <>
+            <div className='flex flex-col lg_flex-row lg_justify-between gap-[30px] mt-8 relative'>
+                {isTablet ? (
+                    <button
+                        onClick={toggleDropdown}
+                        className={cn(
+                            'text-[14px] font-medium flex justify-between items-center gap-x-4 border',
+                            'border-gray-100 border-solid rounded-md min-w-max px-2.5 py-3',
+                        )}
+                    >
+                        <span>My Account</span>
+                        <ArrowDown2
+                            size={14}
+                            className={cn(
+                                'text-colorDefault transition-all',
+                                isOpen ? 'rotate-180' : 'rotate-0',
+                            )}
+                        />
+                    </button>
+                ) : null}
+
+                <div
+                    className={cn(
+                        classes.menu,
+                        'hidden lg_block',
+                        isTablet && isOpen ? 'absolute !block bg-white w-full top-14' : '',
+                    )}
+                >
+                    <div
+                        className={cn(
+                            'flex flex-col border border-gray-100 rounded-lg px-2.5 py-5'
+                        )}
+                    >
+                        <li className="list-none">
+                            <Link
+                                to="/order-history"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.orderHistory'}
+                                    defaultMessage={'Order History'}
+                                />
+
+                            </Link>
+                        </li>
+                        <li className="list-none">
+                            <Link
+                                to="/wishlist"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.wishlist'}
+                                    defaultMessage={'Wishlist'}
+                                />
+
+                            </Link>
+                        </li>
+                        <li className="list-none">
+                            <Link
+                                to="#"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.favoriteSeller'}
+                                    defaultMessage={'Favorite Seller'}
+                                />
+
+                            </Link>
+                        </li>
+                        <li className="list-none">
+                            <Link
+                                to="/address-book"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.addressBook'}
+                                    defaultMessage={'Address Book'}
+                                />
+
+                            </Link>
+                        </li>
+                        <li className="list-none">
+                            <Link
+                                to="/saved-payments"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.payments'}
+                                    defaultMessage={'Payments'}
+                                />
+
+                            </Link>
+                        </li>
+                        <li className="list-none">
+                            <Link
+                                to="/communications#"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.newsletter'}
+                                    defaultMessage={'Newsletter'}
+                                />
+
+                            </Link>
+                        </li>
+                        <li className="list-none">
+                            <Link
+                                to="/account-information"
+                                className="text-[14px] font-medium p-2.5 block w-full hover_bg-gray-150 rounded-md"
+                            >
+                                <FormattedMessage
+                                    id={'myaccount.accountInformation'}
+                                    defaultMessage={'Account Information'}
+                                />
+
+                            </Link>
+                        </li>
+
+                    </div>
+                </div>
+                <div className='block w-full'>
+                    {children}
+                </div>
+            </div >
+        </>
+    )
+}
+
+export default AccountLayout