authscape 1.0.192 → 1.0.196

package/index.js

@@ -27,6 +27,8 @@ function AuthScapeApp(_ref) {
     pageProps = _ref.pageProps,
     _ref$muiTheme = _ref.muiTheme,
     muiTheme = _ref$muiTheme === void 0 ? {} : _ref$muiTheme,
+    _ref$enforceLoggedIn = _ref.enforceLoggedIn,
+    enforceLoggedIn = _ref$enforceLoggedIn === void 0 ? false : _ref$enforceLoggedIn,
     _ref$onAuthentication = _ref.onAuthenticationLoaded,
     onAuthenticationLoaded = _ref$onAuthentication === void 0 ? null : _ref$onAuthentication;
   var _useState = (0, _react.useState)(false),
@@ -56,6 +58,13 @@ function AuthScapeApp(_ref) {
       if (router.query.r != null) {
         localStorage.setItem("ref", router.query.r);
       }
+
+      // ORM module
+      //   if (process.env.enableOEMClient)
+      //   {
+      //     var baseURL = window.location.protocol + "//" + window.location.host;
+      //     apiService().get("/oem/")
+      //   }
     }
   }, [loadedUser]);
   (0, _react.useEffect)(function () {
@@ -75,8 +84,12 @@ function AuthScapeApp(_ref) {
     isEnabled: process.env.enableAuth,
     userLoaded: function userLoaded(signedInUser) {
       setLoadedUser(true);
-      if (onAuthenticationLoaded != null) {
-        onAuthenticationLoaded(signedInUser);
+      if (enforceLoggedIn) {
+        authService().login();
+      } else {
+        if (onAuthenticationLoaded != null) {
+          onAuthenticationLoaded(signedInUser);
+        }
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
@@ -101,6 +114,107 @@ function AuthScapeApp(_ref) {
 }
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ColorPicker = ColorPicker;
+var _react = _interopRequireWildcard(require("react"));
+var _reactColor = require("react-color");
+var _reactcss = _interopRequireDefault(require("reactcss"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ColorPicker(_ref) {
+  var name = _ref.name,
+    defaultColor = _ref.defaultColor,
+    onColorChanged = _ref.onColorChanged;
+  var _useState = (0, _react.useState)(defaultColor != null ? defaultColor : "#ffffff"),
+    _useState2 = _slicedToArray(_useState, 2),
+    rgbColor = _useState2[0],
+    setColor = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    displayColorPicker = _useState4[0],
+    setDisplayColorPicker = _useState4[1];
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedColor = _useState6[0],
+    setSelectedColor = _useState6[1];
+  var _useState7 = (0, _react.useState)(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    timeoutToken = _useState8[0],
+    setTimeoutToken = _useState8[1];
+  var styles = (0, _reactcss["default"])({
+    'default': {
+      color: {
+        width: '36px',
+        height: '14px',
+        borderRadius: '2px',
+        background: rgbColor
+      },
+      swatch: {
+        padding: '5px',
+        background: '#fff',
+        borderRadius: '1px',
+        boxShadow: '0 0 0 1px rgba(0,0,0,.1)',
+        display: 'inline-block',
+        cursor: 'pointer'
+      },
+      popover: {
+        position: 'absolute',
+        zIndex: '2'
+      },
+      cover: {
+        position: 'fixed',
+        top: '0px',
+        right: '0px',
+        bottom: '0px',
+        left: '0px'
+      }
+    }
+  });
+  (0, _react.useEffect)(function () {
+    if (!displayColorPicker && selectedColor != null) {
+      clearTimeout(timeoutToken);
+      setTimeoutToken(setTimeout(function () {
+        onColorChanged(name, selectedColor);
+      }, 500));
+    }
+  }, [displayColorPicker, selectedColor]);
+  return /*#__PURE__*/_react["default"].createElement(_Box["default"], null, /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.swatch,
+    onClick: function onClick() {
+      setDisplayColorPicker(!displayColorPicker);
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.color
+  })), displayColorPicker ? /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.popover
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.cover,
+    onClick: function onClick() {
+      setDisplayColorPicker(false);
+    }
+  }), /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
+    color: rgbColor,
+    onChange: function onChange(color) {
+      setColor(color.hex);
+    },
+    onChangeComplete: function onChangeComplete(color) {
+      setSelectedColor(color.hex);
+    }
+  })) : null);
+}
+"use strict";
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.192",
+  "version": "1.0.196",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -39,6 +39,7 @@
     "next": "^13.3.2",
     "nookies": "^2.5.2",
     "query-string": "^7.1.1",
+    "react-color": "^2.19.3",
     "react-cool-onclickoutside": "^1.7.0",
     "react-data-table-component": "^7.5.2",
     "react-hook-form": "^7.44.2",

package/src/components/AuthScapeApp.js

@@ -6,7 +6,7 @@ import { useRouter } from 'next/router';
 import { ThemeProvider } from '@mui/material/styles';
 import { Box } from '@mui/material';
 
-export function AuthScapeApp({Component, pageProps, muiTheme = {}, onAuthenticationLoaded = null}) {
+export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLoggedIn = false, onAuthenticationLoaded = null}) {
 
     const [isLoading, setIsLoading] = useState(false);
     const [loadedUser, setLoadedUser] = useState(false);
@@ -26,7 +26,15 @@ export function AuthScapeApp({Component, pageProps, muiTheme = {}, onAuthenticat
           if (router.query.r != null)
           {
             localStorage.setItem("ref", router.query.r);
-          }         
+          }
+
+          // ORM module
+        //   if (process.env.enableOEMClient)
+        //   {
+        //     var baseURL = window.location.protocol + "//" + window.location.host;
+        //     apiService().get("/oem/")
+        //   }
+
         }
     }, [loadedUser]);
 
