@riosst100/pwa-marketplace 1.1.8 → 1.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {
@@ -9,7 +9,8 @@
     }
   },
   "dependencies": {
-    "axios": "^1.6.5"
+    "axios": "^1.6.5",
+    "react-phone-number-input": "^3.3.9"
   },
   "license": "MIT",
   "private": false

package/src/components/BecomeSeller/becomeSeller.js

@@ -24,7 +24,7 @@ import Region from '@magento/venia-ui/lib/components/Region';
 import Postcode from '@magento/venia-ui/lib/components/Postcode';
 import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
 import { Link } from 'react-router-dom';
-import PhoneInput from '@riosst100/pwa-marketplace/src/components/PhoneInput';
+import PhoneTextInput from '@riosst100/pwa-marketplace/src/components/PhoneTextInput';
 
 const BecomeSeller = props => {
     const talonProps = useBecomeSeller({
@@ -274,9 +274,10 @@ const BecomeSeller = props => {
                     defaultMessage: 'Contact Number'
                 })}
             >
-                <PhoneInput
+                <PhoneTextInput
                     id="contactNumber"
                     field="seller.contact_number"
+                    countryCodeField="seller.country_id"
                     validate={isRequired}
                 />
             </Field>
@@ -312,6 +313,17 @@ const BecomeSeller = props => {
     ) : '';
 };
 
+BecomeSeller.defaultProps = {
+    seller: {
+        country: {
+            code: DEFAULT_COUNTRY_CODE
+        },
+        region: {
+            id: null
+        }
+    }
+};
+
 BecomeSeller.propTypes = {
     classes: shape({
         actions: string,

package/src/components/PhoneTextInput/index.js

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

package/src/components/{PhoneInput/phoneInput.js → PhoneTextInput/phoneTextInput.js}

@@ -1,12 +1,14 @@
-import React, { Fragment } from 'react';
+import React, { Fragment, useState } from 'react';
 import { node, shape, string } from 'prop-types';
 import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';
 
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import { FieldIcons, Message } from '@magento/venia-ui/lib/components/Field';
-import defaultClasses from './phoneInput.module.css';
+import defaultClasses from './phoneTextInput.module.css';
+import PhoneInput from 'react-phone-number-input'
+import 'react-phone-number-input/style.css'
 
-const PhoneInput = props => {
+const PhoneTextInput = props => {
     const {
         after,
         before,
@@ -14,6 +16,7 @@ const PhoneInput = props => {
         regionError,
         field,
         message,
+        countryCodeField,
         ...rest
     } = props;
     const fieldState = useFieldState(field);
@@ -21,7 +24,10 @@ const PhoneInput = props => {
     var inputClass =
         fieldState.error || regionError ? classes.input_error : classes.input;
 
-    const [value, setValue] = useState(null);
+    const [value, setValue] = useState('');
+
+    const countryFieldState = useFieldState(countryCodeField);
+    const { value: country } = countryFieldState;
 
     return (
         <Fragment>
@@ -29,7 +35,7 @@ const PhoneInput = props => {
                 <PhoneInput
                 international
                 countryCallingCodeEditable={false}
-                defaultCountry="ID"
+                defaultCountry={country}
                 value={value}
                 onChange={setValue}/>
             </FieldIcons>
@@ -38,9 +44,9 @@ const PhoneInput = props => {
     );
 };
 
-export default PhoneInput;
+export default PhoneTextInput;
 
-PhoneInput.propTypes = {
+PhoneTextInput.propTypes = {
     after: node,
     before: node,
     classes: shape({

package/src/components/{PhoneInput/phoneInput.module.css → PhoneTextInput/phoneTextInput.module.css}

@@ -1,11 +1,11 @@
 .input {
-    composes: input from '../Field/field.module.css';
+    composes: input from '@magento/venia-ui/lib/components/Field/field.module.css';
 
     composes: disabled_text-subtle from global;
 }
 
 .input_error {
-    composes: input from '../Field/field.module.css';
+    composes: input from '@magento/venia-ui/lib/components/Field/field.module.css';
 
     composes: border-error from global;
 }

package/src/components/SellerCountry/sellerCountry.js

@@ -8,6 +8,9 @@ import Field from '@magento/venia-ui/lib/components/Field';
 import Select from '@magento/venia-ui/lib/components/Select';
 import defaultClasses from './sellerCountry.module.css';
 import { GET_SELLER_COUNTRIES_QUERY } from './sellerCountry.gql';
+import { BrowserPersistence } from '@magento/peregrine/lib/util';
+
+const storage = new BrowserPersistence();
 
 const SellerCountry = props => {
     const talonProps = useSellerCountry({
@@ -26,11 +29,14 @@ const SellerCountry = props => {
     const { formatMessage } = useIntl();
 
     const classes = useStyle(defaultClasses, propClasses);
+    const websiteCode = storage.getItem('website_code') || null;
+    const currentWebsiteCountry = websiteCode && websiteCode != "base" ? websiteCode.toUpperCase() : DEFAULT_COUNTRY_CODE;
     const selectProps = {
         classes,
         disabled: loading,
         field,
         items: countries,
+        initialValue: currentWebsiteCountry,
         ...inputProps
     };
 

package/src/overwrites/peregrine/lib/talons/SignIn/useSignIn.js

@@ -119,8 +119,6 @@ export const useSignIn = props => {
                     fetchPolicy: 'cache-only'
                 });
 
-                console.log(data.customer)
-
                 if (data.customer.is_seller) {
                     storage.setItem('is_seller', true);
                 }

package/src/talons/Header/useWebsiteSwitcher.js

@@ -108,7 +108,6 @@ export const useWebsiteSwitcher = (props = {}) => {
 
     // availableStores => mapped options or empty map if undefined.
     const availableStores = useMemo(() => {
-        console.log(availableStoresData)
         return (
             (storeConfigData &&
                 availableStoresData &&

package/src/talons/WebsiteByIp/useWebsiteByIp.js

@@ -13,7 +13,6 @@ export const useWebsiteByIp = websiteCodeInUrl => {
                         setWebsiteByUserIpData(data)
                     }
                 }).catch((error) => {
-                    console.log(error);
                 });
             };
         

package/src/components/PhoneInput/index.js

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