Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Summit 2023 to develop #409

Merged
merged 8 commits into from
Oct 5, 2023
Merged

Summit 2023 to develop #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79a7c6c
Merge pull request #401 from cardano-foundation/develop
cfuisat Oct 4, 2023
65a9b6c
Merge pull request #403 from cardano-foundation/develop
cfuisat Oct 4, 2023
ca2f9d9
fix: big foot changes with support icon
cfuisat Oct 4, 2023
ce8cd1e
Merge pull request #404 from cardano-foundation/fix/final-perks
cfuisat Oct 4, 2023
d7dcf28
fix: clear session
jimcase Oct 4, 2023
8d9b466
Merge pull request #405 from cardano-foundation/fix/clear-session
jimcase Oct 4, 2023
252f50e
fix: leaderboard title fix
cfuisat Oct 4, 2023
3fca3ef
Merge pull request #407 from cardano-foundation/fix/final-perks
cfuisat Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/summit-2023/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/>
<meta
property="og:image"
content="%PUBLIC_URL%/Ballot_2023_share_card.png"
content="%PUBLIC_URL%/static/share-card.png"
/>
<meta
property="og:image:width"
Expand Down
0 .../public/static/Ballot_2023_share_card.png → ui/summit-2023/public/static/share-card.png
View file
Open in desktop
File renamed without changes
3 changes: 2 additions & 1 deletion ui/summit-2023/src/components/common/ConnectWalletButton/ConnectWalletButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import VerifiedIcon from '@mui/icons-material/Verified';
import React from 'react';
import './ConnectWalletButton.scss';
import { env } from 'common/constants/env';
import { getUserInSession, tokenIsExpired } from '../../../utils/session';
import {clearUserInSessionStorage, getUserInSession, tokenIsExpired} from '../../../utils/session';

type ConnectWalletButtonProps = {
disableBackdropClick?: boolean;
Expand Down Expand Up @@ -39,6 +39,7 @@ const ConnectWalletButton = (props: ConnectWalletButtonProps) => {

const onDisconnectWallet = () => {
disconnect();
clearUserInSessionStorage();
eventBus.publish('showToast', 'Wallet disconnected successfully');
};

Expand Down
42 changes: 10 additions & 32 deletions ui/summit-2023/src/components/common/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { Typography, Grid, IconButton, Tooltip } from '@mui/material';
import styles from './Footer.module.scss';
import discordLogo from '../../../common/resources/images/discord-icon.svg';
import ContactSupportOutlinedIcon from '@mui/icons-material/ContactSupportOutlined';
import SupportIcon from '@mui/icons-material/SupportAgent';
import { env } from 'common/constants/env';
import { NavLink } from 'react-router-dom';
import { i18n } from 'i18n';
Expand All @@ -14,7 +14,7 @@ const Footer: React.FC = () => {
container
spacing={1}
direction={{ sm: 'column', md: 'row' }}
justifyContent="center"
justifyContent="space-between"
alignItems="center"
className={styles.footer}
>
Expand All @@ -38,7 +38,7 @@ const Footer: React.FC = () => {
<Grid
item
xs={12}
sm={6}
sm={'auto'}
>
<Grid
container
Expand All @@ -49,7 +49,7 @@ const Footer: React.FC = () => {
<Grid
item
xs={12}
sm={3}
sm={'auto'}
>
<NavLink to="/termsandconditions">
<Typography
Expand All @@ -65,7 +65,7 @@ const Footer: React.FC = () => {
<Grid
item
xs={12}
sm={3}
sm={'auto'}
>
<NavLink to="/privacypolicy">
<Typography
Expand All @@ -81,48 +81,26 @@ const Footer: React.FC = () => {
<Grid
item
xs={12}
sm={4}
>
<Typography
variant="body2"
justifyContent="center"
>
Version {env.APP_VERSION}
<NavLink
to={'https://status2023.voting.summit.cardano.org/'}
target="_blank"
>
<span
className={styles.link}
>
Status
</span>
</NavLink>
</Typography>
</Grid>

<Grid
item
xs={12}
sm={1}
sm={'auto'}
>
<Tooltip
title="Get support"
placement="top"
>
<IconButton
onClick={() => openNewTab(env.DISCORD_SUPPORT_CHANNEL_URL)}
sx={{ m: -1 }}
size="large"
sx={{p: 0, color: '#434656'}}
>
<ContactSupportOutlinedIcon/>
<SupportIcon/>
</IconButton>
</Tooltip>
</Grid>

<Grid
item
xs={12}
sm={1}
sm={'auto'}
>
<Tooltip
title="Join our Discord"
Expand Down
1 change: 0 additions & 1 deletion ui/summit-2023/src/pages/Leaderboard/Leaderboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ const Leaderboard = () => {
</StatsTile>
<StatsTile
title="Votes Per Category"
summary={<span style={{ color: '#061d3c' }}>{statsSum || placeholder}</span>}
dataTestId="votes-per-category"
>
<Grid
Expand Down
2 changes: 1 addition & 1 deletion ui/summit-2023/src/pages/Leaderboard/components/StatsTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styles from './StatsTile.module.scss';

type StatsTilePorps = {
title: string | React.ReactElement;
summary: string | React.ReactElement;
summary?: string | React.ReactElement;
children: React.ReactNode;
dataTestId: string;
};
Expand Down