homeflowjs 0.9.39 → 0.10.0

package/app/hf-dispatch.js

@@ -1,5 +1,6 @@
 import store from '../store';
 import {
+  setSearch,
   setSearchField,
   toggleTag,
 } from '../actions/search.actions';
@@ -8,12 +9,12 @@ import { loadNext } from '../actions/properties.actions';
 
 const hfDispatch = {
   search: {
-    setSearch: payload => store.dispatch(setSearch(payload)),
-    setSearchField: payload => store.dispatch(setSearchField(payload)),
-    toggleTag: payload => store.dispatch(toggleTag(payload)),
+    setSearch: (payload) => store.dispatch(setSearch(payload)),
+    setSearchField: (payload) => store.dispatch(setSearchField(payload)),
+    toggleTag: (payload) => store.dispatch(toggleTag(payload)),
   },
   user: {
-    setCurrentUser: payload => store.dispatch(setCurrentUser(payload)),
+    setCurrentUser: (payload) => store.dispatch(setCurrentUser(payload)),
   },
   properties: {
     loadNext: () => store.dispatch(loadNext()),

package/app/hf-initialize.jsx

@@ -8,6 +8,12 @@ import notify from './notify';
 import antiCSRF from './anti-csrf';
 import recaptcha from './recaptcha';
 import bookingCalendar from '../booking-calendar/booking-calendar';
+import { setThemePreferences, setThemeSettings, setAuthenticityToken } from '../actions/app.actions';
+import { fetchUser } from '../actions/user.actions';
+import {
+  setProperties, setPagination, setProperty, setPropertyLinksAsync,
+} from '../actions/properties.actions';
+import { setArticles } from '../actions/articles.actions';
 
 const hfInitialize = () => {
   if (!window.Homeflow) {
@@ -68,13 +74,32 @@ const hfInitialize = () => {
     );
   });
 
+  window.addEventListener('DOMContentLoaded', () => {
+    try {
+      store.dispatch(fetchUser());
+    } catch (e) {
+      console.error('Unable to fetch user', e);
+    }
+  });
+
+  store.dispatch(setProperty(Homeflow.get('property')));
+  store.dispatch(setProperties(Homeflow.get('properties')));
+  store.dispatch(setPagination(Homeflow.get('pagination')));
+  store.dispatch(setThemePreferences(Homeflow.get('theme_preferences')));
+  store.dispatch(setThemeSettings(Homeflow.get('theme_settings')));
+  store.dispatch(setAuthenticityToken(Homeflow.get('authenticityToken')));
+
+  // if we're on the property show page, set next and previous links
+  if (Homeflow.get('property')) {
+    store.dispatch(setPropertyLinksAsync());
+  }
+
+  // setting articles, pagination and topics on articles index page
+  if (Homeflow.get('articles')) {
+    store.dispatch(setArticles(Homeflow.get('articles')));
+  }
+
   return null;
 };
 
-// buffer_height = @calcBufferHeight()
-// cur_pos = $(window).scrollTop()
-// $(".infinite_page").each(idx, element) =>
-// ele_top = $(element).offset().top;
-// @setPage(element) if ele_top <= cur_pos and ele_top + $(element).height() > cur_pos
-
 export default hfInitialize;

package/package.json

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

package/search/property-search/property-search.js

@@ -13,6 +13,7 @@ const fragmentize = (key, value) => {
   if (key === 'poly') return pattern[0] + base64.encode(value);
 
   if (typeof pattern === 'string') return pattern;
+
   return `${pattern[0] ? pattern[0] : ''}${value}${pattern[1] ? pattern[1] : ''}`;
 };
 
@@ -20,25 +21,28 @@ export const buildQueryString = (search) => {
   const queryParams = [];
   const fragmentParams = [];
 
-  for (const key in search) {
+  Object.keys(search).forEach((key) => {
     const value = search[key];
 
-    if (!value) continue;
-    if (Array.isArray(value) && !value.length) continue;
+    if (!value) return;
+
+    if (Array.isArray(value) && !value.length) return;
+
     // only include either q or place ID
-    if (key === 'q' && !search.isQuerySearch
-        || key === 'placeId' && search.isQuerySearch
-        || key === 'place' && search.isQuerySearch
-        || key === 'poly' && search.isQuerySearch) continue;
+    if ((key === 'q' && !search.isQuerySearch)
+        || (key === 'placeId' && search.isQuerySearch)
+        || (key === 'place')
+        || (key === 'poly' && search.isQuerySearch)) return;
 
     // Don't include branch_id if a search term has been entered
-    if (key === 'branch_id' && search.isQuerySearch) continue;
-    if (!FRAGMENT_BOOKENDS.hasOwnProperty(key)) {
+    if (key === 'branch_id' && search.isQuerySearch) return;
+
+    if (!Object.prototype.hasOwnProperty.call(FRAGMENT_BOOKENDS, key)) {
       queryParams.push(`${camelToSnakeCase(key)}=${value}`);
     } else {
       fragmentParams.push(fragmentize(key, value));
     }
-  }
+  });
 
   let queryString = queryParams.join('&');
   queryString += `&fragment=${fragmentParams.join('/')}`;

package/search/search-form/search-form.component.jsx

@@ -97,7 +97,7 @@ class SearchForm extends Component {
       <form onSubmit={this.handleSubmit.bind(this)} {...otherProps}>
         {children}
       </form>
-    )
+    );
   }
 }
 
