Merge pull request #137 from TrustlessComputer/feat/whitelist_munual

Feat/whitelist munual
TrustlessComputer · Jan 30, 2024 · 9c4fe43 · 9c4fe43
2 parents 43ad1b3 + 714d481
commit 9c4fe43
Show file tree

Hide file tree

Showing 28 changed files with 633 additions and 120 deletions.
diff --git a/public/images/pie-chart-7.png b/public/images/pie-chart-7.png
diff --git a/public/public-sale/rwbn.png b/public/public-sale/rwbn.png
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -12,6 +12,7 @@ import { MetadataConfig, ViewportConfig } from '@/config';
 import chakraThemes from '@/themes/chakra-themes';
 import { ChakraProvider } from '@chakra-ui/react';
 import dynamic from 'next/dynamic';
+import Script from 'next/script';
 
 export const metadata: Metadata = MetadataConfig;
 export const viewport: Viewport = ViewportConfig;
@@ -30,6 +31,19 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en">
+      <head>
+        <Script
+          async
+          src="https://www.googletagmanager.com/gtag/js?id=G-D9T7LSF6BJ"
+        ></Script>
+        <Script>
+          {`window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', 'G-D9T7LSF6BJ');`}
+        </Script>
+      </head>
       <body>
         <StoreProvider>
           <ChakraProvider theme={chakraThemes}>

