💄 UI fixes
Simon Mulquin simon@octree.ch
Tue, 14 Jun 2022 11:26:42 +0000
6 files changed,
25 insertions(+),
24 deletions(-)
M
frontend/containers/DrawerMenu/index.tsx
→
frontend/containers/DrawerMenu/index.tsx
@@ -6,6 +6,7 @@ import DrawerMenuItem from './DrawerMenuItem';
import useStyles from './styles'; import useBannerStore from '../../stores/useBannerStore'; import useEventStore from '../../stores/useEventStore'; +import Box from '@material-ui/core/Box'; const DrawerMenu = () => { const {t} = useTranslation();@@ -22,21 +23,24 @@ <Drawer variant="permanent" className={classes.drawer}>
<DrawerMenuItem title={t('drawer.travels')} onClick={() => { - router.push(`/e/${uuid}`, null, {shallow: true} ); + router.push(`/e/${uuid}`, undefined, {shallow: true}); setAreDetailsOpened(false); }} Icon={<Icon>directions_car</Icon>} active={router.pathname == `/e/[uuid]`} /> - <DrawerMenuItem - title={t('drawer.waitingList')} - onClick={() => { - router.push(`/e/${uuid}/waitingList`, null, {shallow: true}); - setAreDetailsOpened(false); - }} - Icon={<Icon>group</Icon>} - active={router.pathname == `/e/[uuid]/waitingList`} - /> + <Box mb={1.5}> + <DrawerMenuItem + title={t('drawer.waitingList')} + onClick={() => { + router.push(`/e/${uuid}/waitingList`, null, {shallow: true}); + setAreDetailsOpened(false); + }} + Icon={<Icon>group</Icon>} + active={router.pathname == `/e/[uuid]/waitingList`} + /> + </Box> + <DrawerMenuItem title={t('drawer.information')} onClick={() => setAreDetailsOpened(true)}
M
frontend/containers/EventBar/index.tsx
→
frontend/containers/EventBar/index.tsx
@@ -9,7 +9,6 @@ import IconButton from '@material-ui/core/IconButton';
import Tooltip from '@material-ui/core/Tooltip'; import Avatar from '@material-ui/core/Avatar'; import Icon from '@material-ui/core/Icon'; -import clsx from 'clsx'; import {useTranslation} from 'react-i18next'; import useAuthStore from '../../stores/useAuthStore'; import useEventStore from '../../stores/useEventStore';@@ -178,15 +177,6 @@ id="ShareBtn"
onClick={() => setAreDetailsOpened(!areDetailsOpened)} > <Icon>share</Icon> - </IconButton> - <IconButton - className={clsx(classes.iconButtons, 'tour_event_infos')} - color="inherit" - edge="end" - id="ShareBtn" - onClick={() => setAreDetailsOpened(!areDetailsOpened)} - > - <Icon>information_outline</Icon> </IconButton> <IconButton color="inherit"
M
frontend/containers/GenericToolbar/index.tsx
→
frontend/containers/GenericToolbar/index.tsx
@@ -13,6 +13,7 @@ import {ActionType} from '../GenericMenu/Action';
import useBannerStore from '../../stores/useBannerStore'; import Banner from '../../components/Banner'; import useSettings from '../../hooks/useSettings'; +import useLangStore from '../../stores/useLangStore'; const GenericToolbar = ({ title,@@ -27,6 +28,7 @@ const router = useRouter();
const [anchorEl, setAnchorEl] = useState(null); const bannerOffset = useBannerStore(s => s.offset); const bannerHeight = useBannerStore(s => s.height); + const language = useLangStore(s => s.language); const classes = useStyles({bannerOffset, bannerHeight}); const {user} = useProfile(); const settings = useSettings();@@ -37,7 +39,9 @@ : ''
); const announcement = settings?.announcement || ''; const showAnnouncement = - announcement !== '' && announcement !== lastAnnouncementSeen; + language === 'FR' && + announcement !== '' && + announcement !== lastAnnouncementSeen; const onBannerClear = () => { if (typeof announcement != 'undefined') {
M
frontend/containers/TravelColumns/NoCar.tsx
→
frontend/containers/TravelColumns/NoCar.tsx
@@ -45,10 +45,13 @@ }),
noTravelImage: ({image}) => ({ width: image ? '100%' : 0, height: image ? 'auto' : theme.spacing(6), + [theme.breakpoints.down('sm')]: { + width: image ? '50%' : 0, + }, }), share: { marginTop: theme.spacing(6), - backgroundColor: theme.palette.background.default + backgroundColor: '#fff', }, }));
M
frontend/containers/WaitingList/TravelDialog.tsx
→
frontend/containers/WaitingList/TravelDialog.tsx
@@ -184,7 +184,7 @@ },
}, share: { marginTop: theme.spacing(2), - backgroundColor: theme.palette.background.default + backgroundColor: '#fff', }, }));
M
frontend/pages/e/[uuid]/index.tsx
→
frontend/pages/e/[uuid]/index.tsx
@@ -1,5 +1,5 @@
import {useState, useReducer, useEffect} from 'react'; -import {makeStyles, useTheme} from '@material-ui/core/styles'; +import {makeStyles} from '@material-ui/core/styles'; import {useTranslation} from 'react-i18next'; import {initializeApollo} from '../../../lib/apolloClient'; import useToastStore from '../../../stores/useToastStore';