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

traffic fix & design on Cards #723

Merged
merged 1 commit into from
Dec 2, 2023
Merged

traffic fix & design on Cards #723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 42 additions & 31 deletions src/modules/explorer/pages/DAOList/components/DAOItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { useProposals } from "services/services/dao/hooks/useProposals"
import { ProposalStatus } from "services/services/dao/mappers/proposal/types"
import { usePolls } from "modules/lite/explorer/hooks/usePolls"
import dayjs from "dayjs"
import { formatNumber } from "modules/explorer/utils/FormatNumber"
import BigNumber from "bignumber.js"

const Container = styled(Grid)(({ theme }: { theme: Theme }) => ({
"background": theme.palette.primary.main,
Expand All @@ -18,7 +20,7 @@ const Container = styled(Grid)(({ theme }: { theme: Theme }) => ({
"padding": "34px 48px",
"minWidth": "340px",
"alignContent": "baseline",
"gap": 18,
"gap": 30,
"maxHeight": 282,

["@media (max-width:760px)"]: {
Expand All @@ -38,16 +40,23 @@ const Container = styled(Grid)(({ theme }: { theme: Theme }) => ({
}
}))

const SymbolText = styled(Typography)({
fontSize: "18px",
const SymbolText = styled(Typography)(({ theme }: { theme: Theme }) => ({
fontSize: "24px",
fontWeight: 300,
color: "#bfc5ca",
lineHeight: "normal",
marginTop: 8,
marginLeft: "12%",

["@media (max-width:1335px)"]: {
fontSize: "16px"
[theme.breakpoints.down("md")]: {
fontSize: 18
},

[theme.breakpoints.down("sm")]: {
fontSize: 18,
marginLeft: "0%"
}
})
}))

const NameText = styled(Typography)(({ theme }) => ({
whiteSpace: "nowrap",
Expand Down Expand Up @@ -85,6 +94,11 @@ const ItemText = styled(Typography)({
whiteSpace: "pre"
})

const ItemTextSmall = styled(Typography)({
fontWeight: 600,
fontSize: 16
})

const Badge = styled(Grid)(({ theme, dao_type }: { theme: Theme; dao_type: string }) => ({
"borderRadius": "50px",
"padding": "8px 16px",
Expand Down Expand Up @@ -114,7 +128,7 @@ export const DAOItem: React.FC<{
}
}> = ({ dao }) => {
const theme = useTheme()
const isExtraSmall = useMediaQuery(theme.breakpoints.down("xs"))
const isExtraSmall = useMediaQuery(theme.breakpoints.down("sm"))
const daoType = dao.dao_type.name
const daoHref =
daoType !== "lambda" && daoType !== "lite"
Expand All @@ -123,18 +137,6 @@ export const DAOItem: React.FC<{
? `dao/${dao.id}`
: `lite/dao/${dao.id}`

const { data: activeProposals } = useProposals(dao.id, ProposalStatus.ACTIVE)
const { data: polls } = usePolls(dao.id)
const activeLiteProposals = polls?.filter(p => Number(p.endTime) > dayjs().valueOf())

const getTotalActiveProposals = () => {
if (daoType === "lite") {
return activeLiteProposals?.length
} else {
return (activeProposals ? activeProposals?.length : 0) + (activeLiteProposals ? activeLiteProposals?.length : 0)
}
}

return (
<Link underline="none" href={daoHref}>
<Container container justifyContent="space-between">
Expand All @@ -151,20 +153,29 @@ export const DAOItem: React.FC<{
<Grid container direction="row">
<DescriptionText>{ReactHtmlParser(dao.description)}</DescriptionText>
</Grid>
<Grid container direction="row" justifyContent="space-between">
<Grid xs={3} container item direction="column">
<ItemText color="textPrimary">DAO {"\n"}Token</ItemText>
<SymbolText>{dao?.symbol?.toUpperCase()}</SymbolText>
</Grid>
<Grid xs={3} container item direction="column">
<ItemText color="textPrimary">Voting {"\n"}Addresses</ItemText>{" "}
<SymbolText>{dao.votingAddressesCount}</SymbolText>
{!isExtraSmall ? (
<Grid container direction="row" justifyContent="space-between">
<Grid md={5} sm={5} container item direction="row">
<ItemText color="textPrimary">DAO {"\n"}Token</ItemText>
<SymbolText>{dao?.symbol?.toUpperCase()}</SymbolText>
</Grid>
<Grid md={5} xs={5} container item direction="row" justifyContent="flex-end">
<ItemText color="textPrimary">Voting {"\n"}Addresses</ItemText>{" "}
<SymbolText>{formatNumber(new BigNumber(dao.votingAddressesCount))}</SymbolText>
</Grid>
</Grid>
<Grid xs={3} container item direction="column">
<ItemText color="textPrimary">Active {"\n"}Proposals</ItemText>
<SymbolText>{getTotalActiveProposals()}</SymbolText>
) : (
<Grid container direction="row" justifyContent="space-between">
<Grid xs={6} container item direction="column">
<ItemTextSmall color="textPrimary">DAO {"\n"}Token</ItemTextSmall>
<SymbolText>{dao?.symbol?.toUpperCase()}</SymbolText>
</Grid>
<Grid xs={6} container item direction="column">
<ItemTextSmall color="textPrimary">Voting Addresses</ItemTextSmall>
<SymbolText>{formatNumber(new BigNumber(dao.votingAddressesCount))}</SymbolText>
</Grid>
</Grid>
</Grid>
)}
</Container>
</Link>
)
Expand Down
Loading