Skip to content

Commit

Permalink
Merge branch 'feat/whitelist_munual' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@camewell071
camewell071 committed Jan 29, 2024
2 parents 20a4f1b + a6c0fee commit 25c5a3a
Show file tree
Hide file tree
Showing 9 changed files with 130 additions and 170 deletions.
Binary file added public/images/pie-chart-4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/wave-chart-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
182 changes: 75 additions & 107 deletions src/modules/PublicSale/BuyForm/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,23 +142,23 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
<Text>
{token
? `$${formatCurrency(
userContributeInfo?.usdt_value,
MIN_DECIMAL,
MIN_DECIMAL,
'BTC',
true,
)}`
userContributeInfo?.usdt_value,
MIN_DECIMAL,
MIN_DECIMAL,
'BTC',
true,
)}`
: '-'}
</Text>
<Text color={"rgba(255, 255, 255, 0.7)"} fontSize={"12px"} fontWeight={"500"}>
<Text color={'rgba(255, 255, 255, 0.7)'} fontSize={'12px'} fontWeight={'500'}>
{token
? `(${formatCurrency(
userContributeInfo?.bvm_balance_not_boost,
MIN_DECIMAL,
MAX_DECIMAL,
'BTC',
false,
)} BVM)`
userContributeInfo?.bvm_balance_not_boost,
MIN_DECIMAL,
MAX_DECIMAL,
'BTC',
false,
)} BVM)`
: '-'}
</Text>
</Flex>
Expand All @@ -177,26 +177,29 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
<Text fontSize={'12px'} fontWeight={'500'} className={s.youGet}>
{token
? formatCurrency(
userContributeInfo?.bvm_balance,
MIN_DECIMAL,
MAX_DECIMAL,
)
userContributeInfo?.bvm_balance,
MIN_DECIMAL,
MAX_DECIMAL,
)
: '-'}{' '}
BVM
</Text>
<Flex
gap={1}
alignItems={'center'}
bg={"linear-gradient(90deg, rgba(0, 245, 160, 0.15) 0%, rgba(0, 217, 245, 0.15) 100%)"}
borderRadius={"100px"}
p={"2px 6px"}
bg={'linear-gradient(90deg, rgba(0, 245, 160, 0.15) 0%, rgba(0, 217, 245, 0.15) 100%)'}
borderRadius={'100px'}
p={'2px 6px'}
>
<svg width="9" height="12" viewBox="0 0 9 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.66601 5.18883H5.39329L6.12056 0.825195L0.666016 7.37065H3.93874L3.21147 11.7343L8.66601 5.18883Z" fill="url(#paint0_linear_30246_12163)"/>
<svg width='9' height='12' viewBox='0 0 9 12' fill='none' xmlns='http://www.w3.org/2000/svg'>
<path
d='M8.66601 5.18883H5.39329L6.12056 0.825195L0.666016 7.37065H3.93874L3.21147 11.7343L8.66601 5.18883Z'
fill='url(#paint0_linear_30246_12163)' />
<defs>
<linearGradient id="paint0_linear_30246_12163" x1="0.666016" y1="6.27974" x2="8.66601" y2="6.27974" gradientUnits="userSpaceOnUse">
<stop stop-color="#00F5A0"/>
<stop offset="1" stop-color="#00D9F5"/>
<linearGradient id='paint0_linear_30246_12163' x1='0.666016' y1='6.27974' x2='8.66601' y2='6.27974'
gradientUnits='userSpaceOnUse'>
<stop stop-color='#00F5A0' />
<stop offset='1' stop-color='#00D9F5' />
</linearGradient>
</defs>
</svg>
Expand Down Expand Up @@ -232,7 +235,6 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
<div className={s.container}>
<form className={s.form} onSubmit={formik.handleSubmit}>
<div className={s.content}>
<Text className={s.title}>Total Funded</Text>
<Text className={s.fundValue}>
$
{formatCurrency(
Expand All @@ -243,93 +245,59 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
true,
)}
</Text>
<Grid className={s.boxInfo} width={'100%'}>
<GridItem>
<Flex
alignItems={'center'}
gap={'16px'}
direction={['column', 'row']}
>
<Column
className={s.blockItem}
value={
<Flex direction={'column'}>
<Text>
{formatCurrency(
contributeInfo?.total_user,
0,
0,
'BTC',
true,
)}
</Text>
<Text
fontSize={'12px'}
fontWeight={'400'}
color={'#FA4E0E'}
textDecoration={'underline'}
onClick={() => setShowContributorModal(true)}
cursor={'pointer'}
lineHeight={"22px"}
>
View all
</Text>
</Flex>
}
title={'Contributors'}
/>
{token ? (
<Tooltip
minW="220px"
bg="white"
boxShadow="rgba(0, 0, 0, 0.15) 1.95px 1.95px 2.6px;"
borderRadius="4px"
padding="16px"
hasArrow
label={<ContributorInfo data={userContributeInfo} />}
>
<ContributorBlock
className={cx(s.contributorBlock, s.blockItem)}
/>
</Tooltip>
) : (
<ContributorBlock className={s.blockItem} />
)}
</Flex>
</GridItem>

