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

Fix:1; Refactor:2 #58

Merged
FatttSnake merged 3 commits from FatttSnake into dev 2024-05-21 16:44:17 +08:00
Conversation 0 Commits 3 Files Changed 10 +19 -21
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8ed24d320 - Show all commits

40
src/util/navigation.ts
View File

@@ -37,15 +37,15 @@ export const navigateToView = (
version?: string, version?: string,
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)
} }
navigate(`${url.pathname}${url.search}`, options) navigate(
`/view/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`,
options
)
} }
export const navigateToSource = ( export const navigateToSource = (
@@ -56,14 +56,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 = (
@@ -113,12 +114,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) => {
@@ -135,15 +136,12 @@ export const getViewPath = (
platform: Platform, platform: Platform,
version?: string version?: string
) => { ) => {
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)
} }
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) =>