makerspace-react-rails 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fae966d16eaf262b48d8646c88a10ff85f7db94b4a21910e921187efb7e873ff
-  data.tar.gz: 55959939bccb2d165c167ab4eb50359fe110e49c0d0e285d1c62ffb1a2e750ed
+  metadata.gz: ad788b1735f51aad3d2a717d3cbf0b75be56a90c87bf0ffa8a140434d99aec57
+  data.tar.gz: 1e91fb3b63634d9d12088994b167e142142b64f26fa9249eaf2f0a589a050a73
 SHA512:
-  metadata.gz: a8b721c37a6fff038dad11313eec9c81a803f9cfd4b011bef85752a271ea5a796c70874ced4739c24e3849b4f30f9ded1ec970cece03b9d4d44171f73d52a42b
-  data.tar.gz: 12c864321c95ad730432220a0e5b9eba5a4eadbb4b703099e5ea25ffbc43e1f7efa123f35af3d22392159248b1b0d4a1a9a4f28f76ec50c5d62002908aaabb21
+  metadata.gz: b48b7f065319c990a42db06028cd38f2da0f3c05c1dd925079a636ec90396129bebbf2e0e74686237a5ea9a97686901d5a090e722d2238d71d46e5bdb0c080e3
+  data.tar.gz: fd4fa608577440e9e2a508d0042e9063a6711eed91515ffb589557cac50619d379289b0b3e388443d698727f361f7f71e023fadc1e64bc111496c6a6755623c1

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    makerspace-react-rails (0.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  makerspace-react-rails!
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.4

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

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.1.0"
+      VERSION = "0.1.2"
     end
   end
 end

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

@@ -82456,7 +82456,7 @@ function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, sta
       if (Object(_isArguments_js__WEBPACK_IMPORTED_MODULE_5__["default"])(objValue)) {
         newValue = Object(_toPlainObject_js__WEBPACK_IMPORTED_MODULE_14__["default"])(objValue);
       }
-      else if (!Object(_isObject_js__WEBPACK_IMPORTED_MODULE_10__["default"])(objValue) || (srcIndex && Object(_isFunction_js__WEBPACK_IMPORTED_MODULE_9__["default"])(objValue))) {
+      else if (!Object(_isObject_js__WEBPACK_IMPORTED_MODULE_10__["default"])(objValue) || Object(_isFunction_js__WEBPACK_IMPORTED_MODULE_9__["default"])(objValue)) {
         newValue = Object(_initCloneObject_js__WEBPACK_IMPORTED_MODULE_4__["default"])(srcValue);
       }
     }
@@ -87753,7 +87753,7 @@ function hasUnicode(string) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /** Used to detect strings that need a more robust regexp to match words. */
-var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
+var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
 
 /**
  * Checks if `string` contains a word composed of Unicode symbols.
@@ -89735,9 +89735,11 @@ __webpack_require__.r(__webpack_exports__);
  * @returns {*} Returns the property value.
  */
 function safeGet(object, key) {
-  return key == '__proto__'
-    ? undefined
-    : object[key];
+  if (key == '__proto__') {
+    return;
+  }
+
+  return object[key];
 }
 
 /* harmony default export */ __webpack_exports__["default"] = (safeGet);
@@ -99947,7 +99949,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /** Used as the semantic version number. */
-var VERSION = '4.17.10';
+var VERSION = '4.17.11';
 
 /** Used to compose bitmasks for function metadata. */
 var WRAP_BIND_KEY_FLAG = 2;
@@ -200530,7 +200532,7 @@ exports.default = PublicRouting;
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(process) {
+
 Object.defineProperty(exports, "__esModule", { value: true });
 var _a;
 var Url;
@@ -200598,7 +200600,7 @@ var Url;
         Subscriptions: baseBillingPath + "/subscriptions",
         Subscription: baseBillingPath + "/subscriptions/" + PathPlaceholder.SubscriptionId,
         Transactions: baseBillingPath + "/transactions",
-        Transaction: baseBillingPath + "/billing/transactions/" + PathPlaceholder.TransactionId,
+        Transaction: baseBillingPath + "/transactions/" + PathPlaceholder.TransactionId,
     };
     Url.EarnedMemberships = baseApiPath + "/earned_memberships";
     Url.EarnedMembership = Url.EarnedMemberships + "/" + PathPlaceholder.MembershipId;
@@ -200658,9 +200660,8 @@ var Whitelists;
     Whitelists["earnedMembership"] = "earned_membership";
 })(Whitelists = exports.Whitelists || (exports.Whitelists = {}));
 // TODO: I don't like this very much
