diff --git a/frontend/src/App.js b/frontend/src/App.js index 20a9c5560..3d0c40a18 100755 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -1,6 +1,6 @@ import React, { useState, useEffect, Suspense } from 'react' -import { ConnectedRouter, push } from 'connected-react-router' +import { ConnectedRouter } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' import { ApolloProvider } from '@apollo/client' @@ -38,21 +38,13 @@ export default ({ history, location }) => { if (isSessionExpired) { setLoading(true) console.log('renewing session now') - dispatch(AuthActions.renewSession()) - .then(() => { - setLoading(false) - }) - .catch(err => { - console.log(err) - dispatch(SnackbarActions.error('Please, log in again')) - }) - .finally(() => setLoading(false)) - } else { - setLoading(false) + dispatch(AuthActions.renewSession()).catch(err => { + console.log(err) + dispatch(SnackbarActions.error('Please, log in again')) + }) } - } else { - setLoading(false) } + setLoading(false) }, [dispatch, isAuthenticated, isSessionExpired]) return ( diff --git a/frontend/src/components/events/EventHeroImage/index.js b/frontend/src/components/events/EventHeroImage/index.js index 00174d338..6a1876375 100644 --- a/frontend/src/components/events/EventHeroImage/index.js +++ b/frontend/src/components/events/EventHeroImage/index.js @@ -110,37 +110,6 @@ export default ({ - {/* - - - - {event?._eventTimeFormatted} - - - {title ?? event?.name} - - - {subheading} - - - - {event?._eventLocationFormatted} - - - - */} { const event = useSelector(OrganiserSelectors.event) const [organizations] = useAllOrganizations() - const dispatch = useDispatch() + const { getQuery, setQuery } = useQuery() + const isPreviewOpen = getQuery('preview') === 'true' + + // Open the preview modal by setting the preview mode in URL + const handlePreviewOpen = () => setQuery('preview', 'true') + + // Close the preview modal by removing the preview mode from URL + const handlePreviewClose = () => setQuery('preview', 'false') return ( @@ -382,12 +390,7 @@ export default () => { ))} - @@ -407,6 +410,11 @@ export default () => { + ) } diff --git a/frontend/src/pages/_events/EventPageCustomizationPreviewModal.js b/frontend/src/pages/_events/EventPageCustomizationPreviewModal.js new file mode 100644 index 000000000..b4e9521bc --- /dev/null +++ b/frontend/src/pages/_events/EventPageCustomizationPreviewModal.js @@ -0,0 +1,36 @@ +import React from 'react' +import { + Dialog, + DialogTitle, + DialogContent, + DialogActions, +} from '@material-ui/core' +import Button from 'components/generic/Button' + +export default ({ open, onClose, eventSlug }) => { + return ( + + Event Preview + + + + +