Merge branch 'develop' into feat/status-page-custom-domain
Resolve conflicts from server reorganization while preserving custom domain support for published status pages.
This commit is contained in:
commit
a37bc63f31
268 files changed
+14697
-12183
No files matched your search
@@ -1,4 +1,4 @@
|
||||
import type { GroupedCheck, NormalizedCheck, NormalizedUptimeCheck, HasResponseTime } from "@/types/index.js";
|
||||
import type { GroupedCheck, HasResponseTime, NormalizedCheck, NormalizedUptimeCheck } from "@/domain/checks/check.type.js";
|
||||
|
||||
export const getDateForRange = (dateRange: string): Date | undefined => {
|
||||
const now = Date.now();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { createLogger, format, transports, Logger as WinstonLogger } from "winston";
|
||||
import type { Logform } from "winston";
|
||||
import dotenv from "dotenv";
|
||||
import { EnvConfig } from "@/service/system/settingsService.js";
|
||||
import { EnvConfig } from "@/domain/app-settings/app-settings.service.js";
|
||||
dotenv.config();
|
||||
|
||||
const SERVICE_NAME = "Logger";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { MaintenanceWindow } from "@/types/index.js";
|
||||
import type { MaintenanceWindow } from "@/domain/maintenance-windows/maintenance-window.type.js";
|
||||
|
||||
export const isWindowActive = (window: MaintenanceWindow, now: Date = new Date()): boolean => {
|
||||
if (!window.active) {
|
||||
|
||||
Reference in new issue
Block a user