From c65761448d45a4499787b3a2a080a263395cf419 Mon Sep 17 00:00:00 2001
From: Carlos Valente <carlosvalente@pm.me>
Date: Sat, 15 Feb 2025 14:01:24 +0100
Subject: [PATCH] refactor: simplify import paths

---
 .../src/common/components/input/colour-input/SwatchPicker.tsx | 4 ++--
 .../common/components/navigation-menu/FloatingNavigation.tsx  | 2 +-
 .../src/common/components/navigation-menu/ViewLockedIcon.tsx  | 2 +-
 .../common/components/view-params-editor/ViewParamsEditor.tsx | 2 +-
 apps/client/src/common/hooks/useFadeOutOnInactivity.tsx       | 3 ++-
 apps/server/src/utils/development.ts                          | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/common/components/input/colour-input/SwatchPicker.tsx b/apps/client/src/common/components/input/colour-input/SwatchPicker.tsx
index 8607c20a1..a129d2278 100644
--- a/apps/client/src/common/components/input/colour-input/SwatchPicker.tsx
+++ b/apps/client/src/common/components/input/colour-input/SwatchPicker.tsx
@@ -3,9 +3,9 @@ import { useController, UseControllerProps } from 'react-hook-form';
 import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
 import { ViewSettings } from 'ontime-types';
 
-import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
-import { debounce } from '../../../../common/utils/debounce';
+import { debounce } from '../../../utils/debounce';
 import { cx, getAccessibleColour } from '../../../utils/styleUtils';
+import PopoverPicker from '../popover-picker/PopoverPicker';
 
 import style from './SwatchSelect.module.scss';
 
diff --git a/apps/client/src/common/components/navigation-menu/FloatingNavigation.tsx b/apps/client/src/common/components/navigation-menu/FloatingNavigation.tsx
index 51d286a9b..a5269ad2b 100644
--- a/apps/client/src/common/components/navigation-menu/FloatingNavigation.tsx
+++ b/apps/client/src/common/components/navigation-menu/FloatingNavigation.tsx
@@ -1,7 +1,7 @@
 import { IoApps } from '@react-icons/all-files/io5/IoApps';
 import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';
 
-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
 
 import style from './NavigationMenu.module.scss';
diff --git a/apps/client/src/common/components/navigation-menu/ViewLockedIcon.tsx b/apps/client/src/common/components/navigation-menu/ViewLockedIcon.tsx
index d54825d73..78e1b712f 100644
--- a/apps/client/src/common/components/navigation-menu/ViewLockedIcon.tsx
+++ b/apps/client/src/common/components/navigation-menu/ViewLockedIcon.tsx
@@ -1,6 +1,6 @@
 import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
 
-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
 
 import style from './NavigationMenu.module.scss';
diff --git a/apps/client/src/common/components/view-params-editor/ViewParamsEditor.tsx b/apps/client/src/common/components/view-params-editor/ViewParamsEditor.tsx
index b1ba81cb2..0d10ad9fa 100644
--- a/apps/client/src/common/components/view-params-editor/ViewParamsEditor.tsx
+++ b/apps/client/src/common/components/view-params-editor/ViewParamsEditor.tsx
@@ -12,7 +12,7 @@ import {
   useDisclosure,
 } from '@chakra-ui/react';
 
-import useViewSettings from '../../../common/hooks-query/useViewSettings';
+import useViewSettings from '../../hooks-query/useViewSettings';
 import Info from '../info/Info';
 
 import { ViewOption } from './types';
diff --git a/apps/client/src/common/hooks/useFadeOutOnInactivity.tsx b/apps/client/src/common/hooks/useFadeOutOnInactivity.tsx
index bbd05a40b..6034301d8 100644
--- a/apps/client/src/common/hooks/useFadeOutOnInactivity.tsx
+++ b/apps/client/src/common/hooks/useFadeOutOnInactivity.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 
-import { throttle } from '../../common/utils/throttle';
+import { throttle } from '../utils/throttle';
+
 
 export const useFadeOutOnInactivity = () => {
   const [isMouseMoved, setIsMouseMoved] = useState(false);
diff --git a/apps/server/src/utils/development.ts b/apps/server/src/utils/development.ts
index 048a30e42..fe86f4c9d 100644
--- a/apps/server/src/utils/development.ts
+++ b/apps/server/src/utils/development.ts
@@ -1,5 +1,6 @@
 import { isProduction } from '../externals.js';
-import { consoleError } from '../utils/console.js';
+
+import { consoleError } from './console.js';
 
 /**
  * Milestone checker for dev environment