diff --git a/frontend/package.json b/frontend/package.json
index 2efb1929..157ceefc 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,13 +9,10 @@
"@emotion/react": "^11.7.0",
"@emotion/styled": "^11.6.0",
"@lezer/highlight": "^1.1.3",
- "@material-ui/core": "^4.5.2",
- "@material-ui/lab": "^4.0.0-alpha.58",
- "@material-ui/styles": "^4.5.2",
- "@material-ui/utils": "^4.11.2",
"@metamask/detect-provider": "^1.2.0",
"@mui/icons-material": "^5.14.0",
"@mui/material": "^5.2.3",
+ "@mui/styles": "^5.14.0",
"@mui/x-data-grid": "^5.17.11",
"@uiw/codemirror-themes": "^4.19.9",
"@uiw/react-codemirror": "^3.2.1",
@@ -37,6 +34,13 @@
"github-markdown-css": "^3.0.1",
"import": "0.0.6",
"interweave": "^11.2.0",
+ "jss": "^10.10.0",
+ "jss-camel-case": "^6.1.0",
+ "jss-default-unit": "^8.0.2",
+ "jss-global": "^3.0.0",
+ "jss-nested": "^6.0.1",
+ "jss-props-sort": "^6.0.0",
+ "jss-vendor-prefixer": "^8.0.1",
"material-icons": "^0.7.7",
"material-icons-react": "^1.0.4",
"material-ui-chip-input": "^2.0.0-beta.2",
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index a70f701e..dbb513fe 100755
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -6,7 +6,6 @@ import { removeCookies, useCookies } from "react-cookie";
import Workflows from "./views/Workflows";
import GettingStarted from "./views/GettingStarted";
-import EditWebhook from "./views/EditWebhook";
import AngularWorkflow from "./views/AngularWorkflow.jsx";
import Header from "./components/Header.jsx";
@@ -20,13 +19,12 @@ import DashboardView from "./views/DashboardViews.jsx";
import AdminSetup from "./views/AdminSetup";
import Admin from "./views/Admin";
import Docs from "./views/Docs.jsx";
-import Introduction from "./views/Introduction";
+//import Introduction from "./views/Introduction";
import SetAuthentication from "./views/SetAuthentication";
import SetAuthenticationSSO from "./views/SetAuthenticationSSO";
import Search from "./views/Search.jsx";
import RunWorkflow from "./views/RunWorkflow.jsx";
-import LandingPageNew from "./views/LandingpageNew";
import LoginPage from "./views/LoginPage";
import SettingsPage from "./views/SettingsPage";
import KeepAlive from "./views/KeepAlive.jsx";
@@ -42,7 +40,6 @@ import { isMobile } from "react-device-detect";
import detectEthereumProvider from "@metamask/detect-provider";
import Drift from "react-driftjs";
-import DashboardPage from "./views/TempDashboard.jsx";
// Production - backend proxy forwarding in nginx
var globalUrl = window.location.origin;
@@ -282,18 +279,6 @@ const App = (message, props) => {
}
const includedData =
- window.location.pathname === "/home" ||
- window.location.pathname === "/features" ? (
-
// backgroundColor: "#213243",
diff --git a/frontend/src/components/AlertTemplate.js b/frontend/src/components/AlertTemplate.js
index e7bf849d..3b320a6b 100755
--- a/frontend/src/components/AlertTemplate.js
+++ b/frontend/src/components/AlertTemplate.js
@@ -5,7 +5,10 @@ import {
ErrorOutline as ErrorOutlineIcon,
Close as CloseIcon,
} from "@mui/icons-material";
-import Typography from "@material-ui/core/Typography";
+
+import {
+ Typography
+} from "@mui/material";
const alertStyle = {
backgroundColor: "rgba(0,0,0,0.9)",
diff --git a/frontend/src/components/AppFramework.jsx b/frontend/src/components/AppFramework.jsx
index 9d965727..54fb6869 100644
--- a/frontend/src/components/AppFramework.jsx
+++ b/frontend/src/components/AppFramework.jsx
@@ -23,11 +23,8 @@ import {
Dialog,
Chip,
Avatar,
-} from "@material-ui/core";
-
-import {
Button
-} from '@material-ui/core';
+} from "@mui/material";
import {
Close as CloseIcon,
diff --git a/frontend/src/components/AppGrid.jsx b/frontend/src/components/AppGrid.jsx
index fc01dccd..1e6ab296 100644
--- a/frontend/src/components/AppGrid.jsx
+++ b/frontend/src/components/AppGrid.jsx
@@ -1,7 +1,7 @@
import React, {useEffect, useState} from 'react';
+import theme from '../theme.jsx';
import ReactGA from 'react-ga4';
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
import {
@@ -25,7 +25,7 @@ import {
Typography,
Button,
Tooltip
-} from '@material-ui/core';
+} from '@mui/material';
const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
//const searchClient = algoliasearch("L55H18ZINA", "a19be455e7e75ee8f20a93d26b9fc6d6")
@@ -38,7 +38,6 @@ const AppGrid = props => {
const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
const xs = parsedXs === undefined || parsedXs === null ? isMobile ? 6 : 2 : parsedXs
- const theme = useTheme();
//const [apps, setApps] = React.useState([]);
//const [filteredApps, setFilteredApps] = React.useState([]);
const [formMail, setFormMail] = React.useState("");
diff --git a/frontend/src/components/Appsearch.jsx b/frontend/src/components/Appsearch.jsx
index 9f0699d2..5defd0f0 100644
--- a/frontend/src/components/Appsearch.jsx
+++ b/frontend/src/components/Appsearch.jsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
+import theme from '../theme.jsx';
import ReactGA from 'react-ga4';
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
import { useAlert } from "react-alert";
import { Search as SearchIcon, CloudQueue as CloudQueueIcon, Code as CodeIcon } from '@mui/icons-material';
@@ -8,7 +8,7 @@ import { Search as SearchIcon, CloudQueue as CloudQueueIcon, Code as CodeIcon }
//import algoliasearch from 'algoliasearch/lite';
import algoliasearch from 'algoliasearch';
import { InstantSearch, connectSearchBox, connectHits } from 'react-instantsearch-dom';
-import { Grid, Paper, TextField, ButtonBase, InputAdornment, Typography, Button, Tooltip} from '@material-ui/core';
+import { Grid, Paper, TextField, ButtonBase, InputAdornment, Typography, Button, Tooltip} from '@mui/material';
import aa from 'search-insights'
const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
const Appsearch = props => {
@@ -18,7 +18,6 @@ const Appsearch = props => {
const alert = useAlert();
const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
const xs = parsedXs === undefined || parsedXs === null ? 12 : parsedXs
- const theme = useTheme();
//const [apps, setApps] = React.useState([]);
//const [filteredApps, setFilteredApps] = React.useState([]);
const [formMail, setFormMail] = React.useState("");
diff --git a/frontend/src/components/AppsearchPopout.jsx b/frontend/src/components/AppsearchPopout.jsx
index 2ba15ccf..1e76206b 100644
--- a/frontend/src/components/AppsearchPopout.jsx
+++ b/frontend/src/components/AppsearchPopout.jsx
@@ -12,7 +12,7 @@ import {
CircularProgress,
Tooltip,
Button,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Close as CloseIcon,
diff --git a/frontend/src/components/AuthenticationItem.jsx b/frontend/src/components/AuthenticationItem.jsx
index c8add063..06329a35 100644
--- a/frontend/src/components/AuthenticationItem.jsx
+++ b/frontend/src/components/AuthenticationItem.jsx
@@ -19,7 +19,7 @@ import {
Typography,
TextField,
Zoom,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Edit as EditIcon,
diff --git a/frontend/src/components/AuthenticationNormal.jsx b/frontend/src/components/AuthenticationNormal.jsx
index d6cd8e35..a0d6acab 100644
--- a/frontend/src/components/AuthenticationNormal.jsx
+++ b/frontend/src/components/AuthenticationNormal.jsx
@@ -13,7 +13,7 @@ import {
DialogTitle,
DialogContent,
Typography,
-} from "@material-ui/core";
+} from "@mui/material";
import {
LockOpen as LockOpenIcon,
diff --git a/frontend/src/components/AuthenticationWindow.jsx b/frontend/src/components/AuthenticationWindow.jsx
index 49782559..47dd9b4e 100755
--- a/frontend/src/components/AuthenticationWindow.jsx
+++ b/frontend/src/components/AuthenticationWindow.jsx
@@ -17,7 +17,7 @@ import {
Typography,
Select,
IconButton,
-} from "@material-ui/core";
+} from "@mui/material";
import {
LockOpen as LockOpenIcon,
diff --git a/frontend/src/components/Billing.jsx b/frontend/src/components/Billing.jsx
index b59b5e4a..71d01789 100644
--- a/frontend/src/components/Billing.jsx
+++ b/frontend/src/components/Billing.jsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
+import theme from "../theme.jsx";
import ReactGA from 'react-ga4';
-import { useTheme } from "@material-ui/core/styles";
import {
Paper,
Typography,
@@ -9,7 +9,7 @@ import {
Button,
Grid,
Card,
-} from "@material-ui/core";
+} from "@mui/material";
import { useAlert } from "react-alert";
import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx";
@@ -17,7 +17,6 @@ import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx";
const Billing = (props) => {
const { globalUrl, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, } = props;
console.log("Billing: ", billingInfo);
- const theme = useTheme();
const alert = useAlert();
const stripe = typeof window === 'undefined' || window.location === undefined ? "" : props.stripeKey === undefined ? "" : window.Stripe ? window.Stripe(props.stripeKey) : ""
diff --git a/frontend/src/components/Branding.jsx b/frontend/src/components/Branding.jsx
index 40254bbb..4b44f5c1 100644
--- a/frontend/src/components/Branding.jsx
+++ b/frontend/src/components/Branding.jsx
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from "react";
import ReactGA from 'react-ga4';
import theme from "../theme.jsx";
-import { useTheme } from "@material-ui/core/styles";
import {
Paper,
Typography,
@@ -10,7 +9,7 @@ import {
Button,
Grid,
Card,
-} from "@material-ui/core";
+} from "@mui/material";
import { useAlert } from "react-alert";
diff --git a/frontend/src/components/CacheView.jsx b/frontend/src/components/CacheView.jsx
index 61084753..62394423 100644
--- a/frontend/src/components/CacheView.jsx
+++ b/frontend/src/components/CacheView.jsx
@@ -15,7 +15,7 @@ import {
Dialog,
DialogTitle,
DialogActions,
-} from "@material-ui/core";
+} from "@mui/material";
import { useAlert } from "react-alert";
import {
diff --git a/frontend/src/components/ConfigureWorkflow.jsx b/frontend/src/components/ConfigureWorkflow.jsx
index b7b9f2b0..f54b73e5 100755
--- a/frontend/src/components/ConfigureWorkflow.jsx
+++ b/frontend/src/components/ConfigureWorkflow.jsx
@@ -15,7 +15,7 @@ import {
ListItem,
ListItemText,
Fade,
-} from "@material-ui/core";
+} from "@mui/material";
import {
FavoriteBorder as FavoriteBorderIcon,
Error as ErrorIcon,
diff --git a/frontend/src/components/CreatorGrid.jsx b/frontend/src/components/CreatorGrid.jsx
index a6b6cbac..cfc3b3e2 100644
--- a/frontend/src/components/CreatorGrid.jsx
+++ b/frontend/src/components/CreatorGrid.jsx
@@ -1,7 +1,6 @@
import React, { useEffect, useState } from 'react';
import ReactGA from 'react-ga4';
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
import {
@@ -29,7 +28,7 @@ import {
Zoom,
CardMedia,
CardActionArea,
-} from '@material-ui/core';
+} from '@mui/material';
import {
Avatar,
diff --git a/frontend/src/components/DocsGrid.jsx b/frontend/src/components/DocsGrid.jsx
index 4331c15b..fa194a25 100644
--- a/frontend/src/components/DocsGrid.jsx
+++ b/frontend/src/components/DocsGrid.jsx
@@ -1,7 +1,7 @@
import React, {useEffect, useState} from 'react';
+import theme from '../theme.jsx';
import ReactGA from 'react-ga4';
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
import { Search as SearchIcon, CloudQueue as CloudQueueIcon, Code as CodeIcon, Close as CloseIcon, Folder as FolderIcon, LibraryBooks as LibraryBooksIcon } from '@mui/icons-material';
@@ -24,7 +24,7 @@ import {
ListItem,
ListItemAvatar,
ListItemText,
-} from '@material-ui/core';
+} from '@mui/material';
@@ -33,7 +33,6 @@ const DocsGrid = props => {
const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, userdata, } = props
const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
const xs = parsedXs === undefined || parsedXs === null ? isMobile ? 6 : 2 : parsedXs
- const theme = useTheme();
//const [apps, setApps] = React.useState([]);
//const [filteredApps, setFilteredApps] = React.useState([]);
const [formMail, setFormMail] = React.useState("");
diff --git a/frontend/src/components/EditWorkflow.jsx b/frontend/src/components/EditWorkflow.jsx
index 3ceaaf23..5e8b0493 100644
--- a/frontend/src/components/EditWorkflow.jsx
+++ b/frontend/src/components/EditWorkflow.jsx
@@ -37,7 +37,7 @@ import {
FormControl,
FormLabel,
-} from "@material-ui/core";
+} from "@mui/material";
import {
ExpandLess as ExpandLessIcon,
diff --git a/frontend/src/components/Files.jsx b/frontend/src/components/Files.jsx
index c2a00240..cd7a004b 100644
--- a/frontend/src/components/Files.jsx
+++ b/frontend/src/components/Files.jsx
@@ -15,7 +15,7 @@ import {
Divider,
Select,
MenuItem,
-} from "@material-ui/core";
+} from "@mui/material";
import {
OpenInNew as OpenInNewIcon,
diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
index 8e27de82..2a27e91a 100644
--- a/frontend/src/components/Header.jsx
+++ b/frontend/src/components/Header.jsx
@@ -1,6 +1,5 @@
import React, {useState} from 'react';
import {BrowserView, MobileView} from "react-device-detect";
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
import ReactGA from 'react-ga4';
@@ -21,7 +20,7 @@ import {
IconButton,
Divider,
LinearProgress,
-} from '@material-ui/core'
+} from '@mui/material';
import {
MeetingRoom as MeetingRoomIcon,
diff --git a/frontend/src/components/LandingpageUsecases.jsx b/frontend/src/components/LandingpageUsecases.jsx
index 9fd5d016..063e4a6b 100644
--- a/frontend/src/components/LandingpageUsecases.jsx
+++ b/frontend/src/components/LandingpageUsecases.jsx
@@ -4,7 +4,7 @@ import AppFramework, { usecases } from "../components/AppFramework.jsx";
import {Link} from 'react-router-dom';
import ReactGA from 'react-ga4';
-import { Button, LinearProgress, Typography } from '@material-ui/core';
+import { Button, LinearProgress, Typography } from '@mui/material';
export const securityFramework = [
{
diff --git a/frontend/src/components/Newsletter.jsx b/frontend/src/components/Newsletter.jsx
index ccadf77b..36a7519c 100644
--- a/frontend/src/components/Newsletter.jsx
+++ b/frontend/src/components/Newsletter.jsx
@@ -1,5 +1,5 @@
import React, {useState} from 'react';
-import { useTheme } from '@material-ui/core/styles';
+import theme from '../theme.jsx';
import {isMobile} from "react-device-detect";
import ReactGA from 'react-ga4';
@@ -8,7 +8,6 @@ import {TextField, Typography, Button} from '@material-ui/core';
const Newsletter = (props) => {
const { globalUrl, } = props;
- const theme = useTheme();
const [email, setEmail] = useState("");
const [msg, setMsg] = useState("");
const [buttonActive, setButtonActive] = useState(true);
diff --git a/frontend/src/components/Oauth2Auth.jsx b/frontend/src/components/Oauth2Auth.jsx
index 9832b990..69b3a699 100755
--- a/frontend/src/components/Oauth2Auth.jsx
+++ b/frontend/src/components/Oauth2Auth.jsx
@@ -1,6 +1,5 @@
import React, { useRef, useState, useEffect, useLayoutEffect } from "react";
import { useParams, useNavigate, Link } from "react-router-dom";
-import { useTheme } from "@material-ui/core/styles";
import theme from '../theme.jsx';
import { useAlert } from "react-alert";
@@ -38,7 +37,7 @@ import {
CircularProgress,
Switch,
Fade,
-} from "@material-ui/core";
+} from "@mui/material";
import {
LockOpen as LockOpenIcon,
SupervisorAccount as SupervisorAccountIcon,
diff --git a/frontend/src/components/OrgHeader.js b/frontend/src/components/OrgHeader.js
index 65dd6e97..6f87bf23 100755
--- a/frontend/src/components/OrgHeader.js
+++ b/frontend/src/components/OrgHeader.js
@@ -1,6 +1,5 @@
import React, { useEffect} from 'react';
-import { makeStyles } from '@material-ui/styles';
-import { useTheme } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
import Tooltip from '@material-ui/core/Tooltip';
import Grid from '@material-ui/core/Grid';
diff --git a/frontend/src/components/OrgHeader.jsx b/frontend/src/components/OrgHeader.jsx
index 2c7e3623..354ec93b 100644
--- a/frontend/src/components/OrgHeader.jsx
+++ b/frontend/src/components/OrgHeader.jsx
@@ -1,5 +1,6 @@
import React, { useEffect } from "react";
-import { makeStyles } from "@material-ui/styles";
+import theme from '../theme.jsx';
+import { makeStyles } from "@mui/styles";
import { useTheme } from "@material-ui/core/styles";
import Tooltip from "@material-ui/core/Tooltip";
@@ -36,7 +37,6 @@ const OrgHeader = (props) => {
handleEditOrg,
} = props;
- const theme = useTheme();
const alert = useAlert();
const classes = useStyles();
diff --git a/frontend/src/components/OrgHeaderexpanded.jsx b/frontend/src/components/OrgHeaderexpanded.jsx
index 862fa503..6a508aa6 100644
--- a/frontend/src/components/OrgHeaderexpanded.jsx
+++ b/frontend/src/components/OrgHeaderexpanded.jsx
@@ -1,8 +1,8 @@
import React, { useEffect } from "react";
-import { makeStyles } from "@material-ui/styles";
-import { useTheme } from "@material-ui/core/styles";
+import { makeStyles } from "@mui/styles";
import { useAlert } from "react-alert";
+import theme from '../theme.jsx';
import {
FormControl,
@@ -23,9 +23,9 @@ import {
Tabs,
Tab,
Grid,
-} from "@material-ui/core";
+ IconButton,
+} from "@mui/material";
-import IconButton from "@material-ui/core/IconButton";
import {
ExpandLess as ExpandLessIcon,
ExpandMore as ExpandMoreIcon,
@@ -48,7 +48,6 @@ const OrgHeaderexpanded = (props) => {
adminTab,
} = props;
- const theme = useTheme();
const alert = useAlert();
const classes = useStyles();
const defaultBranch = "master";
diff --git a/frontend/src/components/PaperComponent.jsx b/frontend/src/components/PaperComponent.jsx
index 76fb56ef..d1e2dc22 100644
--- a/frontend/src/components/PaperComponent.jsx
+++ b/frontend/src/components/PaperComponent.jsx
@@ -3,7 +3,7 @@ import React, {useState, useEffect, useLayoutEffect} from 'react';
import Draggable from "react-draggable";
import {
Paper
-} from "@material-ui/core";
+} from "@mui/material";
const PaperComponent = (props) => {
return (
diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx
index 964fe2d9..6d0d6185 100755
--- a/frontend/src/components/ParsedAction.jsx
+++ b/frontend/src/components/ParsedAction.jsx
@@ -1,10 +1,10 @@
import React, { useState, useEffect, useLayoutEffect } from "react";
-import { makeStyles, createStyles } from "@material-ui/core/styles";
+import { makeStyles, createStyles } from "@mui/styles";
+
import { validateJson, GetIconInfo } from "../views/Workflows.jsx";
import { GetParsedPaths } from "../views/Apps.jsx";
import { sortByKey } from "../views/AngularWorkflow.jsx";
-import { useTheme } from "@material-ui/core/styles";
//import NestedMenuItem from "material-ui-nested-menu-item-v5";
import { NestedMenuItem } from "mui-nested-menu";
import { useAlert } from "react-alert";
@@ -44,11 +44,8 @@ import {
CircularProgress,
Switch,
Fade,
-} from "@material-ui/core";
-
-import {
Autocomplete
-} from "@material-ui/lab";
+} from "@mui/material";
import {
HelpOutline as HelpOutlineIcon,
diff --git a/frontend/src/components/Priorities.jsx b/frontend/src/components/Priorities.jsx
index 88bea907..6e0a872e 100644
--- a/frontend/src/components/Priorities.jsx
+++ b/frontend/src/components/Priorities.jsx
@@ -9,7 +9,7 @@ import {
Grid,
Card,
Switch,
-} from "@material-ui/core";
+} from "@mui/material";
import Priority from "../components/Priority.jsx";
import { useAlert } from "react-alert";
diff --git a/frontend/src/components/Priority.jsx b/frontend/src/components/Priority.jsx
index 0123b37d..8d571d79 100644
--- a/frontend/src/components/Priority.jsx
+++ b/frontend/src/components/Priority.jsx
@@ -9,7 +9,7 @@ import {
Button,
Grid,
Card,
-} from "@material-ui/core";
+} from "@mui/material";
// import magic wand icon from material ui icons
import {
diff --git a/frontend/src/components/Searchfield.js b/frontend/src/components/Searchfield.js
deleted file mode 100644
index 0a86014d..00000000
--- a/frontend/src/components/Searchfield.js
+++ /dev/null
@@ -1,647 +0,0 @@
-import React, {useState, useEffect, useRef} from 'react';
-
-import { useNavigate, Link, useParams } from "react-router-dom";
-import { useTheme } from '@material-ui/core/styles';
-
-import {
- Chip,
- IconButton,
- TextField,
- InputAdornment,
- List,
- Card,
- ListItem,
- ListItemAvatar,
- ListItemText,
- Avatar,
- Typography,
- Tooltip,
-} from '@material-ui/core';
-
-import {
- AvatarGroup,
-} from "@mui/material"
-
-import {Search as SearchIcon, Close as CloseIcon, Folder as FolderIcon, Code as CodeIcon, LibraryBooks as LibraryBooksIcon} from '@mui/icons-material'
-
-import algoliasearch from 'algoliasearch/lite';
-import aa from 'search-insights'
-import { InstantSearch, Configure, connectSearchBox, connectHits, Index } from 'react-instantsearch-dom';
-//import { InstantSearch, SearchBox, Hits, connectSearchBox, connectHits, Index } from 'react-instantsearch-dom';
-
-// https://www.algolia.com/doc/api-reference/widgets/search-box/react/
-const chipStyle = {
- backgroundColor: "#3d3f43", height: 30, marginRight: 5, paddingLeft: 5, paddingRight: 5, height: 28, cursor: "pointer", borderColor: "#3d3f43", color: "white",
-}
-
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
-const SearchField = props => {
- const { serverside, userdata } = props
-
- const theme = useTheme();
- let navigate = useNavigate();
- const borderRadius = 3
- const node = useRef()
- const [searchOpen, setSearchOpen] = useState(false)
- const [oldPath, setOldPath] = useState("")
-
- if (serverside === true) {
- return null
- }
-
- if (window !== undefined && window.location !== undefined && window.location.pathname === "/search") {
- return null
- }
-
- const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
-
- if (window.location.pathname !== oldPath) {
- setSearchOpen(false)
- setOldPath(window.location.pathname)
- }
-
- //useEffect(() => {
- // if (searchOpen) {
- // var tarfield = document.getElementById("shuffle_search_field")
- // tarfield.focus()
- // }
- //}, searchOpen)
-
- const SearchBox = ({currentRefinement, refine, isSearchStalled, } ) => {
-
- /*
- endAdornment: (
-
{
- event.preventDefault()
- }}>
- {
- setSearchOpen(false)
- }} />
-
- ),
- */
-
- return (
-
- )
- }
-
- const WorkflowHits = ({ hits }) => {
- const [mouseHoverIndex, setMouseHoverIndex] = useState(0)
-
- var tmp = searchOpen
- if (!searchOpen) {
- return null
- }
-
-
- const positionInfo = document.activeElement.getBoundingClientRect()
- const outerlistitemStyle = {
- width: "100%",
- overflowX: "hidden",
- overflowY: "hidden",
- borderBottom: "1px solid rgba(255,255,255,0.4)",
- }
-
- if (hits.length > 4) {
- hits = hits.slice(0, 4)
- }
-
- var type = "workflows"
- const baseImage =
-
- return (
-
-
- Workflows
-
-
-
- {hits.length === 0 ?
-
- console.log(hits)}>
-
-
-
-
-
-
- :
- hits.map((hit, index) => {
- const innerlistitemStyle = {
- width: positionInfo.width+35,
- overflowX: "hidden",
- overflowY: "hidden",
- borderBottom: "1px solid rgba(255,255,255,0.4)",
- backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
- cursor: "pointer",
- marginLeft: 5,
- marginRight: 5,
- maxHeight: 75,
- minHeight: 75,
- maxWidth: 420,
- minWidth: "100%",
- }
-
- const name = hit.name === undefined ?
- hit.filename.charAt(0).toUpperCase() + hit.filename.slice(1).replaceAll("_", " ") + " - " + hit.title :
- (hit.name.charAt(0).toUpperCase()+hit.name.slice(1)).replaceAll("_", " ")
- const secondaryText = hit.description !== undefined && hit.description !== null && hit.description.length > 3 ? hit.description.slice(0, 40)+"..." : ""
- const appGroup = hit.action_references === undefined || hit.action_references === null ? [] : hit.action_references
- const avatar = baseImage
-
- var parsedUrl = isCloud ? `/workflows/${hit.objectID}` : `https://shuffler.io/workflows/${hit.objectID}`
- parsedUrl += `?queryID=${hit.__queryID}`
-
- //
- return (
- {
- //console.log("CLICK")
- setSearchOpen(true)
-
- aa('init', {
- appId: searchClient.appId,
- apiKey: searchClient.transporter.queryParameters["x-algolia-api-key"]
- })
-
- const timestamp = new Date().getTime()
- aa('sendEvents', [
- {
- eventType: 'click',
- eventName: 'Workflow Clicked',
- index: 'workflows',
- objectIDs: [hit.objectID],
- timestamp: timestamp,
- queryID: hit.__queryID,
- positions: [hit.__position],
- userToken: userdata === undefined || userdata === null || userdata.id === undefined ? "unauthenticated" : userdata.id,
- }
- ])
-
- if (!isCloud) {
- event.preventDefault()
- window.open(parsedUrl, '_blank');
- }
- }}>
- {
- setMouseHoverIndex(index)
- }}>
-
- {avatar}
-
-
-
-
- {appGroup.map((app, index) => {
- // Putting all this in secondary of ListItemText looked weird.
- return (
- {
- navigate("/apps/"+app.id)
- }}
- >
-
-
-
-
- )
- })}
-
-
- {/*
-
-
-
-
-
- */}
-
-
- )})
- }
-
- {/*
-
-
-
- See all workflows
-
-
-
- */}
-
- )
- }
-
- const AppHits = ({ hits }) => {
- const [mouseHoverIndex, setMouseHoverIndex] = useState(0)
-
- var tmp = searchOpen
- if (!searchOpen) {
- return null
- }
-
- const positionInfo = document.activeElement.getBoundingClientRect()
- const outerlistitemStyle = {
- width: "100%",
- overflowX: "hidden",
- overflowY: "hidden",
- borderBottom: "1px solid rgba(255,255,255,0.4)",
- }
-
- if (hits.length > 4) {
- hits = hits.slice(0, 4)
- }
-
- var type = "app"
- const baseImage =
-
- return (
-
- {
- setSearchOpen(false)
- }}>
-
-
-
- Apps
-
-
-
- {hits.length === 0 ?
-
- console.log(hits)}>
-
-
-
-
-
-
- :
- hits.map((hit, index) => {
- const innerlistitemStyle = {
- width: positionInfo.width+35,
- overflowX: "hidden",
- overflowY: "hidden",
- borderBottom: "1px solid rgba(255,255,255,0.4)",
- backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
- cursor: "pointer",
- marginLeft: 5,
- marginRight: 5,
- maxHeight: 75,
- minHeight: 75,
- maxWidth: 420,
- minWidth: "100%",
- }
-
- const name = hit.name === undefined ?
- hit.filename.charAt(0).toUpperCase() + hit.filename.slice(1).replaceAll("_", " ") + " - " + hit.title :
- (hit.name.charAt(0).toUpperCase()+hit.name.slice(1)).replaceAll("_", " ")
-
- var secondaryText = hit.data !== undefined ? hit.data.slice(0, 40)+"..." : ""
- const avatar = hit.image_url === undefined ?
- baseImage
- :
-
-
- //console.log(hit)
- if (hit.categories !== undefined && hit.categories !== null && hit.categories.length > 0) {
- secondaryText = hit.categories.slice(0,3).map((data, index) => {
- if (index === 0) {
- return data
- }
-
- return ", "+data
-
- /*
- {
- //handleChipClick
- }}
- variant="outlined"
- color="primary"
- />
- */
- })
- }
-
- var parsedUrl = isCloud ? `/apps/${hit.objectID}` : `https://shuffler.io/apps/${hit.objectID}`
- parsedUrl += `?queryID=${hit.__queryID}`
-
- return (
- {
- console.log("CLICK")
- setSearchOpen(true)
-
- aa('init', {
- appId: searchClient.appId,
- apiKey: searchClient.transporter.queryParameters["x-algolia-api-key"]
- })
-
- const timestamp = new Date().getTime()
- aa('sendEvents', [
- {
- eventType: 'click',
- eventName: 'App Clicked',
- index: 'appsearch',
- objectIDs: [hit.objectID],
- timestamp: timestamp,
- queryID: hit.__queryID,
- positions: [hit.__position],
- userToken: userdata === undefined || userdata === null || userdata.id === undefined ? "unauthenticated" : userdata.id,
- }
- ])
-
- if (!isCloud) {
- event.preventDefault()
- window.open(parsedUrl, '_blank');
- }
- }}>
- {
- setMouseHoverIndex(index)
- }}>
-
- {avatar}
-
-
- {/*
-
-
-
-
-
- */}
-
-
- )})
- }
-
-
-
-
- See more
-
-
-
-
- )
- }
-
- const DocHits = ({ hits }) => {
- const [mouseHoverIndex, setMouseHoverIndex] = useState(0)
-
- var tmp = searchOpen
- if (!searchOpen) {
- return null
- }
-
-
- const positionInfo = document.activeElement.getBoundingClientRect()
- const outerlistitemStyle = {
- width: "100%",
- overflowX: "hidden",
- overflowY: "hidden",
- borderBottom: "1px solid rgba(255,255,255,0.4)",
- }
-
- if (hits.length > 4) {
- hits = hits.slice(0, 4)
- }
-
- const type = "documentation"
- const baseImage =
-
- //console.log(type, hits.length, hits)
-
- return (
-
- {
- setSearchOpen(false)
- }}>
-
-
-
- Documentation
-
- {/*
- {
- setSearchOpen(false)
- }}>
-
-
- */}
-
- {hits.length === 0 ?
-
- console.log(hits)}>
-
-
-
-
-
-
- :
- hits.map((hit, index) => {
- const innerlistitemStyle = {
- width: positionInfo.width+35,
- overflowX: "hidden",
- overflowY: "hidden",
- borderBottom: "1px solid rgba(255,255,255,0.4)",
- backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
- cursor: "pointer",
- marginLeft: 5,
- marginRight: 5,
- maxHeight: 75,
- minHeight: 75,
- maxWidth: 420,
- minWidth: "100%",
- }
-
- var name = hit.name === undefined ?
- hit.filename.charAt(0).toUpperCase() + hit.filename.slice(1).replaceAll("_", " ") + " - " + hit.title
- :
- (hit.name.charAt(0).toUpperCase()+hit.name.slice(1)).replaceAll("_", " ")
-
- if (name.length > 30) {
- name = name.slice(0, 30)+"..."
- }
- const secondaryText = hit.data !== undefined ? hit.data.slice(0, 40)+"..." : ""
- const avatar = hit.image_url === undefined ?
- baseImage
- :
-
-
- var parsedUrl = hit.urlpath !== undefined ? hit.urlpath : ""
- parsedUrl += `?queryID=${hit.__queryID}`
- if (parsedUrl.includes("/apps/")) {
- const extraHash = hit.url_hash === undefined ? "" : `#${hit.url_hash}`
-
- parsedUrl = `/apps/${hit.filename}?tab=docs&queryID=${hit.__queryID}${extraHash}`
- }
-
- return (
- {
- aa('init', {
- appId: searchClient.appId,
- apiKey: searchClient.transporter.queryParameters["x-algolia-api-key"]
- })
-
- const timestamp = new Date().getTime()
- aa('sendEvents', [
- {
- eventType: 'click',
- eventName: 'Document Clicked',
- index: 'documentation',
- objectIDs: [hit.objectID],
- timestamp: timestamp,
- queryID: hit.__queryID,
- positions: [hit.__position],
- userToken: userdata === undefined || userdata === null || userdata.id === undefined ? "unauthenticated" : userdata.id,
- }
- ])
-
- console.log("CLICK")
- setSearchOpen(true)
- }}>
- {
- setMouseHoverIndex(index)
- }}>
-
- {avatar}
-
-
- {/*
-
-
-
-
-
- */}
-
-
- )})
- }
-
- {type === "documentation" ?
-
-
- Search by
-
-
-
-
-
- : null}
-
- )
- }
-
- const CustomSearchBox = connectSearchBox(SearchBox)
- const CustomAppHits = connectHits(AppHits)
- const CustomWorkflowHits = connectHits(WorkflowHits)
- const CustomDocHits = connectHits(DocHits)
-
- return (
-
- {
- console.log("CLICKED")
- }}>
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default SearchField;
diff --git a/frontend/src/components/Searchfield.jsx b/frontend/src/components/Searchfield.jsx
index 4a13bd8d..9c5e6674 100644
--- a/frontend/src/components/Searchfield.jsx
+++ b/frontend/src/components/Searchfield.jsx
@@ -1,7 +1,7 @@
import React, {useState, useEffect, useRef} from 'react';
+import theme from '../theme.jsx';
import { useNavigate, Link, useParams } from "react-router-dom";
-import { useTheme } from '@material-ui/core/styles';
import {
Chip,
@@ -16,7 +16,7 @@ import {
Avatar,
Typography,
Tooltip,
-} from '@material-ui/core';
+} from '@mui/material';
import {
AvatarGroup,
@@ -38,7 +38,6 @@ const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e52
const SearchField = props => {
const { serverside, userdata } = props
- const theme = useTheme();
let navigate = useNavigate();
const borderRadius = 3
const node = useRef()
diff --git a/frontend/src/components/SecurityFramework.jsx b/frontend/src/components/SecurityFramework.jsx
index 9e3a7b90..139dbed1 100644
--- a/frontend/src/components/SecurityFramework.jsx
+++ b/frontend/src/components/SecurityFramework.jsx
@@ -4,7 +4,7 @@ import AppFramework, { usecases } from "../components/AppFramework.jsx";
import {Link} from 'react-router-dom';
import ReactGA from 'react-ga4';
-import { Button, LinearProgress, Typography } from '@material-ui/core';
+import { Button, LinearProgress, Typography } from '@mui/material';
export const securityFramework = [
{
diff --git a/frontend/src/components/ShuffleCodeEditor.jsx b/frontend/src/components/ShuffleCodeEditor.jsx
index f3eccb15..56e9b3c6 100644
--- a/frontend/src/components/ShuffleCodeEditor.jsx
+++ b/frontend/src/components/ShuffleCodeEditor.jsx
@@ -12,7 +12,7 @@ import {
Menu,
MenuItem,
Button,
-} from '@material-ui/core';
+} from '@mui/material';
import theme from '../theme.jsx';
import Checkbox from '@mui/material/Checkbox';
diff --git a/frontend/src/components/SuggestedWorkflows.jsx b/frontend/src/components/SuggestedWorkflows.jsx
index 1b9148f1..1f01529a 100644
--- a/frontend/src/components/SuggestedWorkflows.jsx
+++ b/frontend/src/components/SuggestedWorkflows.jsx
@@ -13,7 +13,7 @@ import {
CircularProgress,
Tooltip,
Dialog,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Close as CloseIcon,
diff --git a/frontend/src/components/UsecaseSearch.jsx b/frontend/src/components/UsecaseSearch.jsx
index 03fd619f..ba8a98a1 100644
--- a/frontend/src/components/UsecaseSearch.jsx
+++ b/frontend/src/components/UsecaseSearch.jsx
@@ -25,7 +25,7 @@ import {
CircularProgress,
Tooltip,
Divider,
-} from "@material-ui/core";
+} from "@mui/material";
const defaultValue = {"id": "", "name": "Build your own",
"source": {"text": "No trigger selected", "error": ""},
diff --git a/frontend/src/components/WelcomeForm2.jsx b/frontend/src/components/WelcomeForm2.jsx
index da66fb08..b8966a74 100644
--- a/frontend/src/components/WelcomeForm2.jsx
+++ b/frontend/src/components/WelcomeForm2.jsx
@@ -1,6 +1,5 @@
import React, { useState, useEffect } from "react";
import ReactGA from 'react-ga4';
-import Button from "@material-ui/core/Button";
import Checkbox from '@mui/material/Checkbox';
import AliceCarousel from 'react-alice-carousel';
@@ -16,6 +15,7 @@ import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
import theme from '../theme.jsx';
import {
+ Button,
Fade,
IconButton,
FormGroup,
@@ -37,7 +37,7 @@ import {
Tooltip,
Chip,
ButtonGroup,
-} from "@material-ui/core";
+} from "@mui/material";
import { useAlert } from "react-alert";
import { useNavigate, Link } from "react-router-dom";
diff --git a/frontend/src/components/WorkflowGrid.jsx b/frontend/src/components/WorkflowGrid.jsx
index b2c9d0be..e4542e06 100644
--- a/frontend/src/components/WorkflowGrid.jsx
+++ b/frontend/src/components/WorkflowGrid.jsx
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react';
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
+import theme from '../theme.jsx';
import { Search as SearchIcon, CloudQueue as CloudQueueIcon, Code as CodeIcon } from '@mui/icons-material';
@@ -18,7 +18,7 @@ import {
Tooltip,
Zoom,
Chip,
-} from '@material-ui/core';
+} from '@mui/material';
import WorkflowPaper from "../components/WorkflowPaper.jsx"
import WorkflowPaperNew from "../components/WorkflowPaperNew.jsx"
@@ -33,7 +33,6 @@ const AppGrid = props => {
const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
const xs = parsedXs === undefined || parsedXs === null ? isMobile ? 6 : 4 : parsedXs
- const theme = useTheme();
//const [apps, setApps] = React.useState([]);
//const [filteredApps, setFilteredApps] = React.useState([]);
const [formMail, setFormMail] = React.useState("");
diff --git a/frontend/src/components/WorkflowPaper.jsx b/frontend/src/components/WorkflowPaper.jsx
index 09cf01fc..e07daca6 100644
--- a/frontend/src/components/WorkflowPaper.jsx
+++ b/frontend/src/components/WorkflowPaper.jsx
@@ -8,7 +8,7 @@ import {
Avatar,
Grid,
Tooltip,
-} from "@material-ui/core";
+} from "@mui/material";
import {
AvatarGroup,
diff --git a/frontend/src/components/WorkflowPaperNew.jsx b/frontend/src/components/WorkflowPaperNew.jsx
index 0efde264..9d59c2a0 100644
--- a/frontend/src/components/WorkflowPaperNew.jsx
+++ b/frontend/src/components/WorkflowPaperNew.jsx
@@ -9,7 +9,7 @@ import {
Grid,
Tooltip,
Button,
-} from "@material-ui/core";
+} from "@mui/material";
import {
AvatarGroup,
diff --git a/frontend/src/components/Workflowsearch.jsx b/frontend/src/components/Workflowsearch.jsx
index 895d3fd0..267face5 100644
--- a/frontend/src/components/Workflowsearch.jsx
+++ b/frontend/src/components/Workflowsearch.jsx
@@ -1,14 +1,14 @@
import React, { useState, useEffect } from 'react';
-import { useTheme } from '@material-ui/core/styles';
import {Link} from 'react-router-dom';
+import theme from '../theme.jsx';
import { Search as SearchIcon, CloudQueue as CloudQueueIcon, Code as CodeIcon } from '@mui/icons-material';
//import algoliasearch from 'algoliasearch/lite';
import algoliasearch from 'algoliasearch';
import { InstantSearch, connectSearchBox, connectHits } from 'react-instantsearch-dom';
-import { Grid, Paper, TextField, ButtonBase, InputAdornment, Typography, Button, Tooltip} from '@material-ui/core';
+import { Grid, Paper, TextField, ButtonBase, InputAdornment, Typography, Button, Tooltip} from '@mui/material';
const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
const WorkflowSearch = props => {
@@ -16,7 +16,6 @@ const WorkflowSearch = props => {
const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
const xs = parsedXs === undefined || parsedXs === null ? 12 : parsedXs
- const theme = useTheme();
//const [apps, setApps] = React.useState([]);
//const [filteredApps, setFilteredApps] = React.useState([]);
const [formMail, setFormMail] = React.useState("");
diff --git a/frontend/src/theme.js b/frontend/src/theme.js
index ad6ca44e..051cc846 100755
--- a/frontend/src/theme.js
+++ b/frontend/src/theme.js
@@ -1,7 +1,7 @@
import React from "react";
-import { createMuiTheme } from "@material-ui/core/styles";
+import { createTheme } from "@mui/material/styles";
-const theme = createMuiTheme({
+const theme = createTheme({
palette: {
primary: {
main: "#f85a3e",
diff --git a/frontend/src/theme.jsx b/frontend/src/theme.jsx
index de75558c..9f1fa983 100644
--- a/frontend/src/theme.jsx
+++ b/frontend/src/theme.jsx
@@ -1,7 +1,7 @@
import React from "react";
-import { createMuiTheme } from "@material-ui/core/styles";
+import { createTheme } from "@mui/material/styles";
-const theme = createMuiTheme({
+const theme = createTheme({
palette: {
primary: {
main: "#F86743",
diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index 0b8ff7c2..8361de43 100755
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
-import { makeStyles } from "@material-ui/styles";
+import { makeStyles } from "@mui/styles";
import { useNavigate, Link } from "react-router-dom";
import countries from "../components/Countries.jsx";
import CodeEditor from "../components/ShuffleCodeEditor.jsx";
@@ -44,7 +44,7 @@ import {
CircularProgress,
Box,
InputAdornment,
-} from "@material-ui/core";
+} from "@mui/material";
import { Autocomplete } from "@mui/material";
diff --git a/frontend/src/views/AdminSetup.jsx b/frontend/src/views/AdminSetup.jsx
index df2355bc..785b0954 100755
--- a/frontend/src/views/AdminSetup.jsx
+++ b/frontend/src/views/AdminSetup.jsx
@@ -1,6 +1,6 @@
/* eslint-disable react/no-multi-comp */
import React, { useState } from "react";
-import { makeStyles } from "@material-ui/styles";
+import { makeStyles } from "@mui/material/styles";
import {
CircularProgress,
@@ -8,7 +8,7 @@ import {
Button,
Paper,
Typography,
-} from "@material-ui/core";
+} from "@mui/material";
const bodyDivStyle = {
margin: "auto",
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index ad55179a..e45902e5 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -1,9 +1,10 @@
/* eslint-disable react/no-multi-comp */
import React, { useState, useEffect, useLayoutEffect } from "react";
import ReactDOM from "react-dom"
+import theme from '../theme.jsx';
import { useInterval } from "react-powerhooks";
-import { makeStyles, useTheme } from "@material-ui/core/styles";
+import { makeStyles, } from "@mui/styles";
import { v4 as uuidv4 } from "uuid";
import { useNavigate, Link, useParams } from "react-router-dom";
@@ -13,7 +14,6 @@ import ReactJson from "react-json-view";
import { NestedMenuItem } from "mui-nested-menu"
import ReactMarkdown from "react-markdown";
import { useAlert } from "react-alert";
-import theme from '../theme.jsx';
import { isMobile } from "react-device-detect"
import aa from 'search-insights'
import Drift from "react-driftjs";
@@ -67,7 +67,8 @@ import {
ListItemText,
ListItemAvatar,
Badge,
-} from "@material-ui/core";
+ Autocomplete,
+} from "@mui/material";
import {
AvatarGroup,
@@ -115,7 +116,6 @@ import {
AutoFixHigh as AutoFixHighIcon,
} from "@mui/icons-material";
-import Autocomplete from "@material-ui/lab/Autocomplete";
import * as cytoscape from "cytoscape";
import * as edgehandles from "cytoscape-edgehandles";
@@ -399,8 +399,6 @@ const AngularWorkflow = (defaultprops) => {
props.match = {}
props.match.params = params
- //const theme = useTheme();
-
var to_be_copied = "";
const [firstrequest, setFirstrequest] = React.useState(true);
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index f9173292..eab88472 100755
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
-import { makeStyles } from "@material-ui/styles";
-import { useTheme } from "@material-ui/core/styles";
+import { makeStyles } from "@mui/styles";
import { BrowserView, MobileView } from "react-device-detect";
+import theme from '../theme.jsx';
import {
Paper,
@@ -22,7 +22,7 @@ import {
Breadcrumbs,
CircularProgress,
Chip,
-} from "@material-ui/core";
+} from "@mui/material";
import {
LockOpen as LockOpenIcon,
@@ -351,7 +351,6 @@ const AppCreator = (defaultprops) => {
const { globalUrl, isLoaded } = defaultprops;
const classes = useStyles();
const alert = useAlert();
- const theme = useTheme();
const params = useParams();
var props = JSON.parse(JSON.stringify(defaultprops))
diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx
index 52a458be..9d7e2700 100755
--- a/frontend/src/views/Apps.jsx
+++ b/frontend/src/views/Apps.jsx
@@ -32,7 +32,7 @@ import {
ListItemAvatar,
ListItemText,
Avatar,
-} from "@material-ui/core";
+} from "@mui/material";
import {
LockOpen as LockOpenIcon,
@@ -53,7 +53,6 @@ import {
} from '@mui/icons-material';
import aa from 'search-insights'
-import { useTheme } from "@material-ui/core/styles";
import { InstantSearch, Configure, connectSearchBox, connectHits, Index } from 'react-instantsearch-dom';
import algoliasearch from 'algoliasearch/lite';
diff --git a/frontend/src/views/Dashboard.jsx b/frontend/src/views/Dashboard.jsx
index 58cc7fec..9af90f64 100755
--- a/frontend/src/views/Dashboard.jsx
+++ b/frontend/src/views/Dashboard.jsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import { useInterval } from "react-powerhooks";
import AppFramework from "../components/AppFramework.jsx";
-import { makeStyles, useTheme } from "@material-ui/core/styles";
+import { makeStyles, useTheme } from "@mui/material/styles";
// nodejs library that concatenates classes
import classNames from "classnames";
import theme from '../theme.jsx';
@@ -10,9 +10,9 @@ import { useNavigate, Link, useParams } from "react-router-dom";
// react plugin used to create charts
//import { Line, Bar } from "react-chartjs-2";
import { useAlert } from "react-alert";
-import Autocomplete from "@material-ui/lab/Autocomplete";
import {
+ Autocomplete,
Tooltip,
TextField,
IconButton,
@@ -22,7 +22,7 @@ import {
Paper,
Chip,
Checkbox,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Close as CloseIcon,
diff --git a/frontend/src/views/DashboardViews.jsx b/frontend/src/views/DashboardViews.jsx
index 63745485..a23a3566 100644
--- a/frontend/src/views/DashboardViews.jsx
+++ b/frontend/src/views/DashboardViews.jsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
import { useInterval } from "react-powerhooks";
-import { makeStyles, useTheme } from "@material-ui/core/styles";
+import { makeStyles, useTheme } from "@mui/styles";
// nodejs library that concatenates classes
import classNames from "classnames";
import theme from '../theme.jsx';
@@ -9,10 +9,10 @@ import { useNavigate, Link, useParams } from "react-router-dom";
// react plugin used to create charts
//import { Line, Bar } from "react-chartjs-2";
import { useAlert } from "react-alert";
-import Autocomplete from "@material-ui/lab/Autocomplete";
import Draggable from "react-draggable";
import {
+ Autocomplete,
Tooltip,
TextField,
IconButton,
@@ -22,7 +22,7 @@ import {
Paper,
Chip,
Checkbox,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Close as CloseIcon,
diff --git a/frontend/src/views/Docs.jsx b/frontend/src/views/Docs.jsx
index 2e229d21..bf32bc96 100755
--- a/frontend/src/views/Docs.jsx
+++ b/frontend/src/views/Docs.jsx
@@ -1,6 +1,5 @@
import React, { useEffect, useState } from "react";
-import { useTheme } from "@material-ui/core/styles";
import ReactMarkdown from "react-markdown";
import { BrowserView, MobileView } from "react-device-detect";
import { useParams, useNavigate, Link } from "react-router-dom";
@@ -18,7 +17,7 @@ import {
Typography,
Paper,
List,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Link as LinkIcon,
diff --git a/frontend/src/views/Faq.jsx b/frontend/src/views/Faq.jsx
index 46296ea2..146ceb68 100644
--- a/frontend/src/views/Faq.jsx
+++ b/frontend/src/views/Faq.jsx
@@ -2,7 +2,7 @@ import React, {useState} from 'react';
import {isMobile} from "react-device-detect";
import {Link} from 'react-router-dom';
-import {Divider, List, ListItem, ListItemText, Card, CardContent, Grid, Typography, Button, ButtonGroup, FormControl, Dialog, DialogTitle, DialogActions, DialogContent, Tooltip} from '@material-ui/core';
+import {Divider, List, ListItem, ListItemText, Card, CardContent, Grid, Typography, Button, ButtonGroup, FormControl, Dialog, DialogTitle, DialogActions, DialogContent, Tooltip} from '@mui/material';
import {ExpandMore as ExpandMoreIcon, ExpandLess as ExpandLessIcon} from '@mui/icons-material';
const hrefStyle = {
diff --git a/frontend/src/views/FrameworkWrapper.jsx b/frontend/src/views/FrameworkWrapper.jsx
index 2d96e03c..0daf0a3d 100644
--- a/frontend/src/views/FrameworkWrapper.jsx
+++ b/frontend/src/views/FrameworkWrapper.jsx
@@ -8,7 +8,7 @@ import theme from '../theme.jsx';
import {
Button,
-} from "@material-ui/core";
+} from "@mui/material";
const Framework = (props) => {
const {globalUrl, isLoaded, isLoggedIn, showOptions, selectedOption, rolling, } = props;
diff --git a/frontend/src/views/GettingStarted.jsx b/frontend/src/views/GettingStarted.jsx
index e6114356..7160a635 100644
--- a/frontend/src/views/GettingStarted.jsx
+++ b/frontend/src/views/GettingStarted.jsx
@@ -1,9 +1,9 @@
import React, { useEffect, useContext } from "react";
-import { makeStyles } from "@material-ui/core/styles";
-import { useTheme } from "@material-ui/core/styles";
+import { makeStyles } from "@mui/material/styles";
import ReactGA from 'react-ga4';
import SecurityFramework from '../components/SecurityFramework.jsx';
+import theme from '../theme.jsx';
import {
Badge,
@@ -28,7 +28,7 @@ import {
DialogTitle,
DialogActions,
DialogContent,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Check as CheckIcon,
@@ -125,7 +125,6 @@ const GettingStarted = (props) => {
const { globalUrl, isLoggedIn, isLoaded, userdata } = props;
document.title = "Getting Started with Shuffle";
- const theme = useTheme();
const alert = useAlert();
const classes = useStyles(theme);
let navigate = useNavigate();
diff --git a/frontend/src/views/HandlePaymentNew.jsx b/frontend/src/views/HandlePaymentNew.jsx
index 1aa24cc6..89546b9b 100644
--- a/frontend/src/views/HandlePaymentNew.jsx
+++ b/frontend/src/views/HandlePaymentNew.jsx
@@ -28,7 +28,7 @@ import {
DialogActions,
DialogContent,
Tooltip
-} from '@material-ui/core';
+} from '@mui/material';
import FAQ from "./Faq.jsx";
import Newsletter from "../components/Newsletter.jsx";
import Services from "./Services.jsx";
diff --git a/frontend/src/views/Introduction.jsx b/frontend/src/views/Introduction.jsx
index bc3e1734..a0955bc9 100755
--- a/frontend/src/views/Introduction.jsx
+++ b/frontend/src/views/Introduction.jsx
@@ -1,5 +1,4 @@
import React, { useEffect, useState } from "react";
-import { useTheme } from "@material-ui/core/styles";
import { Link, useParams } from "react-router-dom";
import Grid from "@material-ui/core/Grid";
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index 4cb4b27c..1a0a4090 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -1,7 +1,8 @@
/* eslint-disable react/no-multi-comp */
import React, { useState, useEffect } from "react";
-import { makeStyles } from "@material-ui/styles";
+import { makeStyles } from "@mui/styles";
import { useInterval } from "react-powerhooks";
+import theme from '../theme.jsx';
import {
CircularProgress,
@@ -9,9 +10,8 @@ import {
Button,
Paper,
Typography,
-} from "@material-ui/core";
+} from "@mui/material";
-import { useTheme } from "@material-ui/core/styles";
import { useNavigate } from "react-router-dom";
const hrefStyle = {
@@ -42,7 +42,6 @@ const LoginDialog = (props) => {
checkLogin,
} = props;
- const theme = useTheme();
let navigate = useNavigate();
const classes = useStyles();
diff --git a/frontend/src/views/RunWorkflow.jsx b/frontend/src/views/RunWorkflow.jsx
index ebc1cad6..51c31408 100644
--- a/frontend/src/views/RunWorkflow.jsx
+++ b/frontend/src/views/RunWorkflow.jsx
@@ -3,7 +3,7 @@ import React, {useState, useEffect} from 'react';
import ReactDOM from "react-dom"
import { useInterval } from "react-powerhooks";
-import { makeStyles } from '@material-ui/styles';
+import { makeStyles } from '@mui/material/styles';
import { useNavigate, Link, useParams } from "react-router-dom";
import {isMobile} from "react-device-detect";
import theme from '../theme.jsx';
@@ -20,7 +20,7 @@ import {
Paper,
Typography,
Divider,
-} from '@material-ui/core';
+} from '@mui/material';
import {
Preview as PreviewIcon,
diff --git a/frontend/src/views/Search.jsx b/frontend/src/views/Search.jsx
index 79ccca1a..ffa2061f 100644
--- a/frontend/src/views/Search.jsx
+++ b/frontend/src/views/Search.jsx
@@ -11,7 +11,7 @@ import { useNavigate } from "react-router-dom";
import {
Tabs,
Tab,
-} from "@material-ui/core";
+} from "@mui/material";
import {
Apps as AppsIcon,
diff --git a/frontend/src/views/Services.jsx b/frontend/src/views/Services.jsx
index 08ab8a61..8934e59a 100644
--- a/frontend/src/views/Services.jsx
+++ b/frontend/src/views/Services.jsx
@@ -4,7 +4,7 @@ import { useNavigate, Link, useParams } from "react-router-dom";
import {isMobile} from "react-device-detect";
import {Done as DoneIcon, Clear as ClearIcon} from '@mui/icons-material';
-import {Paper, Divider, List, ListItem, ListItemText, Card, CardContent, Grid, Typography, Button, ButtonGroup, FormControl, Dialog, DialogTitle, DialogActions, DialogContent, Tooltip} from '@material-ui/core';
+import {Paper, Divider, List, ListItem, ListItemText, Card, CardContent, Grid, Typography, Button, ButtonGroup, FormControl, Dialog, DialogTitle, DialogActions, DialogContent, Tooltip} from '@mui/material';
import FAQ from "./Faq.jsx";
import Newsletter from "../components/Newsletter.jsx";
diff --git a/frontend/src/views/SetAuthentication.jsx b/frontend/src/views/SetAuthentication.jsx
index df7916ab..258056d0 100755
--- a/frontend/src/views/SetAuthentication.jsx
+++ b/frontend/src/views/SetAuthentication.jsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
-import { Typography, CircularProgress } from "@material-ui/core";
+import { Typography, CircularProgress } from "@mui/material";
import theme from '../theme.jsx';
const SetAuthentication = (props) => {
diff --git a/frontend/src/views/SetAuthenticationSSO.jsx b/frontend/src/views/SetAuthenticationSSO.jsx
index 371eedb8..1b46bacd 100755
--- a/frontend/src/views/SetAuthenticationSSO.jsx
+++ b/frontend/src/views/SetAuthenticationSSO.jsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
-import { Typography, CircularProgress } from "@material-ui/core";
+import { Typography, CircularProgress } from "@mui/material";
const SetAuthentication = (props) => {
const { globalUrl } = props;
diff --git a/frontend/src/views/SettingsPage.jsx b/frontend/src/views/SettingsPage.jsx
index b0a7c038..52a6a6a4 100755
--- a/frontend/src/views/SettingsPage.jsx
+++ b/frontend/src/views/SettingsPage.jsx
@@ -8,9 +8,8 @@ import {
Button,
Divider,
TextField,
-} from "@material-ui/core";
+} from "@mui/material";
import { useAlert } from "react-alert";
-import { useTheme } from "@material-ui/core/styles";
import detectEthereumProvider from "@metamask/detect-provider";
diff --git a/frontend/src/views/TempDashboard.jsx b/frontend/src/views/TempDashboard.jsx
index 4d4ab368..a34ac730 100644
--- a/frontend/src/views/TempDashboard.jsx
+++ b/frontend/src/views/TempDashboard.jsx
@@ -1,7 +1,7 @@
import React from "react";
import { Grid, Container, Divider } from "@mui/material";
-import { makeStyles } from "@material-ui/core/styles";
+import { makeStyles } from "@mui/material/styles";
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
diff --git a/frontend/src/views/UpdateAuthentication.jsx b/frontend/src/views/UpdateAuthentication.jsx
index c4d671b5..22504282 100644
--- a/frontend/src/views/UpdateAuthentication.jsx
+++ b/frontend/src/views/UpdateAuthentication.jsx
@@ -5,7 +5,7 @@ import {
Typography,
CircularProgress,
Button,
-} from "@material-ui/core";
+} from "@mui/material";
import theme from '../theme.jsx';
import { useAlert } from "react-alert";
diff --git a/frontend/src/views/Welcome.jsx b/frontend/src/views/Welcome.jsx
index 22c571c9..ebdd5036 100644
--- a/frontend/src/views/Welcome.jsx
+++ b/frontend/src/views/Welcome.jsx
@@ -1,9 +1,11 @@
import React, { useState, useEffect } from 'react';
import ReactGA from 'react-ga4';
import WelcomeForm2 from "../components/WelcomeForm2.jsx";
-import Stepper from "@material-ui/core/Stepper";
-import Step from "@material-ui/core/Step";
-import StepLabel from "@material-ui/core/StepLabel";
+import {
+ Stepper,
+ Step,
+ StepLabel,
+} from '@mui/material';
import AppFramework from "../components/AppFramework.jsx";
import ArrowBackIosIcon from '@mui/icons-material/ArrowBackIos';
import {
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index 49724dd9..30982e9d 100755
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -1,7 +1,7 @@
import React, { useEffect, useContext } from "react";
import ReactDOM from "react-dom"
-import { makeStyles } from "@material-ui/core/styles";
+import { makeStyles } from "@mui/styles";
import { Navigate } from "react-router-dom";
//import { Redirect } from "react-router-dom";
@@ -41,7 +41,7 @@ import {
Checkbox,
LinearProgress,
ListItemText,
-} from "@material-ui/core";
+} from "@mui/material"
import {
AvatarGroup,