Skip to content

Commit

Permalink
Merge remote-tracking branch 'clearcontracts/main' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
mesudip committed Dec 2, 2024
2 parents 2dea559 + fb718e1 commit 5982310
Show file tree
Hide file tree
Showing 16 changed files with 891 additions and 116 deletions.
2 changes: 1 addition & 1 deletion src/components/buttons/connectWalletButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export function ConnectWalletButton(props: Props): JSX.Element {
fontWeight: 500,
color: isHomepage
? theme.palette.secondary.contrastText
: theme.palette.success.contrastText,
: '#FFFFFF',
}}
>
{session.status === 'authenticated'
Expand Down
191 changes: 166 additions & 25 deletions src/components/layout/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,46 +1,187 @@
import Image from 'next/image';
import Link from 'next/link';
import ccLogo from '@/img/cc-logo.svg';
import clarity from '@/img/Clarity.png';
import { GitHub } from '@mui/icons-material';
import { Box, Button } from '@mui/material';
import gradient from '@/img/constitution-gradient.png';
import { Box, Typography, useTheme } from '@mui/material';
import Grid from '@mui/material/Grid2';

import { paths } from '@/paths';

/**
* Footer with Clarity logo & link to repo
* @returns Footer
*/
export function Footer(): JSX.Element {
const theme = useTheme();
return (
<Box
<Grid
container
sx={{
position: 'static',
bottom: 0,
left: 0,
width: '100%',
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
p: 2,

height: '75px',
pt: 8,
pb: 2,
px: {
xs: 2,
sm: 4,
md: 10,
lg: 16,
},
background: 'rgb(13,26,61)',
backgroundImage: `url(${gradient.src})`,
backgroundRepeat: 'no-repeat',
backgroundSize: 'cover',
backgroundPosition: 'center',
}}
>
<Link
href="https://www.clarity.community/"
style={{ textDecoration: 'none' }}
data-testid="clarity-link"
target="_blank"
<Grid
size={{
xs: 12,
md: 4,
}}
sx={{ mt: 2 }}
>
<Link
href="https://cardanoconvention.com/"
style={{ textDecoration: 'none' }}
data-testid="convention-link"
target="_blank"
>
<Image
src={ccLogo}
width={168}
height={25}
alt="Constitutional Convention 2024"
/>
</Link>
</Grid>
<Grid
size={{
xs: 12,
md: 4,
}}
display="flex"
flexDirection="column"
gap={{
xs: 1,
md: 2,
}}
mt={{
xs: 4,
md: 0,
}}
>
<Typography variant="h5" fontWeight="bold">
Useful links
</Typography>
<Link
href="https://www.intersectmbo.org/"
style={{ textDecoration: 'none' }}
data-testid="intersect-link"
target="_blank"
>
<Typography>Intersect</Typography>
</Link>
<Link
href="https://2024constitutionalconsultation.docs.intersectmbo.org/"
style={{ textDecoration: 'none' }}
data-testid="docs-link"
target="_blank"
>
<Typography>Docs</Typography>
</Link>
<Link
href={paths.home}
style={{ textDecoration: 'none' }}
data-testid="intersect-link"
target="_blank"
>
<Typography>Voting</Typography>
</Link>
</Grid>
<Grid
size={{
xs: 12,
md: 4,
}}
display="flex"
flexDirection="column"
gap={{
xs: 1,
md: 2,
}}
mt={{
xs: 4,
md: 0,
}}
>
<Image src={clarity} width="200" height="50" alt="Powered by Clarity" />
</Link>
<Button
href="https://github.com/ClearContracts/cardano-constitution-voting-app"
target="_blank"
data-testid="github-link"
color="primary"
<Typography variant="h5" fontWeight="bold">
Social
</Typography>
<Link
href="https://x.com/IntersectMBO"
style={{ textDecoration: 'none' }}
data-testid="x-link"
target="_blank"
>
<Typography>X</Typography>
</Link>
<Link
href="https://www.linkedin.com/company/intersectmbo/"
style={{ textDecoration: 'none' }}
data-testid="linkedin-link"
target="_blank"
>
<Typography>LinkedIn</Typography>
</Link>
</Grid>
<Box
display="flex"
flexDirection={{
xs: 'column',
md: 'row',
}}
width="100%"
justifyContent="space-between"
alignItems="center"
borderTop={`1px solid ${theme.palette.divider}`}
mt={8}
pt={2}
>
<GitHub />
</Button>
</Box>
<Box display="flex" flexDirection="row" gap={4} alignItems="center">
<Box display="flex" flexDirection="row" gap={1} alignItems="center">
<Typography>Built by </Typography>
<Link
href="https://www.clarity.community/"
style={{ textDecoration: 'none' }}
data-testid="clarity-link"
target="_blank"
>
<Image
src={clarity}
width="150"
height="37.5"
alt="Built by Clarity"
/>
</Link>
</Box>
<Typography color={theme.palette.divider}>|</Typography>
<Link
href="https://github.com/ClearContracts/cardano-constitution-voting-app"
style={{ textDecoration: 'none' }}
data-testid="github-link"
target="_blank"
>
<Typography>GitHub</Typography>
</Link>
</Box>
<Typography>
© {new Date().getFullYear()}. Intersect. All Rights Reserved.
</Typography>
</Box>
</Grid>
);
}
39 changes: 10 additions & 29 deletions src/components/layout/navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Image from 'next/image';
import Link from 'next/link';
import ccLogo from '@/img/cc-logo.png';
import ccLogo from '@/img/cc-logo.svg';
import { Box, Typography } from '@mui/material';

import { paths } from '@/paths';
Expand Down Expand Up @@ -36,38 +36,19 @@ export function Navbar(): JSX.Element {
>
<Box display="flex" flexDirection="row" gap={4} alignItems="center">
<Link
href={paths.home}
href={'https://cardanoconvention.com/'}
style={{ textDecoration: 'none' }}
data-testid="home-logo"
target="_blank"
>
<Box
display={{
xs: 'none',
sm: 'flex',
}}
>
<Image
src={ccLogo}
alt="Constitutional Convention Logo"
width={168}
height={25}
/>
</Box>
<Box
display={{
xs: 'flex',
sm: 'none',
}}
>
<Image
src={ccLogo}
alt="Constitutional Convention Logo"
width={100.8}
height={15}
/>
</Box>
<Image
src={ccLogo}
alt="Constitutional Convention Logo"
width={168}
height={25}
/>
</Link>
<Box display={{ xs: 'none', md: 'flex' }}>
<Box display={{ xs: 'none', sm: 'flex' }}>
<Link
href={paths.home}
style={{
Expand Down
Loading

0 comments on commit 5982310

Please sign in to comment.