diff --git a/src/app/deals/components/desktop/DealsTable/useDealsTableColumns.tsx b/src/app/deals/components/desktop/DealsTable/useDealsTableColumns.tsx index 45a1858..2c1e3c3 100644 --- a/src/app/deals/components/desktop/DealsTable/useDealsTableColumns.tsx +++ b/src/app/deals/components/desktop/DealsTable/useDealsTableColumns.tsx @@ -1,6 +1,7 @@ import { useMemo } from "react"; import { MRT_ColumnDef } from "mantine-react-table"; import { DealSchema } from "@/lib/client"; +import { utcDateTimeToLocalString } from "@/utils/datetime"; const useDealsTableColumns = () => { return useMemo[]>( @@ -19,7 +20,7 @@ const useDealsTableColumns = () => { header: "Дата создания", accessorKey: "createdAt", Cell: ({ row }) => - new Date(row.original.createdAt).toLocaleString("ru-RU"), + utcDateTimeToLocalString(row.original.createdAt), enableSorting: true, sortingFn: (rowA, rowB) => new Date(rowB.original.createdAt).getTime() - diff --git a/src/components/layout/Navbar/Navbar.tsx b/src/components/layout/Navbar/Navbar.tsx index 98a6928..9c1eec6 100644 --- a/src/components/layout/Navbar/Navbar.tsx +++ b/src/components/layout/Navbar/Navbar.tsx @@ -1,5 +1,5 @@ import { IconCircleDotted, IconLayoutKanban } from "@tabler/icons-react"; -import { Flex } from "@mantine/core"; +import { Box, Flex } from "@mantine/core"; import PageBlock from "@/components/layout/PageBlock/PageBlock"; import { ColorSchemeToggle } from "@/components/ui/ColorSchemeToggle/ColorSchemeToggle"; import Logo from "@/components/ui/Logo/Logo"; @@ -20,26 +20,28 @@ const linksData = [ const Navbar = () => { return ( - - - + + - - + + + + + - - + + ); }; diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts index 117259c..01824e7 100644 --- a/src/utils/datetime.ts +++ b/src/utils/datetime.ts @@ -11,6 +11,10 @@ export const localDateTimeToString = (datetime: string | Date) => { return date.toLocaleString("ru").substring(0, 17); }; -export const utcDateTimeToLocalString = (datetime: string | Date) => { - return localDateTimeToString(utcDateToLocal(datetime)); +export const utcDateTimeToLocalString = ( + datetime: string | Date, + withSeconds: boolean = false +) => { + const res = localDateTimeToString(utcDateToLocal(datetime)); + return withSeconds ? res : res.substring(0, 17); };