Merge pull request #85 from Orcania/dev

Dev
Orcania · Aug 18, 2023 · db73617 · db73617
2 parents f3fcc17 + 7d383a3
commit db73617
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 25 deletions.
diff --git a/public/unity/Build/BdaoTreasury WebGL - Copy.data.unityweb b/public/unity/Build/BdaoTreasury WebGL - Copy.data.unityweb
diff --git a/public/unity/Build/BdaoTreasury WebGL - Copy.wasm.code.unityweb b/public/unity/Build/BdaoTreasury WebGL - Copy.wasm.code.unityweb
diff --git a/public/unity/Build/BdaoTreasury WebGL - Copy.wasm.framework.unityweb b/public/unity/Build/BdaoTreasury WebGL - Copy.wasm.framework.unityweb
diff --git a/src/app/(header-footer)/va/page.jsx b/src/app/(header-footer)/va/page.jsx
@@ -30,45 +30,58 @@ export default function Treasury() {
                 Total Value: <span className="fmb text-[12px] font-semibold">${totalValue}</span>
             </h1>
             <div>
-                <div className="flex justify-center items-center fmb text-[12px] font-normal">
-                    <div className="flex-1 flex justify-start items-center gap-20">
+                <div className="flex justify-center items-center fmb text-[12px] font-normal  gap-5 sm:gap-0">
+                    <div className="flex-1 flex justify-start items-center gap-0 sm:gap-20">
                         <h1 className="ml-5 text-start">#</h1>
                         <h1 className="text-start">Name</h1>
                     </div>
                     <div className="flex-1 flex justify-center items-center">
                         <h1 className="text-center">Price</h1>
                     </div>
-                    <div className="flex-1 flex justify-center items-center">
+                    <div className="flex-1 flex justify-center items-center gap-2 sm:gap-20">
                         <h1 className="text-end">Holdings</h1>
                     </div>
+                    <div className="flex-1 flex justify-center items-center gap-2 sm:gap-20">
+                        <h1 className="text-end">Value</h1>
+                    </div>
                 </div>
                 <hr
                     className="my-8"
                     style={{ strokeWidth: "1px", stroke: "rgba(255, 255, 255, 0.50)" }}
                 />
                 <div className="flex flex-col gap-10">
-                    {vasData.sort((a, b) => a.rank - b.rank).map((item, index) => (
-                        <div
-                            key={index}
-                            className="flex justify-center items-center bg-[#E78A74] py-5 text-[14px] font-semibold"
-                            style={{ borderRadius: "5px", background: "rgba(231, 138, 116, 0.15)" }}
-                        >
-                            <div className="flex-1 flex justify-start items-center gap-20">
-                                <h1 className="ml-5 text-start">{item.rank +1 }</h1>
-                                <div className="flex gap-2 justify-center items-center">
-                                    <Image alt="" width={25} height={25} src={item.imageUrl} />
-                                    <h1 className="font-semibold">{item.name}</h1>
-                                    <h1 className="text-[#E26E5D] font-semibold">{item.symbol}</h1>
+                    {vasData
+                        .sort((a, b) => a.rank - b.rank)
+                        .map((item, index) => (
+                            <div
+                                key={index}
+                                className="flex justify-center items-center bg-[#E78A74] py-5 gap-5 sm:gap-0 text-[14px] font-semibold"
+                                style={{
+                                    borderRadius: "5px",
+                                    background: "rgba(231, 138, 116, 0.15)",
+                                }}
+                            >
+                                <div className="flex-1 flex justify-start items-center gap-0 sm:gap-20">
+                                    <h1 className="ml-5 text-start">{item?.rank + 1}</h1>
+                                    <div className="flex gap-2 justify-center items-center">
+                                        <Image alt="" width={25} height={25} src={item?.imageUrl} />
+                                        <h1 className="font-semibold">{item?.name}</h1>
+                                        <h1 className="text-[#E26E5D] font-semibold">
+                                            {item?.symbol}
+                                        </h1>
+                                    </div>
+                                </div>
+                                <div className="flex-1 flex gap-10 justify-center items-center">
+                                    <h1 className="text-center">{item?.price}</h1>
+                                </div>
+                                <div className="flex-1 flex justify-center items-center ">
+                                    <h1 className="text-end">{item?.holdings}</h1>
+                                </div>
+                                <div className="flex-1 flex justify-center items-center ">
+                                    <h1 className="text-center">${item?.value}</h1>
                                 </div>
                             </div>
-                            <div className="flex-1 flex justify-center items-center">
-                                <h1 className="text-center">{item.price}</h1>
-                            </div>
-                            <div className="flex-1 flex justify-center items-center">
-                                <h1 className="text-end">{item.holdings}</h1>
-                            </div>
-                        </div>
-                    ))}
+                        ))}
                 </div>
             </div>
         </div>

diff --git a/src/app/layout.jsx b/src/app/layout.jsx
@@ -28,7 +28,7 @@ export default function RootLayout({ children }) {
             <body className={`${ibm.variable} ${ps2p.variable}`}>
                 <LoadingComponent />
                 {/* <Header /> */}
-                <div className="bg-[#FBBC99]">
+                <div className="bg-[#FFB898]">
                     <section className="pt-[81px]"></section>
                     {children}
                 </div>

diff --git a/src/layout/header-layout/header.component.jsx b/src/layout/header-layout/header.component.jsx
@@ -35,7 +35,7 @@ const Header = () => {
 
     return (
         <nav
-            className={`bg-[#D86F60] fixed w-full z-50 top-0 left-0  ${
+            className={`bg-[#FFB898] fixed w-full z-50 top-0 left-0  ${
                 scrollY <= 100 ? "md:bg-transparent" : "md:bg-[#D86F60]"
             } transition-colors duration-300`}
         >