diff --git a/src/app/public-sale/page.tsx b/src/app/public-sale/page.tsx
@@ -4,7 +4,7 @@ import PublicSaleModule from '@/modules/PublicSale';
 
 const PublicSale = () => {
   return (
-    <MainLayout headerProps={{bgColor: '#000000'}}>
+    <MainLayout headerProps={{bgColor: '#0E0E0E'}}>
       <div className={s.container}>
         <PublicSaleModule />
       </div>

diff --git a/src/components/DropList/styles.module.scss b/src/components/DropList/styles.module.scss
@@ -7,6 +7,7 @@
     gap: 5px;
     align-items: center;
     font-weight: 500;
+    cursor: pointer;
 
     &.black {
       color: black;

diff --git a/src/modules/PublicSale/AuthForBuy/index.tsx b/src/modules/PublicSale/AuthForBuy/index.tsx
@@ -33,7 +33,7 @@ const AuthForBuy: React.FC<IAuthForBuy> = () => {
           className={s.btnContainer}
         >
           {/*<SvgInset svgUrl="/icons/ic_twitter.svg" />*/}
-          Back $BVM
+          Buy $BVM
         </Button>
       </Flex>
       <GoogleReCaptchaProvider
@@ -48,7 +48,7 @@ const AuthForBuy: React.FC<IAuthForBuy> = () => {
         <BaseModal
           isShow={isOpen}
           onHide={onClose}
-          title={isSigned ? 'Back $BVM' : 'Back $BVM'}
+          title={isSigned ? 'Buy $BVM' : 'Buy $BVM'}
           headerClassName={s.modalHeader}
           className={cs(s.modalContent, isSigned ? s.deposit : s.notSignModal)}
           // size={modalSize}

diff --git a/src/modules/PublicSale/BuyForm/index.tsx b/src/modules/PublicSale/BuyForm/index.tsx
@@ -181,7 +181,7 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
             borderRadius={'100px'}
             p={'4px 8px'}
           >
-            <svg width='16' height='17' viewBox='0 0 16 17' fill='none' xmlns='http://www.w3.org/2000/svg'>
+            {/* <svg width='16' height='17' viewBox='0 0 16 17' fill='none' xmlns='http://www.w3.org/2000/svg'>
               <path d='M13.3334 7.04474H8.96978L9.93947 1.22656L2.66675 9.95383H7.03038L6.06069 15.772L13.3334 7.04474Z'
                     fill='url(#paint0_linear_30263_14863)' />
               <defs>
@@ -191,7 +191,7 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
                   <stop offset='1' stop-color='#35CCA6' />
                 </linearGradient>
               </defs>
-            </svg>
+            </svg> */}
 
             <Text
               fontSize={'14'}
@@ -200,13 +200,13 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
               color={'#000'}
             >
               {token
-                ? `${formatCurrency(
+                ? `+${formatCurrency(
                   userContributeInfo?.view_boost,
                   MIN_DECIMAL,
                   MIN_DECIMAL,
                   'BTC',
                   true,
-                )}%`
+                )}% boost`
                 : '-'}
             </Text>
           </Flex>
@@ -225,7 +225,7 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
       <form className={s.form} onSubmit={formik.handleSubmit}>
         <div className={s.content}>
           <Text fontSize={14} lineHeight={1} fontWeight={400} color={'black'} mb={'12px'}>
-            Total Funded
+            Total
           </Text>
           <Text className={s.fundValue}>
             <NumberScale label={'$'} couters={Number(contributeInfo?.total_usdt_value)} maximumFractionDigits={0} minimumFractionDigits={0} />

diff --git a/src/modules/PublicSale/IntroVideos/index.tsx b/src/modules/PublicSale/IntroVideos/index.tsx
@@ -0,0 +1,18 @@
+import { Box, Flex, Text } from '@chakra-ui/react';
+import BoxContent from '@/layouts/BoxContent';
+
+const IntroVideos = () => {
+  return (
+    <Flex bg="black" justifyContent="center">
+      <BoxContent>
+        <Text fontSize={{ base: "24px", md: "44px" }} mb={{ base: "12px", md: "24px" }} textAlign="center" ml="auto" mr="auto">Bitcoin, reimagined.</Text>
+        <Text fontSize={{ base: "16px", md: "22px" }} textAlign="center" maxWidth="620px" ml="auto" mr="auto">Our mission is to make Bitcoin as generalized as possible — usable for far more than just a currency. We want DeFi, Gaming, AI, DAOs, and NFTs all on Bitcoin.</Text>
+        <Box maxW={{ base: "100%", lg: "1100px" }} alignSelf="center" mt={{ base: "16px", md: "52px" }} mb="80px">
+          <video src="public-sale/public_sale_video.mp4" controls autoPlay={true} />
+        </Box>
+      </BoxContent>
+    </Flex>
+  )
+}
+
+export default IntroVideos;
diff --git a/src/modules/PublicSale/IntroVideos/styles.module.scss b/src/modules/PublicSale/IntroVideos/styles.module.scss
@@ -0,0 +1,3 @@
+.container {
+
+}
diff --git a/src/modules/PublicSale/aboveTheFold/index.tsx b/src/modules/PublicSale/aboveTheFold/index.tsx
@@ -11,6 +11,8 @@ import LeaderBoardVisual from '@/modules/PublicSale/leaderBoardVisual';
 import RaffleButton from '@/modules/PublicSale/raffleButton';
 import Activities from '@/modules/PublicSale/activities';
 import LeaderBoardSwitch from '@/modules/PublicSale/leaderBoardSwitch';
+import RewardButton from '../rewardButton';
+import cs from 'classnames'
 
 const AboveTheFold = () => {
   const { setPlay } = useAnimationStore();
@@ -39,6 +41,7 @@ const AboveTheFold = () => {
           <LeaderBoardVisual />
           {/*<AddMoreContribution />*/}
           <RaffleButton className={s.raffleButton}/>
+          <RewardButton className={cs(s.raffleButton, s.rewardButton)}/>
           <LeaderBoardSwitch classNames={s.boardSwitch} />
         </Flex>
         <Flex className={s.rightSection} direction={"column"}>

diff --git a/src/modules/PublicSale/aboveTheFold/styles.module.scss b/src/modules/PublicSale/aboveTheFold/styles.module.scss
@@ -13,13 +13,12 @@
   }
 
   .leftSection {
-    background: #1B1B1B;
+    background: #1b1b1b;
     padding-top: 80px;
     position: relative;
   }
 
   .rightSection {
-
     @include w-max(768px) {
       height: unset;
     }
@@ -34,7 +33,7 @@
     font-size: 68px;
     font-weight: 400;
     line-height: 100%;
-    color: #FFFFFF;
+    color: #ffffff;
 
     @include is-mobile {
       font-size: 32px;
@@ -45,23 +44,23 @@
     font-size: 36px;
     font-weight: 400;
     line-height: 100%;
-    color: #FFFFFF;
+    color: #ffffff;
 
     @include w-max(768px) {
       font-size: 24px;
     }
   }
 
   .hightlight {
-    color: #FF7E21;
+    color: #ff7e21;
   }
 
   .desc {
     font-weight: 400;
     font-size: 24px;
     line-height: 140%;
     letter-spacing: 0.02em;
-    color: #FFFFFF;
+    color: #ffffff;
     white-space: pre-wrap;
 
     @include w-max(768px) {
@@ -71,9 +70,19 @@
 
   .raffleButton {
     position: absolute;
-    top: 24px;
+
+    :global {
+      --top-spacing: 24px;
+      --item-spacing: 12px;
+    }
+
+    top: var(--top-spacing);
     left: 24px;
 
+    &.rewardButton {
+      top: calc(var(--top-spacing) + var(--item-spacing) + 50px);
+    }
+
     @include is-mobile {
       top: 280px;
     }

diff --git a/src/modules/PublicSale/components/contributorDetailInfo/index.tsx b/src/modules/PublicSale/components/contributorDetailInfo/index.tsx
@@ -29,7 +29,7 @@ const ContributorDetailInfo = ({data}: {data?: ILeaderBoardPoint}) => {
     return [
       {
         id: 'rank',
-        label: <Text pl={"8px"}>TOKEN NAME</Text>,
+        label: <Text pl={"8px"}>TOKEN</Text>,
         labelConfig,
         config: {
           borderBottom: 'none',

diff --git a/src/modules/PublicSale/depositModal/deposit.login.mode.tsx b/src/modules/PublicSale/depositModal/deposit.login.mode.tsx
@@ -135,12 +135,12 @@ const DepositLoginMode = ({ onClose }: { onClose: any }) => {
   return (
     <Flex mt={5} gap={'12px'}>
       <Button
-        onClick={getTwitterOauthUrl}
+        onClick={handleShareTw}
         className={cs(s.btnTweetToSign, s.btnPrimary)}
       >
         <Text>Post to sign-in</Text>
       </Button>
-      <Button onClick={handleShareTw} className={cs(s.btnTweetToSign)}>
+      <Button onClick={getTwitterOauthUrl} className={cs(s.btnTweetToSign)}>
         <Text>Authorize to sign-in</Text>
       </Button>
     </Flex>

diff --git a/src/modules/PublicSale/index.tsx b/src/modules/PublicSale/index.tsx
@@ -8,6 +8,7 @@ import RoadmapModule from '@/modules/PublicSale/roadmap';
 import FAQContent from '@/modules/Whitelist/FAQContent';
 import TopContent from '@/modules/PublicSale/topContent';
 import React from 'react';
+import IntroVideos from '@/modules/PublicSale/IntroVideos';
 
 const PublicSaleModule = () => {
   return (
@@ -18,6 +19,7 @@ const PublicSaleModule = () => {
           <AboveTheFold />
         </div>
       </div>
+      <IntroVideos />
       <RoadmapModule />
       <Allocation />
       <FAQContent />