marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Theme name issue and updated backend to 0.4.17

Browse Source
This commit is contained in:
frikky
2023-05-30 17:14:00 +02:00
parent 012371c922
commit c98aedb66f
37 changed files with 139 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/AppFramework.jsx
+1 -1
View File
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
import CytoscapeComponent from 'react-cytoscapejs';
import frameworkStyle from '../frameworkStyle.jsx';
import { v4 as uuidv4 } from "uuid";
import theme from '../theme';
import theme from '../theme.jsx';
import { useAlert } from "react-alert";
import AppSearch from '../components/Appsearch.jsx';
frontend/src/components/AppsearchPopout.jsx
+1 -1
View File
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import theme from '../theme';
import theme from '../theme.jsx';
import AppSearch from './Appsearch.jsx';
import {
frontend/src/components/AuthenticationItem.jsx
+1 -1
View File
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
import theme from '../theme';
import theme from '../theme.jsx';
import { useAlert } from "react-alert";
import {
Tooltip,
frontend/src/components/AuthenticationNormal.jsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
import theme from '../theme';
import theme from '../theme.jsx';
import { v4 as uuidv4 } from "uuid";
frontend/src/components/Branding.jsx
+1 -1
View File
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
import ReactGA from 'react-ga4';
import theme from "../theme";
import theme from "../theme.jsx";
import { useTheme } from "@material-ui/core/styles";
import {
frontend/src/components/CacheView.jsx
+23 -16
View File
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
import theme from "../theme";
import theme from "../theme.jsx";
import {
Tooltip,
Divider,
@@ -48,9 +48,10 @@ const CacheView = (props) => {
const [listCache, setListCache] = React.useState([]);
const [addCache, setAddCache] = React.useState("");
const [modalOpen, setModalOpen] = React.useState(false);
const [key,setKey]= React.useState("");
const [key, setKey]= React.useState("");
const [value, setValue]= React.useState("");
const [cacheInput, setCacheInput]= React.useState('');
const [cacheInput, setCacheInput]= React.useState("");
const [cacheCursor, setCacheCursor]= React.useState("");
const alert = useAlert();
useEffect(() => {
@@ -67,20 +68,26 @@ const CacheView = (props) => {
},
credentials: "include",
})
.then((response) => {
if (response.status !== 200) {
console.log("Status not 200 for apps :O!");
return;
}
.then((response) => {
if (response.status !== 200) {
console.log("Status not 200 for apps :O!");
return;
}
return response.json();
})
.then((responseJson) => {
setListCache(responseJson);
})
.catch((error) => {
alert.error(error.toString());
});
return response.json();
})
.then((responseJson) => {
if (responseJson.success === true) {
setListCache(responseJson.keys);
}
if (responseJson.cursor !== undefined && responseJson.cursor !== null && responseJson.cursor !== "") {
setCacheCursor(responseJson.cursor);
}
})
.catch((error) => {
alert.error(error.toString());
});
};
// const getCacheList = (orgId) => {
frontend/src/components/EditWorkflow.jsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, { useEffect, useContext } from "react";
import theme from '../theme';
import theme from '../theme.jsx';
import { isMobile } from "react-device-detect"
import ChipInput from "material-ui-chip-input";
import UsecaseSearch from "../components/UsecaseSearch.jsx"
frontend/src/components/Files.jsx
+1 -1
View File
@@ -32,7 +32,7 @@ import {
import { useAlert } from "react-alert";
import Dropzone from "../components/Dropzone.jsx";
import CodeEditor from "../components/ShuffleCodeEditor.jsx";
import theme from "../theme";
import theme from "../theme.jsx";
const Files = (props) => {
const { globalUrl, userdata, serverside, selectedOrganization, isCloud, } = props;
frontend/src/components/Header.jsx
+1 -1
View File
@@ -77,7 +77,7 @@ const { globalUrl, setNotifications, notifications, isLoggedIn, removeCookie, ho
textDecoration: "none",
}
const isCloud = serverside === true ? true : window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
const isCloud = serverside === true || typeof window === 'undefined' ? true : window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
const clearNotifications = () => {
// Don't really care about the logout
frontend/src/components/Oauth2Auth.jsx
+3 -8
View File
@@ -1,7 +1,7 @@
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';
import theme from '../theme.jsx';
import { v4 as uuidv4 } from "uuid";
import {
@@ -90,7 +90,6 @@ const AuthenticationOauth2 = (props) => {
appAuthentication,
setSelectedAction,
setNewAppAuth,
setAuthenticationModalOpen,
isCloud,
autoAuth,
authButtonOnly,
@@ -118,7 +117,7 @@ const AuthenticationOauth2 = (props) => {
const [oauthUrl, setOauthUrl] = React.useState("");
const [buttonClicked, setButtonClicked] = React.useState(false);
const [offlineAccess, setOfflineAccess] = React.useState(false);
const [offlineAccess, setOfflineAccess] = React.useState(true);
const allscopes = authenticationType.scope !== undefined ? authenticationType.scope : [];
@@ -365,9 +364,6 @@ const AuthenticationOauth2 = (props) => {
if (newwin.closed) {
console.log("Closing?")
if (setAuthenticationModalOpen !== undefined) {
setAuthenticationModalOpen(false)
}
setButtonClicked(false);
clearInterval(timer);
@@ -375,7 +371,7 @@ const AuthenticationOauth2 = (props) => {
//
if (getAppAuthentication !== undefined) {
getAppAuthentication(true, true);
getAppAuthentication(true, true, true);
}
} else {
console.log("Not closed")
@@ -574,7 +570,6 @@ const AuthenticationOauth2 = (props) => {
return autoAuthButton
}
console.log("Window: ", window.location)
return (
<div>
<DialogTitle>
frontend/src/components/ParsedAction.jsx
+1 -1
View File
@@ -7,7 +7,7 @@ import { sortByKey } from "../views/AngularWorkflow.jsx";
import { useTheme } from "@material-ui/core/styles";
import NestedMenuItem from "material-ui-nested-menu-item";
import { useAlert } from "react-alert";
import theme from '../theme';
import theme from '../theme.jsx';
import {
ButtonGroup,
frontend/src/components/RenderCytoscape.jsx
+1 -1
View File
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useLayoutEffect } from "react";
import * as cytoscape from "cytoscape";
import CytoscapeComponent from "react-cytoscapejs";
import cystyle from "../defaultCytoscapeStyle";
import cystyle from "../defaultCytoscapeStyle.jsx";
const surfaceColor = "#27292D";
const CytoscapeWrapper = (props) => {
frontend/src/components/ShuffleCodeEditor.jsx
+1 -1
View File
@@ -14,7 +14,7 @@ import {
Button,
} from '@material-ui/core';
import theme from '../theme';
import theme from '../theme.jsx';
import Checkbox from '@mui/material/Checkbox';
import { orange } from '@mui/material/colors';
import { isMobile } from "react-device-detect"
frontend/src/components/SuggestedWorkflows.jsx
+1 -1
View File
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import ReactGA from 'react-ga4';
import theme from '../theme';
import theme from '../theme.jsx';
import PaperComponent from "../components/PaperComponent.jsx"
import UsecaseSearch, { usecaseTypes } from "../components/UsecaseSearch.jsx"
frontend/src/components/UsecaseSearch.jsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
import theme from '../theme';
import theme from '../theme.jsx';
import { useNavigate, Link } from "react-router-dom";
import { useAlert } from "react-alert";
import ConfigureWorkflow from "../components/ConfigureWorkflow.jsx";
frontend/src/components/WelcomeForm2.jsx
+1 -1
View File
@@ -14,7 +14,7 @@ import LightbulbIcon from '@mui/icons-material/Lightbulb';
import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew';
import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
import theme from '../theme';
import theme from '../theme.jsx';
import {
Fade,
IconButton,
frontend/src/components/WorkflowPaper.jsx
+15 -14
View File
@@ -1,5 +1,5 @@
import React, { useState, useEffect, useLayoutEffect } from "react";
import theme from '../theme';
import theme from '../theme.jsx';
import {
Chip,
@@ -30,19 +30,6 @@ const workflowActionStyle = {
justifyContent: "space-between",
}
const paperAppStyle = {
minHeight: 130,
maxHeight: 130,
overflow: "hidden",
width: "100%",
color: "white",
backgroundColor: theme.palette.surfaceColor,
padding: "12px 12px 0px 15px",
borderRadius: 5,
display: "flex",
boxSizing: "border-box",
position: "relative",
}
const chipStyle = {
backgroundColor: "#3d3f43",
@@ -70,6 +57,20 @@ const WorkflowPaper = (props) => {
//console.log("Workflow: ", data)
var boxColor = "#86c142";
const paperAppStyle = {
minHeight: 130,
maxHeight: 130,
overflow: "hidden",
width: "100%",
color: "white",
backgroundColor: theme.palette.surfaceColor,
padding: "12px 12px 0px 15px",
borderRadius: 5,
display: "flex",
boxSizing: "border-box",
position: "relative",
}
var parsedName = data.name;
if (
parsedName !== undefined &&
frontend/src/components/WorkflowPaperNew.jsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, { useState, useEffect, useLayoutEffect } from "react";
import theme from '../theme';
import theme from '../theme.jsx';
import {
Chip,