-
-
Notifications
You must be signed in to change notification settings - Fork 130
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.
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
Add basic search functionality #34
Changes from all commits
7c572c2
3474894
b91a02f
6a44981
53be0bd
7031525
5edc1b1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { useCategories } from "../hooks/useCategories"; | ||
import { useAppContext } from "../contexts/AppContext"; | ||
|
||
const SearchFilters = () => { | ||
const { category, setCategory } = useAppContext(); | ||
const { fetchedCategories } = useCategories(); | ||
|
||
return ( | ||
<div className="search-filters"> | ||
<select value={category} onChange={(e) => setCategory(e.target.value)}> | ||
<option value="">All Categories</option> | ||
{fetchedCategories.map((cat, idx) => ( | ||
<option key={idx} value={cat}> | ||
{cat} | ||
</option> | ||
))} | ||
</select> | ||
</div> | ||
); | ||
}; | ||
|
||
export default SearchFilters; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,63 @@ | ||
import { SearchIcon } from "./Icons"; | ||
import { useState, useCallback } from "react"; | ||
import { useSearchParams, useNavigate, useLocation } from "react-router-dom"; | ||
|
||
const SearchInput = () => { | ||
const navigate = useNavigate(); | ||
const location = useLocation(); | ||
const [searchParams, setSearchParams] = useSearchParams(); | ||
const [searchValue, setSearchValue] = useState(searchParams.get("q") || ""); | ||
|
||
const navigateToSearch = useCallback( | ||
(query: string, isCompletedSearch = false) => { | ||
const trimmedQuery = query.trim().toLowerCase(); | ||
|
||
if (!trimmedQuery) { | ||
// Remove search params and navigate to home if query is empty | ||
setSearchParams({}); | ||
navigate("/", { replace: true }); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one shouldn't replace |
||
return; | ||
} | ||
|
||
// Set the search params with the query | ||
// Use replace: true for keypresses (when isCompletedSearch is false) | ||
setSearchParams({ q: trimmedQuery }, { replace: !isCompletedSearch }); | ||
|
||
// Only navigate if we're not already on the search page | ||
if (location.pathname !== "/search") { | ||
navigate("/search", { | ||
replace: isCompletedSearch || location.pathname === "/search", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one should always be false There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll look at it next year, I've been going crazy for the past four hours trying to get this all to behave. |
||
}); | ||
} | ||
}, | ||
[navigate, location.pathname, setSearchParams] | ||
); | ||
|
||
return ( | ||
<div className="search-field"> | ||
<form | ||
onSubmit={(e) => { | ||
e.preventDefault(); | ||
navigateToSearch(searchValue, true); | ||
}} | ||
className="search-field" | ||
> | ||
<label htmlFor="search"> | ||
<SearchIcon /> | ||
</label> | ||
<input | ||
type="search" | ||
id="search" | ||
value={searchValue} | ||
onChange={(e) => { | ||
const newValue = e.target.value; | ||
setSearchValue(newValue); | ||
navigateToSearch(newValue, false); | ||
}} | ||
onBlur={() => navigateToSearch(searchValue, true)} | ||
placeholder="Search here..." | ||
autoComplete="off" | ||
/> | ||
</div> | ||
</form> | ||
); | ||
}; | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import { useAppContext } from "../contexts/AppContext"; | ||
import SnippetList from "../components/SnippetList"; | ||
import Sidebar from "../layouts/Sidebar"; | ||
|
||
const HomePage = () => { | ||
const { category } = useAppContext(); | ||
|
||
return ( | ||
<> | ||
<Sidebar /> | ||
<section className="flow"> | ||
<h2 className="section-title"> | ||
{category ? category : "Select a category"} | ||
</h2> | ||
<SnippetList /> | ||
</section> | ||
</> | ||
); | ||
}; | ||
|
||
export default HomePage; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { useSearchParams } from "react-router-dom"; | ||
import SnippetList from "../components/SnippetList"; | ||
import Sidebar from "../layouts/Sidebar"; | ||
|
||
const SearchPage = () => { | ||
const [searchParams] = useSearchParams(); | ||
const query = searchParams.get("q"); | ||
|
||
return ( | ||
<> | ||
<Sidebar /> | ||
<section className="flow"> | ||
<h2 className="section-title">Search Results for: {query}</h2> | ||
<SnippetList query={query} /> | ||
</section> | ||
</> | ||
); | ||
}; | ||
|
||
export default SearchPage; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
react-router-dom
is not used anywhere in the project, it was just added inpackage.json
. So I think, it will be better to use the latest version.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure where you're seeing it being added to the package.json.
react-router-dom
was part of the initial commit.If you wish to have the dependencies updated, I recommend making a new PR for it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you update it in your PR ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was added in the initial commit, but its not being used anywhere. Its just there.
Since you are using it in this PR, you can just make it like its being added for the first time and update it to the latest version.