makerspace-react-rails 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1030842a540ac1fe94653dbcf76c89706cbcae3f7f606af86b0ff343d3e45f5
-  data.tar.gz: ac5b06e0bda6b47f9c0f1e620dfdda67f1af363172fe65cffa4741b497a35a76
+  metadata.gz: 412835fbde98fbd7a5e6f2ed8d0ef73d032808f72d938e9bf8ac66d1a8f246c5
+  data.tar.gz: e964a6021c1bf58c2ec3713ee5e9e2b0f3e01a70cc70fc6032f15e637cb06e69
 SHA512:
-  metadata.gz: 41bcc88fb8d1a9f5bbb719568c7074a3a52d7842d2b4dc0013b33214ab4a99ff7432700b11d671f285325940ecf3e77e8e8d17e5f655a9070e965f15b6eab641
-  data.tar.gz: cdf2b0143f1410032f651ef8be534e6cce339f239d808ae99116320eb4589ddd8436cccbd9015c669c4d5cc96d93d11cf3e0daaa11d995e80508cbd053d563df
+  metadata.gz: 8b63f0ab95cf4ef21183a8878299522ac8be1c654790549670992bc28615000ce7fead44a7efafaaa2f184e8e5a33128ad204ffb5ce095425e6882b164e73b7c
+  data.tar.gz: 5fe5b8d86b991128113d81c49411193fef5b5286a5b569810f8a5f3a99244d03bc25650e74705e7c98491ab72914ec36b022351669c35cf1f7fb4012d4795caa

data/lib/makerspace/react/rails/version.rb

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.10.3"
+      VERSION = "0.10.4"
     end
   end
 end

data/vendor/assets/javascripts/makerspace-react.js

@@ -187041,8 +187041,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! app/PublicRouting */ "./src/app/PublicRouting.tsx");
 /* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
 /* harmony import */ var ui_member_utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/member/utils */ "./src/ui/member/utils.ts");
-/* harmony import */ var ui_common_Help__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ui/common/Help */ "./src/ui/common/Help.tsx");
-
 
 
 
@@ -187091,9 +187089,12 @@ const App = () => {
       loginAttempted && setAttemptingLogin(false);
 
       if (currentUserId) {
-        if (initialPath && initialPath !== app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].Root && !publicPaths.some(path => initialPath.startsWith(path))) {
-          history.push(initialPath);
-        } else {
+        if (initialPath && initialPath !== app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].Root && // Don't nav to initial if initial is root
+        !publicPaths.some(path => initialPath.startsWith(path)) && // or initial is a public path
+        !pathname.startsWith(app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].SignUp) // or user just signed up
+        ) {
+            history.push(initialPath);
+          } else {
           history.push(Object(ui_member_utils__WEBPACK_IMPORTED_MODULE_10__["buildProfileRouting"])(currentUserId));
         }
       }
@@ -187107,7 +187108,7 @@ const App = () => {
     permissions: permissions,
     currentUserId: currentUserId,
     isAdmin: isAdmin
-  }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__["default"], null), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_Help__WEBPACK_IMPORTED_MODULE_11__["default"], null));
+  }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__["default"], null));
 };
 
 /* harmony default export */ __webpack_exports__["default"] = (App);
@@ -191607,7 +191608,7 @@ class PaymentMethodsContainer extends react__WEBPACK_IMPORTED_MODULE_0__["Compon
 
     _defineProperty(this, "setFormRef", ref => this.formRef = ref);
 
-    _defineProperty(this, "fetchPaymentMethods", async () => {
+    _defineProperty(this, "fetchPaymentMethods", async callback => {
       this.setState({
         isRequesting: true,
         paymentMethods: []
@@ -191618,13 +191619,13 @@ class PaymentMethodsContainer extends react__WEBPACK_IMPORTED_MODULE_0__["Compon
         this.setState({
           isRequesting: false,
           error: result.error.message
-        });
+        }, callback);
       } else {
         this.setState({
           isRequesting: false,
           paymentMethods: result.data,
           error: ""
-        });
+        }, callback);
       }
     });
 
@@ -191642,9 +191643,11 @@ class PaymentMethodsContainer extends react__WEBPACK_IMPORTED_MODULE_0__["Compon
       this.setState({
         selectedPaymentMethodId: selectedPaymentMethod.id
       });
-      this.fetchPaymentMethods();
+      this.fetchPaymentMethods(() => {
+        const fullPaymentMethod = this.paymentMethodFromNonce(selectedPaymentMethod.id);
+        this.props.onPaymentMethodChange && this.props.onPaymentMethodChange(fullPaymentMethod);
+      });
       this.closeAddPaymentMethod();
-      this.props.onPaymentMethodChange && this.props.onPaymentMethodChange(selectedPaymentMethod);
     });
 
     _defineProperty(this, "selectPaymentMethod", event => {
@@ -192223,6 +192226,7 @@ const SubscriptionAuthorizationModal = ({
       borderRadius: "3px"
     }
   }, "I, ", currentUser.firstname, " ", currentUser.lastname, ", authorize Manchester Makerspace to charge $", item.amount, " ", "to the payment method I have selected every ", item.quantity, " month(s). I understand that this authorization will remain in effect until I notify Manchester Makerspace of cancellation in writing or electronically through ", react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("a", {
+    target: "_blank",
     href: `${Object(ui_member_utils__WEBPACK_IMPORTED_MODULE_8__["buildProfileRouting"])(currentUser.id)}/settings`
   }, "Subscription Settings"), "."), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_5___default.a, {
     control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_4___default.a, {
@@ -193280,6 +193284,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var ui_auth_actions__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ui/auth/actions */ "./src/ui/auth/actions.ts");
 /* harmony import */ var ui_member_utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ui/member/utils */ "./src/ui/member/utils.ts");
 /* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
+/* harmony import */ var ui_common_Help__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ui/common/Help */ "./src/ui/common/Help.tsx");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
@@ -193298,6 +193303,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
 class Header extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
   constructor(props) {
     super(props);
@@ -193417,7 +193423,7 @@ class Header extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
       alt: "Manchester Makerspace",
       viewBox: "0 0 960 580",
       preserveAspectRatio: "xMinYMin"
-    })), currentUser.id ? this.renderHambMenu() : !authRequesting && this.renderLoginLink()));
+    })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_Help__WEBPACK_IMPORTED_MODULE_14__["default"], null), currentUser.id ? this.renderHambMenu() : !authRequesting && this.renderLoginLink()));
   }
 
 }