@@ -61,9 +69,16 @@ export function AuthScapeApp({Component, pageProps, muiTheme = {}, onAuthenticat
                     <AuthorizationComponent setCurrentUser={setCurrentUser} isEnabled={process.env.enableAuth} userLoaded={(signedInUser) => {
                         setLoadedUser(true);
 
-                        if (onAuthenticationLoaded != null)
+                        if (enforceLoggedIn)
+                        {
+                            authService().login();
+                        }
+                        else
                         {
-                            onAuthenticationLoaded(signedInUser);
+                            if (onAuthenticationLoaded != null)
+                            {
+                                onAuthenticationLoaded(signedInUser);
+                            }
                         }
                     }}>
                     <Component {...pageProps} currentUser={currentUser} toast={toast} setIsLoading={setIsLoading} loadedUser={loadedUser} logEvent={logEvent} />

package/src/components/ColorPicker.js

@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react';
+import { SketchPicker } from 'react-color';
+import reactCSS from 'reactcss';
+import Box from '@mui/material/Box';
+
+export function ColorPicker({name, defaultColor, onColorChanged}) {
+  
+    const [rgbColor, setColor] = useState(defaultColor != null ? defaultColor : "#ffffff");
+      
+    const [displayColorPicker, setDisplayColorPicker] = useState(false);
+    const [selectedColor, setSelectedColor] = useState(null);
+    const [timeoutToken, setTimeoutToken] = useState(null);
+
+    const styles = reactCSS({
+        'default': {
+          color: {
+            width: '36px',
+            height: '14px',
+            borderRadius: '2px',
+            background: rgbColor,
+          },
+          swatch: {
+            padding: '5px',
+            background: '#fff',
+            borderRadius: '1px',
+            boxShadow: '0 0 0 1px rgba(0,0,0,.1)',
+            display: 'inline-block',
+            cursor: 'pointer',
+          },
+          popover: {
+            position: 'absolute',
+            zIndex: '2',
+          },
+          cover: {
+            position: 'fixed',
+            top: '0px',
+            right: '0px',
+            bottom: '0px',
+            left: '0px',
+          },
+        },
+    });
+
+    useEffect(() => {
+
+      if (!displayColorPicker && selectedColor != null)
+      {
+        clearTimeout(timeoutToken);
+        setTimeoutToken(setTimeout(() => {
+          
+          onColorChanged(name, selectedColor);
+
+        }, 500));
+      }
+
+    }, [displayColorPicker, selectedColor]);
+
+    return (
+        <Box>
+            <div style={ styles.swatch } onClick={() => {
+                setDisplayColorPicker(!displayColorPicker);
+            }}>
+                <div style={ styles.color } />
+            </div>
+
+            { displayColorPicker ? <div style={ styles.popover }>
+            <div style={ styles.cover } onClick={() => {
+                setDisplayColorPicker(false);
+            }}/>
+            <SketchPicker color={ rgbColor } onChange={(color) => {
+                
+                setColor(color.hex);
+
+            }} onChangeComplete={(color) => {
+
+              setSelectedColor(color.hex);
+
+            }} />
+            </div> : null }
+        </Box>
+    );
+}