diff --git a/frontend/src/components/generic/PageHeader/index.js b/frontend/src/components/generic/PageHeader/index.js index 6b93855a..28f71c22 100644 --- a/frontend/src/components/generic/PageHeader/index.js +++ b/frontend/src/components/generic/PageHeader/index.js @@ -1,6 +1,5 @@ import React from 'react' - -import { Link, Typography } from '@mui/material' +import { Link, Typography, Box } from '@mui/material' const PageHeader = ({ heading, @@ -9,32 +8,45 @@ const PageHeader = ({ link = null, alignment = 'center', }) => { - const styling = { - center: 'tw-items-center tw-text-center', - left: 'tw-items-start tw-text-left', - right: 'tw-items-end tw-text-right', + const alignmentMap = { + center: 'center', + left: 'flex-start', + right: 'flex-end', } return ( -
+ {heading} -
- - {subheading} - - - {details} - + + + {subheading && ( + + {subheading} + + )} + {details && ( + + {details} + + )} {!!link && ( )} -
-
+ + ) } diff --git a/frontend/src/pages/_hackerpack/index.js b/frontend/src/pages/_hackerpack/index.js index 819b4544..929a4664 100644 --- a/frontend/src/pages/_hackerpack/index.js +++ b/frontend/src/pages/_hackerpack/index.js @@ -1,37 +1,20 @@ import React, { useState, useEffect } from 'react' import { Box, Typography, Divider, Button } from '@mui/material' - import { useNavigate, useParams } from 'react-router' import HackerpackDetail from 'components/hackerpack/HackerpackDetail' -import PageHeader from 'components/generic/PageHeader' import Footer from 'components/layouts/Footer' import PageWrapper from 'components/layouts/PageWrapper' import GlobalNavBar from 'components/navbars/GlobalNavBar' import Container from 'components/generic/Container' - import ArrowBackIosIcon from '@mui/icons-material/ArrowBackIos' import { Helmet } from 'react-helmet' import config from 'constants/config' import * as DashboardSelectors from 'reducers/dashboard/selectors' import { useSelector } from 'react-redux' - -// const useStyles = styled(theme => ({ -// wrapper: { -// height: '100%', -// display: 'flex', -// flexDirection: 'column', -// alignItems: 'center', -// justifyContent: 'center', -// padding: theme.spacing(3), -// background: 'black', -// color: 'white', -// }, -// })) +import PageHeader from 'components/generic/PageHeader' export default () => { const navigate = useNavigate() - // const classes = useStyles() - const { slug } = useParams() const event = useSelector(DashboardSelectors.event) @@ -42,7 +25,6 @@ export default () => { setHackerpacks(event.hackerpacks) } }, [event, slug]) - console.log(event) return ( { property="og:title" content="Junction App || Hackerpack" /> - { name="twitter:description" content="Login to redeem our awesome hackerpack offers!" /> - @@ -91,6 +71,7 @@ export default () => { content={config.SEO_TWITTER_HANDLE} /> + + { /> {hackerpacks.map(hackerpack => ( - + ))} Anything you would like to see here in the future? - Contact us at partnerships@hackjunction.com with your - suggestion. + Contact us at{' '} + + partnerships@hackjunction.com + {' '} + with your suggestion. diff --git a/frontend/src/pages/_home/index.js b/frontend/src/pages/_home/index.js index 9c05de25..cba8b4a7 100644 --- a/frontend/src/pages/_home/index.js +++ b/frontend/src/pages/_home/index.js @@ -105,20 +105,36 @@ export default () => { - + {/* Logo Centered */} + - - {t('Platform_organise_hack_', { - owner: config.PLATFORM_OWNER_NAME, - })} - - - + + + {/* Heading Centered */} + + {t('Platform_organise_hack_', { + owner: config.PLATFORM_OWNER_NAME, + })} + + + {/* Buttons Centered Horizontally with Spacing */} + - + + + - - - + + + {t('New_to_', { owner: config.PLATFORM_OWNER_NAME_CAPS, })} - {t('Junction_info_', { owner: config.PLATFORM_OWNER_NAME, })} - + {t('More_info_', { owner: config.PLATFORM_OWNER_NAME, - })} + })}{' '} {t('More_info_link_')} - - - - + {t('Join_hackerpack_')} +