Merge branch 'development' into brent-fix-eslint4-errors

* development: Fix error when inviting already invited user (#2433) Revert minifier to abernix fork (#2486) Updated dependencies (#2463) Update current user's name on Navbar and profile page when address is added. (#2455) 2422 Fix on email invite link leading to blank screen (#2437) 2459 router range error fix (#2476) remove older Blaze based launchdock plugin (#2467) Remove random regex checks on names. Fixes #2461 (#2471) update media gallery new / deleted image indicators (#2469) [WIP] 2356 fix on tag menu-sidebar glitch (#2472) [WIP] 2452 fix on UI icon toolbar (#2460) set css property overflow on horizontal to hidden (#2458) Navbar hover issue (#2451) # Conflicts: # imports/plugins/included/launchdock-connect/client/templates/dashboard.js # imports/plugins/included/launchdock-connect/client/templates/settings.js # imports/plugins/included/launchdock-connect/lib/collections.js # server/methods/accounts/accounts.js
reactioncommerce · Jun 22, 2017 · 94da803 · 94da803
2 parents 2ea5e4b + 543ddc0
commit 94da803
Show file tree

Hide file tree

Showing 70 changed files with 387 additions and 1,557 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.meteor/packages b/.meteor/packages
@@ -15,7 +15,6 @@ [email protected]              # Enable ECMAScript2015+ syntax in app code
 [email protected]   # ensure meteor method argument validation
 [email protected]          # security-related policies enforced by newer browsers
 juliancwirko:postcss          # CSS post-processing plugin (replaces standard-minifier-css)
-standard-minifier-js          # a minifier plugin used for Meteor apps by default
 [email protected]                 # ReactiveDict whose contents are preserved across Hot Code Push
 [email protected]                 # Meteor transparent reactive programming library
 [email protected]
@@ -61,7 +60,6 @@ cfs:standard-packages
 cfs:storage-adapter
 cfs:ui
 dispatch:run-as-user
-jeremy:stripe
 jparker:gravatar
 juliancwirko:s-alert
 juliancwirko:s-alert-stackslide
@@ -96,3 +94,4 @@ johanbrook:publication-collector
 # meteorhacks:sikka                         # additional ddp, login security
 
 # Custom Packages
+abernix:[email protected]
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,8 +1,10 @@
+abernix:[email protected]
+abernix:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].6
+[email protected].7
 [email protected]
 alanning:[email protected]
 aldeed:[email protected]
@@ -17,7 +19,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -53,7 +55,7 @@ cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 [email protected]
-[email protected].3_1
+[email protected].6_1
 dburles:[email protected]
 [email protected]
 [email protected]
