diff --git a/frontend/src/App.js b/frontend/src/App.js index a5a3cc502..a1d1e089b 100755 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -33,7 +33,7 @@ export default ({ history, location }) => { }, [location, history]) useEffect(() => { - + if (isAuthenticated) { if (isSessionExpired) { setLoading(true) @@ -41,9 +41,9 @@ export default ({ history, location }) => { dispatch(AuthActions.renewSession()).then(() => { setLoading(false) }) - } else { - setLoading(false) - } + } else { + setLoading(false) + } } else { setLoading(false) } diff --git a/frontend/src/components/events/EventHeroImage/index.js b/frontend/src/components/events/EventHeroImage/index.js index 00174d338..6dca4c55a 100644 --- a/frontend/src/components/events/EventHeroImage/index.js +++ b/frontend/src/components/events/EventHeroImage/index.js @@ -83,6 +83,7 @@ export default ({ onBack, backgroundColor, alignRight, + isPreview = false, }) => { const dispatch = useDispatch() const classes = useStyles({ backgroundColor }) @@ -145,7 +146,7 @@ export default ({ wrapperClass={classes.backButtonWrapper} className={classes.buttonInner} > - + )} - + ) } diff --git a/frontend/src/hooks/useQuery.js b/frontend/src/hooks/useQuery.js new file mode 100644 index 000000000..eae464b7b --- /dev/null +++ b/frontend/src/hooks/useQuery.js @@ -0,0 +1,19 @@ +import { useLocation, useHistory } from 'react-router-dom' + +export function useQuery() { + const { search } = useLocation() + const history = useHistory() + + function getQuery(key) { + const params = new URLSearchParams(search) + return params.get(key) + } + + function setQuery(key, value) { + const params = new URLSearchParams(search) + params.set(key, value) + history.push({ search: params.toString() }) + } + + return { getQuery, setQuery } +} diff --git a/frontend/src/pages/_events/EventPageCustomizationPreviewModal.js b/frontend/src/pages/_events/EventPageCustomizationPreviewModal.js new file mode 100644 index 000000000..1798f0927 --- /dev/null +++ b/frontend/src/pages/_events/EventPageCustomizationPreviewModal.js @@ -0,0 +1,29 @@ +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 + +