Merge pull request #517 from DnD-Montreal/dev-hide-hard-coded-content

Hide hard coded content
DnD-Montreal · Mar 17, 2022 · d016246 · d016246
2 parents 392aded + 8b5b5f8
commit d016246
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 44 deletions.
diff --git a/resources/js/Layouts/ApplicationLayout/ApplicationLayout.tsx b/resources/js/Layouts/ApplicationLayout/ApplicationLayout.tsx
@@ -189,14 +189,6 @@ const ApplicationLayout = ({children}: LayoutProps) => {
                                 {t('common.characters')}
                             </InertiaLink>
                         </PaddingGrid>
-                        <PaddingGrid item xs={12} md={2}>
-                            <InertiaLink
-                                className={route().current()?.includes('trade') ? 'active' : ''}
-                                color='white'
-                                href='/#'>
-                                {t('common.item-shop')}
-                            </InertiaLink>
-                        </PaddingGrid>
                         <PaddingGrid item xs={12} md={2}>
                             <InertiaLink
                                 className={route().current()?.includes('campaign') ? 'active' : ''}

diff --git a/resources/js/Pages/Welcome.tsx b/resources/js/Pages/Welcome.tsx
@@ -1,8 +1,6 @@
-import RoomIcon from '@mui/icons-material/Room'
-import {Box, Card, CardContent, Container, Grid, Typography} from '@mui/material'
+import {Box, Container, Grid, Typography} from '@mui/material'
 import {Select} from 'Components'
 import i18n from 'i18next'
-import {eventData} from 'Mock/event-data'
 import {useTranslation} from 'react-i18next'
 import styled from 'styled-components'
 
@@ -17,22 +15,6 @@ const CenteredGrid = styled(Grid)`
     justify-content: center;
 `
 
-const StyledCardContainer = styled(Grid)`
-    align-items: stretch;
-    justify-content: center;
-    text-align: center;
-`
-
-const StyledCardContent = styled(CardContent)`
-    align-items: stretch;
-    justify-content: center;
-    text-align: center;
-`
-
-const StyledCard = styled(Card)`
-    height: 100%;
-`
-
 const Welcome = () => {
     const {t} = useTranslation()
 
@@ -51,23 +33,6 @@ const Welcome = () => {
                         {t('welcome.welcome-text-2')}
                     </Typography>
                 </Grid>
-                <StyledCardContainer item xs container direction='row' spacing={2}>
-                    <Grid item xs={12}>
-                        <StyledBox>{t('welcome.upcoming-events')}</StyledBox>
-                    </Grid>
-                    {eventData.map((event: {ename: string; date: string}) => (
-                        <Grid item xs={4} key={event.ename}>
-                            <StyledCard>
-                                <StyledCardContent>
-                                    <RoomIcon color='primary' />
-                                    <Typography variant='body2' color='text.secondary'>
-                                        {event.ename} - {event.date}
-                                    </Typography>
-                                </StyledCardContent>
-                            </StyledCard>
-                        </Grid>
-                    ))}
-                </StyledCardContainer>
             </CenteredGrid>
             <Grid container style={{marginTop: 16}}>
                 <Grid item xs={4} />