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

Refactor:3 #52

Merged
FatttSnake merged 3 commits from FatttSnake into dev 2024-05-10 02:32:02 +08:00
Conversation 0 Commits 3 Files Changed 4 +32 -12
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 386744d702 - Show all commits

44
src/util/navigation.ts
View File

@@ -37,10 +37,15 @@ export const navigateToView = (
version?: string, version?: string,
options?: NavigateOptions options?: NavigateOptions
) => { ) => {
navigate( const url = new URL(
`/view/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`, `/view/${username}/${toolId}${version ? `/${version}` : ''}`,
options window.location.href
) )
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
} }
export const navigateToSource = ( export const navigateToSource = (
@@ -51,10 +56,14 @@ export const navigateToSource = (
version?: string, version?: string,
options?: NavigateOptions options?: NavigateOptions
) => { ) => {
navigate( const url = new URL(
`/source/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`, `/source/${username}/${toolId}${version ? `/${version}` : ''}`,
options window.location.href
) )
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
} }
export const navigateToRedirect = ( export const navigateToRedirect = (
@@ -104,10 +113,12 @@ export const navigateToEdit = (
platform: Platform, platform: Platform,
options?: NavigateOptions options?: NavigateOptions
) => { ) => {
navigate( const url = new URL(`/edit/${toolId}`, window.location.href)
`/edit/${toolId}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`, if (platform !== import.meta.env.VITE_PLATFORM) {
options url.searchParams.append('platform', platform)
) }
navigate(`${url.pathname}${url.search}`, options)
} }
export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => { export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => {
@@ -123,5 +134,14 @@ export const getViewPath = (
toolId: string, toolId: string,
platform: Platform, platform: Platform,
version?: string version?: string
) => ) => {
`/view/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}` const url = new URL(
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
return `${url.pathname}${url.search}`
}