Merge pull request #20 from BuidlerDAO/NIG-431

feat: style review
BuidlerDAO · Feb 4, 2024 · 2fd8656 · 2fd8656
2 parents f81b2f6 + 95860f6
commit 2fd8656
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 17 deletions.
diff --git a/src/content/drawer/index.tsx b/src/content/drawer/index.tsx
@@ -85,7 +85,7 @@ export default function PersistentDrawerRight() {
         anchor="right"
         open={open}
       >
-        <div className="flex h-full">
+        <div className="flex">
           <div className="h-[24px] w-[24px] mt-[37px] mx-[2px]">
             <ChevronRightIcon onClick={handleDrawerClose} className="m-0 w-[24px] cursor-pointer" />
           </div>

diff --git a/src/content/drawer/logoButton.tsx b/src/content/drawer/logoButton.tsx
@@ -5,7 +5,7 @@ const LogoButton = () => {
     <div className="absolute right-0 rounded-full m-0 w-[50px] h-[50px] cursor-pointer">
       <img
         src="https://cdn.oasiscircle.xyz/circle/2392B974-347E-4F8D-8E06-BA0941D5195C.1707035754946.0xA0B5B5"
-        className="mx-0 p-0 mt-[120px] w-[50px] h-[50px]"
+        className="mx-0 p-0 mt-[120px] w-[50px] h-[50px] rounded-full"
         alt="Logo"
       />
     </div>

diff --git a/src/content/loginPage/congratulationPage.tsx b/src/content/loginPage/congratulationPage.tsx
@@ -10,7 +10,7 @@ interface CongratulationPageProps {
 
 const CongratulationPage: FC<CongratulationPageProps> = ({ handleButtonClick }) => {
   return (
-    <div className="w-full justify-center text-center items-center">
+    <div className="w-full justify-center text-center items-center min-h-screen">
       <p className="text-[#0F1419] text-[24px] leading-[38px] font-bold text-center mt-[81px] mb-[44px]">
         Congratulations!
       </p>

diff --git a/src/content/loginPage/invitePage.tsx b/src/content/loginPage/invitePage.tsx
@@ -47,7 +47,7 @@ const InvitePage: FC<InvitePageProps> = ({ handleButtonClick }) => {
     }
   };
   return (
-    <div className="w-full px-[34px] justify-center text-center items-center">
+    <div className="w-full px-[34px] justify-center text-center items-center min-h-screen">
       <p className=" mt-[81px] text-[#0F1419] text-[24px] leading-[38px] font-bold text-center">
         Invite Code
       </p>

diff --git a/src/content/loginPage/signInWithXPage.tsx b/src/content/loginPage/signInWithXPage.tsx
@@ -10,7 +10,7 @@ interface SignInWithXPageProps {
 
 const SignInWithXPage: FC<SignInWithXPageProps> = ({ handleButtonClick }) => {
   return (
-    <div className="w-full justify-center text-center items-center">
+    <div className="w-full justify-center text-center items-center min-h-screen">
       <img
         className="mx-auto mt-[81px] mb-[32px] w-[120px] h-[120px]"
         src="https://ik.imagekit.io/pqilkfzt7wb/xfans/logo_SPGs-kd5v.png?updatedAt=1706859358184"

diff --git a/src/welcome/Profile/Reward.tsx b/src/welcome/Profile/Reward.tsx
@@ -145,7 +145,7 @@ const Reward = () => {
                       </div>
                     </div>
 
-                    <span className="text-sm font-medium">#{item.rank}</span>
+                    <span className="text-sm font-medium">#{i + 1}</span>
                   </div>
 
                   <p className="text-black text-xs leading-[20px]">{item.text}</p>

diff --git a/src/welcome/Profile/index.tsx b/src/welcome/Profile/index.tsx
@@ -30,7 +30,7 @@ const Profile = (props: { handleButtonClick?: () => void }) => {
   };
 
   return (
-    <div className="flex flex-col w-[433px] max-w-[433px]">
+    <div className="flex flex-col w-[433px] max-w-[433px] min-h-screen">
       <div className="px-[15px] py-[10px] flex items-center justify-between">
         <div className="space-x-2 flex items-center">
           <img

diff --git a/src/welcome/Wallet/Profile.tsx b/src/welcome/Wallet/Profile.tsx
@@ -95,25 +95,88 @@ const ProfileModal = () => {
     },
   ];
 
+  const holder16 = [
+    {
+      holder: (
+        <div className="flex items-center space-x-1">
+          <img
+            onClick={openProfile}
+            src="https://s3-alpha-sig.figma.com/img/b0e6/1e6e/9e0b10bc7df7f8b016a4a4b14a72390c?Expires=1707696000&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=jnbGI97jQAvsSduElyoEwhWDBy3ytk-UwcwPR4fNFQEGeEQV~28hanQuhf5r6umsnzldxFhwhONJyKMjTNU2r2st4byQ6livJ7w6D6wI6ZbYfm7MZIMfy5JnzMqplGZ5CWHjnzw84MCz8NlIHKnNlWjWKZajIc6izKmEAz9pMrPxCdOSFT~BTODNdLX9X8cQ52IVybWUQyDjieMs3g69nQrGSufNTGiAjlfO6ZOJj1-R5C7zpMmozB5NCDRCpyQjHuwK6bpVYKF3UomzKKTgts6gX1OcJFyLDoqdugwOiVUuz8GBT6AMunwKhFjIYWTewHsEJiM2evEe8ST1BAX5Yw__"
+            alt=""
+            className="w-5 rounded-full cursor-pointer"
+          />
+          <span className="text-[#0F1419] text-xs">Patricia Smith</span>
+        </div>
+      ),
+      shares: 4,
+      value: (
+        <div className="flex items-center space-x-1">
+          <Icon />
+          <span className="text-[#0F1419] text-xs">2.132</span>
+        </div>
+      ),
+    },
+    {
+      holder: (
+        <div className="flex items-center space-x-1">
+          <img
+            onClick={openProfile}
+            src="https://s3-alpha-sig.figma.com/img/a943/c456/1554d0938e310067d530a29ef6ff1664?Expires=1707696000&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=pJNMzft~d6XupbZFvcLHyodBsjJTxF7efO9NOhhuM3umsQ6eQgcuugzffRuin4KDl7fOI4dSwu64XS5i2UcBXCCr~jiUsqf8afYa-rcLlTkS8mIC-p2N~OxV9bK1qPFhdGEbLF6Bv8r5KtXSeK5eWnmyUjDVLKjOM-2t7uPL8Z~Uc83MuZGGWiTiF2a16x~sKBwqSuOm7cFI85vzwB2xz1zOzn~dL7fwVVm52zbOuoqMg0v-oRi238IkEOgEt0Yup4Huk47ApntDZRzENu3devBDz~fqIBwQANqBXEG1Gq0lHdl7JgDem9oUTAUZjnHHqoOYIhmvDPPt~aVS0MXnpg__"
+            alt=""
+            className="w-5 rounded-full cursor-pointer"
+          />
+          <span className="text-[#0F1419] text-xs">Brenda Wilson</span>
+        </div>
+      ),
+      shares: 16,
+      value: (
+        <div className="flex items-center space-x-1">
+          <Icon />
+          <span className="text-[#0F1419] text-xs">3.612</span>
+        </div>
+      ),
+    },
+    {
+      holder: (
+        <div className="flex items-center space-x-1">
+          <img
+            onClick={openProfile}
+            src="https://s3-alpha-sig.figma.com/img/80e2/698e/d168cf144ccafa1e4ed54123a0b6d7a3?Expires=1707696000&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=ErPGgBW-siAsqlC7hQjIGBFbEXMKzHwZmAQKXuUYt4KlYYnkKwryJpoI~CnKN6AKqjiIyzZUP84Bmmq~qFcXDMor3hAQo6KdioyETNQeLJg3LxoKN~T3E4FeUStL99qDsUu334PMVTqgroF13-8esW7Dx3GqdnU7Dnj-lFIA0VwcfeBHZSm22qXp8Fb0Yha8PHC4XOZ2Z7jj0i1mfcxQXfMG~JU0SC-pRT2z2S19p06HUgFfKSYNemsAMVav-0hFLliWyMq5ed8uvoYlfe8XaURtDtnk59gz8cEX8nBaG-QNbCiWaDlXFqY5Kkl3XseFaRPZBacF2whoYMQfLpjFuA__"
+            alt=""
+            className="w-5 rounded-full cursor-pointer"
+          />
+          <span className="text-[#0F1419] text-xs">Laura Lewis</span>
+        </div>
+      ),
+      shares: 23,
+      value: (
+        <div className="flex items-center space-x-1">
+          <Icon />
+          <span className="text-[#0F1419] text-xs">3.191</span>
+        </div>
+      ),
+    },
+  ];
+
   const ranking = [
     {
       data: (
         <div className="flex items-center space-x-1">
           <img
             onClick={openProfile}
-            src="https://cdn.oasiscircle.xyz/circle/4A5E15E2-2210-40AC-9778-FB5D7CC664A1.1706768249263.0xA0B5B5"
+            src="https://s3-alpha-sig.figma.com/img/d138/c800/8678b73810e3250021201b1c109dfd71?Expires=1707696000&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=B8kiFsfkEy6OxlDBABAKQ9SbzMCUFr1hJz9YucH2N69g-btcYP97j~lPyoYJC6fVOQGGXyr7G7OFMtS1hozUMvkuEsSvyV9f7ysmt6R4WggMeXVhVaEAvfQRqcOvaLvRvt831tVU-B1YR-7R7upWuuIH3B4iUmz6ot4evXmUEInB-NH~zVmkWl5E~kVKKXcX~uxgD8uV0ayHbjFsoxAlZMWbHuTQ2ai9nbBqTTXZfzlon6kOSIc1WVeKWK8qozVpvkp77GHQ1F3nM1HZbMTJZrNNMy8-G3vEJjQLTWHsNZt-3bUgRR5y4-fcPqkP1NHIZ1ezoko3YGY2HndqnzLMWw__"
             alt=""
             className="w-5 rounded-full cursor-pointer"
           />
-          <span className="text-[#0F1419] text-xs">Devon Lane</span>
+          <span className="text-[#0F1419] text-xs">Laura Lewis</span>
         </div>
       ),
       post: 'Autonomous Worlds Ecosystem',
       rank: 17,
       value: (
         <div className="flex items-center space-x-1">
           <Icon />
-          <span className="text-[#0F1419] text-xs">1.002</span>
+          <span className="text-[#0F1419] text-xs">2.102</span>
         </div>
       ),
     },
@@ -122,19 +185,19 @@ const ProfileModal = () => {
         <div className="flex items-center space-x-1">
           <img
             onClick={openProfile}
-            src="https://s3-alpha-sig.figma.com/img/5884/a9a3/850993a22ae68a1d928237508e713a95?Expires=1707696000&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=PUVlmyDBuGd4II7wipQawCSRUyyoxBtJyqdfXBhpYqcPag4kTlvgyDWZ-2IvcF~5kFNqNsf24923sNWKZ8nZL8WxOggJXrejcARhkzwh7G4DCpGN6PpPsbojbKJ3Qv4ZJqd~w6x7vVdcVi1dxsZtNpVzV7M47B9EatTp7nSzXRnMxVhYesCQ02PmC5UvV5TdvYdjQ0jQaNS3mQpebF1tg6UzD6A42UGZFkCZIgcdmekThAWPGexCCjfup9PRWQnQdf~0rdKewsn7LAwxPpR2IwSgivX2O~s46UKJjcVWy9wogq7QX9NAzQIUoV29DVzD18qR7AjB-byeBtuafKvGvg__"
+            src="https://s3-alpha-sig.figma.com/img/1203/cf03/bb9345489f0ac2959e0b644729346c7e?Expires=1707696000&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=QsTTmZc0rLNJgBCpuHWLL5loeEOW6QmPzmNTyrl4bSellvqIS1ieS8bF5kVdkTSeFIi7g1n4rt5WO9xoPLawO71FBgjEbc368XmOSf4jkv3~46VYjLGBvoS3q2~VFMqmU-dK5bVBFk0Y8ayggsqIC4o90qCslk8nfmG2sggPPaeqfDM3fmTFd3sehCELMUEQIBooyeIsUJmU6kxGM-53QxtMrLYJQp774tDSGA9W4rQVtztpPWWqLOOtuXN4lZZMezMcP2WQZyJMOb2zdCY5VoNen6dUeXLqK9~JrfWP8DEqEbGSqbv86QQ1NR8SF-HZ-07kzznXDMP-Th47PJSaQw__"
             alt=""
             className="w-5 rounded-full cursor-pointer"
           />
-          <span className="text-[#0F1419] text-xs">Betty Moore</span>
+          <span className="text-[#0F1419] text-xs">Brenda Wilson</span>
         </div>
       ),
       post: 'Autonomous Worlds Ecosystem',
       rank: 23,
       value: (
         <div className="flex items-center space-x-1">
           <Icon />
-          <span className="text-[#0F1419] text-xs">2.012</span>
+          <span className="text-[#0F1419] text-xs">1.034</span>
         </div>
       ),
     },
@@ -147,15 +210,15 @@ const ProfileModal = () => {
             alt=""
             className="w-5 rounded-full cursor-pointer"
           />
-          <span className="text-[#0F1419] text-xs">William Miller</span>
+          <span className="text-[#0F1419] text-xs">Steven Garcia</span>
         </div>
       ),
       post: 'Autonomous Worlds Ecosystem',
       rank: 45,
       value: (
         <div className="flex items-center space-x-1">
           <Icon />
-          <span className="text-[#0F1419] text-xs">7.126</span>
+          <span className="text-[#0F1419] text-xs">1.126</span>
         </div>
       ),
     },
@@ -269,7 +332,7 @@ const ProfileModal = () => {
                   </TableRow>
                 </TableHead>
                 <TableBody>
-                  {rows.map((row, i) => (
+                  {holder16.map((row, i) => (
                     <TableRow key={i} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
                       <TableCell component="th" scope="row">
                         {row.holder}

diff --git a/src/welcome/Wallet/index.tsx b/src/welcome/Wallet/index.tsx
@@ -153,7 +153,7 @@ const Wallet = (props: { handleButtonClick?: () => void }) => {
   const { openProfile } = useProfileModal((state) => ({ ...state }));
 
   return (
-    <div className="flex flex-col w-[433px] max-w-[433px]">
+    <div className="flex flex-col w-[433px] max-w-[433px] min-h-screen">
       <div className="pl-4 py-3 space-x-[10px] flex items-center">
         <div className="cursor-pointer" onClick={() => props.handleButtonClick?.()}>
           <GoBack />
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,7 +145,7 @@ const Reward = () => { @@
                           </div>
                         </div>
-                        <span className="text-sm font-medium">#{item.rank}</span>
+                        <span className="text-sm font-medium">#{i + 1}</span>
                       </div>
                       <p className="text-black text-xs leading-[20px]">{item.text}</p>
@@ Expand Down @@