@@ -193495,13 +193501,7 @@ const Help = () => {
   }
 
   const mailLink = `mailto:contact@manchestermakerspace.org?subject="${subject}"`;
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
-    style: {
-      position: "absolute",
-      bottom: "2rem",
-      right: "2rem"
-    }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tooltip__WEBPACK_IMPORTED_MODULE_1___default.a, {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tooltip__WEBPACK_IMPORTED_MODULE_1___default.a, {
     title: "Help"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_IconButton__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "aria-label": "Help",
@@ -193509,11 +193509,12 @@ const Help = () => {
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_icons_HelpOutlineOutlined__WEBPACK_IMPORTED_MODULE_4___default.a, {
     fontSize: "large",
     color: "primary"
-  })))), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_7__["default"], {
+  }))), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_7__["default"], {
     isOpen: true,
     id: "help-modal",
     title: "Contact Us",
-    closeHandler: closeModal
+    closeHandler: closeModal,
+    cancelText: "Close"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2___default.a, {
     variant: "body1"
   }, "Having trouble using our software? Please don't hesitate to", " ", react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("a", {
@@ -194608,11 +194609,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
 /* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _material_ui_core_Card__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Card */ "./node_modules/@material-ui/core/Card/index.js");
-/* harmony import */ var _material_ui_core_Card__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Card__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/CardContent */ "./node_modules/@material-ui/core/CardContent/index.js");
-/* harmony import */ var _material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
+/* harmony import */ var _material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Paper */ "./node_modules/@material-ui/core/Paper/index.js");
+/* harmony import */ var _material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -194623,7 +194622,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-
 let Documents;
 
 (function (Documents) {
@@ -194671,26 +194669,12 @@ const DocumentFrame = ({
   id,
   src
 }) => {
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Card__WEBPACK_IMPORTED_MODULE_2___default.a, {
-    style: {
-      height: "75vh"
-    }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_3___default.a, {
-    style: {
-      height: "100%"
-    }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_2___default.a, null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
     container: true,
-    spacing: 16,
-    style: {
-      height: "100%"
-    }
+    spacing: 16
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
     item: true,
-    xs: 12,
-    style: {
-      height: "100%"
-    }
+    xs: 12
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](DocumentInternalFrame, {
     id: id,
     src: src,
@@ -194698,7 +194682,7 @@ const DocumentFrame = ({
       height: "100%",
       width: "100%"
     }
-  })))));
+  }))));
 };
 
 const DocumentInternalFrame = ({
@@ -194707,15 +194691,22 @@ const DocumentInternalFrame = ({
   style
 }) => {
   const [loading, setLoading] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](true);
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, loading && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_4__["default"], {
+  const [height, setHeight] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](style.height);
+  const onLoad = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
+    setHeight(document.getElementById(id).contentWindow.document.documentElement.scrollHeight + "px");
+    setLoading(false);
+  }, [setLoading]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, loading && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_3__["default"], {
     id: id,
     contained: true
   }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("iframe", {
     id: id,
     name: id,
     src: src,
-    style: _objectSpread({}, style),
-    onLoad: () => setLoading(false),
+    style: _objectSpread({}, style, {
+      height
+    }),
+    onLoad: onLoad,
     frameBorder: 0
   }));
 };
@@ -202803,9 +202794,9 @@ const ViewTransactionModal = ({
     closeHandler: closeModal,
     title: Object(_utils__WEBPACK_IMPORTED_MODULE_8__["getTransactionDescription"])(transaction)
   }, transaction.invoice ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_documents_Document__WEBPACK_IMPORTED_MODULE_9__["DocumentInternalFrame"], {
+    id: "view-transaction-frame",
     style: {
-      width: "100%",
-      height: "600px"
+      width: "100%"
     },
     src: Object(_checkout_Receipt__WEBPACK_IMPORTED_MODULE_10__["buildReceiptUrl"])(transaction.invoice.id, isAdmin)
   }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_2__["default"], {