<GridItem>
<Column
className={s.blockItem}
value={
<Flex direction={'column'}>
<Countdown
className={s.time}
expiredTime={dayjs
.utc(PUBLIC_SALE_END, 'YYYY-MM-DD HH:mm:ss')
.toString()}
hideIcon={true}
onRefreshEnd={() => setIsEnd(true)}
/>
<Text
fontSize={'12px'}
fontWeight={'400'}
color={'rgba(255,255,255, 0.7)'}
lineHeight={"22px"}
>
{dayjs(PUBLIC_SALE_END).format('MMM D, YYYY h:mm A')}
</Text>
</Flex>
<div>

}
title={'Ends in'}

<Flex direction={'column'} onClick={() => setShowContributorModal(true)}>
<Text>
{formatCurrency(
contributeInfo?.total_user,
0,
0,
'BTC',
true,
)}
</Text>
<Text
>
backers
</Text>
</Flex>
</div>
{token ? (
<Tooltip
minW='220px'
bg='white'
boxShadow='rgba(0, 0, 0, 0.15) 1.95px 1.95px 2.6px;'
borderRadius='4px'
padding='16px'
hasArrow
label={<ContributorInfo data={userContributeInfo} />}
>
<ContributorBlock
className={cx(s.contributorBlock, s.blockItem)}
/>
</GridItem>
</Grid>
</Tooltip>
) : (
<ContributorBlock className={s.blockItem} />
)}

<Flex gap={6} direction={'column'} width={'100%'}>
<Countdown
className={s.time}
expiredTime={dayjs
.utc(PUBLIC_SALE_END, 'YYYY-MM-DD')
.toString()}
hideIcon={true}
onRefreshEnd={() => setIsEnd(true)}
/>
</Flex>

<Flex gap={6} direction={'column'} width={'100%'}>
<AuthForBuy>
<Button
type="submit"
type='submit'
isDisabled={isCreating}
isLoading={isCreating}
// loadingText={'Submitting...'}
Expand Down
15 changes: 3 additions & 12 deletions src/modules/PublicSale/BuyForm/styles.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
align-items: center;
padding: 64px 24px 64px;
padding: 32px 24px 32px;
width: 100%;
max-width: 826px;
margin: 0 auto;
Expand All @@ -11,13 +11,6 @@
padding: 16px;
}

.content {
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}

.title {
font-size: 14px;
font-weight: 400;
Expand All @@ -28,13 +21,11 @@
}

