Merge development into marketplace

.eslintrc

@@ -3,33 +3,44 @@
   "env": {
     "browser": true,
     "node": true,
-    "es6": true
+    "es6": true,
+    "mocha": true
+  },
+  "globals": {
+    "browser": true,
+    "Assets": true, // Meteor global
+    "Package": true, // Meteor global
+    "FS": true, // gridFS,
+    "Alerts": true,  // this needs to get cleaned up, but ignoring for now
+    "jest": true,
+    "expect": true,
+    "test": true
   },
   "parserOptions": {
      "ecmaVersion": 6,
      "sourceType": "module",
+      "ecmaFeatures": {
+        "arrowFunctions": true,
+        "blockBindings": true,
+        "classes": true,
+        "defaultParams": true,
+        "destructuring": true,
+        "forOf": true,
+        "generators": false,
+        "modules": true,
+        "objectLiteralComputedProperties": true,
+        "objectLiteralDuplicateProperties": false,
+        "objectLiteralShorthandMethods": true,
+        "objectLiteralShorthandProperties": true,
+        "spread": true,
+        "superInFunctions": true,
+        "templateStrings": true,
+        "jsx": true
+      },
      "allowImportExportEverywhere": true
   },
   "plugins": ["react"],
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "classes": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "forOf": true,
-    "generators": false,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": false,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "spread": true,
-    "superInFunctions": true,
-    "templateStrings": true,
-    "jsx": true
-  },
-  // NOTE: We're now using eslint-3
+  // NOTE: We're now using eslint-4
   "rules": {
     /**
      * Strict mode
@@ -160,7 +171,8 @@
     "no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
     "no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
     "no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
-    "no-with": 2, // http://eslint.org/docs/rules/no-with
+    "no-with": 2, // http://eslint.org/docs/rules/no-with,
+    "no-undef": 2,
     "radix": 2, // http://eslint.org/docs/rules/radix
     "vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
     "wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife

.meteor/packages

@@ -30,7 +30,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-amplify
 mdg:validated-method
 [email protected]
 dynamic-import

.meteor/versions

@@ -16,7 +16,6 @@ aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]

Dockerfile

@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v2.0.0
+FROM reactioncommerce/base:v2.0.2
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"

client/config/defaults.js

@@ -1,4 +1,5 @@
 import { Session } from "meteor/session";
+import { AutoForm } from "meteor/aldeed:autoform";
 
 /**
  * Misc. App. Configuration

client/modules/accounts/components/auth/loginButtons.js

@@ -46,7 +46,7 @@ class LoginButtons extends Component {
                  
                 <Translation defaultValue={this.props.capitalizeName(service.name)} i18nKey={`social.${service.name}`} />
               </span>
-          </Button>
+            </Button>
           ))
         }
       </div>

client/modules/accounts/components/auth/signIn.js

@@ -135,7 +135,7 @@ class SignIn extends Component {
               value={this.state.email}
               onChange={this.handleFieldChange}
             />
-          {this.renderEmailErrors()}
+            {this.renderEmailErrors()}
           </div>
 
           <div className={passwordClasses}>
@@ -149,7 +149,7 @@ class SignIn extends Component {
               value={this.state.password}
               onChange={this.handleFieldChange}
             />
-          {this.renderPasswordErrors()}
+            {this.renderPasswordErrors()}
           </div>
 
           <div className="form-group">

client/modules/accounts/components/auth/signUp.js

@@ -133,7 +133,7 @@ class SignUp extends Component {
               value={this.state.password}
               onChange={this.handleFieldChange}
             />
-          {this.renderPasswordErrors()}
+            {this.renderPasswordErrors()}
           </div>
 
           <div className="form-group">
@@ -170,14 +170,14 @@ class SignUp extends Component {
     return (
       <div>
         <div className="loginForm-title">
-        <h2>
-          <Translation defaultValue="Create an Account" i18nKey="accountsUI.createAccount" />
-        </h2>
-      </div>
+          <h2>
+            <Translation defaultValue="Create an Account" i18nKey="accountsUI.createAccount" />
+          </h2>
+        </div>
 
-      {this.renderForm(emailClasses, passwordClasses)}
+        {this.renderForm(emailClasses, passwordClasses)}
 
-    </div>
+      </div>
     );
   }
 }

client/modules/accounts/components/dropdown/mainDropdown.js

@@ -104,14 +104,14 @@ class MainDropdown extends Component {
       <div>
         {this.props.currentUser ?
           <div style={{ paddingRight: 5 }}>
-              <DropDownMenu
-                buttonElement={this.buttonElement()}
-                attachment="bottom right"
-                targetAttachment="top right"
-                menuStyle={menuStyle}
-                className="accounts-li-tag"
-                onChange={this.props.handleChange}
-              >
+            <DropDownMenu
+              buttonElement={this.buttonElement()}
+              attachment="bottom right"
+              targetAttachment="top right"
+              menuStyle={menuStyle}
+              className="accounts-li-tag"
+              onChange={this.props.handleChange}
+            >
 
               {this.renderUserIcons()}
               {this.renderAdminIcons()}

client/modules/accounts/components/passwordReset/forgot.js

@@ -129,7 +129,7 @@ class Forgot extends Component {
               data-event-category="accounts"
               onClick={this.props.onSignInClick}
             >
-            <Translation defaultValue="Sign In" i18nKey="accountsUI.signIn" />
+              <Translation defaultValue="Sign In" i18nKey="accountsUI.signIn" />
             </a>
           </div>
 

client/modules/accounts/components/passwordReset/updatePasswordOverlay.js

@@ -64,13 +64,13 @@ class UpdatePasswordOverlay extends Component {
     return (
       <span className="help-block">
         {this.props.onError(this.props.messages.errors && this.props.messages.errors.password) &&
-          this.props.messages.errors.password.map((error, i) => (
-            <Translation
-              key={i}
-              defaultValue={error.reason}
-              i18nKey={error.i18nKeyReason}
-            />
-          ))
+        this.props.messages.errors.password.map((error, i) => (
+          <Translation
+            key={i}
+            defaultValue={error.reason}
+            i18nKey={error.i18nKeyReason}
+          />
+        ))
         }
       </span>
     );
@@ -80,7 +80,7 @@ class UpdatePasswordOverlay extends Component {
     if (this.props.isDisabled === true) {
       return (
         <div className="col-sm-6" style={{ textAlign: "center" }}>
-          <i className="fa fa-spinner fa-spin" />
+          <i className="fa fa-spinner fa-spin"/>
         </div>
       );
     }
@@ -100,9 +100,9 @@ class UpdatePasswordOverlay extends Component {
 
   renderSpinnerOnLoad() {
     return (
-        <div className="spinner-container">
-          <div className="spinner" />
-        </div>
+      <div className="spinner-container">
+        <div className="spinner"/>
+      </div>
     );
   }
 
@@ -114,17 +114,17 @@ class UpdatePasswordOverlay extends Component {
     const { showSpinner } = this.state;
 
     return (
-        <div>
+      <div>
         {this.props.isOpen === true &&
-          <div>
-            <div className="modal-backdrop fade in" id={`modal-backdrop-${this.props.uniqueId}`} />
-            <div className="modal fade in" id={`modal-${this.props.uniqueId}`} style={{ display: "block" }}>
-              <div className="modal-dialog">
-                {showSpinner ? this.renderSpinnerOnLoad() :
+        <div>
+          <div className="modal-backdrop fade in" id={`modal-backdrop-${this.props.uniqueId}`}/>
+          <div className="modal fade in" id={`modal-${this.props.uniqueId}`} style={{ display: "block" }}>
+            <div className="modal-dialog">
+              {showSpinner ? this.renderSpinnerOnLoad() :
                 <form className="modal-content" onSubmit={this.handleSubmit}>
                   <div className="modal-header">
                     <h4 className="modal-title">
-                      <Translation defaultValue="Update Your Password" i18nKey="accountsUI.updateYourPassword" />
+                      <Translation defaultValue="Update Your Password" i18nKey="accountsUI.updateYourPassword"/>
                     </h4>
                   </div>
 
@@ -134,15 +134,15 @@ class UpdatePasswordOverlay extends Component {
                       {this.renderFormMessages()}
 
                       <div className={passwordClasses}>
-                          <TextField
-                            i18nKeyLabel="accountsUI.password"
-                            label="Password"
-                            name="password"
-                            type="password"
-                            id={`password-${this.props.uniqueId}`}
-                            value={this.state.password}
-                            onChange={this.handleFieldChange}
-                          />
+                        <TextField
+                          i18nKeyLabel="accountsUI.password"
+                          label="Password"
+                          name="password"
+                          type="password"
+                          id={`password-${this.props.uniqueId}`}
+                          value={this.state.password}
+                          onChange={this.handleFieldChange}
+                        />
                         {this.renderPasswordErrors()}
                       </div>
 
@@ -167,10 +167,10 @@ class UpdatePasswordOverlay extends Component {
                   </div>
 
                 </form>
-                }
-              </div>
+              }
             </div>
-          </div>}
+          </div>
+        </div>}
       </div>
     );
   }

client/modules/accounts/containers/auth/authContainer.js

@@ -2,6 +2,7 @@ import _ from "lodash";
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Meteor } from "meteor/meteor";
+import { Accounts } from "meteor/accounts-base";
 import { Router } from "/client/api";
 import { composeWithTracker } from "/lib/api/compose";
 import { SignIn, SignUp, LoginButtons } from "../../components";
@@ -202,7 +203,7 @@ class AuthContainer extends Component {
           onSocialClick={this.handleSocialLogin}
           capitalizeName={this.capitalizeName}
         />
-      {this.renderAuthView()}
+        {this.renderAuthView()}
       </div>
     );
   }

client/modules/accounts/containers/auth/loginContainer.js

@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
+import { Random } from "meteor/random";
 import { composeWithTracker } from "/lib/api/compose";
 import AuthContainer from "./authContainer";
 import { ForgotContainer } from "../passwordReset";
@@ -70,7 +71,6 @@ class LoginContainer extends Component {
       );
     }
   }
-
 }
 
 function composer(props, onData) {

client/modules/accounts/containers/dropdown/mainDropdownContainer.js

@@ -2,7 +2,9 @@ import React, { Component } from "react";
 import { Meteor } from "meteor/meteor";
 import { Accounts } from "meteor/accounts-base";
 import { Roles } from "meteor/alanning:roles";
-import { Reaction } from "/client/api";
+import { Session } from "meteor/session";
+import { Gravatar } from "meteor/jparker:gravatar";
+import { Reaction, Logger } from "/client/api";
 import { i18nextDep, i18next } from  "/client/api";
 import { composeWithTracker } from "/lib/api/compose";
 import * as Collections from "/lib/collections";

client/modules/accounts/containers/passwordReset/passwordOverlayContainer.js

@@ -2,6 +2,7 @@ import _ from "lodash";
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Accounts } from "meteor/accounts-base";
+import { Random } from "meteor/random";
 import { composeWithTracker } from "/lib/api/compose";
 import { UpdatePasswordOverlay } from "/client/modules/accounts/components";
 import { MessagesContainer } from "/client/modules/accounts/containers/helpers";

client/modules/accounts/helpers/templates.js

@@ -1,7 +1,10 @@
-import { Reaction, i18next, i18nextDep } from "/client/api";
-import * as Collections from "/lib/collections";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
+import { Accounts } from "meteor/accounts-base";
+import { Roles } from "meteor/alanning:roles";
+import { Gravatar } from "meteor/jparker:gravatar";
+import { Reaction, i18next, i18nextDep } from "/client/api";
+import * as Collections from "/lib/collections";
 
 Template.registerHelper("getGravatar", function (currentUser, size) {
   const options = {

client/modules/accounts/helpers/util.js

@@ -1,4 +1,6 @@
 import _ from "lodash";
+import { Accounts } from "meteor/accounts-base";
+import { ServiceConfiguration } from "meteor/service-configuration";
 
 function capitalize(str) {
   const finalString = str === null ? "" : String(str);
@@ -33,7 +35,6 @@ providers.Twitter.fields = function () {
 };
 
 export class ServiceConfigHelper {
-
   availableServices() {
     const services = Package["accounts-oauth"] ? Accounts.oauth.serviceNames() : [];
     services.sort();