reactioncommerce · brent-hoover · May 3, 2016 · Apr 28, 2016
diff --git a/common/config.js b/common/config.js
@@ -5,6 +5,16 @@
  */
 // client configuration
 if (Meteor.isClient) {
+  // override/set layout
+  DEFAULT_LAYOUT = "coreLayout";
+  // override/set workflow
+  DEFAULT_WORKFLOW = "coreWorkflow";
+
+  // Use this to override just the home Package
+  // ie: {template: "products"}
+  INDEX_OPTIONS = {};
+
+  // default load qty for product grid
   ITEMS_INCREMENT = 24;
   // sets default number of product displayed on a grid
   Session.setDefault("productScrollLimit", ITEMS_INCREMENT);

diff --git a/packages/reaction-core/client/helpers/layout.js b/packages/reaction-core/client/helpers/layout.js
@@ -15,7 +15,7 @@ Template.registerHelper("reactionTemplate", function (options) {
   const reactionTemplates = [];
   // fetch collection from shop.layout configuration
   let layout = _.findWhere(Shop.layout, {
-    workflow: options.hash.workflow || "coreWorkflow"
+    workflow: options.hash.workflow || DEFAULT_WORKFLOW || "coreWorkflow"
   });
 
   let layoutConfigCollection;

diff --git a/packages/reaction-core/server/register.js b/packages/reaction-core/server/register.js
@@ -46,7 +46,7 @@ ReactionCore.registerPackage({
     }
   }, {
     layout: "coreLayout",
-    workflow: "coreWorkflow",
+    workflow: "coreUnauthorized",
     theme: "default",
     enabled: true,
     structure: {

diff --git a/packages/reaction-router/common/init.js b/packages/reaction-router/common/init.js
@@ -98,11 +98,13 @@ ReactionRouter.initPackageRoutes = () => {
 
   //
   // index / home route
+  // to overide layout, ie: home page templates
+  // set DEFAULT_LAYOUT, in config.js
   //
   shop.route("/", {
     name: "index",
     action: function () {
-      ReactionLayout();
+      ReactionLayout(INDEX_OPTIONS);
     }
   });
 

diff --git a/packages/reaction-router/common/layout.js b/packages/reaction-router/common/layout.js
@@ -23,8 +23,12 @@ selectLayout = (layout, setLayout, setWorkflow) => {
  * @returns {Object} layout - return object of template definitions for Blaze Layout
  */
 ReactionLayout = (options = {}) => {
-  const layout = options.layout || "coreLayout";
-  const workflow = options.workflow || "coreWorkflow";
+  const layout = options.layout || DEFAULT_LAYOUT || "coreLayout";
+  const workflow = options.workflow || DEFAULT_WORKFLOW || "coreWorkflow";
+
+  // this only occurs if you aren't overriding
+  // with custom options, merges the default (that is already assigned to layout/workflow)
+  // so that the "newLayout" is actually the old layout
   if (!options.layout) {
     options.layout = "coreLayout";
   }
@@ -44,7 +48,7 @@ ReactionLayout = (options = {}) => {
     if (ReactionCore.Subscriptions.Shops.ready()) {
       const shop = ReactionCore.Collections.Shops.findOne(ReactionCore.getShopId());
       if (shop) {
-        const newLayout = shop.layout.find((x) => selectLayout(x, layout, workflow));
+        const newLayout = shop.layout.reverse().find((x) => selectLayout(x, layout, workflow));
         // oops this layout wasn't found. render notFound
         if (!newLayout) {
           BlazeLayout.render("notFound");

diff --git a/packages/reaction-ui/.npm/package/npm-shrinkwrap.json b/packages/reaction-ui/.npm/package/npm-shrinkwrap.json