diff --git a/.env b/.env index 0c5140c4..9c3004a7 100644 --- a/.env +++ b/.env @@ -59,7 +59,7 @@ SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-1.0.0" SHUFFLE_CONTAINER_AUTO_CLEANUP=false SHUFFLE_ELASTIC=true SHUFFLE_LOGS_DISABLED=false -SHUFFLE_CHAT_DISABLED=false +SHUFFLE_CHAT_DISABLED=false # Controls support chat SHUFFLE_RERUN_SCHEDULE=300 # DATABASE CONFIGURATIONS diff --git a/.github/push_nightly.sh b/.github/push_nightly.sh index bdd96960..21695b45 100644 --- a/.github/push_nightly.sh +++ b/.github/push_nightly.sh @@ -1,5 +1,9 @@ # This can be done in the dockerpush workflow itself docker pull frikky/shuffle-backend:nightly docker pull frikky/shuffle-frontend:nightly + docker tag frikky/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:nightly docker tag frikky/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:nightly + +docker push ghcr.io/frikky/shuffle-backend:nightly +docker push ghcr.io/frikky/shuffle-frontend:nightly diff --git a/frontend/src/components/WorkflowGrid.jsx b/frontend/src/components/WorkflowGrid.jsx index 4d8a04dc..c086790d 100644 --- a/frontend/src/components/WorkflowGrid.jsx +++ b/frontend/src/components/WorkflowGrid.jsx @@ -21,10 +21,11 @@ import { } from '@material-ui/core'; import WorkflowPaper from "../components/WorkflowPaper.jsx" +import WorkflowPaperNew from "../components/WorkflowPaperNew.jsx" const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240") const AppGrid = props => { - const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs } = props + const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, alternativeView, } = props const isCloud = window.location.host === "localhost:3002" || @@ -241,7 +242,11 @@ const AppGrid = props => { return ( - + {alternativeView === true ? + + : + + } ) diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx index 86728413..f77f1b11 100644 --- a/frontend/src/views/Apps.jsx +++ b/frontend/src/views/Apps.jsx @@ -1019,7 +1019,7 @@ const Apps = (props) => { {activateButton} {editNewButton} {(props.userdata !== undefined && - (props.userdata.role === "admin" || + (props.userdata.admin === "true" || props.userdata.id === selectedApp.owner || selectedApp.owner === "" )) || !selectedApp.generated ? ( @@ -1408,6 +1408,7 @@ const Apps = (props) => { }, [appValidation, isDropzone]); var appDelay = -75 + const appView = isLoggedIn ? ( { )} - {userdata === undefined || userdata === null || userdata.role !== "admin" ? null : + {userdata === undefined || userdata === null || userdata.admin === "false" ? null : { : curTab === 1 ? - + window.location.pathname === "/search" ? + + : + : curTab === 2 ? @@ -162,6 +165,7 @@ const Search = (props) => { null} + //{/*alternativeView={true} />*/} const loadedCheck = isLoaded ?