FatttSnake/oxygen-desktop
1
0
Fork 0
Code Pull Requests Activity

Fix(Navigation): Fix navigate bug

Browse Source
This commit is contained in:
Fat Snake
2024-05-20 23:00:09 +08:00
parent 19113a56af
commit 606064b1fb
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/renderer/src/util/navigation.ts
View File

@@ -42,16 +42,16 @@ export const navigateToView = (
local?: boolean, local?: boolean,
options?: NavigateOptions options?: NavigateOptions
) => { ) => {
const url = new URL( const searchParams = new URLSearchParams()
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) { if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform) searchParams.append('platform', platform)
} }
local && url.searchParams.append('source', 'local') local && searchParams.append('source', 'local')
navigate(`${url.pathname}${url.search}`, options) navigate(
`/view/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`,
options
)
} }
export const navigateToSource = ( export const navigateToSource = (
@@ -62,14 +62,15 @@ export const navigateToSource = (
version?: string, version?: string,
options?: NavigateOptions options?: NavigateOptions
) => { ) => {
const url = new URL( const searchParams = new URLSearchParams()
`/source/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) { if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform) searchParams.append('platform', platform)
} }
navigate(`${url.pathname}${url.search}`, options)
navigate(
`/source/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`,
options
)
} }
export const navigateToRedirect = ( export const navigateToRedirect = (
@@ -119,12 +120,12 @@ export const navigateToEdit = (
platform: Platform, platform: Platform,
options?: NavigateOptions options?: NavigateOptions
) => { ) => {
const url = new URL(`/edit/${toolId}`, window.location.href) const searchParams = new URLSearchParams()
if (platform !== import.meta.env.VITE_PLATFORM) { if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform) searchParams.append('platform', platform)
} }
navigate(`${url.pathname}${url.search}`, options) navigate(`/edit/${toolId}${searchParams.size ? `?${searchParams.toString()}` : ''}`, options)
} }
export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => { export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => {
@@ -142,16 +143,13 @@ export const getViewPath = (
version?: string, version?: string,
local?: boolean local?: boolean
) => { ) => {
const url = new URL( const searchParams = new URLSearchParams()
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) { if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform) searchParams.append('platform', platform)
} }
local && url.searchParams.append('source', 'local') local && searchParams.append('source', 'local')
return `${url.pathname}${url.search}` return `/view/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`
} }
export const getAndroidUrl = (username: string, toolId: string) => export const getAndroidUrl = (username: string, toolId: string) =>