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

Added minor fix for coloring and text highlights

Browse Source
This commit is contained in:
frikky
2022-06-05 21:32:28 +02:00
parent 9e3e86f1b0
commit 387731fbfe
5 changed files with 86 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app_sdk/app_base.py
+1 -1
View File
@@ -352,7 +352,7 @@ class AppBase:
finished = True
break
else:
self.logger.info(f"[DEBUG] RESP: {ret.text}")
self.logger.info(f"[ERROR] RESP: {ret.text}")
except requests.exceptions.RequestException as e:
self.logger.info(f"[DEBUG] Request problem: {e}")
frontend/src/components/ParsedAction.jsx
+8 -9
View File
@@ -1884,7 +1884,6 @@ const ParsedAction = (props) => {
const coverColor = "#82ccc3"
//menuPosition.left -= 50
//menuPosition.top -= 250
console.log(menuPosition)
return parsedPaths.length > 0 ? (
<NestedMenuItem
key={innerdata.name}
@@ -2369,7 +2368,7 @@ const ParsedAction = (props) => {
title="See previous results for this action"
placement="top"
>
<ArrowLeftIcon style={{ color: "white" }} />
<ArrowLeftIcon style={{ color: "rgba(255,255,255,0.7)" }} />
</Tooltip>
</IconButton>
<IconButton
@@ -2389,7 +2388,7 @@ const ParsedAction = (props) => {
title="Read app docs"
placement="top"
>
<DescriptionIcon style={{ color: "white" }} />
<DescriptionIcon style={{ color: "rgba(255,255,255,0.7)" }} />
</Tooltip>
</IconButton>
<IconButton
@@ -2413,7 +2412,7 @@ const ParsedAction = (props) => {
title="What are actions?"
placement="top"
>
<HelpOutlineIcon style={{ color: "white" }} />
<HelpOutlineIcon style={{ color: "rgba(255,255,255,0.7)" }} />
</Tooltip>
</a>
</IconButton>
@@ -2448,7 +2447,7 @@ const ParsedAction = (props) => {
title={selectedAction.run_magic_output === undefined || selectedAction.run_magic_output === null || selectedAction.run_magic_output === false ? "Click to enable magic parsing" : "Click to disable magic parsing"}
placement="top"
>
<AutoFixHighIcon style={{ color: selectedAction.run_magic_output === undefined || selectedAction.run_magic_output === null || selectedAction.run_magic_output === false ? "white" : "#f86a3e"}} />
<AutoFixHighIcon style={{ color: selectedAction.run_magic_output === undefined || selectedAction.run_magic_output === null || selectedAction.run_magic_output === false ? "rgba(255,255,255,0.7)" : "#f86a3e"}} />
</Tooltip>
</IconButton>
@@ -2529,7 +2528,7 @@ const ParsedAction = (props) => {
/>
<div style={{display: "flex"}}>
<div style={{flex: 5}}>
<Typography>Name</Typography>
<Typography style={{color: "rgba(255,255,255,0.7)"}}>Name</Typography>
<TextField
style={theme.palette.textFieldStyle}
InputProps={{
@@ -2626,7 +2625,7 @@ const ParsedAction = (props) => {
placement="top"
>
<span>
<Typography>Delay</Typography>
<Typography style={{color: "rgba(255,255,255,0.7)"}}>Delay</Typography>
<TextField
style={{
backgroundColor: theme.palette.inputColor,
@@ -2691,7 +2690,7 @@ const ParsedAction = (props) => {
selectedAction.authentication !== null &&
selectedAction.authentication.length > 0 ? (
<div style={{ marginTop: 15 }}>
<Typography>Authentication</Typography>
<Typography style={{color: "rgba(255,255,255,0.7)"}}>Authentication</Typography>
<div style={{ display: "flex" }}>
<Select
MenuProps={{
@@ -2797,7 +2796,7 @@ const ParsedAction = (props) => {
{showEnvironment !== undefined && showEnvironment && environments.length > 1 ? (
<div style={{ marginTop: "20px" }}>
<Typography>Environment</Typography>
<Typography style={{color: "rgba(255,255,255,0.7)"}}>Environment</Typography>
<Select
MenuProps={{
disableScrollLock: true,
frontend/src/views/AngularWorkflow.jsx
+52 -33
View File
@@ -451,7 +451,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Workflow error: ", error.toString())
});
};
@@ -539,7 +540,7 @@ const AngularWorkflow = (defaultprops) => {
setUserSettings(responseJson);
})
.catch((error) => {
console.log(error);
console.log("Apikey error: ", error);
});
};
@@ -574,7 +575,7 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
console.log(error);
console.log("Settings error: ", error);
});
};
@@ -608,7 +609,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("New auth error: ", error.toString());
});
};
@@ -692,7 +694,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Get execution error: ", error.toString());
});
};
@@ -719,7 +722,7 @@ const AngularWorkflow = (defaultprops) => {
handleUpdateResults(responseJson, executionRequest);
})
.catch((error) => {
console.log("Error: ", error);
console.log("Execution result Error: ", error);
stop();
});
};
@@ -751,7 +754,8 @@ const AngularWorkflow = (defaultprops) => {
return response.json();
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Abort error: ", error.toString());
});
};
@@ -1262,7 +1266,8 @@ const AngularWorkflow = (defaultprops) => {
})
.catch((error) => {
setSavingState(0);
alert.error(error.toString());
//alert.error(error.toString());
console.log("Save workflow error: ", error.toString());
});
return success;
@@ -1387,7 +1392,8 @@ const AngularWorkflow = (defaultprops) => {
start();
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Execute workflow err: ", error.toString());
});
})
};
@@ -1501,7 +1507,8 @@ const AngularWorkflow = (defaultprops) => {
})
.catch((error) => {
setAuthLoaded(true);
alert.error("Auth loading error: " + error.toString());
//alert.error("Auth loading error: " + error.toString());
console.log("AppAuth error: " + error.toString());
});
};
@@ -1578,7 +1585,8 @@ const AngularWorkflow = (defaultprops) => {
})
.catch((error) => {
setAppsLoaded(true)
alert.error("App loading error: "+error.toString());
//alert.error("App loading error: "+error.toString());
console.log("App loading error: "+error.toString());
});
};
@@ -1607,7 +1615,7 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
console.log(error);
console.log("Get userprofile error: ", error);
})
}
@@ -1825,7 +1833,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Get workflows error: ", error.toString());
});
};
@@ -2709,7 +2718,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch(error => {
alert.error(error.toString())
//alert.error(error.toString())
console.log("Activate app error: ", error.toString())
});
}
@@ -3658,7 +3668,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Get environments error: ", error.toString());
});
};
@@ -4563,7 +4574,8 @@ const AngularWorkflow = (defaultprops) => {
saveWorkflow(workflow);
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Stop schedule error: ", error.toString());
});
};
@@ -4615,7 +4627,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Get schedule error: ", error.toString());
});
};
@@ -5063,14 +5076,14 @@ const AngularWorkflow = (defaultprops) => {
is_valid: true,
label: "Webhook",
environment: "onprem",
description: "Simple HTTP webhook",
description: "Custom HTTP input",
long_description: "Execute a workflow with an unauthicated POST request",
},
{
name: "Schedule",
type: "TRIGGER",
status: "uninitialized",
description: "Schedule execution time",
description: "Specify time",
trigger_type: "SCHEDULE",
errors: null,
large_image:
@@ -5091,7 +5104,7 @@ const AngularWorkflow = (defaultprops) => {
is_valid: true,
label: "Subflow",
environment: "onprem",
description: "Control another workflow",
description: "Control a workflow",
long_description: "Execute another workflow from this workflow",
},
{
@@ -5112,7 +5125,7 @@ const AngularWorkflow = (defaultprops) => {
name: "Office365",
type: "TRIGGER",
status: "uninitialized",
description: "Starts upon O365 email",
description: "O365 email trigger",
trigger_type: "EMAIL",
errors: null,
is_valid: cloudSyncEnabled || isCloud ? true : false,
@@ -5126,7 +5139,7 @@ const AngularWorkflow = (defaultprops) => {
name: "Gmail",
type: "TRIGGER",
status: "uninitialized",
description: "Trigger based on Gmail",
description: "Gmail email trigger",
trigger_type: "EMAIL",
errors: null,
is_valid: cloudSyncEnabled || isCloud ? true : false,
@@ -5203,10 +5216,11 @@ const AngularWorkflow = (defaultprops) => {
display: "flex",
flexDirection: "column",
marginLeft: "20px",
overflow: "hidden",
}}
>
<Grid item style={{ flex: "1" }}>
<h3 style={{ marginBottom: "0px", marginTop: "10px" }}>
<Grid item style={{ flex: "1", overflow: "hidden",}}>
<h3 style={{ marginBottom: "0px", marginTop: "10px", overflow: "hidden" }}>
{trigger.name}
</h3>
</Grid>
@@ -7293,7 +7307,7 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
console.log(error.toString());
console.log("Get gmail folder error: ", error.toString());
});
};
@@ -7347,7 +7361,7 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
console.log(error.toString());
console.log("Get outlook folders error: ", error.toString());
});
};
@@ -7368,7 +7382,8 @@ const AngularWorkflow = (defaultprops) => {
setTriggerAuthentication(responseJson);
})
.catch((error) => {
console.log(error.toString());
//console.log(error.toString());
console.log("Set outlook auth error: ", error.toString());
});
};
@@ -7458,7 +7473,7 @@ const AngularWorkflow = (defaultprops) => {
setGmailFolders();
})
.catch((error) => {
console.log(error.toString());
console.log("Set gmail trigg error: ", error.toString());
});
}, 2500);
@@ -7556,7 +7571,7 @@ const AngularWorkflow = (defaultprops) => {
setOutlookFolders();
})
.catch((error) => {
console.log(error.toString());
console.log("Set outlook trigger error: ", error.toString());
});
}, 2500);
@@ -9476,7 +9491,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Stop mailsub error: ", error.toString());
});
};
@@ -9552,7 +9568,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
console.log("Start mailsub error: ", error.toString());
});
};
@@ -9636,7 +9653,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
console.log(error.toString());
//console.log(error.toString());
console.log("New webhook error: ", error.toString());
});
};
@@ -9679,7 +9697,8 @@ const AngularWorkflow = (defaultprops) => {
setSelectedTrigger(trigger);
})
.catch((error) => {
alert.error(error.toString());
//alert.error(error.toString());
alert.error("Delete webhook error: ", error.toString());
});
};
frontend/src/views/SettingsPage.jsx
+1 -1
View File
@@ -733,7 +733,7 @@ const Settings = (props) => {
{isCloud ?
<span>
<Typography variant="body1" color="textSecondary">
By connecting your Github account, you agree to our <a href="/docs/terms_of_service" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>Terms of Service</a>, and acknowledge that your non-sensitive data will be turned into a <a target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}} href="https://shuffler.io/search?tab=creators">creator account</a>. This enables you to earn a passive income from Shuffle. This IS reversible.
By connecting your Github or Metamask account, you agree to our <a href="/docs/terms_of_service" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>Terms of Service</a>, and acknowledge that your non-sensitive data will be turned into a <a target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}} href="https://shuffler.io/search?tab=creators">creator account</a>. This enables you to earn a passive income from Shuffle. This IS reversible. Support: support@shuffler.io
</Typography>
<Button
style={{ height: 40, marginTop: 10 }}
functions/onprem/orborus/orborus.go
+17 -1
View File
@@ -28,6 +28,7 @@ import (
"net/http"
"os"
"os/exec"
"runtime"
"strconv"
"strings"
"time"
@@ -441,6 +442,15 @@ func deployServiceWorkers(image string) {
if len(os.Getenv("DOCKER_HOST")) > 0 {
serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("DOCKER_HOST=%s", os.Getenv("DOCKER_HOST")))
} else {
if runtime.GOOS == "windows" {
serviceSpec.TaskTemplate.ContainerSpec.Mounts = []mount.Mount{
mount.Mount{
Source: `\\.\pipe\docker_engine`,
Target: `\\.\pipe\docker_engine`,
Type: mount.TypeBind,
},
}
} else {
serviceSpec.TaskTemplate.ContainerSpec.Mounts = []mount.Mount{
mount.Mount{
@@ -449,6 +459,8 @@ func deployServiceWorkers(image string) {
Type: mount.TypeBind,
},
}
}
}
serviceOptions := types.ServiceCreateOptions{}
@@ -506,8 +518,12 @@ func deployWorker(image string, identifier string, env []string, executionReques
}
if len(os.Getenv("DOCKER_HOST")) == 0 {
if runtime.GOOS == "windows" {
hostConfig.Binds = []string{`\\.\pipe\docker_engine:\\.\pipe\docker_engine`}
} else {
hostConfig.Binds = []string{"/var/run/docker.sock:/var/run/docker.sock:rw"}
}
}
hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
@@ -868,7 +884,7 @@ func main() {
log.Printf("[DEBUG] Running docker with socket proxy %s instead of default", os.Getenv("DOCKER_HOST"))
} else {
log.Printf("[DEBUG] Running docker with default socket /var/run/docker.sock")
log.Printf(`[DEBUG] Running docker with default socket /var/run/docker.sock or `)
}
ctx := context.Background()