@@ -65,9 +67,9 @@ [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
@@ -84,8 +86,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-jeremy:[email protected]
-johanbrook:[email protected]
+johanbrook:[email protected]
 jparker:[email protected]
 jparker:[email protected]
 jparker:[email protected]
@@ -107,19 +108,18 @@ [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 momentjs:[email protected]
 [email protected]
 [email protected]
 [email protected]
 mrt:[email protected]
 natestrauser:[email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -151,7 +151,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]

diff --git a/client/modules/accounts/components/passwordReset/updatePasswordOverlay.js b/client/modules/accounts/components/passwordReset/updatePasswordOverlay.js
@@ -19,14 +19,19 @@ class UpdatePasswordOverlay extends Component {
     super();
 
     this.state = {
-      password: ""
+      password: "",
+      showSpinner: true
     };
 
     this.handleFieldChange = this.handleFieldChange.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
     this.handleCancel = this.handleCancel.bind(this);
   }
 
+  componentWillReceiveProps() {
+    this.setState({ showSpinner: false });
+  }
+
   handleFieldChange = (event, value, field) => {
     this.setState({
       [field]: value
@@ -93,20 +98,29 @@ class UpdatePasswordOverlay extends Component {
     );
   }
 
+  renderSpinnerOnLoad() {
+    return (
+        <div className="spinner-container">
+          <div className="spinner" />
+        </div>
+    );
+  }
+
   render() {
     const passwordClasses = classnames({
       "form-group": true,
       "has-error has-feedback": this.props.onError(this.props.messages.errors && this.props.messages.errors.password)
     });
+    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() :
                 <form className="modal-content" onSubmit={this.handleSubmit}>
                   <div className="modal-header">
                     <h4 className="modal-title">
@@ -153,6 +167,7 @@ class UpdatePasswordOverlay extends Component {
                   </div>
 
                 </form>
+                }
               </div>
             </div>
           </div>}

diff --git a/client/modules/accounts/containers/dropdown/mainDropdownContainer.js b/client/modules/accounts/containers/dropdown/mainDropdownContainer.js
@@ -56,7 +56,7 @@ class MainDropdownContainer extends Component {
 
   render() {
     return (
-      <div>
+      <div className="accounts">
         <MainDropdown
           {...this.props}
           handleChange={this.handleChange}

diff --git a/client/modules/accounts/containers/passwordReset/forgotContainer.js b/client/modules/accounts/containers/passwordReset/forgotContainer.js
@@ -6,6 +6,8 @@ import { i18next } from "/client/api";
 import { composeWithTracker } from "/lib/api/compose";
 import { MessagesContainer } from "../helpers";
 import { Forgot } from "../../components";
+import { LoginFormValidation } from "/lib/api";
+
 
 class ForgotContainer extends Component {
   static propTypes = {

diff --git a/client/modules/accounts/containers/passwordReset/passwordOverlayContainer.js b/client/modules/accounts/containers/passwordReset/passwordOverlayContainer.js
@@ -5,6 +5,8 @@ import { Accounts } from "meteor/accounts-base";
 import { composeWithTracker } from "/lib/api/compose";
 import { UpdatePasswordOverlay } from "/client/modules/accounts/components";
 import { MessagesContainer } from "/client/modules/accounts/containers/helpers";
+import { TranslationProvider } from "/imports/plugins/core/ui/client/providers";
+import { LoginFormValidation } from "/lib/api";
 
 class UpdatePasswordOverlayContainer extends Component {
   static propTypes = {
@@ -100,16 +102,18 @@ class UpdatePasswordOverlayContainer extends Component {
 
   render() {
     return (
-      <UpdatePasswordOverlay
-        uniqueId={this.props.uniqueId}
-        loginFormMessages={this.formMessages}
-        onError={this.hasError}
-        messages={this.state.formMessages}
-        onFormSubmit={this.handleFormSubmit}
-        onCancel={this.handleFormCancel}
-        isOpen={this.state.isOpen}
-        isDisabled={this.state.isDisabled}
-      />
+      <TranslationProvider>
+        <UpdatePasswordOverlay
+          uniqueId={this.props.uniqueId}
+          loginFormMessages={this.formMessages}
+          onError={this.hasError}
+          messages={this.state.formMessages}
+          onFormSubmit={this.handleFormSubmit}
+          onCancel={this.handleFormCancel}
+          isOpen={this.state.isOpen}
+          isDisabled={this.state.isDisabled}
+        />
+      </TranslationProvider>
     );
   }
 }

diff --git a/client/modules/accounts/templates/members/memberForm.html b/client/modules/accounts/templates/members/memberForm.html
@@ -1,6 +1,7 @@
 <template name="memberForm">
   <div class="panel panel-default">
     <div class="panel-body">
+      {{> inlineAlerts placement="memberform"}}
       <form class="">
         <div class="form-group">
           <label for="member-form-name"><span data-i18n="accountsUI.name">Name</span></label>

diff --git a/client/modules/accounts/templates/members/memberForm.js b/client/modules/accounts/templates/members/memberForm.js
@@ -2,6 +2,7 @@ import { Reaction, i18next } from "/client/api";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 
+
 /**
  * memberForm events
  *
@@ -19,16 +20,22 @@ Template.memberForm.events({
           let message;
           if (error.reason === "Unable to send invitation email.") {
             message = i18next.t("accountsUI.error.unableToSendInvitationEmail");
+          } else if (error.reason === "A user with this email address already exists") {
+            message = i18next.t("accountsUI.error.userWithEmailAlreadyExists");
           } else if (error.reason !== "") {
             message = error;
           } else {
             message = `${i18next.t("accountsUI.error.errorSendingEmail")
             } ${error}`;
           }
-          Alerts.toast(message, "error", {
-            html: true,
-            timeout: 10000
+
+          Alerts.inline(message, "warning", {
+            placement: "memberform",
+            autoHide: 1000
           });
+
+          template.$("input[type=text], input[type=email]").val("");
+
           return false;
         }
         if (result) {

diff --git a/imports/plugins/core/dashboard/client/components/shortcutBar.js b/imports/plugins/core/dashboard/client/components/shortcutBar.js
@@ -76,7 +76,6 @@ class ShortcutBar extends Component {
         <nav
           style={{
             height: 54,
-            display: "flex",
             alignItems: "center",
             justifyContent: "center"
           }}

diff --git a/imports/plugins/core/router/client/startup.js b/imports/plugins/core/router/client/startup.js
@@ -8,8 +8,16 @@ import { Router } from "../lib";
 Meteor.startup(function () {
   Tracker.autorun(function () {
     // initialize client routing
+
     if (Reaction.Subscriptions.Packages.ready() && Reaction.Subscriptions.Shops.ready()) {
-      initBrowserRouter();
+      //  initBrowserRouter calls Router.initPackageRoutes which calls shopSub.ready which is reactive,
+      //  So we have to call initBrowserRouter in a non reactive context.
+      //  Otherwise initBrowserRouter is called twice each time a Reaction.Subscriptions.Packages.ready() and
+      //  Reaction.Subscriptions.Shops.ready() are true
+
+      Tracker.nonreactive(()=> {
+        initBrowserRouter();
+      });
     }
   });