refactor: run format and fix linting errors

EyeTrackVR · May 22, 2023 · 56f2544 · 56f2544
1 parent 2f7cada
commit 56f2544
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 10 deletions.
diff --git a/GUI/ETVR/src-tauri/Cargo.toml b/GUI/ETVR/src-tauri/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 repository = "https://github.com/RedHawk989/EyeTrackVR"
 default-run = "eyetrackvr"
 edition = "2021"
-rust-version = "1.64"
+rust-version = "1.69"
 
 [dependencies]
 serde_json = "1.0"
@@ -26,7 +26,39 @@ features = ["derive"]
 
 [dependencies.tauri]
 version = "1.3.0"
-features = ["process-exit", "protocol-asset", "fs-all", "shell-sidecar", "dialog-all", "http-all", "icon-ico", "notification-all", "os-all", "path-all", "process-relaunch", "shell-open", "system-tray", "window-center", "window-close", "window-create", "window-hide", "window-maximize", "window-minimize", "window-request-user-attention", "window-set-decorations", "window-set-focus", "window-set-fullscreen", "window-set-position", "window-set-resizable", "window-set-size", "window-set-title", "window-show", "window-start-dragging", "window-unmaximize", "window-unminimize"]
+features = [
+    "process-exit",
+    "protocol-asset",
+    "fs-all",
+    "shell-sidecar",
+    "dialog-all",
+    "http-all",
+    "icon-ico",
+    "notification-all",
+    "os-all",
+    "path-all",
+    "process-relaunch",
+    "shell-open",
+    "system-tray",
+    "window-center",
+    "window-close",
+    "window-create",
+    "window-hide",
+    "window-maximize",
+    "window-minimize",
+    "window-request-user-attention",
+    "window-set-decorations",
+    "window-set-focus",
+    "window-set-fullscreen",
+    "window-set-position",
+    "window-set-resizable",
+    "window-set-size",
+    "window-set-title",
+    "window-show",
+    "window-start-dragging",
+    "window-unmaximize",
+    "window-unminimize",
+]
 
 [dependencies.tauri-plugin-window-state]
 git = "https://github.com/tauri-apps/plugins-workspace"

diff --git a/GUI/ETVR/src/routes/Routes.tsx b/GUI/ETVR/src/routes/Routes.tsx
@@ -1,6 +1,10 @@
-import Header from '@components/Header'
 import { useLocation, useNavigate, useRoutes } from '@solidjs/router'
+import { createEffect, onMount, type Component, createSignal } from 'solid-js'
+import { useEventListener } from 'solidjs-use'
+import { debug } from 'tauri-plugin-log-api'
+import { routes } from '.'
 import type { PersistentSettings } from '@src/static/types'
+import Header from '@components/Header'
 import { ENotificationAction } from '@src/static/types/enums'
 import { useAppAPIContext } from '@src/store/context/api'
 import { useAppContext } from '@src/store/context/app'
@@ -10,10 +14,6 @@ import { useAppNotificationsContext } from '@src/store/context/notifications'
 import { useAppUIContext } from '@src/store/context/ui'
 import { usePersistentStore } from '@src/store/tauriStore'
 import { generateWebsocketClients } from '@src/utils/hooks/websocket'
-import { createEffect, onMount, type Component, createSignal } from 'solid-js'
-import { useEventListener } from 'solidjs-use'
-import { debug } from 'tauri-plugin-log-api'
-import { routes } from '.'
 
 const AppRoutes: Component = () => {
     const [userIsInSettings, setUserIsInSettings] = createSignal(false)

diff --git a/GUI/ETVR/src/store/context/ui/index.tsx b/GUI/ETVR/src/store/context/ui/index.tsx
@@ -1,8 +1,8 @@
-import { MenuOpen, UiStore } from '@src/static/types/interfaces'
-import type { Context } from '@static/types'
-import { loaderType } from '@static/types/enums'
 import { Accessor, createContext, createMemo, useContext, type Component } from 'solid-js'
 import { createStore, produce } from 'solid-js/store'
+import type { Context } from '@static/types'
+import { MenuOpen, UiStore } from '@src/static/types/interfaces'
+import { loaderType } from '@static/types/enums'
 
 interface AppUIContext {
     connectingStatus: Accessor<boolean | undefined>