clean sidebar

src/components/DefaulModal.tsx

@@ -25,7 +25,7 @@ const DefaulModal: FC<Props> = (props: Props) => {
             {
                 props.open && (
                     <Fragment>
-                        <div style={{ maxWidth: props.width }} className='xl:justify-center xl:items-center items-end flex overflow-x-hidden  overflow-y-auto fixed inset-0 z-[9999999]  h-auto top-0 bottom-0 m-auto outline-none focus:outline-none xl:max-w-xl mx-auto'>
+                        <div style={{ maxWidth: props.width }} className='xl:justify-center xl:items-center items-end flex overflow-x-hidden  overflow-y-auto fixed inset-0 z-9999999  h-auto top-0 bottom-0 m-auto outline-none focus:outline-none xl:max-w-xl mx-auto'>
                             <div className='relative xl:h-full max-h-[80%] bottom-0 left-0  flex xl:items-center sm:h-auto w-full xl:my-6 xl:p-2'>
                                 <div className='h-auto p-5 lg:min-w-full overflow-y-auto rounded-3xl rounded-b-none xl:rounded-b-3xl relative flex flex-col w-full outline-none focus:outline-none bg-card border border-border bg-white'>
 

src/pages/order/OrderDetail.tsx

@@ -53,7 +53,7 @@ const OrderDetail: FC = () => {
           <div>
             <div className="flex items-center gap-6">
               {order?.product && (
-                <div className="size-[86px] rounded-lg overflow-hidden flex-shrink-0">
+                <div className="size-[86px] rounded-lg overflow-hidden shrink-0">
                   <img
                     src={order.product.images?.[0]}
                     className="size-full object-cover"

src/pages/request/components/TicketSection.tsx

@@ -199,7 +199,7 @@ const TicketSection: FC = () => {
                     <div className="w-full h-12 bg-white border border-border rounded-xl flex items-center px-3 gap-3 mt-3">
                         <button
                             onClick={togglePlayPause}
-                            className="w-8 h-8 rounded-full bg-black flex items-center justify-center flex-shrink-0"
+                            className="w-8 h-8 rounded-full bg-black flex items-center justify-center shrink-0"
                         >
                             {isPlaying ? (
                                 <Pause size={16} color="#fff" variant="Bold" />

src/shared/Sidebar.tsx

@@ -1,6 +1,6 @@
 import { type FC } from 'react'
 import LogoImage from '@/assets/images/logo.svg'
-import { DocumentText, Element3, Home2, Messages3, NotificationStatus, Receipt21, ShoppingCart, Teacher } from 'iconsax-react'
+import { DocumentText, Element3, Home2, Logout, Messages3, NotificationStatus, Receipt21, ShoppingCart, Teacher } from 'iconsax-react'
 import SideBarItem from './SidebarItem'
 import { Link, useLocation } from 'react-router-dom'
 import { Paths } from '../config/Paths'
@@ -27,7 +27,7 @@ const SideBar: FC = () => {
             <div
                 className={clx(
                     'fixed xl:flex translate-x-[400px] xl:translate-x-0 transition-all ease-in-out opacity-0 invisible xl:visible xl:opacity-100  xl:right-4 right-0 xl:top-4 top-0 xl:bottom-4 bottom-0 xl:rounded-[32px] w-[240px] bg-white flex-col py-12',
-                    openSidebar && 'opacity-100 visible -translate-x-[0px] block z-40'
+                    openSidebar && 'opacity-100 visible translate-x-0 block z-40'
                 )}
             >
                 <div className='px-6'>
@@ -54,17 +54,10 @@ const SideBar: FC = () => {
                         <SideBarItem
                             icon={<Element3 size={iconSizeSideBar} color='#4F5260' />}
                             title={t('sidebar.myRequests')}
-                            isActive={isActive('/my-requests')}
+                            isActive={isActive('request')}
                             link={Paths.request.myRequest}
                         />
 
-                        <SideBarItem
-                            icon={<ShoppingCart size={iconSizeSideBar} color='#4F5260' />}
-                            title={t('sidebar.myOrders')}
-                            isActive={isActive('/orders')}
-                            link={Paths.order.myOrders}
-                        />
-
                         <SideBarItem
                             icon={<Receipt21 size={iconSizeSideBar} color='#4F5260' />}
                             title={t('sidebar.preFactors')}
@@ -72,6 +65,13 @@ const SideBar: FC = () => {
                             link={Paths.proformaInvoice}
                         />
 
+                        <SideBarItem
+                            icon={<ShoppingCart size={iconSizeSideBar} color='#4F5260' />}
+                            title={t('sidebar.myOrders')}
+                            isActive={isActive('order')}
+                            link={Paths.order.myOrders}
+                        />
+
                     </div>
 
                     <div className='mt-10 px-6 text-description text-sm font-bold'>
@@ -111,7 +111,7 @@ const SideBar: FC = () => {
 
                     <div className='flex-1 items-end mt-14 pb-8'>
 
-                        {/* <div className='text-xs text-[#8C90A3]'>
+                        <div className='text-xs text-[#8C90A3]'>
                             <SideBarItem
                                 icon={<Logout variant={isActive('logout') ? 'Bold' : 'Outline'} color={isActive('logout') ? 'black' : '#8C90A3'} size={iconSizeSideBar} />}
                                 title={t('sidebar.logout')}
@@ -119,7 +119,7 @@ const SideBar: FC = () => {
                                 link={`#`}
                                 isLogout
                             />
-                        </div> */}
+                        </div>
                     </div>
                 </div>
             </div>