@@ -116,7 +116,12 @@ SearchForm.propTypes = {
   submitCallback: PropTypes.func,
 };
 
-const mapStateToProps = state => ({
+SearchForm.defaultProps = {
+  defaultSort: null,
+  submitCallback: null,
+};
+
+const mapStateToProps = (state) => ({
   search: state.search.currentSearch,
   defaultStatus: state.app.themePreferences.default_search_status,
 });

package/store.js

@@ -1,54 +1,12 @@
-/* eslint-disable import/no-cycle */
 import { createStore, applyMiddleware } from 'redux';
 import thunk from 'redux-thunk';
 import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
-// import logger from 'redux-logger';
 import rootReducer from './reducers';
-import { setThemePreferences, setThemeSettings, setAuthenticityToken } from './actions/app.actions';
-import { fetchUser } from './actions/user.actions';
-import {
-  setProperties, setPagination, setProperty, setPropertyLinksAsync,
-} from './actions/properties.actions';
-import { setArticles } from './actions/articles.actions';
-// import { fetchCompanyPreferences } from './actions/company-preferences.actions';
-// import { fetchCompanyPreferences } from './actions/company-preferences.actions';
 
 const middleware = [thunk];
 
-// if (process.env.NODE_ENV !== 'production') {
-//   middleware.push(logger);
-// }
-
 const store = createStore(rootReducer, composeWithDevTools(
   applyMiddleware(...middleware),
 ));
 
-window.addEventListener('DOMContentLoaded', () => {
-  try {
-    store.dispatch(fetchUser());
-  } catch (e) {
-    console.error('Unable to fetch user', e);
-  }
-});
-
-// TODO: This should use data set inline for use setCompanyPreferences.
-// store.dispatch(fetchCompanyPreferences());
-
-store.dispatch(setProperty(Homeflow.get('property')));
-store.dispatch(setProperties(Homeflow.get('properties')));
-store.dispatch(setPagination(Homeflow.get('pagination')));
-store.dispatch(setThemePreferences(Homeflow.get('theme_preferences')));
-store.dispatch(setThemeSettings(Homeflow.get('theme_settings')));
-store.dispatch(setAuthenticityToken(Homeflow.get('authenticityToken')));
-
-// if we're on the property show page, set next and previous links
-if (Homeflow.get('property')) {
-  store.dispatch(setPropertyLinksAsync());
-}
-
-// setting articles, pagination and topics on articles index page
-if (Homeflow.get('articles')) {
-  store.dispatch(setArticles(Homeflow.get('articles')));
-}
-
 export default store;