diff --git a/public/config/apps.xml b/public/config/apps.xml index 543604d..b4d4b3b 100644 --- a/public/config/apps.xml +++ b/public/config/apps.xml @@ -1,3 +1,3 @@ - file-explorer + \ No newline at end of file diff --git a/src/components/utils/button/Button.jsx b/src/components/_utils/button/Button.jsx similarity index 100% rename from src/components/utils/button/Button.jsx rename to src/components/_utils/button/Button.jsx diff --git a/src/components/utils/button/Button.module.css b/src/components/_utils/button/Button.module.css similarity index 100% rename from src/components/utils/button/Button.module.css rename to src/components/_utils/button/Button.module.css diff --git a/src/components/utils/dropdown-button/DropdownButton.jsx b/src/components/_utils/dropdown-button/DropdownButton.jsx similarity index 89% rename from src/components/utils/dropdown-button/DropdownButton.jsx rename to src/components/_utils/dropdown-button/DropdownButton.jsx index 1af9ef7..139ea01 100644 --- a/src/components/utils/dropdown-button/DropdownButton.jsx +++ b/src/components/_utils/dropdown-button/DropdownButton.jsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import styles from "./DropdownButton.module.css"; -import OutsideClickListener from "../../../hooks/utils/outsideClick.js"; -import { formatShortcut } from "../../../features/utils/string.utils.js"; +import OutsideClickListener from "../../../hooks/_utils/outsideClick.js"; +import { formatShortcut } from "../../../features/_utils/string.utils.js"; /** * @param {object} props diff --git a/src/components/utils/dropdown-button/DropdownButton.module.css b/src/components/_utils/dropdown-button/DropdownButton.module.css similarity index 100% rename from src/components/utils/dropdown-button/DropdownButton.module.css rename to src/components/_utils/dropdown-button/DropdownButton.module.css diff --git a/src/components/utils/interactable/Interactable.jsx b/src/components/_utils/interactable/Interactable.jsx similarity index 100% rename from src/components/utils/interactable/Interactable.jsx rename to src/components/_utils/interactable/Interactable.jsx diff --git a/src/components/utils/progress-bar/ProgressBar.jsx b/src/components/_utils/progress-bar/ProgressBar.jsx similarity index 100% rename from src/components/utils/progress-bar/ProgressBar.jsx rename to src/components/_utils/progress-bar/ProgressBar.jsx diff --git a/src/components/utils/progress-bar/ProgressBar.module.css b/src/components/_utils/progress-bar/ProgressBar.module.css similarity index 100% rename from src/components/utils/progress-bar/ProgressBar.module.css rename to src/components/_utils/progress-bar/ProgressBar.module.css diff --git a/src/components/actions/Actions.jsx b/src/components/actions/Actions.jsx index 587b4c0..6962024 100644 --- a/src/components/actions/Actions.jsx +++ b/src/components/actions/Actions.jsx @@ -1,7 +1,7 @@ import { Children, cloneElement, isValidElement } from "react"; -import { useShortcuts } from "../../hooks/utils/keyboard.js"; +import { useShortcuts } from "../../hooks/_utils/keyboard.js"; import styles from "./Actions.module.css"; -import { useScreenBounds } from "../../hooks/utils/screen.js"; +import { useScreenBounds } from "../../hooks/_utils/screen.js"; export const STYLES = { CONTEXT_MENU: styles["Context-menu"], diff --git a/src/components/actions/actions/ClickAction.jsx b/src/components/actions/actions/ClickAction.jsx index 7e78e68..395b64f 100644 --- a/src/components/actions/actions/ClickAction.jsx +++ b/src/components/actions/actions/ClickAction.jsx @@ -1,5 +1,5 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { formatShortcut } from "../../../features/utils/string.utils.js"; +import { formatShortcut } from "../../../features/_utils/string.utils.js"; import styles from "../Actions.module.css"; import { ImagePreview } from "../../apps/file-explorer/directory-list/ImagePreview.jsx"; import { memo } from "react"; diff --git a/src/components/actions/actions/RadioAction.jsx b/src/components/actions/actions/RadioAction.jsx index 3fa30ae..472b7fb 100644 --- a/src/components/actions/actions/RadioAction.jsx +++ b/src/components/actions/actions/RadioAction.jsx @@ -1,5 +1,5 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { formatShortcut } from "../../../features/utils/string.utils.js"; +import { formatShortcut } from "../../../features/_utils/string.utils.js"; import styles from "../Actions.module.css"; import { faCircleDot } from "@fortawesome/free-solid-svg-icons"; import { useState } from "react"; diff --git a/src/components/actions/actions/ToggleAction.jsx b/src/components/actions/actions/ToggleAction.jsx index bf04697..fbe35ef 100644 --- a/src/components/actions/actions/ToggleAction.jsx +++ b/src/components/actions/actions/ToggleAction.jsx @@ -1,5 +1,5 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { formatShortcut } from "../../../features/utils/string.utils.js"; +import { formatShortcut } from "../../../features/_utils/string.utils.js"; import styles from "../Actions.module.css"; import { useState } from "react"; import { faSquare } from "@fortawesome/free-regular-svg-icons"; diff --git a/src/components/apps/_common/HeaderMenu.jsx b/src/components/apps/_utils/header-menu/HeaderMenu.jsx similarity index 76% rename from src/components/apps/_common/HeaderMenu.jsx rename to src/components/apps/_utils/header-menu/HeaderMenu.jsx index f463069..e62e47f 100644 --- a/src/components/apps/_common/HeaderMenu.jsx +++ b/src/components/apps/_utils/header-menu/HeaderMenu.jsx @@ -1,5 +1,5 @@ -import { useShortcuts } from "../../../hooks/utils/keyboard.js"; -import { DropdownButton } from "../../utils/dropdown-button/DropdownButton.jsx"; +import { useShortcuts } from "../../../../hooks/_utils/keyboard.js"; +import { DropdownButton } from "../../../_utils/dropdown-button/DropdownButton.jsx"; import styles from "./HeaderMenu.module.css"; /** diff --git a/src/components/apps/_common/HeaderMenu.module.css b/src/components/apps/_utils/header-menu/HeaderMenu.module.css similarity index 100% rename from src/components/apps/_common/HeaderMenu.module.css rename to src/components/apps/_utils/header-menu/HeaderMenu.module.css diff --git a/src/components/apps/_templates/WebView.jsx b/src/components/apps/_utils/web-view/WebView.jsx similarity index 100% rename from src/components/apps/_templates/WebView.jsx rename to src/components/apps/_utils/web-view/WebView.jsx diff --git a/src/components/apps/_templates/WebView.module.css b/src/components/apps/_utils/web-view/WebView.module.css similarity index 100% rename from src/components/apps/_templates/WebView.module.css rename to src/components/apps/_utils/web-view/WebView.module.css diff --git a/src/components/apps/browser/Browser.jsx b/src/components/apps/browser/Browser.jsx index 9daa063..06f8d49 100644 --- a/src/components/apps/browser/Browser.jsx +++ b/src/components/apps/browser/Browser.jsx @@ -1,11 +1,11 @@ import { useEffect, useRef, useState } from "react"; import styles from "./Browser.module.css"; -import { WebView } from "../_templates/WebView.jsx"; +import { WebView } from "../_utils/web-view/WebView.jsx"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faCaretLeft, faCaretRight, faHome, faRotateRight } from "@fortawesome/free-solid-svg-icons"; import { HOME_URL, SEARCH_URL } from "../../../config/apps/browser.config.js"; -import { isValidUrl } from "../../../features/utils/browser.utils.js"; -import { useHistory } from "../../../hooks/utils/history.js"; +import { isValidUrl } from "../../../features/_utils/browser.utils.js"; +import { useHistory } from "../../../hooks/_utils/history.js"; /** @type {import("../../windows/WindowView.jsx").windowProps} */ export function Browser({ startUrl, focus }) { diff --git a/src/components/apps/file-explorer/FileExplorer.jsx b/src/components/apps/file-explorer/FileExplorer.jsx index 7c6eb3b..3561692 100644 --- a/src/components/apps/file-explorer/FileExplorer.jsx +++ b/src/components/apps/file-explorer/FileExplorer.jsx @@ -18,7 +18,7 @@ import AppsManager from "../../../features/apps/appsManager.js"; import { APPS, APP_ICONS, APP_NAMES } from "../../../config/apps.config.js"; import { TITLE_SEPARATOR } from "../../../config/windows.config.js"; import { FileProperties } from "../../modals/file-properties/FileProperties.jsx"; -import { useHistory } from "../../../hooks/utils/history.js"; +import { useHistory } from "../../../hooks/_utils/history.js"; import { Divider } from "../../actions/actions/Divider.jsx"; /** diff --git a/src/components/apps/file-explorer/directory-list/DirectoryList.jsx b/src/components/apps/file-explorer/directory-list/DirectoryList.jsx index 0b8bb97..9cc6d6d 100644 --- a/src/components/apps/file-explorer/directory-list/DirectoryList.jsx +++ b/src/components/apps/file-explorer/directory-list/DirectoryList.jsx @@ -1,7 +1,7 @@ import { useEffect, useRef, useState } from "react"; import { VirtualFile } from "../../../../features/virtual-drive/file/virtualFile.js"; import { VirtualFolder } from "../../../../features/virtual-drive/folder/virtualFolder.js"; -import { Interactable } from "../../../utils/interactable/Interactable.jsx"; +import { Interactable } from "../../../_utils/interactable/Interactable.jsx"; import styles from "./DirectoryList.module.css"; import { ImagePreview } from "./ImagePreview.jsx"; diff --git a/src/components/apps/settings/AboutSettings.jsx b/src/components/apps/settings/AboutSettings.jsx index fe5be8d..670fd9d 100644 --- a/src/components/apps/settings/AboutSettings.jsx +++ b/src/components/apps/settings/AboutSettings.jsx @@ -1,4 +1,4 @@ -import { Button } from "../../utils/button/Button.jsx"; +import { Button } from "../../_utils/button/Button.jsx"; import styles from "./Settings.module.css"; import utilStyles from "../../../styles/utils.module.css"; import Vector2 from "../../../features/math/vector2.js"; diff --git a/src/components/apps/settings/StorageSettings.jsx b/src/components/apps/settings/StorageSettings.jsx index 98a5c57..2324bde 100644 --- a/src/components/apps/settings/StorageSettings.jsx +++ b/src/components/apps/settings/StorageSettings.jsx @@ -1,8 +1,8 @@ import styles from "./Settings.module.css"; import utilStyles from "../../../styles/utils.module.css"; import { round } from "../../../features/math/round.js"; -import { ProgressBar } from "../../utils/progress-bar/ProgressBar.jsx"; -import { Button } from "../../utils/button/Button.jsx"; +import { ProgressBar } from "../../_utils/progress-bar/ProgressBar.jsx"; +import { Button } from "../../_utils/button/Button.jsx"; import { useVirtualRoot } from "../../../hooks/virtual-drive/virtualRootContext.js"; import { StorageManager } from "../../../features/storage/storageManager.js"; diff --git a/src/components/apps/terminal/Terminal.jsx b/src/components/apps/terminal/Terminal.jsx index 921200d..b378430 100644 --- a/src/components/apps/terminal/Terminal.jsx +++ b/src/components/apps/terminal/Terminal.jsx @@ -6,7 +6,7 @@ import { OutputLine } from "./OutputLine.jsx"; import { InputLine } from "./InputLine.jsx"; import { ANSI, HOSTNAME, USERNAME } from "../../../config/apps/terminal.config.js"; import CommandsManager from "../../../features/apps/terminal/commands.js"; -import { removeFromArray } from "../../../features/utils/array.utils.js"; +import { removeFromArray } from "../../../features/_utils/array.utils.js"; /** * @param {import("../../windows/WindowView.jsx").windowProps} props diff --git a/src/components/apps/text-editor/TextEditor.jsx b/src/components/apps/text-editor/TextEditor.jsx index 258a700..9ecf6c1 100644 --- a/src/components/apps/text-editor/TextEditor.jsx +++ b/src/components/apps/text-editor/TextEditor.jsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import styles from "./TextEditor.module.css"; -import { HeaderMenu } from "../_common/HeaderMenu.jsx"; +import { HeaderMenu } from "../_utils/header-menu/HeaderMenu.jsx"; import Markdown from "markdown-to-jsx"; import { DEFAULT_ZOOM, ZOOM_FACTOR } from "../../../config/apps/textEditor.config.js"; import AppsManager from "../../../features/apps/appsManager.js"; diff --git a/src/components/desktop/Desktop.jsx b/src/components/desktop/Desktop.jsx index b7c0892..30cb20f 100644 --- a/src/components/desktop/Desktop.jsx +++ b/src/components/desktop/Desktop.jsx @@ -8,7 +8,7 @@ import { ModalsView } from "../modals/ModalsView.jsx"; import { useWindowsManager } from "../../hooks/windows/windowsManagerContext.js"; import { useContextMenu } from "../../hooks/modals/contextMenu.js"; import { FALLBACK_ICON_SIZE, FALLBACK_WALLPAPER } from "../../config/desktop.config.js"; -import { reloadViewport } from "../../features/utils/browser.utils.js"; +import { reloadViewport } from "../../features/_utils/browser.utils.js"; import { useVirtualRoot } from "../../hooks/virtual-drive/virtualRootContext.js"; import { DirectoryList } from "../apps/file-explorer/directory-list/DirectoryList.jsx"; import { APPS, APP_ICONS, APP_NAMES } from "../../config/apps.config.js"; @@ -20,7 +20,7 @@ import { ToggleAction } from "../actions/actions/ToggleAction.jsx"; import { DropdownAction } from "../actions/actions/DropdownAction.jsx"; import { RadioAction } from "../actions/actions/RadioAction.jsx"; import { Divider } from "../actions/actions/Divider.jsx"; -import { isValidInteger } from "../../features/utils/number.utils.js"; +import { isValidInteger } from "../../features/_utils/number.utils.js"; export const Desktop = memo(() => { const settingsManager = useSettingsManager(); diff --git a/src/components/modals/ModalView.jsx b/src/components/modals/ModalView.jsx index 7761107..5cb2daf 100644 --- a/src/components/modals/ModalView.jsx +++ b/src/components/modals/ModalView.jsx @@ -1,6 +1,6 @@ import { memo } from "react"; import { Modal as ModalType } from "../../features/modals/modal.js"; -import OutsideClickListener from "../../hooks/utils/outsideClick.js"; +import OutsideClickListener from "../../hooks/_utils/outsideClick.js"; import styles from "./ModalView.module.css"; import { useEffect } from "react"; diff --git a/src/components/modals/_templates/WindowedModal.jsx b/src/components/modals/_templates/WindowedModal.jsx index 62b9512..3635f54 100644 --- a/src/components/modals/_templates/WindowedModal.jsx +++ b/src/components/modals/_templates/WindowedModal.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from "react"; -import { useScreenDimensions } from "../../../hooks/utils/screen.js"; +import { useScreenDimensions } from "../../../hooks/_utils/screen.js"; import Vector2 from "../../../features/math/vector2.js"; import styles from "./WindowedModal.module.css"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; diff --git a/src/components/taskbar/Taskbar.jsx b/src/components/taskbar/Taskbar.jsx index 7412e5b..07f84a2 100644 --- a/src/components/taskbar/Taskbar.jsx +++ b/src/components/taskbar/Taskbar.jsx @@ -5,13 +5,13 @@ import { faCog, faSearch } from "@fortawesome/free-solid-svg-icons"; import AppsManager from "../../features/apps/appsManager.js"; import { ReactSVG } from "react-svg"; import { HomeMenu } from "./menus/HomeMenu.jsx"; -import OutsideClickListener from "../../hooks/utils/outsideClick.js"; +import OutsideClickListener from "../../hooks/_utils/outsideClick.js"; import { Battery } from "./indicators/Battery.jsx"; import { Network } from "./indicators/Network.jsx"; import { Volume } from "./indicators/Volume.jsx"; import { SearchMenu } from "./menus/SearchMenu.jsx"; import { Calendar } from "./indicators/Calendar.jsx"; -import { useScrollWithShadow } from "../../hooks/utils/scrollWithShadows.js"; +import { useScrollWithShadow } from "../../hooks/_utils/scrollWithShadows.js"; import { AppButton } from "./app-icon/AppIcon.jsx"; import { useContextMenu } from "../../hooks/modals/contextMenu.js"; import { Actions } from "../actions/Actions.jsx"; diff --git a/src/components/taskbar/app-icon/AppIcon.jsx b/src/components/taskbar/app-icon/AppIcon.jsx index 9131b86..1df8fe0 100644 --- a/src/components/taskbar/app-icon/AppIcon.jsx +++ b/src/components/taskbar/app-icon/AppIcon.jsx @@ -9,7 +9,7 @@ import { Actions } from "../../actions/Actions.jsx"; import { ClickAction } from "../../actions/actions/ClickAction.jsx"; import { faThumbTack, faTimes } from "@fortawesome/free-solid-svg-icons"; import { SettingsManager } from "../../../features/settings/settingsManager.js"; -import { removeFromArray } from "../../../features/utils/array.utils.js"; +import { removeFromArray } from "../../../features/_utils/array.utils.js"; import AppsManager from "../../../features/apps/appsManager.js"; /** diff --git a/src/components/taskbar/menus/HomeMenu.jsx b/src/components/taskbar/menus/HomeMenu.jsx index d1b5862..1ffdbd4 100644 --- a/src/components/taskbar/menus/HomeMenu.jsx +++ b/src/components/taskbar/menus/HomeMenu.jsx @@ -5,8 +5,8 @@ import { faCircleInfo, faFileLines, faGear, faImage, faPowerOff } from "@fortawe import { useWindowsManager } from "../../../hooks/windows/windowsManagerContext.js"; import AppsManager from "../../../features/apps/appsManager.js"; import { ReactSVG } from "react-svg"; -import { closeViewport } from "../../../features/utils/browser.utils.js"; -import { useKeyboardListener } from "../../../hooks/utils/keyboard.js"; +import { closeViewport } from "../../../features/_utils/browser.utils.js"; +import { useKeyboardListener } from "../../../hooks/_utils/keyboard.js"; import { useVirtualRoot } from "../../../hooks/virtual-drive/virtualRootContext.js"; import { useEffect, useState } from "react"; import Vector2 from "../../../features/math/vector2.js"; diff --git a/src/components/taskbar/menus/SearchMenu.jsx b/src/components/taskbar/menus/SearchMenu.jsx index 1ce8c9f..eaa830a 100644 --- a/src/components/taskbar/menus/SearchMenu.jsx +++ b/src/components/taskbar/menus/SearchMenu.jsx @@ -4,7 +4,7 @@ import AppsManager from "../../../features/apps/appsManager.js"; import { useWindowsManager } from "../../../hooks/windows/windowsManagerContext.js"; import { ReactSVG } from "react-svg"; import { useEffect, useState } from "react"; -import { useKeyboardListener } from "../../../hooks/utils/keyboard.js"; +import { useKeyboardListener } from "../../../hooks/_utils/keyboard.js"; /** * @param {object} props diff --git a/src/components/windows/WindowView.jsx b/src/components/windows/WindowView.jsx index 5e6fdae..52f54d9 100644 --- a/src/components/windows/WindowView.jsx +++ b/src/components/windows/WindowView.jsx @@ -15,9 +15,9 @@ import { useContextMenu } from "../../hooks/modals/contextMenu.js"; import AppsManager from "../../features/apps/appsManager.js"; import { ClickAction } from "../actions/actions/ClickAction.jsx"; import { Actions } from "../actions/Actions.jsx"; -import { useScreenDimensions } from "../../hooks/utils/screen.js"; +import { useScreenDimensions } from "../../hooks/_utils/screen.js"; import { NAME } from "../../config/branding.config.js"; -import { setViewportIcon, setViewportTitle } from "../../features/utils/browser.utils.js"; +import { setViewportIcon, setViewportTitle } from "../../features/_utils/browser.utils.js"; /** * @typedef {object} windowProps diff --git a/src/components/windows/WindowsView.jsx b/src/components/windows/WindowsView.jsx index ad379f9..8e1bbb5 100644 --- a/src/components/windows/WindowsView.jsx +++ b/src/components/windows/WindowsView.jsx @@ -5,7 +5,7 @@ import { WindowView } from "./WindowView.jsx"; import { useSettingsManager } from "../../hooks/settings/settingsManagerContext.js"; import { SettingsManager } from "../../features/settings/settingsManager.js"; import { NAME, TAG_LINE } from "../../config/branding.config.js"; -import { setViewportIcon, setViewportTitle } from "../../features/utils/browser.utils.js"; +import { setViewportIcon, setViewportTitle } from "../../features/_utils/browser.utils.js"; export const WindowsView = memo(() => { const settingsManager = useSettingsManager(); diff --git a/src/features/utils/array.utils.js b/src/features/_utils/array.utils.js similarity index 100% rename from src/features/utils/array.utils.js rename to src/features/_utils/array.utils.js diff --git a/src/features/utils/browser.utils.js b/src/features/_utils/browser.utils.js similarity index 100% rename from src/features/utils/browser.utils.js rename to src/features/_utils/browser.utils.js diff --git a/src/features/utils/date.utils.js b/src/features/_utils/date.utils.js similarity index 100% rename from src/features/utils/date.utils.js rename to src/features/_utils/date.utils.js diff --git a/src/features/utils/event.utils.js b/src/features/_utils/event.utils.js similarity index 100% rename from src/features/utils/event.utils.js rename to src/features/_utils/event.utils.js diff --git a/src/features/utils/number.utils.js b/src/features/_utils/number.utils.js similarity index 100% rename from src/features/utils/number.utils.js rename to src/features/_utils/number.utils.js diff --git a/src/features/utils/string.utils.js b/src/features/_utils/string.utils.js similarity index 100% rename from src/features/utils/string.utils.js rename to src/features/_utils/string.utils.js diff --git a/src/features/apps/appsManager.js b/src/features/apps/appsManager.js index b821624..737aea4 100644 --- a/src/features/apps/appsManager.js +++ b/src/features/apps/appsManager.js @@ -1,7 +1,7 @@ import App from "./app.js"; import { FileExplorer } from "../../components/apps/file-explorer/FileExplorer.jsx"; import { MediaViewer } from "../../components/apps/media-viewer/MediaViewer.jsx"; -import { WebView } from "../../components/apps/_templates/WebView.jsx"; +import { WebView } from "../../components/apps/_utils/web-view/WebView.jsx"; import { Terminal } from "../../components/apps/terminal/Terminal.jsx"; import { TextEditor } from "../../components/apps/text-editor/TextEditor.jsx"; import { Settings } from "../../components/apps/settings/Settings.jsx"; diff --git a/src/features/apps/terminal/commands/fortune.js b/src/features/apps/terminal/commands/fortune.js index ed030ed..421021f 100644 --- a/src/features/apps/terminal/commands/fortune.js +++ b/src/features/apps/terminal/commands/fortune.js @@ -1,4 +1,4 @@ -import { randomFromArray } from "../../../utils/array.utils.js"; +import { randomFromArray } from "../../../_utils/array.utils.js"; import Command from "../command.js"; /** diff --git a/src/features/apps/terminal/commands/neofetch.js b/src/features/apps/terminal/commands/neofetch.js index c9421c5..d97c1f0 100644 --- a/src/features/apps/terminal/commands/neofetch.js +++ b/src/features/apps/terminal/commands/neofetch.js @@ -2,7 +2,7 @@ import { APPS } from "../../../../config/apps.config.js"; import { ANSI } from "../../../../config/apps/terminal.config.js"; import { ANSI_ASCII_LOGO, ANSI_LOGO_COLOR, NAME } from "../../../../config/branding.config.js"; import { START_DATE } from "../../../../index.js"; -import { formatRelativeTime } from "../../../utils/date.utils.js"; +import { formatRelativeTime } from "../../../_utils/date.utils.js"; import AppsManager from "../../appsManager.js"; import Command from "../command.js"; diff --git a/src/features/apps/terminal/commands/reboot.js b/src/features/apps/terminal/commands/reboot.js index efa83a2..1bce6cf 100644 --- a/src/features/apps/terminal/commands/reboot.js +++ b/src/features/apps/terminal/commands/reboot.js @@ -1,4 +1,4 @@ -import { reloadViewport } from "../../../utils/browser.utils.js"; +import { reloadViewport } from "../../../_utils/browser.utils.js"; import Command from "../command.js"; export const reboot = new Command("reboot") diff --git a/src/features/apps/terminal/commands/uptime.js b/src/features/apps/terminal/commands/uptime.js index 36715ae..fe59b4b 100644 --- a/src/features/apps/terminal/commands/uptime.js +++ b/src/features/apps/terminal/commands/uptime.js @@ -1,5 +1,5 @@ import { START_DATE } from "../../../../index.js"; -import { formatRelativeTime } from "../../../utils/date.utils.js"; +import { formatRelativeTime } from "../../../_utils/date.utils.js"; import Command from "../command.js"; diff --git a/src/features/virtual-drive/folder/virtualFolder.js b/src/features/virtual-drive/folder/virtualFolder.js index 3f4e26f..25a8c8f 100644 --- a/src/features/virtual-drive/folder/virtualFolder.js +++ b/src/features/virtual-drive/folder/virtualFolder.js @@ -1,6 +1,6 @@ import { APPS } from "../../../config/apps.config.js"; import AppsManager from "../../apps/appsManager.js"; -import { removeFromArray } from "../../utils/array.utils.js"; +import { removeFromArray } from "../../_utils/array.utils.js"; import WindowsManager from "../../windows/windowsManager.js"; import { VirtualFileLink } from "../file/virtualFileLink.js"; import { VirtualFolderLink } from "./virtualFolderLink.js"; diff --git a/src/features/virtual-drive/folder/virtualFolderLink.js b/src/features/virtual-drive/folder/virtualFolderLink.js index 5dde9e0..d1ae328 100644 --- a/src/features/virtual-drive/folder/virtualFolderLink.js +++ b/src/features/virtual-drive/folder/virtualFolderLink.js @@ -68,6 +68,9 @@ export class VirtualFolderLink extends VirtualFolder { if (this.iconUrl != null) return this.iconUrl; + if (this.isValid() && this.linkedFolder.iconUrl) + return this.linkedFolder.iconUrl; + return AppsManager.getAppIconUrl(APPS.FILE_EXPLORER, "folder-link"); } diff --git a/src/features/virtual-drive/virtualBase.js b/src/features/virtual-drive/virtualBase.js index cb914c3..ef3fa02 100644 --- a/src/features/virtual-drive/virtualBase.js +++ b/src/features/virtual-drive/virtualBase.js @@ -1,6 +1,6 @@ import { APPS } from "../../config/apps.config.js"; import AppsManager from "../apps/appsManager.js"; -import { EventEmitter } from "../utils/event.utils.js"; +import { EventEmitter } from "../_utils/event.utils.js"; import { VirtualRoot } from "./root/virtualRoot.js"; export class VirtualBase extends EventEmitter { diff --git a/src/hooks/utils/history.js b/src/hooks/_utils/history.js similarity index 100% rename from src/hooks/utils/history.js rename to src/hooks/_utils/history.js diff --git a/src/hooks/utils/keyboard.js b/src/hooks/_utils/keyboard.js similarity index 96% rename from src/hooks/utils/keyboard.js rename to src/hooks/_utils/keyboard.js index fcfb0bb..e26aa90 100644 --- a/src/hooks/utils/keyboard.js +++ b/src/hooks/_utils/keyboard.js @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { removeFromArray } from "../../features/utils/array.utils.js"; +import { removeFromArray } from "../../features/_utils/array.utils.js"; /** * @param {object} params diff --git a/src/hooks/utils/mouse.js b/src/hooks/_utils/mouse.js similarity index 100% rename from src/hooks/utils/mouse.js rename to src/hooks/_utils/mouse.js diff --git a/src/hooks/utils/outsideClick.js b/src/hooks/_utils/outsideClick.js similarity index 100% rename from src/hooks/utils/outsideClick.js rename to src/hooks/_utils/outsideClick.js diff --git a/src/hooks/utils/screen.js b/src/hooks/_utils/screen.js similarity index 100% rename from src/hooks/utils/screen.js rename to src/hooks/_utils/screen.js diff --git a/src/hooks/utils/scrollWithShadows.js b/src/hooks/_utils/scrollWithShadows.js similarity index 100% rename from src/hooks/utils/scrollWithShadows.js rename to src/hooks/_utils/scrollWithShadows.js