-exports.billingEnabled = process.env.BILLING_ENABLED || false;
+exports.billingEnabled =  true || false;
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../node_modules/process/browser.js */ "./node_modules/process/browser.js")))
 
 /***/ }),
 
@@ -201506,7 +201507,7 @@ var LandingPage = /** @class */ (function (_super) {
                 React.createElement(Card_1.default, { style: { minWidth: 275 } },
                     React.createElement(CardContent_1.default, null,
                         React.createElement(Grid_1.default, { container: true, spacing: 24 },
-                            React.createElement(Grid_1.default, { item: true, md: 6, sm: 12 },
+                            React.createElement(Grid_1.default, { item: true, md: 6, sm: 12, id: "landing-page-graphic" },
                                 React.createElement(FilledLaserableLogo_svg_1.default, { style: { width: '100%', height: '200px' }, alt: "Manchester Makerspace", viewBox: "0 0 960 580" })),
                             React.createElement(Grid_1.default, { item: true, md: 6, sm: 12 },
                                 React.createElement(Typography_1.default, { variant: "subtitle1" }, "Manchester Makerspace is a non-profit collaborative organization of members who maintain a shared workspace, tooling, and skills in the Manchester, NH community. We will provide access to shared resources, training, and mentorship for the benefit of Manchester\u2019s local entrepreneurs, makers, and artists of all ages."))),
@@ -201768,6 +201769,7 @@ var Hidden_1 = __webpack_require__(/*! @material-ui/core/Hidden */ "./node_modul
 var LoginForm_1 = __webpack_require__(/*! ui/auth/LoginForm */ "./src/ui/auth/LoginForm.tsx");
 var constants_1 = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
 var react_redux_1 = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
+var FilledLaserableLogo_svg_1 = __webpack_require__(/*! -!react-svg-loader!assets/FilledLaserableLogo.svg */ "./node_modules/react-svg-loader/lib/loader.js!./src/assets/FilledLaserableLogo.svg");
 var LoginPage = /** @class */ (function (_super) {
     __extends(LoginPage, _super);
     function LoginPage() {
@@ -201776,8 +201778,8 @@ var LoginPage = /** @class */ (function (_super) {
     LoginPage.prototype.render = function () {
         return (React.createElement(Grid_1.default, { container: true, spacing: 24 },
             React.createElement(Hidden_1.default, { smDown: true },
-                React.createElement(Grid_1.default, { item: true, md: 6, sm: 12, style: { padding: '3em', height: '350px' } },
-                    React.createElement(Grid_1.default, { id: "landing-page-graphic" }))),
+                React.createElement(Grid_1.default, { item: true, md: 6, sm: 12, id: "landing-page-graphic" },
+                    React.createElement(FilledLaserableLogo_svg_1.default, { style: { width: '100%', height: '200px' }, alt: "Manchester Makerspace", viewBox: "0 0 960 580" }))),
             React.createElement(Grid_1.default, { item: true, md: 6, sm: 12 },
                 React.createElement(Grid_1.default, { container: true, justify: "center", spacing: 24 },
                     React.createElement(Grid_1.default, { item: true, xs: 12 },
@@ -205919,10 +205921,10 @@ var DetailView = /** @class */ (function (_super) {
         _this.renderInformation = function () {
             var _a = _this.props, information = _a.information, title = _a.title, actionButtons = _a.actionButtons;
             return (React.createElement(React.Fragment, null,
-                React.createElement(Grid_1.default, { item: true, xs: 10 },
+                React.createElement(Grid_1.default, { item: true, md: 10, xs: 12 },
                     React.createElement(Typography_1.default, { id: "detail-view-title", gutterBottom: true, variant: "h6" }, title),
                     React.createElement(ButtonRow_1.default, { actionButtons: actionButtons })),
-                React.createElement(Grid_1.default, { item: true, xs: 10, style: sectionBorderStyle }, information)));
+                React.createElement(Grid_1.default, { item: true, md: 10, xs: 12, style: sectionBorderStyle }, information)));
         };
         _this.changeResource = function (_event, value) {
             _this.setActiveResourceFromProps(value);
@@ -214718,43 +214720,33 @@ var Typography_1 = __webpack_require__(/*! @material-ui/core/Typography */ "./no
 var FormModal_1 = __webpack_require__(/*! ui/common/FormModal */ "./src/ui/common/FormModal.tsx");
 var KeyValueItem_1 = __webpack_require__(/*! ui/common/KeyValueItem */ "./src/ui/common/KeyValueItem.tsx");
 var timeToDate_1 = __webpack_require__(/*! ui/utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
+var numberAsCurrency_1 = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
 var DeleteTransactionModal = /** @class */ (function (_super) {
     __extends(DeleteTransactionModal, _super);
     function DeleteTransactionModal() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.setFormRef = function (ref) { return _this.formRef = ref; };
-        _this.getAdminContent = function () {
-            var transaction = _this.props.transaction;
-            return (React.createElement(React.Fragment, null,
-                React.createElement(Typography_1.default, { gutterBottom: true }, "Are you sure you want to refund this transaction?"),
-                React.createElement(KeyValueItem_1.default, { label: "Date" },
-                    React.createElement("span", { id: "refund-transaction-date" }, timeToDate_1.timeToDate(transaction.createdAt))),
-                React.createElement(KeyValueItem_1.default, { label: "Amount" },
-                    React.createElement("span", { id: "refund-transaction-amount" }, (Number(transaction.amount) - Number(transaction.discountAmount)))),
-                transaction.invoice &&
-                    React.createElement(React.Fragment, null,
-                        React.createElement(KeyValueItem_1.default, { label: "Member" },
-                            React.createElement("span", { id: "refund-transaction-member" }, transaction.invoice.memberName)),
-                        React.createElement(KeyValueItem_1.default, { label: "Description" },
-                            React.createElement("span", { id: "refund-transaction-description" }, transaction.invoice.description)))));
-        };
-        _this.getMemberContent = function () {
-            var transaction = _this.props.transaction;
-            return (React.createElement(React.Fragment, null,
-                React.createElement(Typography_1.default, { gutterBottom: true }, "Would you like to request a refund for this transaction? An administrator will review the request and notify you of a decision. Please note, requests for refunds are evaluated on a case by case basis and are not guaranteed."),
-                React.createElement(KeyValueItem_1.default, { label: "Date" },
-                    React.createElement("span", { id: "refund-transaction-date" }, timeToDate_1.timeToDate(transaction.createdAt))),
-                React.createElement(KeyValueItem_1.default, { label: "Amount" },
-                    React.createElement("span", { id: "refund-transaction-amount" }, (Number(transaction.amount) - Number(transaction.discountAmount)))),
-                React.createElement(KeyValueItem_1.default, { label: "Description" },
-                    React.createElement("span", { id: "refund-transaction-description" }, transaction.invoice.description))));
-        };
         return _this;
     }
     DeleteTransactionModal.prototype.render = function () {
         var _a = this.props, isOpen = _a.isOpen, onClose = _a.onClose, isRequesting = _a.isRequesting, error = _a.error, onSubmit = _a.onSubmit, transaction = _a.transaction, isAdmin = _a.isAdmin;
         var title = isAdmin ? "Refund Transaction" : "Request Refund";
-        return transaction ? (React.createElement(FormModal_1.default, { formRef: this.setFormRef, id: "refund-transaction", loading: isRequesting, isOpen: isOpen, closeHandler: onClose, title: title, onSubmit: onSubmit, error: error }, isAdmin ? this.getAdminContent() : this.getMemberContent())) : null;
+        var text = isAdmin ? (React.createElement("span", null, "Are you sure you want to refund this transaction?")) : (React.createElement("span", null,
+            "Would you like to request a refund for this transaction?",
+            React.createElement("br", null),
+            "An administrator will review the request and notify you of a decision. Please note, requests for refunds are evaluated on a case by case basis and are not guaranteed."));
+        return transaction ? (React.createElement(FormModal_1.default, { formRef: this.setFormRef, id: "refund-transaction", loading: isRequesting, isOpen: isOpen, closeHandler: onClose, title: title, onSubmit: onSubmit, error: error },
+            React.createElement(Typography_1.default, { gutterBottom: true }, text),
+            React.createElement(KeyValueItem_1.default, { label: "Date" },
+                React.createElement("span", { id: "refund-transaction-date" }, timeToDate_1.timeToDate(transaction.createdAt))),
+            React.createElement(KeyValueItem_1.default, { label: "Amount" },
+                React.createElement("span", { id: "refund-transaction-amount" }, numberAsCurrency_1.numberAsCurrency(Number(transaction.amount) - Number(transaction.discountAmount)))),
+            isAdmin && transaction.memberName &&
+                React.createElement(KeyValueItem_1.default, { label: "Member" },
+                    React.createElement("span", { id: "refund-transaction-member" }, transaction.memberName)),
+            transaction.invoice &&
+                React.createElement(KeyValueItem_1.default, { label: "Description" },
+                    React.createElement("span", { id: "refund-transaction-description" }, transaction.invoice.description)))) : null;
     };
     return DeleteTransactionModal;
 }(React.Component));
@@ -215048,9 +215040,8 @@ var TransactionsList = /** @class */ (function (_super) {
                 return (React.createElement(RefundTransactionModal_1.default, { ref: renderProps.setRef, transaction: renderProps.transaction, isOpen: renderProps.isOpen, isRequesting: renderProps.isRequesting, error: renderProps.error, onClose: renderProps.closeHandler, onSubmit: submit, isAdmin: admin }));
             };
             var selectedTransaction = transactions[selectedId];
-            return (admin &&
-                React.createElement(React.Fragment, null, !!selectedTransaction && (React.createElement(React.Fragment, null,
-                    React.createElement(UpdateTransactionContainer_1.default, { operation: constants_2.CrudOperation.Delete, isAdmin: admin, isOpen: openTransactionForm && modalOperation === constants_2.CrudOperation.Delete, transaction: transactions[selectedId], closeHandler: _this.closeTransactionModal, render: refundModal })))));
+            return (!!selectedTransaction &&
+                React.createElement(UpdateTransactionContainer_1.default, { operation: constants_2.CrudOperation.Delete, isAdmin: admin, isOpen: openTransactionForm && modalOperation === constants_2.CrudOperation.Delete, transaction: transactions[selectedId], closeHandler: _this.closeTransactionModal, render: refundModal }));
         };
         _this.updateStartDate = function (event) {
             var value = event.currentTarget.value;
@@ -215493,7 +215484,7 @@ var transaction_1 = __webpack_require__(/*! app/entities/transaction */ "./src/a
 var constants_1 = __webpack_require__(/*! ui/constants */ "./src/ui/constants.ts");
 var StatusLabel_1 = __webpack_require__(/*! ui/common/StatusLabel */ "./src/ui/common/StatusLabel.tsx");
 exports.renderTransactionStatus = function (transaction) {
-    var label = "In Progress";
+    var label = "Pending";
     var color = constants_1.Status.Info;
     switch (transaction.status) {
         case transaction_1.TransactionStatus.Settled: