diff --git a/src/App.css b/src/App.css index b817aaa..64e4904 100644 --- a/src/App.css +++ b/src/App.css @@ -104,7 +104,7 @@ .profile-dropdown:hover { border-radius: 8px; - background: #7c7c7c; + cursor: pointer; } .profile-dropdown-ava { @@ -865,6 +865,10 @@ border-radius: 8px; } */ +.ant-pagination-item { + width: 40px; +} + .btn-refresh-dark img { animation: none; transition: transform 0.2s linear; diff --git a/src/App.tsx b/src/App.tsx index 25d9bdb..c22547e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -481,7 +481,7 @@ const App: React.FC = () => { > - +
e.preventDefault()} diff --git a/src/Components/CallRequests/Call.tsx b/src/Components/CallRequests/Call.tsx index 87adef4..a518f56 100644 --- a/src/Components/CallRequests/Call.tsx +++ b/src/Components/CallRequests/Call.tsx @@ -11,6 +11,8 @@ import { } from "antd"; import { TCall } from "../../types/CallRequests/TCall"; import { TSocket } from "../../types/common/TSocket"; +import { LeftOutlined, RightOutlined } from "@ant-design/icons"; +import { theme } from "antd"; const Call = ({ socketData }: { socketData: TSocket | undefined }) => { const [status, setStatus] = useState("Awaiting"); @@ -19,10 +21,11 @@ const Call = ({ socketData }: { socketData: TSocket | undefined }) => { const { data, isLoading, refetch } = useCallData({ status: status, page: page, - page_size: 10, + page_size: 15, }); - const theme = localStorage.getItem("theme") === "true" ? true : false; + // const theme = localStorage.getItem("theme") === "true" ? true : false; + const { token } = theme.useToken(); useEffect(() => { setTableData(data?.data); @@ -98,13 +101,42 @@ const Call = ({ socketData }: { socketData: TSocket | undefined }) => {
- {/* - - { let num = e.target.value; @@ -113,11 +145,19 @@ const Call = ({ socketData }: { socketData: TSocket | undefined }) => { } }} /> - - */} + ); }; diff --git a/src/Components/Companies/Companies.tsx b/src/Components/Companies/Companies.tsx index 9abcb65..923e266 100644 --- a/src/Components/Companies/Companies.tsx +++ b/src/Components/Companies/Companies.tsx @@ -30,7 +30,7 @@ const Company = () => { name: search, is_active: undefined, page: page, - page_size: 10, + page_size: 15, }); const timerRef = useRef(null); diff --git a/src/Components/Customers/Customers.tsx b/src/Components/Customers/Customers.tsx index 93b5ac1..d5b2061 100644 --- a/src/Components/Customers/Customers.tsx +++ b/src/Components/Customers/Customers.tsx @@ -19,19 +19,13 @@ const Customer = () => { setOpen(true); }; - const page_size = 10; - - const handlePageChange = (page: number) => { - setPage(page); - }; - const { token } = theme.useToken(); const [search, setSearch] = useState(""); const { data, isLoading, refetch } = useCustomerData({ name: search, is_active: undefined, - page_size: 10, + page_size: 15, page: page, }); @@ -142,9 +136,9 @@ const Customer = () => { {/* setPage(page)} /> */} diff --git a/src/Components/Profile/Profile.tsx b/src/Components/Profile/Profile.tsx index c7bb893..d1b93be 100644 --- a/src/Components/Profile/Profile.tsx +++ b/src/Components/Profile/Profile.tsx @@ -1,4 +1,5 @@ import { useState } from "react"; +import dayjs from "dayjs"; import { LineChart, @@ -88,6 +89,12 @@ const Profile = () => { tasks: stat.number_of_tasks, })); + const firstDayOfMonth = dayjs().startOf("month"); // Oyning birinchi kuni + // const lastDayOfMonth = dayjs().endOf("month"); + const today = dayjs(); + + const dateFormat = "YYYY-MM-DD"; + return (
@@ -165,13 +172,17 @@ const Profile = () => { {data && data.team !== "" && ( - - - + {role === "Owner" || role === "Tech Support" ? ( + "" + ) : ( + + + + )} )} @@ -185,7 +196,13 @@ const Profile = () => { justifyContent: "flex-start", }} > - +