fix: border colors + some error fix
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import Input from '../../../components/Input'
|
import Input from '../../../components/Input'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { LoginType } from '../types/AuthTypes'
|
import { LoginType } from '../types/AuthTypes'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { OtpVerifyType } from '../types/AuthTypes'
|
import { OtpVerifyType } from '../types/AuthTypes'
|
||||||
import { useFormik } from 'formik'
|
import { useFormik } from 'formik'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import Input from '../../../components/Input'
|
import Input from '../../../components/Input'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { LoginWithPasswordType } from '../types/AuthTypes'
|
import { LoginWithPasswordType } from '../types/AuthTypes'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import Input from '../../../components/Input'
|
import Input from '../../../components/Input'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { CheckHasAccountPhoneType } from '../types/AuthTypes'
|
import { CheckHasAccountPhoneType } from '../types/AuthTypes'
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ const SideBar: FC = () => {
|
|||||||
|
|
||||||
{
|
{
|
||||||
hasSubMenu && (openSidebar || window.innerWidth > 1139) &&
|
hasSubMenu && (openSidebar || window.innerWidth > 1139) &&
|
||||||
<div className='fixed xl:right-[112px] right-[96px] bg-white z-20 xl:top-4 xl:bottom-4 top-0 bottom-0 rounded-tl-[32px] rounded-bl-[32px] w-[190px] border-r'>
|
<div className='fixed xl:right-[112px] right-[96px] bg-white z-20 xl:top-4 xl:bottom-4 top-0 bottom-0 rounded-tl-[32px] rounded-bl-[32px] w-[190px] border-r border-border'>
|
||||||
{
|
{
|
||||||
subMenuName === 'foods' ?
|
subMenuName === 'foods' ?
|
||||||
<FoodsSubMenu />
|
<FoodsSubMenu />
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { DocumentText } from 'iconsax-react'
|
import { DocumentText } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { Pages } from '../../config/Pages'
|
import { Pages } from '../../config/Pages'
|
||||||
@@ -14,7 +14,7 @@ const BlogSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<DocumentText
|
<DocumentText
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { People } from 'iconsax-react'
|
import { People } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { Pages } from '../../config/Pages'
|
import { Pages } from '../../config/Pages'
|
||||||
@@ -14,7 +14,7 @@ const CustomerSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<People
|
<People
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { People } from 'iconsax-react'
|
import { People } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -16,7 +16,7 @@ const CustomersSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<People
|
<People
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { TicketDiscount } from 'iconsax-react'
|
import { TicketDiscount } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -16,7 +16,7 @@ const DiscountSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<TicketDiscount
|
<TicketDiscount
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Element3 } from 'iconsax-react'
|
import { Element3 } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -16,7 +16,7 @@ const FoodsSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Element3
|
<Element3
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Teacher } from 'iconsax-react'
|
import { Teacher } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -16,7 +16,7 @@ const LearningSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Teacher
|
<Teacher
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { DocumentText } from 'iconsax-react'
|
import { DocumentText } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -16,7 +16,7 @@ const OrdersSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<DocumentText
|
<DocumentText
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Receipt21 } from 'iconsax-react'
|
import { Receipt21 } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -16,7 +16,7 @@ const ReceiptSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Receipt21
|
<Receipt21
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Element3 } from 'iconsax-react'
|
import { Element3 } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -17,7 +17,7 @@ const ServicesSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Element3
|
<Element3
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import { clx } from '../../helpers/utils'
|
import { clx } from '../../helpers/utils'
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Headphone } from 'iconsax-react'
|
import { Headphone } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
import { Pages } from '../../config/Pages'
|
import { Pages } from '../../config/Pages'
|
||||||
@@ -17,7 +17,7 @@ const SupportSubMenu: FC = () => {
|
|||||||
|
|
||||||
|
|
||||||
return <div className='py-12'>
|
return <div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Headphone
|
<Headphone
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Messages3 } from 'iconsax-react'
|
import { Messages3 } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
@@ -17,7 +17,7 @@ const TicketSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Messages3
|
<Messages3
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Card } from 'iconsax-react'
|
import { Card } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ const TransactionsSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Card
|
<Card
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Profile } from 'iconsax-react'
|
import { Profile } from 'iconsax-react'
|
||||||
import { FC } from 'react'
|
import { type FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import SubMenuItem from './SubMenuItem'
|
import SubMenuItem from './SubMenuItem'
|
||||||
import { Pages } from '../../config/Pages'
|
import { Pages } from '../../config/Pages'
|
||||||
@@ -14,7 +14,7 @@ const UsersSubMenu: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='py-12'>
|
<div className='py-12'>
|
||||||
<div className='flex gap-3 items-center border-b pb-10 px-6'>
|
<div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
|
||||||
<Profile
|
<Profile
|
||||||
size={24}
|
size={24}
|
||||||
color='#000'
|
color='#000'
|
||||||
|
|||||||
Reference in New Issue
Block a user