.fundValue {
font-size: 72px;
font-size: 48px;
font-weight: 500;
line-height: 100%;
width: 100%;
text-align: center;
color: #ffffff;
margin-top: 8px;
color: #FA4E0E;

@include is-mobile {
font-size: 48px;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/PublicSale/aboveTheFold/styles.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
.rightSection {
background: #222222;
padding-top: 80px;
height: calc(100dvh + 80px);
height: 100dvh;
overflow-y: auto;
-ms-overflow-style: none; /* Internet Explorer 10+ */
scrollbar-width: none; /* Firefox */
Expand Down
2 changes: 1 addition & 1 deletion src/modules/PublicSale/leaderBoardVisual/AvatarItem/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const AvatarItem = forwardRef((props: IProps, ref: any) => {
<div className={s.meta}>
<p className={s.price} ref={refInertMoney}></p>
{
isShowName && !isYou && <p className={s.name}>{data.twitter_username}</p>
isShowName && data.levelRender === 0 && !isYou && <p className={s.name}>{data.twitter_username}</p>
}
{
isYou && <p className={s.name}>You</p>
Expand Down
42 changes: 23 additions & 19 deletions src/modules/PublicSale/leaderBoardVisual/AvatarItem/styles.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
.meta {
position: absolute;
left: 50%;
bottom: -32px;
bottom: -8px;
transform: translateX(-50%);
}

Expand All @@ -72,7 +72,7 @@
border-radius: 100px;
font-weight: 500;
color: #000;
padding: 6px 12px;
padding: 5px 15px;
line-height: 1.4;
text-align: center;
width: fit-content;
Expand Down Expand Up @@ -115,19 +115,23 @@


&:global(.level-0) {
margin-bottom: 48px;
margin-bottom: 58px;
margin-top: 24px;

.meta{
bottom: -32px;
}

.price {
font-size: clamp(14px, #{vw(140px)}, 16px);
background: linear-gradient(180deg, #FF9776 0%, #FF8139 32.81%, #E04300 100%);
color: white;
margin-bottom: 5px;
padding: 6px clamp(16px, #{vw(140px)}, 20px);
}

.name {
font-size: clamp(16px, #{vw(140px)}, 18px);
margin-bottom: 5px;
font-size: clamp(14px, #{vw(140px)}, 16px);
}

.avatarItem_avatar {
Expand All @@ -141,50 +145,50 @@
&:global(.level-1) {
margin-bottom: 48px;

margin-left: clamp(14px, #{vw(110px)}, 19px);
margin-right: clamp(14px, #{vw(110px)}, 19px);
margin-left: clamp(14px, #{vw(88px)}, 19px);
margin-right: clamp(14px, #{vw(88px)}, 19px);

.price {
font-size: clamp(12px, #{vw(110px)}, 18px);
font-size: clamp(12px, #{vw(88px)}, 14px);
background: linear-gradient(90deg, #00F5A0 0%, #00D9F5 100%);
}


.avatarItem_avatar {
* {
width: 110px !important;
height: 110px !important;
width: 88px !important;
height: 88px !important;
}
}
}

&:global(.level-2) {
margin-bottom: 40px;
margin-left: clamp(14px, #{vw(80px)}, 20px);
margin-right: clamp(14px, #{vw(80px)}, 20px);
margin-left: clamp(14px, #{vw(60px)}, 20px);
margin-right: clamp(14px, #{vw(60px)}, 20px);

.price {
font-size: clamp(12px, #{vw(80px)}, 16px);
font-size: clamp(12px, #{vw(60px)}, 14px);
}

.avatarItem_avatar {
* {
width: 80px !important;
height: 80px !important;
width: 60px !important;
height: 60px !important;
}
}
}

&:global(.level-3) {

margin-bottom: 60px;
margin-left: clamp(14px, #{vw(60px)}, 20px);
margin-right: clamp(14px, #{vw(60px)}, 20px);

.price {
font-size: clamp(12px, #{vw(60px)}, 14px);
padding: 4px clamp(4px, #{vw(60px)}, 8px);
}

margin-left: clamp(12px, #{vw(60px)}, 18px);
margin-right: clamp(12px, #{vw(60px)}, 18px);

.avatarItem_avatar {
* {
width: 60px !important;
Expand Down
Loading

0 comments on commit 25c5a3a

Please sign in to comment.