Refactoring

Author: webdevstar

package.json

@@ -46,7 +46,7 @@
   "dependencies": {
     "babel-cli": "^6.24.0",
     "babel-core": "^6.24.0",
-    "babel-loader": "^6.3.2",
+    "babel-loader": "^6.4.1",
     "babel-plugin-transform-class-properties": "^6.23.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-latest": "^6.24.0",
@@ -59,7 +59,7 @@
     "express-jwt": "^5.1.0",
     "extract-text-webpack-plugin": "^2.1.0",
     "formidable": "^1.1.1",
-    "fs-extra": "^2.0.0",
+    "fs-extra": "^2.1.2",
     "handlebars": "^4.0.6",
     "helmet": "^3.4.1",
     "html-webpack-plugin": "^2.28.0",
@@ -68,7 +68,7 @@
     "lru-cache": "^4.0.2",
     "material-ui": "^0.17.1",
     "moment": "^2.16.0",
-    "mongodb": "^2.2.24",
+    "mongodb": "^2.2.25",
     "nodemailer": "^3.1.5",
     "nodemailer-smtp-transport": "^2.7.2",
     "react": "^15.4.2",

public/assets/js/polyfill.js

@@ -5,6 +5,7 @@
   <title>Dashboard</title>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="theme-color" content="#1976D2">
   <link rel="manifest" href="/admin-assets/manifest.json">
   <link rel="shortcut icon" href="/admin-assets/images/shortcut.png">
 </head>

public/assets/js/require-shims.js

@@ -35,8 +35,8 @@ class ProductsService {
         aggregationPipeline.push({ $project: projectQuery });
         aggregationPipeline.push({ $match: matchQuery });
         aggregationPipeline.push({ $sort: sortQuery });
-        aggregationPipeline.push({ $limit : limit });
         aggregationPipeline.push({ $skip : offset });
+        aggregationPipeline.push({ $limit : limit });
 
         return mongo.db.collection('products').aggregate(aggregationPipeline).toArray()
           .then(items => items.map(item => this.changeProperties(categories, item, thumbnail_width)))

src/admin/client/index.html

@@ -72,8 +72,9 @@ storeRouter.get('*', (req, res, next) => {
   Promise.all([
     readIndexHtmlFile(),
     api.sitemap.retrieve({ path: req.path, enabled: true }),
-    api.checkout_fields.list()
-  ]).then(([templateHtml, sitemapDetails, checkout_fields]) => {
+    api.checkout_fields.list(),
+    api.settings.retrieve()
+  ]).then(([templateHtml, sitemapDetails, checkout_fields, settings]) => {
     if (sitemapDetails.status === 200 || sitemapDetails.status === 404) {
       let currentPage = sitemapDetails.json;
       if(sitemapDetails.status === 404) {
@@ -83,7 +84,7 @@ storeRouter.get('*', (req, res, next) => {
         }
       }
 
-      getInitialState(req, checkout_fields.json, currentPage).then(initialState => {
+      getInitialState(req, checkout_fields.json, currentPage, settings.json).then(initialState => {
         const store = createStore(reducers, initialState, applyMiddleware(thunkMiddleware));
         const routes = createRoutes(store);
 

src/api/server/services/products/products.js

@@ -7,6 +7,9 @@ export const PRODUCTS_REQUEST = 'PRODUCTS_REQUEST'
 export const PRODUCTS_RECEIVE = 'PRODUCTS_RECEIVE'
 export const PRODUCTS_FAILURE = 'PRODUCTS_FAILURE'
 
+export const PRODUCTS_MORE_REQUEST = 'PRODUCTS_MORE_REQUEST'
+export const PRODUCTS_MORE_RECEIVE = 'PRODUCTS_MORE_RECEIVE'
+
 export const CHECKOUT_REQUEST = 'CHECKOUT_REQUEST'
 export const CHECKOUT_RECEIVE = 'CHECKOUT_RECEIVE'
 export const CHECKOUT_FAILURE = 'CHECKOUT_FAILURE'

src/store/server/index.js

@@ -12,6 +12,10 @@ function receiveProducts(products) {
   return {type: t.PRODUCTS_RECEIVE, products}
 }
 
+function requestProducts() {
+  return {type: t.PRODUCTS_REQUEST}
+}
+
 function receiveProduct(product) {
   return {type: t.PRODUCT_RECEIVE, product}
 }
@@ -60,6 +64,19 @@ function requestCheckout() {
   return {type: t.CHECKOUT_REQUEST}
 }
 
+function requestMoreProducts() {
+  return {
+    type: t.PRODUCTS_MORE_REQUEST
+  }
+}
+
+function receiveProductsMore(products) {
+  return {
+    type: t.PRODUCTS_MORE_RECEIVE,
+    products
+  }
+}
+
 export function setCategory(category_id) {
   return (dispatch, getState) => {
     const state = getState();
@@ -259,19 +276,36 @@ export function fetchProduct(product_id) {
 export function fetchProducts() {
   return (dispatch, getState) => {
     const state = getState();
+    dispatch(requestProducts());
 
     let filter = state.app.productsFilter;
-    filter.thumbnail_width = 320,
-    filter.enabled = true;
     filter.category_id = state.app.currentCategory.id;
-    filter.fields = 'path,id,name,category_id,category_name,sku,images,enabled,discontinued,stock_status,stock_quantity,price,on_sale,regular_price';
-
+    // filter.search =
     return api.ajax.products.list(filter).then(({status, json}) => {
       dispatch(receiveProducts(json))
     }).catch(error => {});
   }
 }
 
+export function fetchMoreProducts() {
+  return (dispatch, getState) => {
+    const state = getState();
+    if(state.app.loadingProducts) {
+      return Promise.resolve();
+    }
+    dispatch(requestMoreProducts());
+
+    let filter = state.app.productsFilter;
+    filter.limit = 15;
+    filter.offset = state.app.products.length;
+    filter.category_id = state.app.currentCategory.id;
+
+    return api.ajax.products.list(filter).then(({status, json}) => {
+      dispatch(receiveProductsMore(json))
+    }).catch(error => {});
+  }
+}
+
 export function fetchPage(pageId) {
   return (dispatch, getState) => {
     return api.ajax.pages.retrieve(pageId).then(({status, json}) => {
@@ -326,10 +360,10 @@ const getCommonData = (req, currentPage, productsFilter) => {
   });
 }
 
-export const getInitialState = (req, checkout_fields, currentPage) => {
+export const getInitialState = (req, checkout_fields, currentPage, settings) => {
   let initialState = {
     app: {
-      language: 'en',
+      settings: settings,
       location: null,
       currentPage: currentPage,
       currentCategory: null,
@@ -339,14 +373,15 @@ export const getInitialState = (req, checkout_fields, currentPage) => {
       payment_methods: [],
       shipping_methods: [],
       page: {},
+      loadingProducts: false,
+      loadingMoreProducts: false,
       loadingShippingMethods: false,
       loadingPaymentMethods: false,
       processingCheckout: false,
       cart: null,
       order: null,
       productsFilter: {
-        limit: 20,
-        thumbnail_width: 320,
+        limit: 30,
         enabled: true,
         fields: 'path,id,name,category_id,category_name,sku,images,enabled,discontinued,stock_status,stock_quantity,price,on_sale,regular_price'
       },

src/store/shared/actionTypes.js

@@ -1,9 +1,20 @@
-import { connect } from 'react-redux'
-import { reset, submit } from 'redux-form';
-import { fetchCart, updateCart, fetchShippingMethods, fetchPaymentMethods, checkout,  updateCartShippingCountry,  updateCartShippingState,  updateCartShippingCity,  updateCartShippingMethod,  updateCartPaymentMethod} from '../../actions'
+import React from 'react'
+import {connect} from 'react-redux'
+import {reset, submit} from 'redux-form';
+import {
+  checkout,
+  updateCart,
+  fetchShippingMethods,
+  fetchPaymentMethods,
+  updateCartShippingCountry,
+  updateCartShippingState,
+  updateCartShippingCity,
+  updateCartShippingMethod,
+  updateCartPaymentMethod
+} from '../../actions'
 import Form from './form'
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state, ownProps) => {
   return {
     initialValues: state.app.cart,
     payment_methods: state.app.payment_methods,
@@ -15,7 +26,7 @@ const mapStateToProps = (state) => {
   }
 }
 
-const mapDispatchToProps = (dispatch) => {
+const mapDispatchToProps = (dispatch, ownProps) => {
   return {
     onSubmit: (values) => {
       dispatch(updateCart(values));