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

Pipeline sync fixes

Browse Source
This commit is contained in:
Frikky
2024-04-30 19:27:32 +02:00
parent c4ea0aaf8e
commit 8a4b27fc70
8 changed files with 738 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/AppGrid.jsx
+664 -718
View File
File diff suppressed because it is too large Load Diff
frontend/src/components/Billing.jsx
+1
View File
@@ -1343,6 +1343,7 @@ const Billing = (props) => {
</div> </div>
<BillingStats <BillingStats
isCloud={isCloud} isCloud={isCloud}
clickedFromOrgTab={clickedFromOrgTab}
globalUrl={globalUrl} globalUrl={globalUrl}
selectedOrganization={selectedOrganization} selectedOrganization={selectedOrganization}
userdata={userdata} userdata={userdata}
frontend/src/components/BillingStats.jsx
+2 -2
View File
@@ -61,7 +61,7 @@ const LineChartWrapper = ({keys, inputname, height, width}) => {
const AppStats = (defaultprops) => { const AppStats = (defaultprops) => {
const { globalUrl, selectedOrganization, userdata, isCloud, inputWorkflows, } = defaultprops; const { globalUrl, selectedOrganization, userdata, isCloud, inputWorkflows,clickedFromOrgTab } = defaultprops;
const [keys, setKeys] = useState([]) const [keys, setKeys] = useState([])
const [searches, setSearches] = useState([]); const [searches, setSearches] = useState([]);
@@ -703,7 +703,7 @@ const AppStats = (defaultprops) => {
textAlign: "center", textAlign: "center",
padding: 40, padding: 40,
margin: 5, margin: 5,
marginLeft: 90, marginLeft: clickedFromOrgTab? null:90,
backgroundColor: theme.palette.platformColor, backgroundColor: theme.palette.platformColor,
border: "1px solid rgba(255,255,255,0.3)", border: "1px solid rgba(255,255,255,0.3)",
maxWidth: 300, maxWidth: 300,
frontend/src/components/CacheView.jsx
+4 -2
View File
@@ -304,7 +304,7 @@ const CacheView = (props) => {
}, },
}} }}
required required
fullWidth={true} fullWidth
autoComplete="Value" autoComplete="Value"
placeholder="123" placeholder="123"
id="Valuefield" id="Valuefield"
@@ -349,7 +349,7 @@ const CacheView = (props) => {
return ( return (
<div style={{paddingBottom: isSelectedDataStore?null:250, width: isSelectedDataStore?1030:null, padding:isSelectedDataStore?27:null, height: isSelectedDataStore?1200:null, color: isSelectedDataStore?'#ffffff':null, backgroundColor: isSelectedDataStore?'#212121':null, borderRadius: isSelectedDataStore?'16px':null, }}> <div style={{paddingBottom: isSelectedDataStore?null:250, width: isSelectedDataStore?1030:null, padding:isSelectedDataStore?27:null, height: isSelectedDataStore?"auto":null, color: isSelectedDataStore?'#ffffff':null, backgroundColor: isSelectedDataStore?'#212121':null, borderRadius: isSelectedDataStore?'16px':null, }}>
{modalView} {modalView}
<div style={{ marginTop: isSelectedDataStore?null:20, marginBottom: 20 }}> <div style={{ marginTop: isSelectedDataStore?null:20, marginBottom: 20 }}>
<h2 style={{ display: isSelectedDataStore?null: "inline" }}>Shuffle Datastore</h2> <h2 style={{ display: isSelectedDataStore?null: "inline" }}>Shuffle Datastore</h2>
@@ -434,6 +434,8 @@ const CacheView = (props) => {
style={{ style={{
minWidth: 300, minWidth: 300,
maxWidth: 300, maxWidth: 300,
height:200,
overflowX: "hidden",
}} }}
primary={validate.valid ? primary={validate.valid ?
<ReactJson <ReactJson
frontend/src/components/Files.jsx
+1 -1
View File
@@ -621,7 +621,7 @@ const Files = (props) => {
}} }}
onDrop={uploadFile} onDrop={uploadFile}
> >
<div style={{position: "relative", width: isSelectedFiles? 1030: null, padding:isSelectedFiles?27:null, height: isSelectedFiles?1200:null, color: isSelectedFiles?'#ffffff':null, backgroundColor: isSelectedFiles?'#212121':null, borderRadius: isSelectedFiles?'16px':null,}}> <div style={{position: "relative", width: isSelectedFiles? 1030: null, padding:isSelectedFiles?27:null, height: isSelectedFiles?"auto":null, color: isSelectedFiles?'#ffffff':null, backgroundColor: isSelectedFiles?'#212121':null, borderRadius: isSelectedFiles?'16px':null,}}>
<Tooltip color="primary" title={"Import files to Shuffle from Git"} placement="top"> <Tooltip color="primary" title={"Import files to Shuffle from Git"} placement="top">
<IconButton <IconButton
frontend/src/components/NewHeader.jsx
+1 -1
View File
@@ -835,7 +835,7 @@ const Header = (props) => {
<img <img
src={"/images/logos/orange_logo.svg"} src={"/images/logos/orange_logo.svg"}
alt="logo" alt="logo"
style={{ height: 20, width: 20, marginTop: 10 }} style={{ height: 20, width: 20, marginTop:4}}
/> />
</Grid> </Grid>
</Grid> </Grid>
frontend/src/views/AppCreator.jsx
+1 -1
View File
@@ -3075,7 +3075,7 @@ const AppCreator = (defaultprops) => {
<TextField <TextField
style={{ style={{
margin: 0, flex: "1", backgroundColor: inputColor, margin: 0, flex: "1", backgroundColor: inputColor,
border: !refreshUrl.startsWith("http") || refreshUrl.includes("//shuffler.") ? "2px solid red" : "inherit", border: refreshUrl.length > 0 && (!refreshUrl.startsWith("http") || refreshUrl.includes("//shuffler.")) ? "2px solid red" : "inherit",
}} }}
fullWidth={true} fullWidth={true}
placeholder="The URL to retrieve refresh-tokens at" placeholder="The URL to retrieve refresh-tokens at"
frontend/src/views/Search.jsx
+64 -64
View File
@@ -57,52 +57,52 @@ const Search = (props) => {
//Stop unnecessariry re-rendering of the component to improve performace //Stop unnecessariry re-rendering of the component to improve performace
const MemoizedAppGrid = useMemo(() => <AppGrid const MemoizedAppGrid = useMemo(() => <AppGrid
maxRows={4} maxRows={4}
isHeader={true} isHeader={true}
showSuggestion={true} showSuggestion={true}
globalUrl={globalUrl} globalUrl={globalUrl}
isMobile={isMobile} isMobile={isMobile}
userdata={userdata} userdata={userdata}
/>, [curTab]); />, [curTab]);
const MemoizedWorkflowGrid = useMemo(() => <WorkflowGrid const MemoizedWorkflowGrid = useMemo(() => <WorkflowGrid
maxRows={3} maxRows={3}
showSuggestion={true} showSuggestion={true}
globalUrl={globalUrl} globalUrl={globalUrl}
isMobile={isMobile} isMobile={isMobile}
userdata={userdata} userdata={userdata}
/>, [curTab]); />, [curTab]);
const MemoizedDocsGrid = useMemo(() => <DocsGrid const MemoizedDocsGrid = useMemo(() => <DocsGrid
maxRows={6} maxRows={6}
parsedXs={12} parsedXs={12}
showSuggestion={true} showSuggestion={true}
globalUrl={globalUrl} globalUrl={globalUrl}
isMobile={isMobile} isMobile={isMobile}
userdata={userdata} userdata={userdata}
/>, [curTab]); />, [curTab]);
const MemoizedCreatorGrid = useMemo(() => <CreatorGrid const MemoizedCreatorGrid = useMemo(() => <CreatorGrid
parsedXs={4} parsedXs={4}
isHeader={true} isHeader={true}
showSuggestion={true} showSuggestion={true}
globalUrl={globalUrl} globalUrl={globalUrl}
isMobile={isMobile} isMobile={isMobile}
userdata={userdata} userdata={userdata}
/>, [curTab]); />, [curTab]);
const MemoizedDiscordChat = useMemo(() => <DiscordChat isMobile={isMobile} />) const MemoizedDiscordChat = useMemo(() => <DiscordChat isMobile={isMobile} />)
const useStyles = makeStyles({ const useStyles = makeStyles({
hideIndicator: { hideIndicator: {
display: 'none', display: 'none',
}, },
customTab: { customTab: {
justifyContent: 'center', justifyContent: 'center',
gap: '46px', gap: '46px',
} }
}); });
const classes = useStyles(); const classes = useStyles();
if (serverside === true) { if (serverside === true) {
return null; return null;
@@ -177,7 +177,7 @@ const classes = useStyles();
const StyledTab = styled(Tab)(({ theme }) => ({ const StyledTab = styled(Tab)(({ theme }) => ({
width: 151, width: 151,
height: 51, height: 51,
padding: "10px 20px", padding: "10px 20px",
borderRadius: 8, borderRadius: 8,
fontWeight: 600, fontWeight: 600,
textTransform: "none", textTransform: "none",
@@ -192,16 +192,16 @@ const classes = useStyles();
})); }));
const tabSpanStyling = { const tabSpanStyling = {
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center' alignItems: 'center'
} }
const tabTextStyling = { const tabTextStyling = {
marginLeft: '5px', marginLeft: '5px',
color: 'white' color: 'white'
} }
// Random names for type & autoComplete. Didn't research :^) // Random names for type & autoComplete. Didn't research :^)
const landingpageDataBrowser = ( const landingpageDataBrowser = (
@@ -219,7 +219,7 @@ const classes = useStyles();
margin: isHeader ? null : "auto", margin: isHeader ? null : "auto",
marginTop: hidemargins === true ? 0 : isHeader ? null : 25, marginTop: hidemargins === true ? 0 : isHeader ? null : 25,
backgroundColor: "rgba(33, 33, 33, 1)", backgroundColor: "rgba(33, 33, 33, 1)",
borderRadius:8 borderRadius: 8
}} }}
value={curTab} value={curTab}
indicatorColor="primary" indicatorColor="primary"
@@ -228,28 +228,28 @@ const classes = useStyles();
aria-label="disabled tabs example" aria-label="disabled tabs example"
variant="scrollable" variant="scrollable"
scrollButtons="auto" scrollButtons="auto"
classes={{indicator: classes.hideIndicator, root: classes.customTab}} classes={{ indicator: classes.hideIndicator, root: classes.customTab }}
> >
<StyledTab <StyledTab
style={{ style={{
backgroundColor: curTab === 0 ? theme.palette.primary.main : 'inherit', backgroundColor: curTab === 0 ? theme.palette.primary.main : 'inherit',
color: curTab === 0? theme.palette.common.white : 'inherit', color: curTab === 0 ? theme.palette.common.white : 'inherit',
}} }}
label={ label={
<span style={tabSpanStyling}> <span style={tabSpanStyling}>
<AppsIcon style={iconStyle} /> <AppsIcon style={{ iconStyle, color: "#F1F1F1" }} />
<Typography variant="body1" style={tabTextStyling}>App</Typography> <Typography variant="body1" style={tabTextStyling}>App</Typography>
</span> </span>
} }
/> />
<StyledTab <StyledTab
style={{ style={{
backgroundColor: curTab ===1 ? theme.palette.primary.main : 'inherit', backgroundColor: curTab === 1 ? theme.palette.primary.main : 'inherit',
color: curTab === 1? theme.palette.common.white : 'inherit', color: curTab === 1 ? theme.palette.common.white : 'inherit',
}} }}
label={ label={
<span style={tabSpanStyling}> <span style={tabSpanStyling}>
<CodeIcon style={iconStyle} /> <CodeIcon style={{ iconStyle, color: "#F1F1F1" }} />
<Typography variant="body1" style={tabTextStyling}>Workflow</Typography> <Typography variant="body1" style={tabTextStyling}>Workflow</Typography>
</span> </span>
} }
@@ -257,11 +257,11 @@ const classes = useStyles();
<StyledTab <StyledTab
style={{ style={{
backgroundColor: curTab === 2 ? theme.palette.primary.main : 'inherit', backgroundColor: curTab === 2 ? theme.palette.primary.main : 'inherit',
color: curTab === 2? theme.palette.common.white : 'inherit', color: curTab === 2 ? theme.palette.common.white : 'inherit',
}} }}
label={ label={
<span style={tabSpanStyling}> <span style={tabSpanStyling}>
<DescriptionOutlinedIcon style={iconStyle} /> <DescriptionOutlinedIcon style={{ iconStyle, color: "#F1F1F1" }} />
<Typography variant="body1" style={tabTextStyling}>Docs</Typography> <Typography variant="body1" style={tabTextStyling}>Docs</Typography>
</span> </span>
} }
@@ -273,7 +273,7 @@ const classes = useStyles();
}} }}
label={ label={
<span style={tabSpanStyling}> <span style={tabSpanStyling}>
<PeopleAltOutlinedIcon style={iconStyle} /> <PeopleAltOutlinedIcon style={{ iconStyle, color: "#F1F1F1" }} />
<Typography variant="body1" style={tabTextStyling}>Creators</Typography> <Typography variant="body1" style={tabTextStyling}>Creators</Typography>
</span> </span>
} }
@@ -285,17 +285,17 @@ const classes = useStyles();
}} }}
label={ label={
<span style={tabSpanStyling}> <span style={tabSpanStyling}>
<ChatIcon style={iconStyle} /> <ChatIcon style={{ iconStyle, color: "#F1F1F1" }} />
<Typography variant="body1" style={{tabTextStyling, whiteSpace: "nowrap", color: "white"}}>Discord Chat</Typography> <Typography variant="body1" style={{ tabTextStyling, whiteSpace: "nowrap", color: "#F1F1F1" }}>Discord Chat</Typography>
</span> </span>
} }
/> />
</Tabs> </Tabs>
{curTab === 0 && MemoizedAppGrid} {curTab === 0 && MemoizedAppGrid}
{curTab === 1 && MemoizedWorkflowGrid} {curTab === 1 && MemoizedWorkflowGrid}
{curTab === 2 && MemoizedDocsGrid} {curTab === 2 && MemoizedDocsGrid}
{curTab === 3 && MemoizedCreatorGrid} {curTab === 3 && MemoizedCreatorGrid}
{curTab === 4 && MemoizedDiscordChat} {curTab === 4 && MemoizedDiscordChat}
</div> </div>
</div> </div>
); );