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

Fixed asearch grid linking to shuffler.io properly for public items

Browse Source
This commit is contained in:
frikky
2022-12-06 12:18:45 +00:00
committed by GitHub
parent 829822fc20
commit e9f730746b
3 changed files with 73 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/AppGrid.jsx
+5 -3
View File
@@ -148,6 +148,8 @@ const AppGrid = props => {
// setInnerHits(hits) // setInnerHits(hits)
//} //}
console.log("In appgrid")
return ( return (
<Grid container spacing={2}> <Grid container spacing={2}>
{hits.map((data, index) => { {hits.map((data, index) => {
@@ -184,11 +186,11 @@ const AppGrid = props => {
} }
parsedname = (parsedname.charAt(0).toUpperCase()+parsedname.substring(1)).replaceAll("_", " ") parsedname = (parsedname.charAt(0).toUpperCase()+parsedname.substring(1)).replaceAll("_", " ")
const appUrl = isCloud ? `/apps/${data.objectID}?queryID=${data.__queryID}` : `https://shuffler.io/apps/${data.objectID}?queryID=${data.__queryID}`
return ( return (
<Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}> <Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}>
<Grid item xs={xs} key={index}> <Grid item xs={xs} key={index}>
<Link to={`/apps/${data.objectID}?queryID=${data.__queryID}`} style={{textDecoration: "none", color: "#f85a3e"}}> <a href={appUrl} rel="noopener noreferrer" target="_blank" style={{textDecoration: "none", color: "#f85a3e"}}>
<Paper elevation={0} style={paperStyle} onMouseOver={() => { <Paper elevation={0} style={paperStyle} onMouseOver={() => {
setMouseHoverIndex(index) setMouseHoverIndex(index)
/* /*
@@ -254,7 +256,7 @@ const AppGrid = props => {
</Tooltip> </Tooltip>
} }
</Paper> </Paper>
</Link> </a>
</Grid> </Grid>
</Zoom> </Zoom>
) )
frontend/src/components/CreatorGrid.jsx
+8 -2
View File
@@ -53,6 +53,10 @@ const CreatorGrid = props => {
const buttonStyle = {borderRadius: 30, height: 50, width: 220, margin: isMobile ? "15px auto 15px auto" : 20, fontSize: 18,} const buttonStyle = {borderRadius: 30, height: 50, width: 220, margin: isMobile ? "15px auto 15px auto" : 20, fontSize: 18,}
const isCloud =
window.location.host === "localhost:3002" ||
window.location.host === "shuffler.io";
const innerColor = "rgba(255,255,255,0.65)" const innerColor = "rgba(255,255,255,0.65)"
const borderRadius = 3 const borderRadius = 3
window.title = "Shuffle | Workflows | Discover your use-case" window.title = "Shuffle | Workflows | Discover your use-case"
@@ -159,12 +163,14 @@ const CreatorGrid = props => {
} }
counted += 1 counted += 1
const creatorUrl = !isCloud ? `https://shuffler.io/creators/${data.username}` : `/creators/${data.username}`
return ( return (
<Zoom key={index} in={true} style={{}}> <Zoom key={index} in={true} style={{}}>
<Grid item xs={xs} style={{ padding: "12px 10px 12px 10px", }}> <Grid item xs={xs} style={{ padding: "12px 10px 12px 10px", }}>
<Card style={{border: "1px solid rgba(255,255,255,0.3)", minHeight: 177, maxHeight: 177,}}> <Card style={{border: "1px solid rgba(255,255,255,0.3)", minHeight: 177, maxHeight: 177,}}>
<CardActionArea component={Link} to={"/creators/"+data.username} style={{padding: "5px 10px 5px 10px", minHeight: 177, maxHeight: 177,}}> <a href={creatorUrl} rel="noopener noreferrer" target="_blank" style={{textDecoration: "none", color: "inherit",}}>
<CardActionArea style={{padding: "5px 10px 5px 10px", minHeight: 177, maxHeight: 177,}}>
<CardContent sx={{ flex: '1 0 auto', minWidth: 160, maxWidth: 160, overflow: "hidden", padding: 0, }}> <CardContent sx={{ flex: '1 0 auto', minWidth: 160, maxWidth: 160, overflow: "hidden", padding: 0, }}>
<div style={{display: "flex"}}> <div style={{display: "flex"}}>
<img style={{height: 74, width: 74, borderRadius: 100, }} alt={"Creator profile of "+data.username} src={data.image} /> <img style={{height: 74, width: 74, borderRadius: 100, }} alt={"Creator profile of "+data.username} src={data.image} />
@@ -213,8 +219,8 @@ const CreatorGrid = props => {
null} null}
</CardContent> </CardContent>
</CardActionArea> </CardActionArea>
</a>
</Card> </Card>
</Grid> </Grid>
</Zoom> </Zoom>
) )
frontend/src/components/WorkflowPaper.jsx
+13 -3
View File
@@ -63,6 +63,10 @@ const WorkflowPaper = (props) => {
const [anchorEl, setAnchorEl] = React.useState(null); const [anchorEl, setAnchorEl] = React.useState(null);
const appGroup = data.action_references === undefined || data.action_references === null ? [] : data.action_references const appGroup = data.action_references === undefined || data.action_references === null ? [] : data.action_references
const isCloud =
window.location.host === "localhost:3002" ||
window.location.host === "shuffler.io";
//console.log("Workflow: ", data) //console.log("Workflow: ", data)
var boxColor = "#86c142"; var boxColor = "#86c142";
@@ -96,6 +100,10 @@ const WorkflowPaper = (props) => {
parsedUrl += `?queryID=${data.__queryID}` parsedUrl += `?queryID=${data.__queryID}`
} }
if (!isCloud) {
parsedUrl = `https://shuffler.io${parsedUrl}`
}
return ( return (
<div style={{width: "100%", position: "relative",}}> <div style={{width: "100%", position: "relative",}}>
<Paper square style={paperAppStyle}> <Paper square style={paperAppStyle}>
@@ -137,12 +145,14 @@ const WorkflowPaper = (props) => {
flex: 10, flex: 10,
}} }}
> >
<Link <a
to={parsedUrl} href={parsedUrl}
rel="norefferer"
target="_blank"
style={{ textDecoration: "none", color: "inherit" }} style={{ textDecoration: "none", color: "inherit" }}
> >
{parsedName} {parsedName}
</Link> </a>
</Typography> </Typography>
</Tooltip> </Tooltip>
</Grid> </Grid>