Skip to content

Commit e690ee5

Browse files
committed
refactor: deps
1 parent 63f7420 commit e690ee5

File tree

4 files changed

+4
-99
lines changed

4 files changed

+4
-99
lines changed

ETVR.code-workspace

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
{
88
"name": "ETVR Assets",
99
"path": "./GUI/assets"
10+
},
11+
{
12+
"name": "Repo Root",
13+
"path": "."
1014
}
1115
],
1216
"settings": {

GUI/ETVR/src-tauri/Cargo.lock

-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GUI/ETVR/src-tauri/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ sysinfo = "0.29.0"
1616
sprintf = "0.1.3"
1717
lazy_static = "1.4.0"
1818
log = "^0.4.17"
19-
env_logger = "0.10.0"
2019
futures-util = "0.3.28"
2120
mdns-sd = "0.7.3"
2221
zip-extract = "0.1.2"

GUI/ETVR/src/store/context/app/index.tsx

-66
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
import { exit } from '@tauri-apps/api/process'
2-
import { invoke } from '@tauri-apps/api/tauri'
3-
import { appWindow } from '@tauri-apps/api/window'
41
import { createContext, useContext, createMemo, type Component, Accessor } from 'solid-js'
52
import { createStore, produce } from 'solid-js/store'
6-
import { useEventListener } from 'solidjs-use'
73
import { attachConsole } from 'tauri-plugin-log-api'
84
import { AppAPIProvider } from '../api'
95
import { AppCameraProvider } from '../camera'
@@ -13,8 +9,6 @@ import { AppUIProvider } from '../ui'
139
import type { Context, DebugMode } from '@static/types'
1410
import type { AppStore } from '@static/types/interfaces'
1511
import type { UnlistenFn } from '@tauri-apps/api/event'
16-
import { usePersistentStore } from '@src/store/tauriStore'
17-
import { ExitCodes } from '@static/types/enums'
1812

1913
interface AppContext {
2014
getDetachConsole: Accessor<Promise<UnlistenFn>>
@@ -82,66 +76,6 @@ export const AppProvider: Component<Context> = (props) => {
8276
const getDetachConsole = createMemo(() => detachConsole)
8377
//#endregion
8478

85-
const handleAppBoot = () => {
86-
const { set, get } = usePersistentStore()
87-
88-
useEventListener(document, 'DOMContentLoaded', () => {
89-
invoke('get_user')
90-
.then((config) => {
91-
const userName = config as string
92-
console.log('[App Boot]: Welcome ', userName)
93-
get('settings').then((settings) => {
94-
if (userName) {
95-
set('settings', { user: userName, ...settings })
96-
}
97-
})
98-
})
99-
.catch((e) => console.error(e))
100-
101-
// check if the window state is saved and restore it if it is
102-
103-
invoke('handle_save_window_state').then(() => {
104-
console.log('[App Boot]: saved window state')
105-
})
106-
107-
setTimeout(() => invoke('close_splashscreen'), 15000)
108-
})
109-
}
110-
111-
const handleAppExit = async (main = false) => {
112-
// TODO: call these before the app exits to shutdown gracefully
113-
114-
await invoke('handle_save_window_state')
115-
console.log('[App Close]: saved window state')
116-
117-
if (main) {
118-
const { save } = usePersistentStore()
119-
await save()
120-
// stopMDNS()
121-
// stopWebsocketClients()
122-
// saveSettings()
123-
// stopPythonBackend()
124-
await exit(ExitCodes.USER_EXIT)
125-
}
126-
127-
await appWindow.close()
128-
}
129-
130-
const handleTitlebar = (main = false) => {
131-
const titlebar = document.getElementsByClassName('titlebar')
132-
if (titlebar) {
133-
useEventListener(document.getElementById('titlebar-minimize'), 'click', () => {
134-
appWindow.minimize()
135-
})
136-
useEventListener(document.getElementById('titlebar-maximize'), 'click', () => {
137-
appWindow.toggleMaximize()
138-
})
139-
useEventListener(document.getElementById('titlebar-close'), 'click', async () => {
140-
await handleAppExit(main)
141-
})
142-
}
143-
}
144-
14579
return (
14680
<AppContext.Provider
14781
value={{

0 commit comments

Comments
 (0)