homeflowjs 0.10.11 → 0.10.13

package/index.js

@@ -7,6 +7,7 @@ import notify from './app/notify';
 import Loader from './shared/loader.component';
 import AuthenticityTokenField from './shared/authenticity-token-field.component';
 import { uniqueKey } from './utils';
+import SingleLocationMap from './shared/single-location-map';
 
 export {
   withHomeflowState,
@@ -18,4 +19,5 @@ export {
   Loader,
   AuthenticityTokenField,
   uniqueKey,
+  SingleLocationMap,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.10.11",
+  "version": "0.10.13",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

package/shared/custom-gmap-styles.js

@@ -2,7 +2,7 @@
 export const simpleBW = [
   {
     stylers: [
-      { saturation: -90 }
+      { saturation: -90 },
     ],
   },
   {

package/shared/single-location-map.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import {
+  MapContainer, TileLayer,
+} from 'react-leaflet';
+import PropTypes from 'prop-types';
+
+const SingleLocationMap = ({
+  lat, lng, zoomLvl, ...otherProps
+}) => {
+  if (!lat || !lng) return null;
+
+  return (
+    <MapContainer
+      center={[lat, lng]}
+      zoom={zoomLvl}
+      scrollWheelZoom={false}
+      {...otherProps}
+    >
+      <TileLayer
+        attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+        url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+      />
+    </MapContainer>
+  );
+};
+
+SingleLocationMap.propTypes = {
+  lat: PropTypes.number.isRequired,
+  lng: PropTypes.number.isRequired,
+  zoomLvl: PropTypes.number,
+};
+
+SingleLocationMap.defaultProps = {
+  zoomLvl: 12,
+};
+
+export default SingleLocationMap;

package/user/marketing-preferences-form/marketing-preferences-form.component.jsx

@@ -21,22 +21,45 @@ const MarketingPreferencesForm = ({ buttonClass, buttonSpanClass, strict }) => {
   const handleSubmit = (e) => {
     e.preventDefault();
 
-    if (!user.marketing_preference_id) {
+    if (!user?.user_id) {
       notify('Please sign in to update your preferences', 'error');
       return;
     }
 
-    fetch(`/marketing_preferences/${user.marketing_preference_id}`, {
+    /**
+     * cms created users don't have marketing_preference_id
+     * associated to them. To update marketing preferences
+     * we can use any of those 2 endpoints depending on the
+     * data we pass. Ideally this should get fixed by BE at some point.
+     */
+    const url = user?.marketing_preference_id
+      ? `/marketing_preferences/${user.marketing_preference_id}`
+      : `/custom_marketing_preferences/${user.user_id}`;
+
+    const optInAtAndUrl = {
+      opt_in_marketing_at: optInMarketing ? 'optin' : 'optout',
+      opt_in_marketing_url: document.URL,
+    };
+
+    const body = {
+      user_id: user.user_id,
+      ...(!user.marketing_preference_id ? ({
+        marketing_preferences: {
+          is_opted_in_to_marketing: optInMarketing,
+          ...optInAtAndUrl,
+        },
+      }) : ({
+        ...optInAtAndUrl,
+      })),
+    };
+
+    fetch(url, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
         'X-Http-Method-Override': 'put',
       },
-      body: JSON.stringify({
-        opt_in_marketing_at: optInMarketing ? 'optin' : 'optout',
-        opt_in_marketing_url: document.URL,
-        user_id: user.user_id,
-      }),
+      body: JSON.stringify(body),
     }).then((res) => {
       if (res.ok && (res.status === 200 || res.status === 204)) {
         dispatch(setCurrentUser({