fix: fix bug

Pear104 · Jul 12, 2024 · 80e8f65 · 80e8f65
1 parent dc4f0f6
commit 80e8f65
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/frontend/src/layouts/CheckoutLayout.tsx b/frontend/src/layouts/CheckoutLayout.tsx
@@ -270,7 +270,9 @@ export default function CheckoutLayout() {
             </div>
             <div className="flex justify-between">
               <div>Discount</div>
-              <div className="font-semibold">{totalDiscount * 100 + "%"}</div>
+              <div className="font-semibold">
+                {(totalDiscount * 100).toFixed(0) + "%"}
+              </div>
             </div>
           </div>
           <Divider />

diff --git a/frontend/src/pages/dashboard/components/DashboardHeader.tsx b/frontend/src/pages/dashboard/components/DashboardHeader.tsx
@@ -66,7 +66,7 @@ export default function DashboardHeader() {
               anchor="bottom end"
               className="w-52 origin-top-right rounded-xl border border-white/5 bg-black p-1 text-sm/6 text-white [--anchor-gap:var(--spacing-1)] focus:outline-none"
             >
-              <MenuItem>
+              {/* <MenuItem>
                 {({ active }) => (
                   <a
                     href="/profile"
@@ -77,7 +77,7 @@ export default function DashboardHeader() {
                     Your Profile
                   </a>
                 )}
-              </MenuItem>
+              </MenuItem> */}
 
               <MenuItem>
                 <Button

diff --git a/frontend/src/pages/dashboard/components/Sidebar.tsx b/frontend/src/pages/dashboard/components/Sidebar.tsx
@@ -389,19 +389,23 @@ export default function Sidebar() {
       {/* Sidebar */}
       <div className="sm:hidden flex flex-col bg-neutral-800 w-auto h-auto text-white overflow-y-auto">
         <Link to={"/"} className="flex items-center gap-2 px-1 py-3 mx-3">
-          <Gem strokeWidth={1.75} />
-          <div className="text-neutral-100 text-xl">DatJ</div>
+          <Gem strokeWidth={1.75} width={15} />
+          <div className="text-neutral-100 text-sm">DatJ</div>
         </Link>
         <Button
-          className="mx-3"
-          type="primary"
+          className="mx-3 w-8 flex justify-center ml-6 bg-neutral-800"
+          type="link"
           onClick={toggleCollapsed}
           style={{ marginBottom: 16, transition: "all 0.5s" }}
         >
-          {collapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}
+          {collapsed ? (
+            <MenuUnfoldOutlined className="mt-1" />
+          ) : (
+            <MenuFoldOutlined className="mt-1" />
+          )}
         </Button>
         <Menu
-          className="bg-neutral-800 text-neutral-100 items-center p-4  "
+          className="bg-neutral-800 text-neutral-100 items-center p-4 "
           mode="inline"
           theme="dark"
           inlineCollapsed={collapsed}

diff --git a/frontend/src/pages/home/components/Content.tsx b/frontend/src/pages/home/components/Content.tsx
@@ -47,7 +47,7 @@ const SecondContentSection = () => {
           </div>
           <div>
             <a
-              href="./"
+              href="/about"
               className="inline-block py-2 px-4 font-bold border-2 border-black hover:scale-95 transition-all"
             >
               ABOUT DATJ

diff --git a/frontend/src/pages/product/accessory/AccessoryDetail.tsx b/frontend/src/pages/product/accessory/AccessoryDetail.tsx
@@ -200,7 +200,7 @@ export default function AccessoryDetail() {
                 )}
               </Form>
               {!currentDiamond && (
-                <div className="text-xl py-6 w-full bg-gray-200 text-slate-500 hover:scale-95 transition-all rounded-md">
+                <div className="text-xl py-6 w-full bg-gray-200 text-slate-500 hover:scale-95 transition-all rounded-md cursor-not-allowed">
                   <div className="text-center uppercase">
                     Choose this accessory
                   </div>