Merge branch 'feat/whitelist_munual' of github.com:TrustlessComputer/…

…bvm-website into feat/whitelist_munual
TrustlessComputer · Jan 30, 2024 · 714d481 · 714d481
2 parents 5e5f753 + 0acc676
commit 714d481
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 18 deletions.
diff --git a/public/images/pie-chart-7.png b/public/images/pie-chart-7.png
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/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
@@ -33,17 +33,19 @@ const Activities = React.memo(() => {
         tag: 'Day 1',
         title: 'Fully on-chain gaming on Bitcoin',
         src: 'public-sale/playGame.png',
-        ctas: [{
-          title: 'Play games on Arcade',
-          type: 'link',
-          link: 'https://bitcoinarcade.xyz/'
-        }],
-        desc: `Play hyper-casual mobile games on Bitcoin Arcade.<br/>Total rewards: <strong>30M $ARCA</strong> testnet tokens.`
+        ctas: [],
+        desc: `
+Bitcoin Arcade is a Bitcoin L2 designed for gaming (aka. the Immutable of Bitcoin). It’s powered by BVM with these modules: Bitcoin for security, EigenDA for data availability, and Optimism for execution.<br/><br/>
+On the first day of BVM’s launch, you’ll play incredibly fun games. These are the first fully on-chain on Bitcoin. Both the game logic and game states are stored on-chain.<br/><br/>
+Rewards: 30 million $ARCA testnet tokens, which can be converted to the $ARCA mainnet tokens in March.<br/><br/>
+How to play: Go to <a href='https://play.bitcoinarcade.xyz' target='_blank' style='text-decoration: underline; color: #FA4E0E'>https://play.bitcoinarcade.xyz</a> and enter the private invite code ARCADE.<br/><br/>
+Good luck and have fun!
+`
       },
       {
         key: 1,
         tag: 'Day 2',
-        title: 'BRC-20 Futures Trading Competition',
+        title: 'BRC-20 Perpetual Futures on Bitcoin',
         src: 'public-sale/playGame.png',
         ctas: [{
           title: 'Trade on Naka',
@@ -55,7 +57,7 @@ const Activities = React.memo(() => {
       {
         key: 2,
         tag: 'Day 3',
-        title: 'Playing with Lego at BVM network',
+        title: 'Modular on Bitcoin',
         src: 'public-sale/playGame.png',
         ctas: [{
           title: 'Play with modular blocks',
@@ -67,7 +69,7 @@ const Activities = React.memo(() => {
       {
         key: 3,
         tag: 'Day 4',
-        title: 'Poker Friday Night on Bitcoin',
+        title: 'Fully on-chain poker on Bitcoin',
         src: 'public-sale/playGame.png',
         ctas: [{
           title: 'Play games on Arcade',
@@ -79,7 +81,7 @@ const Activities = React.memo(() => {
       {
         key: 4,
         tag: 'Day 5',
-        title: 'Get Fit & Raise Charity on Bitcoin',
+        title: 'Running Bitcoin',
         src: 'public-sale/playGame.png',
         ctas: [{
           title: 'Run with Alphas',
@@ -91,7 +93,7 @@ const Activities = React.memo(() => {
       {
         key: 5,
         tag: 'Day 6',
-        title: 'Get Fit & Raise Charity on Bitcoin',
+        title: 'Running Bitcoin',
         src: 'public-sale/playGame.png',
         ctas: [{
           title: 'Run with Alphas',
@@ -103,7 +105,7 @@ const Activities = React.memo(() => {
       {
         key: 6,
         tag: 'Day 7',
-        title: 'Last day',
+        title: 'AI x Bitcoin',
         src: 'public-sale/playGame.png',
         desc: 'Details of Day 7 will be provided as soon as Day 6 is completed.'
       },
@@ -153,7 +155,7 @@ const Activities = React.memo(() => {
 
   const renderItem = (item: GameItemProps, index: number) => {
     const isDisable = index > currentDay.diffDay;
-    const title = isDisable ? <img src={'/public-sale/textblur.png'} alt={"textblur"}/> : item.title
+    const title = isDisable ? item.title : item.title
     return (
       <AccordionItem isDisabled={index > currentDay.diffDay} className={styles.itemWrapper}>
         {({ isExpanded }) => (

diff --git a/src/modules/PublicSale/activities/styles.module.scss b/src/modules/PublicSale/activities/styles.module.scss
@@ -14,10 +14,10 @@
   &__title {
     align-self: stretch;
     color: #FFFFFF;
-    font-size: 18px;
+    font-size: 24px;
     font-style: normal;
     font-weight: 400;
-    line-height: 28px;
+    line-height: 140%;
     margin-bottom: 8px;
   }
 }
@@ -86,6 +86,7 @@
     padding: 10px 16px !important;
     background-color: rgba(black, .8);
     //border: 1px solid rgba(white, .10);
+    cursor: default !important;
 
     button {
       padding: 0 !important;

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 />

diff --git a/src/modules/PublicSale/leaderBoardVisual/AvatarItem/styles.module.scss b/src/modules/PublicSale/leaderBoardVisual/AvatarItem/styles.module.scss
@@ -271,6 +271,7 @@
 .isYou {
   .price {
     background: linear-gradient(90deg, #FFE259 0%, #FFA751 100%) !important;
+    color: black !important;
   }
 
 }
diff --git a/src/modules/PublicSale/raffleButton/styles.module.scss b/src/modules/PublicSale/raffleButton/styles.module.scss
@@ -126,6 +126,8 @@
     background-repeat: no-repeat;
     padding: 8px;
     align-items: flex-start;
+    width: 156px;
+    height: 156px;
 
     > img {
       min-width: 140px;

diff --git a/src/modules/bvm_v2/Allocation/index.tsx b/src/modules/bvm_v2/Allocation/index.tsx
@@ -48,7 +48,7 @@ const Allocation = () => {
             >
               <Flex flex={1}>
                 <Image
-                  src={'/images/pie-chart-6.png'}
+                  src={'/images/pie-chart-7.png'}
                   alt={'Allocation chart'}
                   flex={1}
                   mx="auto"

diff --git a/src/modules/landing/Componets/Hero/JoinAllowList/index.tsx b/src/modules/landing/Componets/Hero/JoinAllowList/index.tsx
@@ -21,6 +21,7 @@ const JoinAllowList = ({isFooter}: {isFooter?: boolean}) => {
   const router = useRouter();
   const [isCreating, setIsCreating] = useState(false);
   const [totalUser, setTotalUser] = useState<string>('');
+  const [totalDeposit, setTotalDeposit] = useState('');
   const [listUser, setListUser] = useState<ILeaderBoardPoint[]>([]);
 
   const isPublicSale = React.useMemo(() => checkIsPublicSale(), [])
@@ -30,6 +31,7 @@ const JoinAllowList = ({isFooter}: {isFooter?: boolean}) => {
       if (isPublicSale) {
         const response = await getPublicSaleSummary();
         setTotalUser(response.total_user.toString());
+        setTotalDeposit(response.total_usdt_value.toString())
       } else {
         const response = await getTopLeaderBoards({ page: 1, limit: 20 });
         const topWhiteList = response.data.filter((item, index) => index < 5);
@@ -61,7 +63,15 @@ const JoinAllowList = ({isFooter}: {isFooter?: boolean}) => {
               {isPublicSale ? (
                 (!!totalUser && Number(totalUser || 0)) ? (
                   <Chars delay={delay + .4}>
-                    Join <span>{formatCurrency(totalUser, 0, 0)}</span> people backing us building the future of Bitcoin.
+                    {/*Join <span>{formatCurrency(totalUser, 0, 0)}</span> people backing us building the future of Bitcoin.*/}
+                    Join the <span>{formatCurrency(totalUser, 0, 0)}</span> early contributors backing us with
+                    {" "}<span>${formatCurrency(
+                      totalDeposit || '0',
+                      0,
+                      0,
+                      'BTC',
+                      true,
+                    )}</span> to build the future of Bitcoin.
                   </Chars>
                 ) : (
                   <Chars delay={delay + .4}>

diff --git a/src/modules/landing/Componets/Hero/JoinAllowList/styles.module.scss b/src/modules/landing/Componets/Hero/JoinAllowList/styles.module.scss
@@ -86,7 +86,7 @@
     font-style: normal;
     font-weight: 400;
     line-height: 130%;
-    max-width: 571px;
+    max-width: 620px;
 
     @include is-mobile {
       font-size: 20px;