diff --git a/Common/Server/Utils/Monitor/DataToProcess.ts b/Common/Server/Utils/Monitor/DataToProcess.ts index e450894d56..780aea857d 100644 --- a/Common/Server/Utils/Monitor/DataToProcess.ts +++ b/Common/Server/Utils/Monitor/DataToProcess.ts @@ -1,8 +1,8 @@ -import IncomingMonitorRequest from "../../Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; -import ServerMonitorResponse from "../../Types/Monitor/ServerMonitor/ServerMonitorResponse"; -import ProbeMonitorResponse from "../../Types/Probe/ProbeMonitorResponse"; -import LogMonitorResponse from "../../Types/Monitor/LogMonitor/LogMonitorResponse"; -import TraceMonitorResponse from "../../Types/Monitor/TraceMonitor/TraceMonitorResponse"; +import IncomingMonitorRequest from "../../../Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; +import ServerMonitorResponse from "../../../Types/Monitor/ServerMonitor/ServerMonitorResponse"; +import ProbeMonitorResponse from "../../../Types/Probe/ProbeMonitorResponse"; +import LogMonitorResponse from "../../../Types/Monitor/LogMonitor/LogMonitorResponse"; +import TraceMonitorResponse from "../../../Types/Monitor/TraceMonitor/TraceMonitorResponse"; import MetricMonitorResponse from "../../../Types/Monitor/MetricMonitor/MetricMonitorResponse"; type DataToProcess = diff --git a/Common/Server/Utils/VM/VMAPI.ts b/Common/Server/Utils/VM/VMAPI.ts index 51bde53fa7..ea8adb0bad 100644 --- a/Common/Server/Utils/VM/VMAPI.ts +++ b/Common/Server/Utils/VM/VMAPI.ts @@ -1,13 +1,13 @@ import { IsolatedVMHostname } from "../../../Server/EnvironmentConfig"; import ClusterKeyAuthorization from "../../Middleware/ClusterKeyAuthorization"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import Protocol from "../../Types/API/Protocol"; -import Route from "../../Types/API/Route"; -import URL from "../../Types/API/URL"; -import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "../../Types/JSON"; -import API from "../../Utils/API"; +import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../Types/API/HTTPResponse"; +import Protocol from "../../../Types/API/Protocol"; +import Route from "../../../Types/API/Route"; +import URL from "../../../Types/API/URL"; +import ReturnResult from "../../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../../Types/JSON"; +import API from "../../../Utils/API"; import CaptureSpan from "../Telemetry/CaptureSpan"; export default class VMUtil { diff --git a/Common/Server/Utils/VM/VMRunner.ts b/Common/Server/Utils/VM/VMRunner.ts index f97f6a1ea9..e4d620fd91 100644 --- a/Common/Server/Utils/VM/VMRunner.ts +++ b/Common/Server/Utils/VM/VMRunner.ts @@ -1,7 +1,7 @@ -import Dictionary from "../../Types/Dictionary"; -import GenericObject from "../../Types/GenericObject"; -import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "../../Types/JSON"; +import Dictionary from "../../../Types/Dictionary"; +import GenericObject from "../../../Types/GenericObject"; +import ReturnResult from "../../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../../Types/JSON"; import axios from "axios"; import http from "http"; import https from "https"; diff --git a/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts b/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts index 821fdecdda..220f2eb11c 100644 --- a/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts +++ b/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts @@ -1,8 +1,8 @@ -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import { JSONObject } from "../../Types/JSON"; -import API from "../../Utils/API"; +import HTTPErrorResponse from "../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../Types/API/HTTPResponse"; +import URL from "../../../../Types/API/URL"; +import { JSONObject } from "../../../../Types/JSON"; +import API from "../../../../Utils/API"; import WorkspaceMessagePayload from "../../../../Types/Workspace/WorkspaceMessagePayload"; import logger from "../../Logger"; import Dictionary from "../../../../Types/Dictionary"; diff --git a/Common/Server/Utils/Workspace/Slack/Slack.ts b/Common/Server/Utils/Workspace/Slack/Slack.ts index a2af5897e0..dc0326a32b 100644 --- a/Common/Server/Utils/Workspace/Slack/Slack.ts +++ b/Common/Server/Utils/Workspace/Slack/Slack.ts @@ -1,8 +1,8 @@ -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import { JSONObject } from "../../Types/JSON"; -import API from "../../Utils/API"; +import HTTPErrorResponse from "../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../Types/API/HTTPResponse"; +import URL from "../../../../Types/API/URL"; +import { JSONObject } from "../../../../Types/JSON"; +import API from "../../../../Utils/API"; import WorkspaceMessagePayload, { WorkspaceCheckboxBlock, WorkspaceDateTimePickerBlock, diff --git a/Common/Server/Utils/Workspace/WorkspaceBase.ts b/Common/Server/Utils/Workspace/WorkspaceBase.ts index de0f5f45c0..c96c405690 100644 --- a/Common/Server/Utils/Workspace/WorkspaceBase.ts +++ b/Common/Server/Utils/Workspace/WorkspaceBase.ts @@ -20,7 +20,7 @@ import WorkspaceMessagePayload, { } from "../../../Types/Workspace/WorkspaceMessagePayload"; import WorkspaceType from "../../../Types/Workspace/WorkspaceType"; import logger from "../Logger"; -import URL from "../../Types/API/URL"; +import URL from "../../../Types/API/URL"; import CaptureSpan from "../Telemetry/CaptureSpan"; export interface WorkspaceThread { diff --git a/Common/Tests/Server/API/ProbeAPI.test.ts b/Common/Tests/Server/API/ProbeAPI.test.ts index b969476d76..65aa37a5de 100644 --- a/Common/Tests/Server/API/ProbeAPI.test.ts +++ b/Common/Tests/Server/API/ProbeAPI.test.ts @@ -8,9 +8,9 @@ import { import Response from "../../../Server/Utils/Response"; import { mockRouter } from "./Helpers"; import { describe, expect, it } from "@jest/globals"; -import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Probe from "Common/Models/DatabaseModels/Probe"; +import LIMIT_MAX from "../../../Types/Database/LimitMax"; +import PositiveNumber from "../../../Types/PositiveNumber"; +import Probe from "../../../Models/DatabaseModels/Probe"; jest.mock("../../../Server/Utils/Express", () => { return { diff --git a/Common/Tests/Server/Services/TeamMemberService.test.ts b/Common/Tests/Server/Services/TeamMemberService.test.ts index e73f4f270e..ff9cea134f 100644 --- a/Common/Tests/Server/Services/TeamMemberService.test.ts +++ b/Common/Tests/Server/Services/TeamMemberService.test.ts @@ -12,12 +12,12 @@ import TeamMemberServiceHelper from "../TestingUtils/Services/TeamMemberServiceH import TeamServiceHelper from "../TestingUtils/Services/TeamServiceHelper"; import UserServiceHelper from "../TestingUtils/Services/UserServiceHelper"; import { describe, expect, it } from "@jest/globals"; -import Email from "../../Types/Email"; -import ObjectID from "../../Types/ObjectID"; -import Project from "../../Models/DatabaseModels/Project"; -import Team from "../../Models/DatabaseModels/Team"; -import TeamMember from "../../Models/DatabaseModels/TeamMember"; -import User from "../../Models/DatabaseModels/User"; +import Email from "../../../Types/Email"; +import ObjectID from "../../../Types/ObjectID"; +import Project from "../../../Models/DatabaseModels/Project"; +import Team from "../../../Models/DatabaseModels/Team"; +import TeamMember from "../../../Models/DatabaseModels/TeamMember"; +import User from "../../../Models/DatabaseModels/User"; import Faker from "../../../Utils/Faker"; import UserService from "../../../Server/Services/UserService"; import ProjectService from "../../../Server/Services/ProjectService"; diff --git a/Common/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts index 9ebe67520d..734124290d 100644 --- a/Common/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts @@ -6,12 +6,12 @@ import { MeteredSubscription, Subscription, } from "./Types"; -import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan"; -import Email from "Common/Types/Email"; -import ProductType from "Common/Types/MeteredPlan/ProductType"; -import ObjectID from "Common/Types/ObjectID"; +import Email from "../../../../Types/Email"; +import ProductType from "../../../../Types/MeteredPlan/ProductType"; +import ObjectID from "../../../../Types/ObjectID"; import { Stripe } from "stripe"; import Faker from "../../../../Utils/Faker"; +import SubscriptionPlan from "../../../../Types/Billing/SubscriptionPlan"; /// @dev consider modifyfing the EnvirontmentConfig to use functions instead of constants so that we can mock them diff --git a/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts index 04828369e9..1a31ddd88f 100644 --- a/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts @@ -1,8 +1,8 @@ -import Faker from "../../../Utils/Faker"; -import Project from "../../../Models/DatabaseModels/Project"; +import Faker from "../../../../Utils/Faker"; +import Project from "../../../../Models/DatabaseModels/Project"; import SubscriptionPlan, { PlanType, -} from "../../../Types/Billing/SubscriptionPlan"; +} from "../../../../Types/Billing/SubscriptionPlan"; import DatabaseCommonInteractionProps from "../../../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import ProjectService from "../../../../Server/Services/ProjectService"; diff --git a/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts index 2b028028d6..437f917f00 100644 --- a/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts @@ -1,6 +1,6 @@ -import ObjectID from "Common/Types/ObjectID"; -import Faker from "Common/Utils/Faker"; -import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance"; +import ObjectID from "../../../../Types/ObjectID"; +import Faker from "../../../../Utils/Faker"; +import ScheduledMaintenance from "../../../../Models/DatabaseModels/ScheduledMaintenance"; import OneUptimeDate from "../../../../Types/Date"; export default class ScheduledMaintenanceTestService { diff --git a/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts index 2c6448f565..770ade4212 100644 --- a/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts @@ -1,6 +1,6 @@ -import { Black, Yellow } from "Common/Types/BrandColors"; -import ObjectID from "Common/Types/ObjectID"; -import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState"; +import { Black, Yellow } from "../../../../Types/BrandColors"; +import ObjectID from "../../../..//Types/ObjectID"; +import ScheduledMaintenanceState from "../../../../Models/DatabaseModels/ScheduledMaintenanceState"; export default class ScheduledMaintenanceStateTestService { public static generateScheduledState(data: { diff --git a/Common/Tests/Server/TestingUtils/Services/TeamMemberServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/TeamMemberServiceHelper.ts index 9b890de808..2faa826e5e 100644 --- a/Common/Tests/Server/TestingUtils/Services/TeamMemberServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/TeamMemberServiceHelper.ts @@ -1,5 +1,5 @@ -import ObjectID from "Common/Types/ObjectID"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; +import ObjectID from "../../../../Types/ObjectID"; +import TeamMember from "../../../../Models/DatabaseModels/TeamMember"; export default class TeamMemberTestService { public static generateRandomTeamMember(data: { diff --git a/Common/Tests/Server/TestingUtils/Services/TeamServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/TeamServiceHelper.ts index 24319cb969..8de2ce3674 100644 --- a/Common/Tests/Server/TestingUtils/Services/TeamServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/TeamServiceHelper.ts @@ -1,6 +1,6 @@ -import ObjectID from "../../../Types/ObjectID"; -import Team from "../../../Models/DatabaseModels/Team"; -import Faker from "../../../Utils/Faker"; +import ObjectID from "../../../../Types/ObjectID"; +import Team from "../../../../Models/DatabaseModels/Team"; +import Faker from "../../../../Utils/Faker"; import DatabaseCommonInteractionProps from "../../../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import TeamService from "../../../../Server/Services/TeamService"; diff --git a/Common/Tests/Server/TestingUtils/Services/UserServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/UserServiceHelper.ts index 2b03e728e3..4b44ac4605 100644 --- a/Common/Tests/Server/TestingUtils/Services/UserServiceHelper.ts +++ b/Common/Tests/Server/TestingUtils/Services/UserServiceHelper.ts @@ -1,7 +1,7 @@ -import CompanySize from "Common/Types/Company/CompanySize"; -import JobRole from "Common/Types/Company/JobRole"; -import Faker from "Common/Utils/Faker"; -import User from "Common/Models/DatabaseModels/User"; +import CompanySize from "../../../../Types/Company/CompanySize"; +import JobRole from "../../../../Types/Company/JobRole"; +import Faker from "../../../../Utils/Faker"; +import User from "../../../../Models/DatabaseModels/User"; import Email from "../../../../Types/Email"; import DatabaseCommonInteractionProps from "../../../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import UserService from "../../../../Server/Services/UserService"; diff --git a/Common/Tests/Server/Utils/JsonToCsv.test.ts b/Common/Tests/Server/Utils/JsonToCsv.test.ts index 5168662f60..4a47c4cff7 100644 --- a/Common/Tests/Server/Utils/JsonToCsv.test.ts +++ b/Common/Tests/Server/Utils/JsonToCsv.test.ts @@ -1,6 +1,6 @@ import csvConverter from "../../../Server/Utils/JsonToCsv"; import { describe, expect, it } from "@jest/globals"; -import { JSONArray } from "Common/Types/JSON"; +import { JSONArray } from "../../../Types/JSON"; describe("CSV Converter", () => { it("throws an error when the input JSON array is empty", () => { diff --git a/Common/UI/Components/Date/RangeStartAndEndDateEdit.tsx b/Common/UI/Components/Date/RangeStartAndEndDateEdit.tsx index cf0fd3f969..3c9e6ec210 100644 --- a/Common/UI/Components/Date/RangeStartAndEndDateEdit.tsx +++ b/Common/UI/Components/Date/RangeStartAndEndDateEdit.tsx @@ -2,14 +2,14 @@ import React, { FunctionComponent, ReactElement } from "react"; import RangeStartAndEndDateTime from "../../../Types/Time/RangeStartAndEndDateTime"; import StartAndEndDate, { StartAndEndDateType, -} from "../../UI/Components/Date/StartAndEndDate"; +} from "../../../UI/Components/Date/StartAndEndDate"; import InBetween from "../../../Types/BaseDatabase/InBetween"; import TimeRange from "../../../Types/Time/TimeRange"; import Dropdown, { DropdownOption, DropdownValue, -} from "../../UI/Components/Dropdown/Dropdown"; -import DropdownUtil from "../../UI/Utils/Dropdown"; +} from "../../../UI/Components/Dropdown/Dropdown"; +import DropdownUtil from "../../../UI/Utils/Dropdown"; export interface ComponentProps { value?: RangeStartAndEndDateTime | undefined; diff --git a/Common/UI/Components/Detail/Field.ts b/Common/UI/Components/Detail/Field.ts index d14cefca89..7673ac6376 100644 --- a/Common/UI/Components/Detail/Field.ts +++ b/Common/UI/Components/Detail/Field.ts @@ -1,4 +1,4 @@ -import AlignItem from "../../../Types/AlignItem"; +import AlignItem from "../../Types/AlignItem"; import { DropdownOption } from "../Dropdown/Dropdown"; import FieldType from "../Types/FieldType"; import { Size } from "./FieldLabel"; diff --git a/Common/UI/Components/Dictionary/Dictionary.tsx b/Common/UI/Components/Dictionary/Dictionary.tsx index bfe65aca3c..ed26416f33 100644 --- a/Common/UI/Components/Dictionary/Dictionary.tsx +++ b/Common/UI/Components/Dictionary/Dictionary.tsx @@ -10,8 +10,8 @@ import React, { useEffect, useState, } from "react"; -import NumberUtil from "../../Utils/Number"; -import BooleanUtil from "../../Utils/Boolean"; +import NumberUtil from "../../../Utils/Number"; +import BooleanUtil from "../../../Utils/Boolean"; export enum ValueType { Text = "Text", diff --git a/Common/UI/Components/Forms/Types/Field.ts b/Common/UI/Components/Forms/Types/Field.ts index 73f78f96a6..58ef46af66 100644 --- a/Common/UI/Components/Forms/Types/Field.ts +++ b/Common/UI/Components/Forms/Types/Field.ts @@ -7,10 +7,10 @@ import { DropdownOption } from "../../Dropdown/Dropdown"; import { RadioButton } from "../../RadioButtons/GroupRadioButtons"; import FormFieldSchemaType from "./FormFieldSchemaType"; import FormValues from "./FormValues"; -import { DatabaseBaseModelType } from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import MimeType from "../../../Types/File/MimeType"; +import { DatabaseBaseModelType } from "../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import Route from "../../../../Types/API/Route"; +import URL from "../../../../Types/API/URL"; +import MimeType from "../../../../Types/File/MimeType"; import { ReactElement } from "react"; export enum FormFieldStyleType { diff --git a/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts b/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts index 6680ef5923..04ea55f832 100644 --- a/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts +++ b/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts @@ -1,4 +1,4 @@ -import FieldType from "../../../Types/FieldType"; +import FieldType from "../../Types/FieldType"; import FormFieldSchemaType from "../Types/FormFieldSchemaType"; export default class FormFieldSchemaTypeUtil { diff --git a/Common/UI/Components/Graphs/DayUptimeGraph.tsx b/Common/UI/Components/Graphs/DayUptimeGraph.tsx index 410a36c609..83fd5adf74 100644 --- a/Common/UI/Components/Graphs/DayUptimeGraph.tsx +++ b/Common/UI/Components/Graphs/DayUptimeGraph.tsx @@ -10,7 +10,7 @@ import React, { useEffect, useState, } from "react"; -import UptimeEvent from "../../Utils/Uptime/Event"; +import UptimeEvent from "../../../Utils/Uptime/Event"; export type Event = UptimeEvent; diff --git a/Common/UI/Components/Header/HeaderIconDropdownButton.tsx b/Common/UI/Components/Header/HeaderIconDropdownButton.tsx index c7539a1f7a..e5e9488307 100644 --- a/Common/UI/Components/Header/HeaderIconDropdownButton.tsx +++ b/Common/UI/Components/Header/HeaderIconDropdownButton.tsx @@ -1,4 +1,4 @@ -import useComponentOutsideClick from "../../../Types/UseComponentOutsideClick"; +import useComponentOutsideClick from "../../Types/UseComponentOutsideClick"; import Icon, { SizeProp } from "../Icon/Icon"; import Image from "../Image/Image"; import Route from "../../../Types/API/Route"; diff --git a/Common/UI/Components/Header/Notifications/NotificationItem.tsx b/Common/UI/Components/Header/Notifications/NotificationItem.tsx index 4412d0fb1d..97a2091bfb 100644 --- a/Common/UI/Components/Header/Notifications/NotificationItem.tsx +++ b/Common/UI/Components/Header/Notifications/NotificationItem.tsx @@ -1,6 +1,6 @@ import CircularIconImage from "../../Icon/CircularIconImage"; import Icon from "../../Icon/Icon"; -import OneUptimeDate from "../../../Types/Date"; +import OneUptimeDate from "../../../../Types/Date"; import IconProp from "../../../../Types/Icon/IconProp"; import React, { FunctionComponent, ReactElement } from "react"; diff --git a/Common/UI/Components/Header/Notifications/Notifications.tsx b/Common/UI/Components/Header/Notifications/Notifications.tsx index 599b11a3ee..ee4ea55ecf 100644 --- a/Common/UI/Components/Header/Notifications/Notifications.tsx +++ b/Common/UI/Components/Header/Notifications/Notifications.tsx @@ -1,6 +1,6 @@ import Icon from "../../Icon/Icon"; import Link from "../../Link/Link"; -import Route from "../../../Types/API/Route"; +import Route from "../../../../Types/API/Route"; import IconProp from "../../../../Types/Icon/IconProp"; import React, { FunctionComponent, ReactElement } from "react"; diff --git a/Common/UI/Components/Header/ProjectPicker/ProjectPicker.tsx b/Common/UI/Components/Header/ProjectPicker/ProjectPicker.tsx index a8d91f9971..206555a598 100644 --- a/Common/UI/Components/Header/ProjectPicker/ProjectPicker.tsx +++ b/Common/UI/Components/Header/ProjectPicker/ProjectPicker.tsx @@ -4,7 +4,7 @@ import CreateNewProjectButton from "./CreateNewProjectButton"; import ProjectPickerMenu from "./ProjectPickerMenu"; import ProjectPickerMenuItem from "./ProjectPickerMenuItem"; import IconProp from "../../../../Types/Icon/IconProp"; -import Project from "../../../Models/DatabaseModels/Project"; +import Project from "../../../../Models/DatabaseModels/Project"; import React, { FunctionComponent, ReactElement, diff --git a/Common/UI/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx b/Common/UI/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx index 0e9c60865b..9ee86cf15e 100644 --- a/Common/UI/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx +++ b/Common/UI/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx @@ -1,8 +1,8 @@ import Navigation from "../../../Utils/Navigation"; import Icon from "../../Icon/Icon"; -import Route from "../../../Types/API/Route"; +import Route from "../../../../Types/API/Route"; import IconProp from "../../../../Types/Icon/IconProp"; -import Project from "../../../Models/DatabaseModels/Project"; +import Project from "../../../../Models/DatabaseModels/Project"; import React, { FunctionComponent, ReactElement } from "react"; export interface ComponentProps { diff --git a/Common/UI/Components/ModelTable/Column.ts b/Common/UI/Components/ModelTable/Column.ts index 07cd0dadf1..0245fd55e5 100644 --- a/Common/UI/Components/ModelTable/Column.ts +++ b/Common/UI/Components/ModelTable/Column.ts @@ -1,9 +1,9 @@ -import AlignItem from "../../../Types/AlignItem"; -import SelectEntityField from "../../../Types/SelectEntityField"; +import AlignItem from "../../Types/AlignItem"; +import SelectEntityField from "../../Types/SelectEntityField"; import FieldType from "../Types/FieldType"; import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import IconProp from "../../../../Types/Icon/IconProp"; +import IconProp from "../../../Types/Icon/IconProp"; import ObjectID from "../../../Types/ObjectID"; import { ReactElement } from "react"; diff --git a/Common/UI/Components/MonitorGraphs/Uptime.tsx b/Common/UI/Components/MonitorGraphs/Uptime.tsx index 6f4107da69..6519a80868 100644 --- a/Common/UI/Components/MonitorGraphs/Uptime.tsx +++ b/Common/UI/Components/MonitorGraphs/Uptime.tsx @@ -3,7 +3,7 @@ import ErrorMessage from "../ErrorMessage/ErrorMessage"; import DayUptimeGraph, { BarChartRule, Event } from "../Graphs/DayUptimeGraph"; import UptimeUtil from "./UptimeUtil"; import Color from "../../../Types/Color"; -import CommonMonitorEvent from "../../Utils/Uptime/MonitorEvent"; +import CommonMonitorEvent from "../../../Utils/Uptime/MonitorEvent"; import MonitorStatus from "../../../Models/DatabaseModels/MonitorStatus"; import MonitorStatusTimeline from "../../../Models/DatabaseModels/MonitorStatusTimeline"; import StatusPageHistoryChartBarColorRule from "../../../Models/DatabaseModels/StatusPageHistoryChartBarColorRule"; diff --git a/Common/UI/Components/MoreMenu/MoreMenu.tsx b/Common/UI/Components/MoreMenu/MoreMenu.tsx index ef9823b9ce..21013f3192 100644 --- a/Common/UI/Components/MoreMenu/MoreMenu.tsx +++ b/Common/UI/Components/MoreMenu/MoreMenu.tsx @@ -6,7 +6,7 @@ import React, { useState, } from "react"; import IconProp from "../../../Types/Icon/IconProp"; -import useComponentOutsideClick from "../../../Types/UseComponentOutsideClick"; +import useComponentOutsideClick from "../../Types/UseComponentOutsideClick"; import Button, { ButtonStyleType } from "../Button/Button"; export interface ComponentProps { diff --git a/Common/UI/Types/EntityFieldType.ts b/Common/UI/Types/EntityFieldType.ts index 8689218150..f054e38f84 100644 --- a/Common/UI/Types/EntityFieldType.ts +++ b/Common/UI/Types/EntityFieldType.ts @@ -1,9 +1,9 @@ -import Hostname from "../../../Types/API/Hostname"; -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import Email from "../../../Types/Email"; -import Name from "../../../Types/Name"; -import ObjectID from "../../../Types/ObjectID"; +import Hostname from "../../Types/API/Hostname"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import Email from "../../Types/Email"; +import Name from "../../Types/Name"; +import ObjectID from "../../Types/ObjectID"; type FormFieldType = | string diff --git a/Common/UI/Utils/BaseDatabase/GroupBy.ts b/Common/UI/Utils/BaseDatabase/GroupBy.ts index 3df1d24020..9a04ce51e0 100644 --- a/Common/UI/Utils/BaseDatabase/GroupBy.ts +++ b/Common/UI/Utils/BaseDatabase/GroupBy.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import { JSONObject } from "../../../Types/JSON"; type GroupBy = { diff --git a/Common/UI/Utils/BaseDatabase/ListResult.ts b/Common/UI/Utils/BaseDatabase/ListResult.ts index a2189e5f95..402fdc4a76 100644 --- a/Common/UI/Utils/BaseDatabase/ListResult.ts +++ b/Common/UI/Utils/BaseDatabase/ListResult.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import { JSONObject } from "../../../Types/JSON"; export default interface ListResult< diff --git a/Common/UI/Utils/BaseDatabase/Select.ts b/Common/UI/Utils/BaseDatabase/Select.ts index 1c37de7e35..a707d6baca 100644 --- a/Common/UI/Utils/BaseDatabase/Select.ts +++ b/Common/UI/Utils/BaseDatabase/Select.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import { JSONObject } from "../../../Types/JSON"; type Select = {