ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "File based settings (#1361)" (#1435)

Browse Source 
This reverts commit 602e7afef6.
This commit is contained in:
Frank Noirot
2024-02-16 09:09:58 -05:00
committed by GitHub
parent 900e3b96ad
commit f00ee3a44a
32 changed files with 167 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/Router.tsx
View File

@ -29,9 +29,11 @@ import {
import { metadata } from 'tauri-plugin-fs-extra-api'
import DownloadAppBanner from './components/DownloadAppBanner'
import { WasmErrBanner } from './components/WasmErrBanner'
import { SettingsAuthStateProvider } from './components/SettingsAuthStateProvider'
import { settingsMachine } from './machines/settingsMachine'
import { SETTINGS_PERSIST_KEY } from 'lib/settings'
import { GlobalStateProvider } from './components/GlobalStateProvider'
import {
SETTINGS_PERSIST_KEY,
settingsMachine,
} from './machines/settingsMachine'
import { ContextFrom } from 'xstate'
import CommandBarProvider from 'components/CommandBar/CommandBar'
import { TEST, VITE_KC_SENTRY_DSN } from './env'
@ -89,9 +91,7 @@ const addGlobalContextToElements = (
...route,
element: (
<CommandBarProvider>
<SettingsAuthStateProvider>
{route.element}
</SettingsAuthStateProvider>
<GlobalStateProvider>{route.element}</GlobalStateProvider>
</CommandBarProvider>
),
}
@ -229,42 +229,32 @@ const router = createBrowserRouter(
const projectDir = await initializeProjectDirectory(
persistedSettings.defaultDirectory || ''
)
let newDefaultDirectory: string | undefined = undefined
if (projectDir.path) {
if (projectDir.path !== persistedSettings.defaultDirectory) {
localStorage.setItem(
SETTINGS_PERSIST_KEY,
JSON.stringify({
...persistedSettings,
defaultDirectory: projectDir,
})
)
newDefaultDirectory = projectDir.path
}
const projectsNoMeta = (await readDir(projectDir.path)).filter(
isProjectDirectory
)
const projects = await Promise.all(
projectsNoMeta.map(async (p: FileEntry) => ({
entrypointMetadata: await metadata(
p.path + sep + PROJECT_ENTRYPOINT
),
...p,
}))
if (projectDir !== persistedSettings.defaultDirectory) {
localStorage.setItem(
SETTINGS_PERSIST_KEY,
JSON.stringify({
...persistedSettings,
defaultDirectory: projectDir,
})
)
newDefaultDirectory = projectDir
}
const projectsNoMeta = (await readDir(projectDir)).filter(
isProjectDirectory
)
const projects = await Promise.all(
projectsNoMeta.map(async (p: FileEntry) => ({
entrypointMetadata: await metadata(
p.path + sep + PROJECT_ENTRYPOINT
),
...p,
}))
)
return {
projects,
newDefaultDirectory,
error: projectDir.error,
}
} else {
return {
projects: [],
newDefaultDirectory,
error: projectDir.error,
}
return {
projects,
newDefaultDirectory,
}
},
children: [