authscape 1.0.243 → 1.0.244

package/index.js

@@ -609,6 +609,8 @@ var FileUploader = function FileUploader(_ref) {
     primaryColor = _ref$primaryColor === void 0 ? "#000" : _ref$primaryColor,
     _ref$onConfirmDelete = _ref.onConfirmDelete,
     onConfirmDelete = _ref$onConfirmDelete === void 0 ? null : _ref$onConfirmDelete,
+    _ref$accept = _ref.accept,
+    accept = _ref$accept === void 0 ? "" : _ref$accept,
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? "filemanager" : _ref$variant,
     _ref$onUploadComplete = _ref.onUploadCompleted,
@@ -804,6 +806,7 @@ var FileUploader = function FileUploader(_ref) {
     type: "file",
     name: "file",
     multiple: multiple,
+    accept: accept,
     ref: fileUploader,
     onChange: handleUpload,
     style: {
@@ -1483,10 +1486,14 @@ function OEMEditor(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     selectedFont = _useState10[0],
     setSelectedFont = _useState10[1];
-  var _useState11 = (0, _react.useState)(''),
+  var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    stateBaseUri = _useState12[0],
-    setBaseUri = _useState12[1];
+    fontUri = _useState12[0],
+    setFontUri = _useState12[1];
+  var _useState13 = (0, _react.useState)(''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    stateBaseUri = _useState14[0],
+    setBaseUri = _useState14[1];
   var handleChange = function handleChange(event, newValue) {
     setValue(newValue);
   };
@@ -1502,7 +1509,7 @@ function OEMEditor(_ref) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return apiService().get("/OEM/GetFonts");
+                return apiService().get("/WhiteLabel/GetFonts");
               case 2:
                 response = _context.sent;
                 if (response != null && response.status == 200) {
@@ -1510,7 +1517,7 @@ function OEMEditor(_ref) {
                 }
                 domain = GetBaseUrl();
                 _context.next = 7;
-                return apiService().get("/OEM/GetFields?domain=" + domain + (companyId != null ? "&companyId=" + companyId : ""));
+                return apiService().get("/WhiteLabel/GetFields?domain=" + domain + (companyId != null ? "&companyId=" + companyId : ""));
               case 7:
                 responseFields = _context.sent;
                 if (responseFields != null && responseFields.status == 200) {
@@ -1545,8 +1552,8 @@ function OEMEditor(_ref) {
   var columns = [{
     field: "label",
     headerName: "Fonts",
-    width: 200,
     editable: false,
+    width: 300,
     renderCell: function renderCell(params) {
       var RenderData = function RenderData(row) {
         // const { id, value, field } = params;
@@ -1554,7 +1561,8 @@ function OEMEditor(_ref) {
         return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Box["default"], {
           sx: {
             fontFamily: row.value,
-            fontSize: 20
+            fontSize: 20,
+            cursor: "pointer"
           }
         }, row.value), /*#__PURE__*/_react["default"].createElement("link", {
           href: "https://fonts.googleapis.com/css2?family=" + row.value,
@@ -1577,12 +1585,13 @@ function OEMEditor(_ref) {
               baseUri = GetBaseUrl();
               setBaseUri(baseUri);
               _context2.next = 4;
-              return apiService().get("/oem/GetEditorData?domain=" + baseUri + (companyId != null ? "&companyId=" + companyId : ""));
+              return apiService().get("/WhiteLabel/GetEditorData?domain=" + baseUri + (companyId != null ? "&companyId=" + companyId : ""));
             case 4:
               response = _context2.sent;
               if (response.status == 200) {
                 setData(response.data);
                 setSelectedFont(response.data.fontFamily);
+                setFontUri(response.data.fontUrl);
               }
             case 6:
             case "end":
@@ -1600,7 +1609,7 @@ function OEMEditor(_ref) {
     sx: {
       width: '100%'
     }
-  }, selectedFont != null && /*#__PURE__*/_react["default"].createElement("link", {
+  }, selectedFont != null && fontUri == null && /*#__PURE__*/_react["default"].createElement("link", {
     href: "https://fonts.googleapis.com/css2?family=" + selectedFont,
     rel: "stylesheet"
   }), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
@@ -1637,7 +1646,8 @@ function OEMEditor(_ref) {
     width: 200,
     height: 200
   }), /*#__PURE__*/_react["default"].createElement(FileUploader, {
-    url: "/oem/UploadAppIcon",
+    url: "/WhiteLabel/UploadAppIcon",
+    accept: ".jpg,.jpeg,.png,.gif",
     params: {
       domain: stateBaseUri
     },
@@ -1671,7 +1681,7 @@ function OEMEditor(_ref) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return apiService().post("/OEM/SetFieldValue", {
+                return apiService().post("/WhiteLabel/SetFieldValue", {
                   id: dnsField.id,
                   fieldId: dnsField.fieldId,
                   value: hex
@@ -1702,7 +1712,8 @@ function OEMEditor(_ref) {
     rows: fonts,
     columns: columns,
     sx: {
-      height: "80vh"
+      height: "80vh",
+      width: "100%"
     },
     pagination: true,
     disableSelectionOnClick: true,
@@ -1720,7 +1731,7 @@ function OEMEditor(_ref) {
             case 0:
               baseUri = GetBaseUrl();
               _context4.next = 3;
-              return apiService().post("/OEM/SetFont", {
+              return apiService().post("/WhiteLabel/SetFont", {
                 companyId: companyId,
                 domain: baseUri,
                 value: params.row.label
@@ -1729,6 +1740,7 @@ function OEMEditor(_ref) {
               response = _context4.sent;
               if (response != null && response.status == 200) {
                 setSelectedFont(params.row.label);
+                setFontUri(null);
                 notification("Font saved!");
               }
             case 5:
@@ -1743,11 +1755,35 @@ function OEMEditor(_ref) {
     }()
   }))), /*#__PURE__*/_react["default"].createElement(_material.Grid, {
     item: true,
-    xs: 6,
+    xs: 6
+  }, /*#__PURE__*/_react["default"].createElement(FileUploader, {
+    url: "/WhiteLabel/UploadCustomFont",
+    accept: ".otf,.ttf,.woff",
+    params: {
+      domain: stateBaseUri
+    },
+    multiple: true,
+    variant: "custom",
+    onUploadCompleted: function onUploadCompleted() {
+      window.location.reload();
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    color: "primary",
+    variant: "contained",
+    fullWidth: true,
+    sx: {
+      height: 50
+    },
+    startIcon: /*#__PURE__*/_react["default"].createElement(_PublishRounded["default"], null)
+  }, /*#__PURE__*/_react["default"].createElement(_Box["default"], null, "Upload Font"), "\xA0", /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+    sx: {
+      textAlign: "center"
+    }
+  }, /*#__PURE__*/_react["default"].createElement("small", null, "(.OTF, .TTF, OR .WOFF)")))), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       marginTop: 4
     }
-  }, /*#__PURE__*/_react["default"].createElement(_Box["default"], null, "Font Selected:"), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+  }, "Font Selected:"), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       marginBottom: 2,
       fontWeight: "bold",
@@ -1789,7 +1825,7 @@ function OEMEditor(_ref) {
           case 0:
             baseUri = GetBaseUrl();
             _context5.next = 3;
-            return apiService().post("/OEM/SetGlobalCSS", {
+            return apiService().post("/WhiteLabel/SetGlobalCSS", {
               companyId: companyId,
               domain: baseUri,
               value: cssEditorRef.current.getValue()
@@ -1847,7 +1883,7 @@ function OEMEditor(_ref) {
           case 0:
             baseUri = GetBaseUrl();
             _context6.next = 3;
-            return apiService().post("/OEM/SetGlobalHTML", {
+            return apiService().post("/WhiteLabel/SetGlobalHTML", {
               companyId: companyId,
               domain: baseUri,
               value: htmlEditorRef.current.getValue()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.243",
+  "version": "1.0.244",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/FileUploader.js

@@ -29,6 +29,7 @@ export const FileUploader = ({
   refOveride = null,
   primaryColor = "#000",
   onConfirmDelete = null,
+  accept = "",
   variant = "filemanager", // custom vs filemanager
   onUploadCompleted = null
 }) => {
@@ -165,6 +166,7 @@ export const FileUploader = ({
             type="file"
             name="file"
             multiple={multiple}
+            accept={accept}
             ref={fileUploader}
             onChange={handleUpload}
             style={{ display: "none" }}

package/src/components/OEMEditor.js

@@ -1,3 +1,4 @@
+
 import React, { useState, useRef, useEffect } from "react";
 import Editor, { useMonaco } from "@monaco-editor/react";
 import Button from '@mui/material/Button';
@@ -22,6 +23,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
     const [fonts, setFonts] = useState([]);
     const [dnsFields, setDnsFields] = useState([]);
     const [selectedFont, setSelectedFont] = useState(null);
+    const [fontUri, setFontUri] = useState(null);
 
     const [stateBaseUri, setBaseUri] = useState('');
 
@@ -39,14 +41,14 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
       {
         const fetchData = async () => {
 
-          let response = await apiService().get("/OEM/GetFonts");
+          let response = await apiService().get("/WhiteLabel/GetFonts");
           if (response != null && response.status == 200)
           {
             setFonts(response.data);
           }
 
           var domain = GetBaseUrl();
-          let responseFields = await apiService().get("/OEM/GetFields?domain=" + domain + (companyId != null ? ("&companyId=" + companyId) : ""));
+          let responseFields = await apiService().get("/WhiteLabel/GetFields?domain=" + domain + (companyId != null ? ("&companyId=" + companyId) : ""));
           if (responseFields != null && responseFields.status == 200)
           {
             setDnsFields(responseFields.data);
@@ -73,21 +75,19 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
       htmlEditorRef.current = editor; 
     }
 
-    
-
     const columns = [
       {
         field: "label",
         headerName: "Fonts",
-        width: 200,
         editable: false,
+        width:300,
         renderCell: (params) => {
           const RenderData = (row) => {
             // const { id, value, field } = params;
             // const apiRef = useGridApiContext();
             return (
               <>
-                <Box sx={{fontFamily: row.value, fontSize:20}}>{row.value}</Box>
+                <Box sx={{fontFamily: row.value, fontSize:20, cursor:"pointer"}}>{row.value}</Box>
                 <link href={"https://fonts.googleapis.com/css2?family=" + row.value} rel="stylesheet"></link>
               </>
             );
@@ -108,11 +108,12 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
             var baseUri = GetBaseUrl();
             setBaseUri(baseUri);
 
-            let response = await apiService().get("/oem/GetEditorData?domain=" + baseUri + (companyId != null ? ("&companyId=" + companyId) : ""));
+            let response = await apiService().get("/WhiteLabel/GetEditorData?domain=" + baseUri + (companyId != null ? ("&companyId=" + companyId) : ""));
             if (response.status == 200)
             {
                 setData(response.data);
                 setSelectedFont(response.data.fontFamily);
+                setFontUri(response.data.fontUrl);
             }
         }
         fetchData();
@@ -123,7 +124,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
         <>
         <Box sx={{ width: '100%' }}>
 
-            {selectedFont != null &&
+            {(selectedFont != null && fontUri == null) &&
             <link href={"https://fonts.googleapis.com/css2?family=" + selectedFont} rel="stylesheet"></link>
             }
         
@@ -151,7 +152,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                             <Image src={data.appIconUrl} width={200} height={200} />
                         }
 
-                        <FileUploader url={"/oem/UploadAppIcon"} params={{
+                        <FileUploader url={"/WhiteLabel/UploadAppIcon"} accept={".jpg,.jpeg,.png,.gif"} params={{
                             domain: stateBaseUri
                         }} multiple={true} variant='custom' onUploadCompleted={() => {
                             window.location.reload();
@@ -177,7 +178,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
 
                                 <ColorPicker name={dnsField.name} defaultColor={dnsField.value} onColorChanged={async (name, hex) => {
 
-                                    await apiService().post("/OEM/SetFieldValue", {
+                                    await apiService().post("/WhiteLabel/SetFieldValue", {
                                     id: dnsField.id,
                                     fieldId: dnsField.fieldId,
                                     value: hex
@@ -209,7 +210,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                             <DataGrid
                                 rows={fonts}
                                 columns={columns}
-                                sx={{height:"80vh"}}
+                                sx={{height:"80vh", width:"100%"}}
                                 pagination
                                 disableSelectionOnClick={true}
                                 onPaginationModelChange={setPaginationModel}
@@ -220,7 +221,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                                 onRowClick={async (params) => {
 
                                     var baseUri = GetBaseUrl();
-                                    let response = await apiService().post("/OEM/SetFont", {
+                                    let response = await apiService().post("/WhiteLabel/SetFont", {
                                         companyId: companyId,
                                         domain: baseUri,
                                         value: params.row.label
@@ -228,6 +229,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                                     if (response != null && response.status == 200)
                                     {
                                         setSelectedFont(params.row.label);
+                                        setFontUri(null);
                                         notification("Font saved!");
                                     }
                                 }}
@@ -237,8 +239,20 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
 
                     
                     </Grid>
-                    <Grid item xs={6} sx={{marginTop:4}}>
-                    <Box>Font Selected:</Box>
+                    <Grid item xs={6} >
+
+                        <FileUploader url={"/WhiteLabel/UploadCustomFont"} accept={".otf,.ttf,.woff"} params={{
+                            domain: stateBaseUri
+                        }} multiple={true} variant='custom' onUploadCompleted={() => {
+                            window.location.reload();
+                            }}>
+
+                            <Button color="primary" variant="contained" fullWidth={true} sx={{height:50}} startIcon={<PublishRoundedIcon/>}><Box>Upload Font</Box>&nbsp;<Box sx={{textAlign:"center"}}><small>(.OTF, .TTF, OR .WOFF)</small></Box></Button>
+
+                        </FileUploader>
+                        
+
+                    <Box sx={{marginTop:4}}>Font Selected:</Box>
                     <Box sx={{marginBottom:2, fontWeight:"bold", fontSize:20}}> {selectedFont}</Box>
                     <hr />
                     <Box sx={{fontFamily: selectedFont}}>
@@ -270,7 +284,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                         <Button startIcon={<CheckIcon/>} sx={{marginTop:4}} variant="contained" onClick={async () => { 
 
                             var baseUri = GetBaseUrl();
-                            let response = await apiService().post("/OEM/SetGlobalCSS", {
+                            let response = await apiService().post("/WhiteLabel/SetGlobalCSS", {
                             companyId: companyId,
                             domain: baseUri,
                             value: cssEditorRef.current.getValue()
@@ -314,7 +328,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                             <Button startIcon={<CheckIcon/>} sx={{marginTop:4}} variant="contained" onClick={async () => {
 
                                 var baseUri = GetBaseUrl();
-                                let response = await apiService().post("/OEM/SetGlobalHTML", {
+                                let response = await apiService().post("/WhiteLabel/SetGlobalHTML", {
                                     companyId: companyId,
                                     domain: baseUri,
                                     value: htmlEditorRef.current.getValue()