Skip to content

fix: make /search mode-aware #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zats wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −10
Open

fix: make /search mode-aware #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default function Header() {
Upload
</Link>
{isSoulMode ? null : <Link to="/import">Import</Link>}
<Link to="/" search={{ q: undefined, highlighted: undefined, search: true }}>
<Link to="/search" search={{ q: undefined, highlighted: undefined }}>
Search
</Link>
{me ? <Link to="/stars">Stars</Link> : null}
Expand Down Expand Up @@ -138,7 +138,7 @@ export default function Header() {
</DropdownMenuItem>
)}
<DropdownMenuItem asChild>
<Link to="/" search={{ q: undefined, highlighted: undefined, search: true }}>
<Link to="/search" search={{ q: undefined, highlighted: undefined }}>
Search
</Link>
</DropdownMenuItem>
Expand Down
41 changes: 33 additions & 8 deletions src/routes/search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,43 @@
import { createFileRoute, redirect } from '@tanstack/react-router'
import { getSiteMode } from '../lib/site'

export const Route = createFileRoute('/search')({
validateSearch: (search) => ({
q: typeof search.q === 'string' && search.q.trim() ? search.q : undefined,
highlighted: search.highlighted === '1' || search.highlighted === 'true' ? true : undefined,
}),
beforeLoad: ({ search }) => {
throw redirect({
to: '/skills',
search: {
q: search.q || undefined,
highlighted: search.highlighted || undefined,
},
replace: true,
})
const mode = getSiteMode()
switch (mode) {
case 'souls':
throw redirect({
to: '/',
search: {
q: search.q || undefined,
highlighted: undefined,
search: search.q ? undefined : true,
},
replace: true,
})
case 'skills':
throw redirect({
to: '/skills',
search: {
q: search.q || undefined,
highlighted: search.highlighted || undefined,
},
replace: true,
})
default:
throw redirect({
to: '/',
search: {
q: search.q || undefined,
highlighted: undefined,
search: search.q ? undefined : true,
},
replace: true,
})
}
},
})