diff --git a/assets/App.tsx b/assets/App.tsx index 7e7e56d..558c6dc 100644 --- a/assets/App.tsx +++ b/assets/App.tsx @@ -32,6 +32,7 @@ import ConnectorsPage from "./pages/tracking/ConnectorsPage"; import NotFoundPage from "./pages/NotFoundPage"; import {ItemType, MenuItemType} from "antd/lib/menu/interface"; import {t} from 'ttag' +import useBreakpoint from "./hooks/useBreakpoint"; export default function App() { const { @@ -40,6 +41,7 @@ export default function App() { const navigate = useNavigate() const location = useLocation() + const sm = useBreakpoint('sm') const [isAuthenticated, setIsAuthenticated] = useState(false) @@ -184,7 +186,8 @@ export default function App() { return - + {/* Ant will use a break-off tab to toggle the collapse of the sider when collapseWidth = 0*/} + navigate('/login') }]} /> -
- +
Domain - Watchdog ©{new Date().getFullYear()} Created by Maël Gangloff + Watchdog © {new Date().getFullYear()} Created by Maël Gangloff diff --git a/assets/components/search/EventTimeline.tsx b/assets/components/search/EventTimeline.tsx index d04a142..b6e87a3 100644 --- a/assets/components/search/EventTimeline.tsx +++ b/assets/components/search/EventTimeline.tsx @@ -10,8 +10,10 @@ import {Timeline} from "antd"; import React from "react"; import {Domain} from "../../utils/api"; import {t} from "ttag"; +import useBreakpoint from "../../hooks/useBreakpoint"; export function EventTimeline({domain}: { domain: Domain }) { + const sm = useBreakpoint('sm') const domainEvent = { registration: t`Registration`, @@ -30,7 +32,7 @@ export function EventTimeline({domain}: { domain: Domain }) { const locale = navigator.language.split('-')[0] return new Date(e2.date).getTime() - new Date(e1.date).getTime()) .map(({action, date}) => { @@ -56,12 +58,21 @@ export function EventTimeline({domain}: { domain: Domain }) { dot = } + const eventName = Object.keys(domainEvent).includes(action) ? domainEvent[action as keyof typeof domainEvent] : action + const dateStr = new Date(date).toLocaleString(locale) + + const text = sm ? { + children: <>{eventName} {dateStr} + } : { + label: dateStr, + children: eventName, + } + return { - label: new Date(date).toLocaleString(locale), - children: Object.keys(domainEvent).includes(action) ? domainEvent[action as keyof typeof domainEvent] : action, color, dot, - pending: new Date(date).getTime() > new Date().getTime() + pending: new Date(date).getTime() > new Date().getTime(), + ...text } } ) diff --git a/assets/components/tracking/WatchlistForm.tsx b/assets/components/tracking/WatchlistForm.tsx index db9f2a0..965b5ee 100644 --- a/assets/components/tracking/WatchlistForm.tsx +++ b/assets/components/tracking/WatchlistForm.tsx @@ -209,10 +209,17 @@ export function WatchlistForm({form, connectors, onCreateWatchlist}: {