fix: title width & warning icon
parent
5966c6dcbb
commit
90672ac88d
|
|
@ -1,6 +1,6 @@
|
|||
import { Text, Tooltip } from '@mantine/core'
|
||||
import { MonitorState, MonitorTarget } from '@/types/uptime.types'
|
||||
import { IconAlertCircle, IconCircleCheck } from '@tabler/icons-react'
|
||||
import { IconAlertCircle, IconAlertTriangle, IconCircleCheck } from '@tabler/icons-react'
|
||||
import DetailChart from './DetailChart'
|
||||
import DetailBar from './DetailBar'
|
||||
import { getColor } from '@/util/color'
|
||||
|
|
@ -37,18 +37,18 @@ export default function MonitorDetail({
|
|||
/>
|
||||
)
|
||||
|
||||
// check in maintenances
|
||||
// Hide real status icon if monitor is in maintenance
|
||||
const now = new Date()
|
||||
const hasMaintenance = (maintenances || [])
|
||||
.filter((m) => (!m.start && !m.end) || (m.start && m.end && now >= m.start && now <= m.end))
|
||||
.find((maintenance) => maintenance.monitors?.includes(monitor.id))
|
||||
if (hasMaintenance)
|
||||
statusIcon = (
|
||||
<IconAlertCircle
|
||||
<IconAlertTriangle
|
||||
style={{
|
||||
width: '1.25em',
|
||||
height: '1.25em',
|
||||
color: hasMaintenance?.color,
|
||||
color: '#fab005',
|
||||
marginRight: '3px',
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ export default function MonitorList({
|
|||
shadow="sm"
|
||||
padding="lg"
|
||||
radius="md"
|
||||
ml="xl"
|
||||
mr="xl"
|
||||
ml="md"
|
||||
mr="md"
|
||||
mt="xl"
|
||||
withBorder={!groupedMonitor}
|
||||
style={{ width: groupedMonitor ? '897px' : '865px' }}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { Maintenances, Monitor } from '@/types/config'
|
||||
import { Alert, Card, Center, Container, List, ListItem, Text, Title } from '@mantine/core'
|
||||
import { IconCircleCheck, IconAlertCircle, IconInfoCircle } from '@tabler/icons-react'
|
||||
import { Alert, Center, Container, List, Text, Title } from '@mantine/core'
|
||||
import { IconCircleCheck, IconAlertCircle, IconAlertTriangle } from '@tabler/icons-react'
|
||||
import { useEffect, useState } from 'react'
|
||||
|
||||
function useWindowVisibility() {
|
||||
|
|
@ -82,7 +82,7 @@ export default function OverallStatus({
|
|||
|
||||
return (
|
||||
<>
|
||||
<Container size="md" mt="xl" style={{ width: '897px' }}>
|
||||
<Container size="md" mt="xl">
|
||||
<Center>{icon}</Center>
|
||||
<Title mt="sm" style={{ textAlign: 'center' }} order={1}>
|
||||
{statusString}
|
||||
|
|
@ -97,11 +97,14 @@ export default function OverallStatus({
|
|||
filteredMaintenances.map((maintenance, idx) => (
|
||||
<Alert
|
||||
key={idx}
|
||||
icon={<IconInfoCircle />}
|
||||
icon={<IconAlertTriangle />}
|
||||
title={maintenance.title}
|
||||
color={maintenance.color || 'primary'}
|
||||
mt="md"
|
||||
ml="md"
|
||||
mr="md"
|
||||
withCloseButton={false}
|
||||
style={{ maxWidth: '865px', margin: '0 auto' }}
|
||||
>
|
||||
<Text>
|
||||
{maintenance.start && (
|
||||
|
|
|
|||
Loading…
Reference in New Issue