Merge branch 'main' of github.com:xuqssq/uppmkt-admin

src/components/Layout/Logo.jsx

@@ -1,18 +1,24 @@
-import React from 'react';
-import { RocketOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
+import React from "react";
 
-const { Text } = Typography;
+import logo from "@/assets/logo.png";
+import logoCollapsed from "@/assets/logo-collapsed.png";
 
 export const Logo = ({ collapsed, isDarkMode }) => (
   <div className="logo">
     <div className="flex items-center justify-center gap-2">
-      <RocketOutlined className="text-2xl text-primary-500" />
-      {!collapsed && (
-        <Text className="text-lg font-semibold m-0" style={{ color: 'var(--primary-color)' }}>
-          Uppeta
-        </Text>
+      {collapsed ? (
+        <div className="flex items-center justify-center">
+          <img
+            src={logoCollapsed}
+            alt="logo"
+            className="w-1/2 object-contain"
+          />
+        </div>
+      ) : (
+        <div className="flex items-center justify-center">
+          <img src={logo} alt="logo" className="w-1/2 object-contain mr-2" />
+        </div>
       )}
     </div>
   </div>
-);
+);

src/components/Layout/MainLayout.jsx

@@ -15,7 +15,7 @@ const MainLayout = () => {
     <Layout className="h-screen overflow-hidden">
       <Sidebar collapsed={collapsed} />
       <Layout className="flex flex-col  ">
-        <Header collapsed={collapsed} setCollapsed={setCollapsed} />
+        <Header collapsed={collapsed} setCollapsed={setCollapsed}/>
         <Content
           className={`
             m-2 p-4 rounded-lg overflow-auto h-full