diff --git a/README.md b/README.md index bebe8c4..4edee64 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Please refer to [Wiki](https://github.com/lyc8503/UptimeFlare/wiki) - [x] Remove old incidents - [x] ~~Known issue~~: `fetch` doesn't support non-standard port (resolved after CF update) - [x] Compatibility date update -- [x] Scheduled Maintenance +- [x] Scheduled Maintenance - [ ] Update wiki/README and add docs for dev - [ ] Migration to Terraform Cloudflare provider version 5.x - [ ] Cloudflare D1 database diff --git a/components/Header.tsx b/components/Header.tsx index 8729577..12dd976 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -3,7 +3,7 @@ import classes from '@/styles/Header.module.css' import { pageConfig } from '@/uptime.config' import { PageConfigLink } from '@/types/config' -export default function Header() { +export default function Header({ style }: { style?: React.CSSProperties }) { const linkToElement = (link: PageConfigLink, i: number) => { return ( +
- {links?.filter((link) => (link.highlight || link.link.startsWith('/'))).map(linkToElement)} + {links?.filter((link) => link.highlight || link.link.startsWith('/')).map(linkToElement)}
diff --git a/components/MonitorList.tsx b/components/MonitorList.tsx index fdaf7e9..610caf0 100644 --- a/components/MonitorList.tsx +++ b/components/MonitorList.tsx @@ -42,7 +42,9 @@ export default function MonitorList({ // Load expanded groups from localStorage const savedExpandedGroups = localStorage.getItem('expandedGroups') - const expandedInitial = savedExpandedGroups ? JSON.parse(savedExpandedGroups) : Object.keys(group || {}) + const expandedInitial = savedExpandedGroups + ? JSON.parse(savedExpandedGroups) + : Object.keys(group || {}) const [expandedGroups, setExpandedGroups] = useState(expandedInitial) useEffect(() => { localStorage.setItem('expandedGroups', JSON.stringify(expandedGroups)) diff --git a/components/OverallStatus.tsx b/components/OverallStatus.tsx index 3c42ed5..aa1fa78 100644 --- a/components/OverallStatus.tsx +++ b/components/OverallStatus.tsx @@ -58,15 +58,16 @@ export default function OverallStatus({ }) const now = new Date() - let filteredMaintenances: (Omit & { monitors?: MonitorTarget[] })[] = - maintenances - .filter((m) => now >= new Date(m.start) && (!m.end || now <= new Date(m.end))) - .map((maintenance) => ({ - ...maintenance, - monitors: maintenance.monitors?.map( - (monitorId) => monitors.find((mon) => monitorId === mon.id)! - ), - })) + let filteredMaintenances: (Omit & { + monitors?: MonitorTarget[] + })[] = maintenances + .filter((m) => now >= new Date(m.start) && (!m.end || now <= new Date(m.end))) + .map((maintenance) => ({ + ...maintenance, + monitors: maintenance.monitors?.map( + (monitorId) => monitors.find((mon) => monitorId === mon.id)! + ), + })) return ( diff --git a/pages/incidents.tsx b/pages/incidents.tsx index f25451a..98f3fb6 100644 --- a/pages/incidents.tsx +++ b/pages/incidents.tsx @@ -85,7 +85,11 @@ export default function IncidentsPage() {
-
+
@@ -103,10 +107,7 @@ export default function IncidentsPage() { ) : ( monitorFilteredIncidents.map((incident, i) => ( - + )) )} diff --git a/worker/src/index.ts b/worker/src/index.ts index f9b4680..0d9d31e 100644 --- a/worker/src/index.ts +++ b/worker/src/index.ts @@ -38,7 +38,7 @@ const Worker = { new Date(timeNow * 1000) >= new Date(m.start) && (!m.end || new Date(timeNow * 1000) <= new Date(m.end)) ) - .map((e) => (e.monitors || [])) + .map((e) => e.monitors || []) .flat() if (maintenanceList.includes(monitor.id)) {