From 65574a1601e6226c891a295852257f926950e501 Mon Sep 17 00:00:00 2001 From: Frikky Date: Wed, 12 Jul 2023 02:09:12 +0200 Subject: [PATCH] Fixed mui core finally --- frontend/package.json | 12 +- frontend/src/App.jsx | 51 +- frontend/src/components/AlertTemplate.js | 5 +- frontend/src/components/AppFramework.jsx | 5 +- frontend/src/components/AppGrid.jsx | 5 +- frontend/src/components/Appsearch.jsx | 5 +- frontend/src/components/AppsearchPopout.jsx | 2 +- .../src/components/AuthenticationItem.jsx | 2 +- .../src/components/AuthenticationNormal.jsx | 2 +- .../src/components/AuthenticationWindow.jsx | 2 +- frontend/src/components/Billing.jsx | 5 +- frontend/src/components/Branding.jsx | 3 +- frontend/src/components/CacheView.jsx | 2 +- frontend/src/components/ConfigureWorkflow.jsx | 2 +- frontend/src/components/CreatorGrid.jsx | 3 +- frontend/src/components/DocsGrid.jsx | 5 +- frontend/src/components/EditWorkflow.jsx | 2 +- frontend/src/components/Files.jsx | 2 +- frontend/src/components/Header.jsx | 3 +- .../src/components/LandingpageUsecases.jsx | 2 +- frontend/src/components/Newsletter.jsx | 3 +- frontend/src/components/Oauth2Auth.jsx | 3 +- frontend/src/components/OrgHeader.js | 3 +- frontend/src/components/OrgHeader.jsx | 4 +- frontend/src/components/OrgHeaderexpanded.jsx | 9 +- frontend/src/components/PaperComponent.jsx | 2 +- frontend/src/components/ParsedAction.jsx | 9 +- frontend/src/components/Priorities.jsx | 2 +- frontend/src/components/Priority.jsx | 2 +- frontend/src/components/Searchfield.js | 647 ------------------ frontend/src/components/Searchfield.jsx | 5 +- frontend/src/components/SecurityFramework.jsx | 2 +- frontend/src/components/ShuffleCodeEditor.jsx | 2 +- .../src/components/SuggestedWorkflows.jsx | 2 +- frontend/src/components/UsecaseSearch.jsx | 2 +- frontend/src/components/WelcomeForm2.jsx | 4 +- frontend/src/components/WorkflowGrid.jsx | 5 +- frontend/src/components/WorkflowPaper.jsx | 2 +- frontend/src/components/WorkflowPaperNew.jsx | 2 +- frontend/src/components/Workflowsearch.jsx | 5 +- frontend/src/theme.js | 4 +- frontend/src/theme.jsx | 4 +- frontend/src/views/Admin.jsx | 4 +- frontend/src/views/AdminSetup.jsx | 4 +- frontend/src/views/AngularWorkflow.jsx | 10 +- frontend/src/views/AppCreator.jsx | 7 +- frontend/src/views/Apps.jsx | 3 +- frontend/src/views/Dashboard.jsx | 6 +- frontend/src/views/DashboardViews.jsx | 6 +- frontend/src/views/Docs.jsx | 3 +- frontend/src/views/Faq.jsx | 2 +- frontend/src/views/FrameworkWrapper.jsx | 2 +- frontend/src/views/GettingStarted.jsx | 7 +- frontend/src/views/HandlePaymentNew.jsx | 2 +- frontend/src/views/Introduction.jsx | 1 - frontend/src/views/LoginPage.jsx | 7 +- frontend/src/views/RunWorkflow.jsx | 4 +- frontend/src/views/Search.jsx | 2 +- frontend/src/views/Services.jsx | 2 +- frontend/src/views/SetAuthentication.jsx | 2 +- frontend/src/views/SetAuthenticationSSO.jsx | 2 +- frontend/src/views/SettingsPage.jsx | 3 +- frontend/src/views/TempDashboard.jsx | 2 +- frontend/src/views/UpdateAuthentication.jsx | 2 +- frontend/src/views/Welcome.jsx | 8 +- frontend/src/views/Workflows.jsx | 4 +- 66 files changed, 111 insertions(+), 827 deletions(-) delete mode 100644 frontend/src/components/Searchfield.js 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" ? ( -
- - } - /> - -
- ) : (
{ /> } /> - - } - /> - - } - /> { {...props} /> } - /> - - } /> { />
- ); //
// 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 ( -