Fix build errors, clean up imports

devklick · devklick · commit 9e49e865fc6b · 2023-10-13T22:20:33.000+01:00
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,6 +1,7 @@
-import "./App.css";
 import Desktop from "./components/Desktop";
 
+import "./App.css";
+
 function App() {
   return (
     <div className="App">
diff --git a/src/ContextMenu/ContextMenu.tsx b/src/ContextMenu/ContextMenu.tsx
@@ -1,8 +1,9 @@
 import { useRef } from "react";
 import MenuItems, { MenuItemProps } from "../components/MenuItems";
-import "./ContextMenu.scss";
 import useDetectMouseDownOutside from "../hooks/useDetectMouseDownOutside";
 
+import "./ContextMenu.scss";
+
 interface ContextMenuProps {
   items: Array<MenuItemProps>;
   position: { x: number; y: number };
diff --git a/src/components/BorderedApp/BorderedApp.tsx b/src/components/BorderedApp/BorderedApp.tsx
@@ -5,10 +5,11 @@ import useWindowManagerStore, {
 import { Dimensions } from "../../hooks/useDragToResize";
 import BorderedAppMenu from "./BorderedAppMenu/BorderedAppMenu";
 import usePositionableElement from "../../hooks/usePositionableElement";
-
-import "./BorderedApp.scss";
 import useSystemSettings from "../../stores/systemSettingsStore";
 import { MenuItemProps } from "../MenuItems";
+
+import "./BorderedApp.scss";
+
 interface BorderedAppProps extends BaseProps {
   title: string;
   type: string;
diff --git a/src/components/BorderedApp/BorderedAppMenu/BorderedAppMenu.tsx b/src/components/BorderedApp/BorderedAppMenu/BorderedAppMenu.tsx
@@ -1,8 +1,9 @@
 import { useEffect, useRef, useState } from "react";
-import "./BorderedAppMenu.scss";
 import useDetectMouseDownOutside from "../../../hooks/useDetectMouseDownOutside";
 import MenuItems, { MenuItemProps } from "../../MenuItems";
 
+import "./BorderedAppMenu.scss";
+
 export interface BorderedAppMenuProps {
   title: string;
   items: Array<MenuItemProps>;
diff --git a/src/components/BottomBar/Launcher/Launcher.tsx b/src/components/BottomBar/Launcher/Launcher.tsx
@@ -1,18 +1,19 @@
 import { useRef } from "react";
+import { v4 as uuid } from "uuid";
+
 import useConditionalClick from "../../../hooks/useConditionalClick";
-import "./Launcher.scss";
 import useWindowManagerStore from "../../../stores/windowManagerStore";
-import { v4 as uuid } from "uuid";
 import BorderedApp from "../../BorderedApp";
 import { Dimensions } from "../../../hooks/useDragToResize";
-import { BorderedAppMenuItemProps } from "../../BorderedApp/BorderedAppMenu/BorderedAppMenu";
+import { MenuItemProps } from "../../MenuItems";
 
+import "./Launcher.scss";
 interface LauncherProps {
   windowType: string;
   WindowTitle: string;
   windowId?: string;
   initialDimensions: Dimensions;
-  menus?: Array<BorderedAppMenuItemProps>;
+  menus?: Array<MenuItemProps>;
   appContent: JSX.Element;
   icon: string;
 }
diff --git a/src/components/Content/Content.tsx b/src/components/Content/Content.tsx
@@ -1,4 +1,5 @@
 import useWindowManagerStore from "../../stores/windowManagerStore";
+
 import "./Content.scss";
 
 interface ContentProps {}
diff --git a/src/components/Desktop/Desktop.tsx b/src/components/Desktop/Desktop.tsx
@@ -1,9 +1,9 @@
 import TopBar from "../TopBar";
 import Content from "../Content";
 import BottomBar from "../BottomBar";
+import useSystemSettings from "../../stores/systemSettingsStore";
 
 import "./Desktop.scss";
-import useSystemSettings from "../../stores/systemSettingsStore";
 
 interface DesktopProps {}
 
diff --git a/src/components/FullAppPrompt/FullAppPrompt.tsx b/src/components/FullAppPrompt/FullAppPrompt.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useRef, useState } from "react";
-import "./FullAppPrompt.scss";
 import { Rect } from "../../hooks/useDragToResize";
 import useDetectMouseDownOutside from "../../hooks/useDetectMouseDownOutside";
 import useSystemSettings from "../../stores/systemSettingsStore";
 
+import "./FullAppPrompt.scss";
+
 interface FullAppPromptProps<Element extends HTMLElement> {
   appRef: React.RefObject<Element>;
   promptName: string;
diff --git a/src/components/MenuItems/MenuItems.tsx b/src/components/MenuItems/MenuItems.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useRef, useState } from "react";
 import useSystemSettings from "../../stores/systemSettingsStore";
+
 import "./MenuItems.scss";
 
 export interface MenuItemsProps {
diff --git a/src/components/TopBar/ClockMenu/ClockMenu.tsx b/src/components/TopBar/ClockMenu/ClockMenu.tsx
@@ -1,8 +1,10 @@
+import { v4 as uuid } from "uuid";
+
 import useDateTime from "../../../hooks/useDateTime";
 import useWindowManagerStore from "../../../stores/windowManagerStore";
 import BorderedApp from "../../BorderedApp";
+
 import "./ClockMenu.scss";
-import { v4 as uuid } from "uuid";
 
 const windowType = "clock";
 
diff --git a/src/components/TopBar/SystemTray/SystemTray.tsx b/src/components/TopBar/SystemTray/SystemTray.tsx
@@ -1,4 +1,5 @@
 import PowerMenu from "./PowerMenu";
+
 import "./SystemTray.scss";
 
 interface SystemTrayProps {}
diff --git a/src/components/TopBar/TopBarItem/TopBarItem.scss b/src/components/TopBar/TopBarItem/TopBarItem.scss
diff --git a/src/components/TopBar/TopBarItem/TopBarItem.tsx b/src/components/TopBar/TopBarItem/TopBarItem.tsx
diff --git a/src/components/TopBar/TopBarItem/index.ts b/src/components/TopBar/TopBarItem/index.ts
diff --git a/src/main.tsx b/src/main.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App";
+
 import "./index.css";
 
 ReactDOM.createRoot(document.getElementById("root")!).render(
diff --git a/src/programs/Calculator/Calculator.tsx b/src/programs/Calculator/Calculator.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from "react";
+
 import "./Calculator.scss";
 
 interface CalculatorProps {}
diff --git a/src/programs/Calculator/CalculatorLauncher/CalculatorLauncher.tsx b/src/programs/Calculator/CalculatorLauncher/CalculatorLauncher.tsx
@@ -13,6 +13,8 @@ function CalculatorLauncher({}: CalculatorLauncherProps) {
       windowType={windowType}
       WindowTitle="Calculator"
       initialDimensions={{ height: 400, width: 400 }}
+      icon=""
+      menus={[]}
       appContent={<Calculator />}
     ></Launcher>
   );
diff --git a/src/programs/FileBrowser/FileBrowser.tsx b/src/programs/FileBrowser/FileBrowser.tsx
@@ -8,14 +8,14 @@ import useLocalFS, {
   isFSDirectory,
 } from "../../stores/localFS";
 import useLocalFSWithHistory from "../../hooks/useLocalFSWithHistory";
-
-import "./FileBrowser.scss";
 import AppSideBar from "../../components/AppSideBar";
 import ContextMenu from "../../ContextMenu/ContextMenu";
 import { getMainContentContextItems } from "./contextMenus";
 import FullAppPrompt from "../../components/FullAppPrompt";
 const defaultPath = "/home/user";
 
+import "./FileBrowser.scss";
+
 interface FileBrowserProps {
   path?: string;
 }
diff --git a/src/programs/Settings/Settings.tsx b/src/programs/Settings/Settings.tsx
@@ -1,9 +1,10 @@
+import React, { HTMLInputTypeAttribute, useRef, useState } from "react";
+
 import AppSideBar from "../../components/AppSideBar";
 import { getPages } from "./settingsPageConfig";
+import useSystemSettings from "../../stores/systemSettingsStore";
 
 import "./Settings.scss";
-import React, { HTMLInputTypeAttribute, useRef, useState } from "react";
-import useSystemSettings from "../../stores/systemSettingsStore";
 
 interface SettingsSectionProps {
   title: string;
diff --git a/src/programs/TextEditor/TextEditorLauncher/TextEditorLauncher.tsx b/src/programs/TextEditor/TextEditorLauncher/TextEditorLauncher.tsx
@@ -1,15 +1,14 @@
 import TextEditor from "..";
-import { BorderedAppMenuItemProps } from "../../../components/BorderedApp/BorderedAppMenu/BorderedAppMenu";
 import Launcher from "../../../components/BottomBar/Launcher";
+import { MenuItemProps } from "../../../components/MenuItems";
 import "./TextEditorLauncher.scss";
-// import { ReactComponent as Icon } from "./text-editor-launcher-icon.svg";
 import icon from "./text-editor-launcher-icon.svg";
 
 const windowType = "text-editor";
 
 interface TextEditorLauncherProps {}
 
-const menus: BorderedAppMenuItemProps[] = [
+const menus: MenuItemProps[] = [
   {
     title: "File",
     items: [
diff --git a/src/programs/WebBrowser/WebBrowserLauncher/WebBrowserLauncher.tsx b/src/programs/WebBrowser/WebBrowserLauncher/WebBrowserLauncher.tsx
@@ -14,6 +14,8 @@ function WebBrowserLauncher({}: WebBrowserLauncherProps) {
       WindowTitle="Web Browser"
       initialDimensions={{ height: 400, width: 400 }}
       appContent={<WebBrowser />}
+      icon=""
+      menus={[]}
     ></Launcher>
   );
 }
diff --git a/src/stores/windowManagerStore.ts b/src/stores/windowManagerStore.ts
@@ -1,15 +1,15 @@
-import React, { ReactNode, createRef } from "react";
+import React from "react";
 import { create } from "zustand";
 
 export interface BaseProps {
   zIndex?: number;
-  children?: ReactNode;
+  children?: React.ReactNode;
 }
 
 interface ComponentDefinition<Props extends BaseProps = BaseProps> {
   component: React.FC<Props>;
   props: Props;
-  children?: ReactNode;
+  children?: React.ReactNode;
   key: string | number;
 }
 
@@ -30,7 +30,7 @@ interface WindowManagerStoreState {
 }
 
 const useWindowManagerStore = create<WindowManagerStoreState>()((set, get) => ({
-  contentRef: createRef<HTMLDivElement>(),
+  contentRef: React.createRef<HTMLDivElement>(),
   windowsMap: new Map(),
   highestZIndex: 0,
   getWindowDefinitions() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import useWindowManagerStore from "../../stores/windowManagerStore";`
	`2`	`+`
`2`	`3`	`import "./Content.scss";`
`3`	`4`
`4`	`5`	`interface ContentProps {}`