From 92d1df49284ef512ed9305051bec1299f0a6629e Mon Sep 17 00:00:00 2001 From: Huakun Shen Date: Fri, 20 Dec 2024 09:43:16 -0500 Subject: [PATCH] refactor: move svelte files into app folder --- apps/desktop/src/lib/cmds/builtin.ts | 30 +++++++++---------- apps/desktop/src/lib/cmds/ext.ts | 8 ++--- .../standalone/settings/AddDevExtForm.svelte | 2 +- .../install-npm-package-name-form.svelte | 2 +- .../settings/install-tarball-url-form.svelte | 2 +- apps/desktop/src/lib/utils/deeplink.ts | 2 +- apps/desktop/src/lib/utils/key.ts | 2 +- apps/desktop/src/lib/utils/route.ts | 2 +- .../src/routes/{ => app}/auth/+page.svelte | 0 .../{ => app}/auth/confirm/+page.svelte | 4 +-- .../routes/{ => app}/auth/confirm/+page.ts | 0 .../src/routes/{ => app}/dance/+page.svelte | 0 .../extension/clipboard/+page.svelte | 0 .../clipboard/content-preview.svelte | 0 .../extension/create-quick-link/+page.svelte | 0 .../extension/create-quick-link/schema.ts | 0 .../extension/file-transfer/+page.svelte | 0 .../extension/file-transfer/file-icon.svelte | 0 .../permission-inspector/+page.svelte | 0 .../extension/pin-screenshot/+page.svelte | 0 .../{ => app}/extension/store/+layout.svelte | 0 .../{ => app}/extension/store/+page.svelte | 0 .../routes/{ => app}/extension/store/+page.ts | 0 .../store/[identifier]/+error.svelte | 4 +-- .../extension/store/[identifier]/+page.svelte | 4 +-- .../extension/store/[identifier]/+page.ts | 0 .../extension/ui-iframe/+page.svelte | 2 +- .../{ => app}/extension/ui-iframe/+page.ts | 6 ++-- .../extension/ui-worker/+page.svelte | 2 +- .../{ => app}/extension/ui-worker/+page.ts | 6 ++-- .../routes/{ => app}/settings/+layout.svelte | 0 .../routes/{ => app}/settings/+page.svelte | 0 .../{ => app}/settings/about/+page.svelte | 0 .../settings/add-dev-extension/+page.svelte | 0 .../{ => app}/settings/developer/+page.svelte | 0 .../settings/extensions/+page.svelte | 0 .../settings/set-dev-ext-path/+page.svelte | 0 .../routes/{ => app}/settings/sidebar.svelte | 0 .../{ => app}/troubleshooters/+layout.svelte | 0 .../extension-loading/+page.svelte | 0 .../extension-window/+page.svelte | 0 .../mdns-debugger/+page.svelte | 0 .../{ => app}/troubleshooters/sidebar.svelte | 0 43 files changed, 39 insertions(+), 39 deletions(-) rename apps/desktop/src/routes/{ => app}/auth/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/auth/confirm/+page.svelte (97%) rename apps/desktop/src/routes/{ => app}/auth/confirm/+page.ts (100%) rename apps/desktop/src/routes/{ => app}/dance/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/clipboard/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/clipboard/content-preview.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/create-quick-link/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/create-quick-link/schema.ts (100%) rename apps/desktop/src/routes/{ => app}/extension/file-transfer/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/file-transfer/file-icon.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/permission-inspector/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/pin-screenshot/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/store/+layout.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/store/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/extension/store/+page.ts (100%) rename apps/desktop/src/routes/{ => app}/extension/store/[identifier]/+error.svelte (91%) rename apps/desktop/src/routes/{ => app}/extension/store/[identifier]/+page.svelte (98%) rename apps/desktop/src/routes/{ => app}/extension/store/[identifier]/+page.ts (100%) rename apps/desktop/src/routes/{ => app}/extension/ui-iframe/+page.svelte (99%) rename apps/desktop/src/routes/{ => app}/extension/ui-iframe/+page.ts (97%) rename apps/desktop/src/routes/{ => app}/extension/ui-worker/+page.svelte (99%) rename apps/desktop/src/routes/{ => app}/extension/ui-worker/+page.ts (98%) rename apps/desktop/src/routes/{ => app}/settings/+layout.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/about/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/add-dev-extension/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/developer/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/extensions/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/set-dev-ext-path/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/settings/sidebar.svelte (100%) rename apps/desktop/src/routes/{ => app}/troubleshooters/+layout.svelte (100%) rename apps/desktop/src/routes/{ => app}/troubleshooters/extension-loading/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/troubleshooters/extension-window/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/troubleshooters/mdns-debugger/+page.svelte (100%) rename apps/desktop/src/routes/{ => app}/troubleshooters/sidebar.svelte (100%) diff --git a/apps/desktop/src/lib/cmds/builtin.ts b/apps/desktop/src/lib/cmds/builtin.ts index 13a1666..6f383f7 100644 --- a/apps/desktop/src/lib/cmds/builtin.ts +++ b/apps/desktop/src/lib/cmds/builtin.ts @@ -24,7 +24,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "Go to Extension Store", function: async () => { appState.clearSearchTerm() - goto("/appextension/store") + goto("/app/extension/store") } }, { @@ -35,7 +35,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ }, description: "", function: async () => { - goto("/appauth") + goto("/app/auth") } }, { @@ -97,7 +97,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ }, description: "", function: async () => { - goto("/appextension/file-transfer") + goto("/app/extension/file-transfer") appState.clearSearchTerm() } }, @@ -111,7 +111,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "", function: async () => { appState.clearSearchTerm() - goto("/appsettings/add-dev-extension") + goto("/app/settings/add-dev-extension") } }, { @@ -136,7 +136,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ function: async () => { // const appStateStore = useAppStateStore() appState.clearSearchTerm() - goto("/appsettings/set-dev-ext-path") + goto("/app/settings/set-dev-ext-path") } }, { @@ -148,11 +148,11 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "", function: async () => { appState.clearSearchTerm() - // goto("/appwindow-troubleshooter") + // goto("/app/window-troubleshooter") const winLabel = `main:extension-window-troubleshooter-${uuidv4()}` console.log(winLabel) new WebviewWindow(winLabel, { - url: "/troubleshooters/extension-window", + url: "/app/troubleshooters/extension-window", title: "Extension Window Troubleshooter" }) }, @@ -167,7 +167,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "", function: async () => { appState.clearSearchTerm() - goto("/appextension/permission-inspector") + goto("/app/extension/permission-inspector") }, keywords: ["extension"] }, @@ -180,7 +180,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "", function: async () => { appState.clearSearchTerm() - goto("/apptroubleshooters/extension-loading") + goto("/app/troubleshooters/extension-loading") }, keywords: ["extension", "troubleshooter"] }, @@ -193,7 +193,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "Create a Quicklink", function: async () => { appState.clearSearchTerm() - goto("/appextension/create-quick-link") + goto("/app/extension/create-quick-link") } }, { @@ -204,7 +204,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ }, description: "Open Settings", function: async () => { - goto("/appsettings") + goto("/app/settings") appState.clearSearchTerm() } }, @@ -264,7 +264,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ }, description: "Dance", function: async () => { - goto("/appdance") + goto("/app/dance") } }, { @@ -305,7 +305,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ description: "Clipboard History", function: async () => { appState.clearSearchTerm() - goto("/appextension/clipboard") + goto("/app/extension/clipboard") } }, { @@ -322,7 +322,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ return } const window = new WebviewWindow(`main:pinned-screenshot-${uuidv4()}`, { - url: "/extension/pin-screenshot", + url: "/app/extension/pin-screenshot", title: "Pinned Screenshot", hiddenTitle: true, titleBarStyle: "transparent", @@ -342,7 +342,7 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ }, description: "MDNS Debugger", function: async () => { - goto("/apptroubleshooters/mdns-debugger") + goto("/app/troubleshooters/mdns-debugger") }, flags: { developer: true diff --git a/apps/desktop/src/lib/cmds/ext.ts b/apps/desktop/src/lib/cmds/ext.ts index 5a6617a..b5c7eb3 100644 --- a/apps/desktop/src/lib/cmds/ext.ts +++ b/apps/desktop/src/lib/cmds/ext.ts @@ -24,7 +24,7 @@ export async function onTemplateUiCmdSelect( ) { await createExtSupportDir(ext.extPath) // console.log("onTemplateUiCmdSelect", ext, cmd, isDev, hmr) - const url = `/extension/ui-worker?extPath=${encodeURIComponent(ext.extPath)}&cmdName=${encodeURIComponent(cmd.name)}` + const url = `/app/extension/ui-worker?extPath=${encodeURIComponent(ext.extPath)}&cmdName=${encodeURIComponent(cmd.name)}` if (cmd.window) { const winLabel = await winExtMap.registerExtensionWithWindow({ extPath: ext.extPath }) const window = launchNewExtWindow(winLabel, url, cmd.window) @@ -52,7 +52,7 @@ export async function onCustomUiCmdSelect( } else { url = decodeURIComponent(convertFileSrc(`${trimSlash(cmd.main)}`, "ext")) } - let url2 = `/extension/ui-iframe?url=${encodeURIComponent(url)}&extPath=${encodeURIComponent(ext.extPath)}` + let url2 = `/app/extension/ui-iframe?url=${encodeURIComponent(url)}&extPath=${encodeURIComponent(ext.extPath)}` if (cmd.window) { const winLabel = await winExtMap.registerExtensionWithWindow({ extPath: ext.extPath, @@ -61,7 +61,7 @@ export async function onCustomUiCmdSelect( if (platform() === "windows" && !useDevMain) { const addr = await spawnExtensionFileServer(winLabel) const newUrl = `http://${addr}` - url2 = `/extension/ui-iframe?url=${encodeURIComponent(newUrl)}&extPath=${encodeURIComponent(ext.extPath)}` + url2 = `/app/extension/ui-iframe?url=${encodeURIComponent(newUrl)}&extPath=${encodeURIComponent(ext.extPath)}` } const window = launchNewExtWindow(winLabel, url2, cmd.window) window.onCloseRequested(async (event) => { @@ -78,7 +78,7 @@ export async function onCustomUiCmdSelect( const addr = await spawnExtensionFileServer(winLabel) // addr has format "127.0.0.1:" console.log("Extension file server address: ", addr) const newUrl = `http://${addr}` - url2 = `/extension/ui-iframe?url=${encodeURIComponent(newUrl)}&extPath=${encodeURIComponent(ext.extPath)}` + url2 = `/app/extension/ui-iframe?url=${encodeURIComponent(newUrl)}&extPath=${encodeURIComponent(ext.extPath)}` } goto(url2) } diff --git a/apps/desktop/src/lib/components/standalone/settings/AddDevExtForm.svelte b/apps/desktop/src/lib/components/standalone/settings/AddDevExtForm.svelte index 9f18e8b..7110fc8 100644 --- a/apps/desktop/src/lib/components/standalone/settings/AddDevExtForm.svelte +++ b/apps/desktop/src/lib/components/standalone/settings/AddDevExtForm.svelte @@ -87,7 +87,7 @@ async function pickExtFiles() { if (!$appConfig.devExtensionPath) { toast.warning("Please set the dev extension path in the settings") - return goto("/appsettings/set-dev-ext-path") + return goto("/app/settings/set-dev-ext-path") } const selected = await openFileSelector({ directory: false, diff --git a/apps/desktop/src/lib/components/standalone/settings/install-npm-package-name-form.svelte b/apps/desktop/src/lib/components/standalone/settings/install-npm-package-name-form.svelte index e9b645e..5f370a6 100644 --- a/apps/desktop/src/lib/components/standalone/settings/install-npm-package-name-form.svelte +++ b/apps/desktop/src/lib/components/standalone/settings/install-npm-package-name-form.svelte @@ -17,7 +17,7 @@ toast.warning( "Please set the dev extension path in the settings to install tarball extension" ) - return goto("/appsettings/set-dev-ext-path") + return goto("/app/settings/set-dev-ext-path") } await extensions .installFromNpmPackageName(data.name, $appConfig.devExtensionPath) diff --git a/apps/desktop/src/lib/components/standalone/settings/install-tarball-url-form.svelte b/apps/desktop/src/lib/components/standalone/settings/install-tarball-url-form.svelte index 7ff58ea..b1401f0 100644 --- a/apps/desktop/src/lib/components/standalone/settings/install-tarball-url-form.svelte +++ b/apps/desktop/src/lib/components/standalone/settings/install-tarball-url-form.svelte @@ -19,7 +19,7 @@ toast.warning( "Please set the dev extension path in the settings to install tarball extension" ) - return goto("/appsettings/set-dev-ext-path") + return goto("/app/settings/set-dev-ext-path") } await extensions .installFromTarballUrl(data.url, $appConfig.devExtensionPath) diff --git a/apps/desktop/src/lib/utils/deeplink.ts b/apps/desktop/src/lib/utils/deeplink.ts index 5eab55c..b0dc155 100644 --- a/apps/desktop/src/lib/utils/deeplink.ts +++ b/apps/desktop/src/lib/utils/deeplink.ts @@ -59,7 +59,7 @@ export async function handleKunkunProtocol(parsedUrl: URL) { if (parsed.identifier) { goto(`/extension/store/${parsed.identifier}`) } else { - goto("/appextension/store") + goto("/app/extension/store") } } else if (href.startsWith(DEEP_LINK_PATH_REFRESH_DEV_EXTENSION)) { emitRefreshDevExt() diff --git a/apps/desktop/src/lib/utils/key.ts b/apps/desktop/src/lib/utils/key.ts index bff13ed..7ee04d3 100644 --- a/apps/desktop/src/lib/utils/key.ts +++ b/apps/desktop/src/lib/utils/key.ts @@ -76,7 +76,7 @@ export async function globalKeyDownHandler(e: KeyboardEvent) { if ((_platform === "macos" && e.metaKey) || (_platform === "windows" && e.ctrlKey)) { if (e.key === ",") { e.preventDefault() - goto("/appsettings") + goto("/app/settings") } } // Toggle Devtools with control + shift + I diff --git a/apps/desktop/src/lib/utils/route.ts b/apps/desktop/src/lib/utils/route.ts index ebc4d2d..98d0910 100644 --- a/apps/desktop/src/lib/utils/route.ts +++ b/apps/desktop/src/lib/utils/route.ts @@ -7,7 +7,7 @@ export function goBack() { } export function goHome() { - goto("/app") + goto("/app/") } export function goHomeOrCloseDependingOnWindow() { diff --git a/apps/desktop/src/routes/auth/+page.svelte b/apps/desktop/src/routes/app/auth/+page.svelte similarity index 100% rename from apps/desktop/src/routes/auth/+page.svelte rename to apps/desktop/src/routes/app/auth/+page.svelte diff --git a/apps/desktop/src/routes/auth/confirm/+page.svelte b/apps/desktop/src/routes/app/auth/confirm/+page.svelte similarity index 97% rename from apps/desktop/src/routes/auth/confirm/+page.svelte rename to apps/desktop/src/routes/app/auth/confirm/+page.svelte index 791ac2e..10a788e 100644 --- a/apps/desktop/src/routes/auth/confirm/+page.svelte +++ b/apps/desktop/src/routes/app/auth/confirm/+page.svelte @@ -44,7 +44,7 @@ function onSignOut() { auth .signOut() - .then(() => goto("/appauth")) + .then(() => goto("/app/auth")) .catch((err) => toast.error("Failed to sign out", { description: err.message })) } @@ -56,7 +56,7 @@ size="icon" onclick={() => { console.log("go Home") - goto("/app") + goto("/app/") }} > diff --git a/apps/desktop/src/routes/auth/confirm/+page.ts b/apps/desktop/src/routes/app/auth/confirm/+page.ts similarity index 100% rename from apps/desktop/src/routes/auth/confirm/+page.ts rename to apps/desktop/src/routes/app/auth/confirm/+page.ts diff --git a/apps/desktop/src/routes/dance/+page.svelte b/apps/desktop/src/routes/app/dance/+page.svelte similarity index 100% rename from apps/desktop/src/routes/dance/+page.svelte rename to apps/desktop/src/routes/app/dance/+page.svelte diff --git a/apps/desktop/src/routes/extension/clipboard/+page.svelte b/apps/desktop/src/routes/app/extension/clipboard/+page.svelte similarity index 100% rename from apps/desktop/src/routes/extension/clipboard/+page.svelte rename to apps/desktop/src/routes/app/extension/clipboard/+page.svelte diff --git a/apps/desktop/src/routes/extension/clipboard/content-preview.svelte b/apps/desktop/src/routes/app/extension/clipboard/content-preview.svelte similarity index 100% rename from apps/desktop/src/routes/extension/clipboard/content-preview.svelte rename to apps/desktop/src/routes/app/extension/clipboard/content-preview.svelte diff --git a/apps/desktop/src/routes/extension/create-quick-link/+page.svelte b/apps/desktop/src/routes/app/extension/create-quick-link/+page.svelte similarity index 100% rename from apps/desktop/src/routes/extension/create-quick-link/+page.svelte rename to apps/desktop/src/routes/app/extension/create-quick-link/+page.svelte diff --git a/apps/desktop/src/routes/extension/create-quick-link/schema.ts b/apps/desktop/src/routes/app/extension/create-quick-link/schema.ts similarity index 100% rename from apps/desktop/src/routes/extension/create-quick-link/schema.ts rename to apps/desktop/src/routes/app/extension/create-quick-link/schema.ts diff --git a/apps/desktop/src/routes/extension/file-transfer/+page.svelte b/apps/desktop/src/routes/app/extension/file-transfer/+page.svelte similarity index 100% rename from apps/desktop/src/routes/extension/file-transfer/+page.svelte rename to apps/desktop/src/routes/app/extension/file-transfer/+page.svelte diff --git a/apps/desktop/src/routes/extension/file-transfer/file-icon.svelte b/apps/desktop/src/routes/app/extension/file-transfer/file-icon.svelte similarity index 100% rename from apps/desktop/src/routes/extension/file-transfer/file-icon.svelte rename to apps/desktop/src/routes/app/extension/file-transfer/file-icon.svelte diff --git a/apps/desktop/src/routes/extension/permission-inspector/+page.svelte b/apps/desktop/src/routes/app/extension/permission-inspector/+page.svelte similarity index 100% rename from apps/desktop/src/routes/extension/permission-inspector/+page.svelte rename to apps/desktop/src/routes/app/extension/permission-inspector/+page.svelte diff --git a/apps/desktop/src/routes/extension/pin-screenshot/+page.svelte b/apps/desktop/src/routes/app/extension/pin-screenshot/+page.svelte similarity index 100% rename from apps/desktop/src/routes/extension/pin-screenshot/+page.svelte rename to apps/desktop/src/routes/app/extension/pin-screenshot/+page.svelte diff --git a/apps/desktop/src/routes/extension/store/+layout.svelte b/apps/desktop/src/routes/app/extension/store/+layout.svelte similarity index 100% rename from apps/desktop/src/routes/extension/store/+layout.svelte rename to apps/desktop/src/routes/app/extension/store/+layout.svelte diff --git a/apps/desktop/src/routes/extension/store/+page.svelte b/apps/desktop/src/routes/app/extension/store/+page.svelte similarity index 100% rename from apps/desktop/src/routes/extension/store/+page.svelte rename to apps/desktop/src/routes/app/extension/store/+page.svelte diff --git a/apps/desktop/src/routes/extension/store/+page.ts b/apps/desktop/src/routes/app/extension/store/+page.ts similarity index 100% rename from apps/desktop/src/routes/extension/store/+page.ts rename to apps/desktop/src/routes/app/extension/store/+page.ts diff --git a/apps/desktop/src/routes/extension/store/[identifier]/+error.svelte b/apps/desktop/src/routes/app/extension/store/[identifier]/+error.svelte similarity index 91% rename from apps/desktop/src/routes/extension/store/[identifier]/+error.svelte rename to apps/desktop/src/routes/app/extension/store/[identifier]/+error.svelte index 4cad5b1..47a29d7 100644 --- a/apps/desktop/src/routes/extension/store/[identifier]/+error.svelte +++ b/apps/desktop/src/routes/app/extension/store/[identifier]/+error.svelte @@ -5,7 +5,7 @@ function handleKeyDown(event: KeyboardEvent) { if (event.key === "Enter") { - goto("/app") + goto("/app/") } } @@ -17,7 +17,7 @@ title="Fail to Load Extension" class="w-fit max-w-screen-sm border-2 border-red-500" message={$page.error?.message ?? "Unknown Error"} - onGoBack={() => goto("/app")} + onGoBack={() => goto("/app/")} rawJsonError={JSON.stringify($page, null, 2)} /> diff --git a/apps/desktop/src/routes/extension/store/[identifier]/+page.svelte b/apps/desktop/src/routes/app/extension/store/[identifier]/+page.svelte similarity index 98% rename from apps/desktop/src/routes/extension/store/[identifier]/+page.svelte rename to apps/desktop/src/routes/app/extension/store/[identifier]/+page.svelte index 7c773cd..80e0388 100644 --- a/apps/desktop/src/routes/extension/store/[identifier]/+page.svelte +++ b/apps/desktop/src/routes/app/extension/store/[identifier]/+page.svelte @@ -136,7 +136,7 @@ function handleKeydown(e: KeyboardEvent) { if (e.key === "Escape") { if (!delayedImageDialogOpen) { - goto("/appextension/store") + goto("/app/extension/store") } } } @@ -148,7 +148,7 @@ size="icon" class={cn("fixed left-3 top-3", Constants.CLASSNAMES.BACK_BUTTON)} data-flip-id={Constants.CLASSNAMES.BACK_BUTTON} - onclick={() => goto("/appextension/store")} + onclick={() => goto("/app/extension/store")} > diff --git a/apps/desktop/src/routes/extension/store/[identifier]/+page.ts b/apps/desktop/src/routes/app/extension/store/[identifier]/+page.ts similarity index 100% rename from apps/desktop/src/routes/extension/store/[identifier]/+page.ts rename to apps/desktop/src/routes/app/extension/store/[identifier]/+page.ts diff --git a/apps/desktop/src/routes/extension/ui-iframe/+page.svelte b/apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte similarity index 99% rename from apps/desktop/src/routes/extension/ui-iframe/+page.svelte rename to apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte index 2dac996..d61618f 100644 --- a/apps/desktop/src/routes/extension/ui-iframe/+page.svelte +++ b/apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte @@ -51,7 +51,7 @@ const iframeUiAPI: IUiIframeServer2 = { goBack: async () => { if (isInMainWindow()) { - goto("/app") + goto("/app/") } else { appWin.close() } diff --git a/apps/desktop/src/routes/extension/ui-iframe/+page.ts b/apps/desktop/src/routes/app/extension/ui-iframe/+page.ts similarity index 97% rename from apps/desktop/src/routes/extension/ui-iframe/+page.ts rename to apps/desktop/src/routes/app/extension/ui-iframe/+page.ts index d37c53d..abf2b94 100644 --- a/apps/desktop/src/routes/extension/ui-iframe/+page.ts +++ b/apps/desktop/src/routes/app/extension/ui-iframe/+page.ts @@ -24,7 +24,7 @@ export const load: PageLoad = async ({ if (!_extPath || !_extUrl) { toast.error("Invalid extension path or url") error("Invalid extension path or url") - goto("/app") + goto("/app/") } const extPath = z.string().parse(_extPath) const extUrl = z.string().parse(_extUrl) @@ -36,7 +36,7 @@ export const load: PageLoad = async ({ toast.error("Error loading extension manifest", { description: `${err}` }) - goto("/app") + goto("/app/") } const loadedExt = _loadedExt! const extInfoInDB = await db.getUniqueExtensionByPath(loadedExt.extPath) @@ -44,7 +44,7 @@ export const load: PageLoad = async ({ toast.error("Unexpected Error", { description: `Extension ${loadedExt.kunkun.identifier} not found in database. Run Troubleshooter.` }) - goto("/app") + goto("/app/") } return { extPath, url: extUrl, loadedExt, extInfoInDB: extInfoInDB! } } diff --git a/apps/desktop/src/routes/extension/ui-worker/+page.svelte b/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte similarity index 99% rename from apps/desktop/src/routes/extension/ui-worker/+page.svelte rename to apps/desktop/src/routes/app/extension/ui-worker/+page.svelte index 207e4d6..d87aaba 100644 --- a/apps/desktop/src/routes/extension/ui-worker/+page.svelte +++ b/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte @@ -63,7 +63,7 @@ async function goBack() { if (isInMainWindow()) { - goto("/app") + goto("/app/") } else { appWin.close() } diff --git a/apps/desktop/src/routes/extension/ui-worker/+page.ts b/apps/desktop/src/routes/app/extension/ui-worker/+page.ts similarity index 98% rename from apps/desktop/src/routes/extension/ui-worker/+page.ts rename to apps/desktop/src/routes/app/extension/ui-worker/+page.ts index 9b238d3..e4f791c 100644 --- a/apps/desktop/src/routes/extension/ui-worker/+page.ts +++ b/apps/desktop/src/routes/app/extension/ui-worker/+page.ts @@ -27,7 +27,7 @@ export const load: PageLoad = async ({ url }) => { if (!extPath || !cmdName) { toast.error("Invalid extension path or url") error("Invalid extension path or url") - goto("/app") + goto("/app/") } let _loadedExt: ExtPackageJsonExtra | undefined @@ -38,7 +38,7 @@ export const load: PageLoad = async ({ url }) => { toast.error("Error loading extension manifest", { description: `${err}` }) - goto("/app") + goto("/app/") } const loadedExt = _loadedExt! const extInfoInDB = await db.getUniqueExtensionByPath(loadedExt.extPath) @@ -46,7 +46,7 @@ export const load: PageLoad = async ({ url }) => { toast.error("Unexpected Error", { description: `Extension ${loadedExt.kunkun.identifier} not found in database. Run Troubleshooter.` }) - goto("/app") + goto("/app/") } const pkgJsonPath = await join(extPath!, "package.json") if (!(await exists(extPath!))) { diff --git a/apps/desktop/src/routes/settings/+layout.svelte b/apps/desktop/src/routes/app/settings/+layout.svelte similarity index 100% rename from apps/desktop/src/routes/settings/+layout.svelte rename to apps/desktop/src/routes/app/settings/+layout.svelte diff --git a/apps/desktop/src/routes/settings/+page.svelte b/apps/desktop/src/routes/app/settings/+page.svelte similarity index 100% rename from apps/desktop/src/routes/settings/+page.svelte rename to apps/desktop/src/routes/app/settings/+page.svelte diff --git a/apps/desktop/src/routes/settings/about/+page.svelte b/apps/desktop/src/routes/app/settings/about/+page.svelte similarity index 100% rename from apps/desktop/src/routes/settings/about/+page.svelte rename to apps/desktop/src/routes/app/settings/about/+page.svelte diff --git a/apps/desktop/src/routes/settings/add-dev-extension/+page.svelte b/apps/desktop/src/routes/app/settings/add-dev-extension/+page.svelte similarity index 100% rename from apps/desktop/src/routes/settings/add-dev-extension/+page.svelte rename to apps/desktop/src/routes/app/settings/add-dev-extension/+page.svelte diff --git a/apps/desktop/src/routes/settings/developer/+page.svelte b/apps/desktop/src/routes/app/settings/developer/+page.svelte similarity index 100% rename from apps/desktop/src/routes/settings/developer/+page.svelte rename to apps/desktop/src/routes/app/settings/developer/+page.svelte diff --git a/apps/desktop/src/routes/settings/extensions/+page.svelte b/apps/desktop/src/routes/app/settings/extensions/+page.svelte similarity index 100% rename from apps/desktop/src/routes/settings/extensions/+page.svelte rename to apps/desktop/src/routes/app/settings/extensions/+page.svelte diff --git a/apps/desktop/src/routes/settings/set-dev-ext-path/+page.svelte b/apps/desktop/src/routes/app/settings/set-dev-ext-path/+page.svelte similarity index 100% rename from apps/desktop/src/routes/settings/set-dev-ext-path/+page.svelte rename to apps/desktop/src/routes/app/settings/set-dev-ext-path/+page.svelte diff --git a/apps/desktop/src/routes/settings/sidebar.svelte b/apps/desktop/src/routes/app/settings/sidebar.svelte similarity index 100% rename from apps/desktop/src/routes/settings/sidebar.svelte rename to apps/desktop/src/routes/app/settings/sidebar.svelte diff --git a/apps/desktop/src/routes/troubleshooters/+layout.svelte b/apps/desktop/src/routes/app/troubleshooters/+layout.svelte similarity index 100% rename from apps/desktop/src/routes/troubleshooters/+layout.svelte rename to apps/desktop/src/routes/app/troubleshooters/+layout.svelte diff --git a/apps/desktop/src/routes/troubleshooters/extension-loading/+page.svelte b/apps/desktop/src/routes/app/troubleshooters/extension-loading/+page.svelte similarity index 100% rename from apps/desktop/src/routes/troubleshooters/extension-loading/+page.svelte rename to apps/desktop/src/routes/app/troubleshooters/extension-loading/+page.svelte diff --git a/apps/desktop/src/routes/troubleshooters/extension-window/+page.svelte b/apps/desktop/src/routes/app/troubleshooters/extension-window/+page.svelte similarity index 100% rename from apps/desktop/src/routes/troubleshooters/extension-window/+page.svelte rename to apps/desktop/src/routes/app/troubleshooters/extension-window/+page.svelte diff --git a/apps/desktop/src/routes/troubleshooters/mdns-debugger/+page.svelte b/apps/desktop/src/routes/app/troubleshooters/mdns-debugger/+page.svelte similarity index 100% rename from apps/desktop/src/routes/troubleshooters/mdns-debugger/+page.svelte rename to apps/desktop/src/routes/app/troubleshooters/mdns-debugger/+page.svelte diff --git a/apps/desktop/src/routes/troubleshooters/sidebar.svelte b/apps/desktop/src/routes/app/troubleshooters/sidebar.svelte similarity index 100% rename from apps/desktop/src/routes/troubleshooters/sidebar.svelte rename to apps/desktop/src/routes/app/troubleshooters/sidebar.svelte