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

dApp: Points card update #839

Merged
merged 3 commits into from
Nov 12, 2024
Merged

dApp: Points card update #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b64d20
Update `AcrePointsCard` styles
kpyszkowski Nov 8, 2024
ac78d66
Update skeletons and spacings
kpyszkowski Nov 8, 2024
b86ac70
Merge branch 'main' into points-card-update
nkuba Nov 12, 2024
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
Binary file added dapp/src/assets/images/acre-points-illustration.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 28 additions & 17 deletions dapp/src/pages/DashboardPage/AcrePointsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
CardProps,
HStack,
Icon,
Stack,
Image,
Tooltip,
VStack,
} from "@chakra-ui/react"
Expand All @@ -20,6 +20,14 @@ import { IconInfoCircle } from "@tabler/icons-react"
import UserDataSkeleton from "#/components/shared/UserDataSkeleton"
import InfoTooltip from "#/components/shared/InfoTooltip"
import useDebounce from "#/hooks/useDebounce"
import acrePointsIllustrationSrc from "#/assets/images/acre-points-illustration.png"

// TODO: Define colors as theme value
const COLOR_TEXT_LIGHT_PRIMARY = "#1C1A16"
const COLOR_TEXT_LIGHT_TERTIARY = "#7D6A4B"
// TODO: Update `Button` component theme
const COLOR_BUTTON_LABEL = "#FBF7EC"
const COLOR_BUTTON_BACKGROUND = "#33A321"

export default function AcrePointsCard(props: CardProps) {
const {
Expand Down Expand Up @@ -49,7 +57,7 @@ export default function AcrePointsCard(props: CardProps) {
return (
<Card px={4} py={5} {...props}>
<CardHeader p={0} mb={2} as={HStack} justify="space-between">
<TextMd fontWeight="bold" color="grey.700">
<TextMd fontWeight="medium" color="grey.700">
Total Acre points
nkuba marked this conversation as resolved.
Show resolved Hide resolved
</TextMd>

Expand All @@ -64,10 +72,16 @@ export default function AcrePointsCard(props: CardProps) {

<CardBody p={0}>
<UserDataSkeleton>
<H4 mb={2}>{formattedTotalPointsAmount}&nbsp;PTS</H4>
<H4 fontWeight="semibold" mb={2}>
{formattedTotalPointsAmount}
</H4>
</UserDataSkeleton>

<Image src={acrePointsIllustrationSrc} mt={6} />

<UserDataSkeleton>
{isDataReady && (
<VStack px={4} py={3} spacing={0} rounded="lg" bg="gold.100">
<VStack px={4} py={5} spacing={0} rounded="lg" bg="gold.100">
{isCalculationInProgress ? (
<VStack spacing={4}>
{!claimableBalance && (
Expand All @@ -89,32 +103,29 @@ export default function AcrePointsCard(props: CardProps) {
</HStack>
</VStack>
) : (
<Stack
direction={claimableBalance ? "row" : "column"}
spacing={0}
>
<TextMd color="grey.500" textAlign="center">
<HStack spacing={0}>
<TextMd color={COLOR_TEXT_LIGHT_TERTIARY} textAlign="center">
Next drop in
</TextMd>
<Countdown
timestamp={nextDropTimestamp!} // Timestamp presence already checked
onCountdownEnd={handleOnCountdownEnd}
size={claimableBalance ? "md" : "2xl"}
display={claimableBalance ? "inline" : "block"}
ml={claimableBalance ? 2 : 0}
mt={claimableBalance ? 0 : 2}
size="md"
ml={1}
color={COLOR_TEXT_LIGHT_PRIMARY}
/>
</Stack>
</HStack>
)}

{claimableBalance && (
<Button
mt={3}
mt={5}
onClick={debouncedClaimPoints}
w="full"
colorScheme="green"
color="gold.200"
fontWeight="bold"
bgColor={COLOR_BUTTON_BACKGROUND}
color={COLOR_BUTTON_LABEL}
fontWeight="semibold"
size="lg"
>
Claim {formattedClaimablePointsAmount} PTS
Expand Down
2 changes: 0 additions & 2 deletions dapp/src/theme/Countdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ const containerBaseStyle = defineStyle({

const unitBaseStyle = defineStyle({
display: "inline-block",
color: "grey.700",
whiteSpace: "nowrap",
})

const separatorBaseStyle = defineStyle({
display: "inline-block",
color: "grey.300",
})

const multiStyleConfig = createMultiStyleConfigHelpers(PARTS)
Expand Down
Loading