From 001b4d9d9825ee6167dbcdaa7829ee6a138978f1 Mon Sep 17 00:00:00 2001 From: shats Date: Wed, 27 Aug 2025 17:05:36 +0700 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20UI?= =?UTF-8?q?=20=D0=B2=20=D0=BD=D0=B8=D0=B6=D0=BD=D0=B5=D0=BC=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D1=82=D0=B8=D1=82=D1=83=D0=BB=D0=B5=20=D0=B8?= =?UTF-8?q?=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B8=D1=82=D1=8C=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?ASN=20=D0=B8=20CIDR=20=D1=81=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89?= =?UTF-8?q?=D1=8C=D1=8E=20=D0=BC=D0=BE=D0=BD=D0=BE=D1=88=D0=B8=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=88=D1=80=D0=B8=D1=84=D1=82?= =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=D1=85=20ASNs=20=D0=B8=20IPRanges?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/ASNsNewManager.jsx | 2 +- frontend/src/App.jsx | 5 +++ frontend/src/IPRangesManager.jsx | 2 +- frontend/src/components/PageHeaderActions.jsx | 7 ++-- frontend/src/components/S3MetaBar.jsx | 5 ++- frontend/src/lib/datetime.js | 42 +++++++++++++++++++ 6 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 frontend/src/lib/datetime.js diff --git a/frontend/src/ASNsNewManager.jsx b/frontend/src/ASNsNewManager.jsx index c9fcb8b..d951a90 100644 --- a/frontend/src/ASNsNewManager.jsx +++ b/frontend/src/ASNsNewManager.jsx @@ -578,7 +578,7 @@ function ASNsNewManager() { {paginatedItems.map((item) => ( - {item.asn} + {item.asn} {renderCommunityBadge(item.community)} {editingAsn === item.asn ? ( diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index f485b04..5af0209 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -336,6 +336,11 @@ function MainLayout() { } /> +
+
+ Версия UI: {import.meta?.env?.VITE_APP_VERSION || 'dev'} +
+
setSettingsOpen(false)} /> ); diff --git a/frontend/src/IPRangesManager.jsx b/frontend/src/IPRangesManager.jsx index 9f9618c..d0c911d 100644 --- a/frontend/src/IPRangesManager.jsx +++ b/frontend/src/IPRangesManager.jsx @@ -841,7 +841,7 @@ function IPRangesManager() { {paginatedItems.map((item) => ( - {item.ipRange} + {item.ipRange} {renderCommunityBadge(item.community)} {editingIp === item.ipRange ? ( diff --git a/frontend/src/components/PageHeaderActions.jsx b/frontend/src/components/PageHeaderActions.jsx index 590d94d..00343b5 100644 --- a/frontend/src/components/PageHeaderActions.jsx +++ b/frontend/src/components/PageHeaderActions.jsx @@ -9,6 +9,7 @@ import { } from '@tabler/icons-react'; import PortalDropdown from './PortalDropdown.jsx'; import { IconClock } from '@tabler/icons-react'; +import { formatDateTimeWithRelative } from '../lib/datetime.js'; function PageHeaderActions({ loading = false, @@ -149,10 +150,10 @@ function PageHeaderActions({
{lastModified && ( - )}
diff --git a/frontend/src/components/S3MetaBar.jsx b/frontend/src/components/S3MetaBar.jsx index 7276b4a..de263b7 100644 --- a/frontend/src/components/S3MetaBar.jsx +++ b/frontend/src/components/S3MetaBar.jsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import api from '../lib/api.js'; import { IconHash, IconClock, IconFileText, IconRefresh } from '@tabler/icons-react'; +import { formatDateTimeWithRelative } from '../lib/datetime.js'; function S3MetaBar({ keys = [], className = '' }) { const [meta, setMeta] = useState({}); @@ -35,8 +36,8 @@ function S3MetaBar({ keys = [], className = '' }) { const it = meta[k]; return (
- {it?.etag || '—'} - {it?.lastModified ? new Date(it.lastModified).toLocaleString() : '—'} + {it?.etag || '—'} + {it?.lastModified ? formatDateTimeWithRelative(it.lastModified) : '—'} {typeof it?.contentLength === 'number' ? `${it.contentLength} байт` : '—'}