Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions src/components/SearchBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from "react";
import "../styles/components/SearchBar.css";

interface SearchBarProps {
searchQuery: string;
setSearchQuery: (query: string) => void;
placeholder?: string;
}

const SearchBar: React.FC<SearchBarProps> = ({
searchQuery,
setSearchQuery,
placeholder = "Search projects..."
}) => {
return (
<div className="search-bar-container">
<input
type="text"
className="search-input"
placeholder={placeholder}
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
/>
{searchQuery && (
<button
className="clear-button"
onClick={() => setSearchQuery("")}
aria-label="Clear search"
>
</button>
)}
</div>
);
};

export default SearchBar;
42 changes: 30 additions & 12 deletions src/pages/Projects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,29 @@ import { REPO_DATA_TYPE } from "../utils/types";
import RepoData from '../data/repo_data.json';
import SortDropdown from "../components/SortDropdown";
import PaginatedCardGrid from "../sections/CardGrid";
import SearchBar from "../components/SearchBar";

const Projects = () => {
const repoList: REPO_DATA_TYPE[] = RepoData as REPO_DATA_TYPE[]
const [sortField, setSortField] = useState("stars");
const [sortType, setSortType] = useState("desc")
const languages = [...new Set(repoList.map(repo => repo.language).flat())].filter(lang => lang !== null).sort();
const [selectedLanguages, setSelectedLanguages] = useState<string[]>([]);
const [searchQuery, setSearchQuery] = useState("");
const [filteredRepos, setFilteredRepos] = useState<REPO_DATA_TYPE[]>(repoList);

useEffect(() => {
let result = repoList.filter((repo) =>
selectedLanguages.length === 0 || repo.language.some(lang => selectedLanguages.includes(lang))
);
let result = repoList.filter((repo) => {
// Filter by language
const languageMatch = selectedLanguages.length === 0 || repo.language.some(lang => selectedLanguages.includes(lang));

// Filter by search query (name or description)
const searchMatch = searchQuery === "" ||
repo.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
repo.description.toLowerCase().includes(searchQuery.toLowerCase());

return languageMatch && searchMatch;
});

if (sortField === "name") {
result.sort((a, b) => {
Expand Down Expand Up @@ -47,7 +57,7 @@ const Projects = () => {
}
setFilteredRepos(result)

}, [selectedLanguages, sortField, sortType])
}, [selectedLanguages, sortField, sortType, searchQuery])



Expand All @@ -72,6 +82,19 @@ const Projects = () => {
</p>
</section>
<div className="filter-container">
<div className="search-sort-row">
<SearchBar
searchQuery={searchQuery}
setSearchQuery={setSearchQuery}
placeholder="Search projects by name or description..."
/>
<SortDropdown
setSortField={setSortField}
setSortType={setSortType}
sortField={sortField}
sortType={sortType}
/>
</div>
<div className="language-filter">
{languages.map(lang => (
<button
Expand All @@ -84,14 +107,9 @@ const Projects = () => {
))}

</div>

<SortDropdown
setSortField={setSortField}
setSortType={setSortType}
sortField={sortField}
sortType={sortType}
/>

</div>
<div className="results-info">
Showing {filteredRepos.length} of {repoList.length} projects
</div>
<PaginatedCardGrid repos={filteredRepos} displayMode="all" />
</div>
Expand Down
53 changes: 53 additions & 0 deletions src/styles/components/SearchBar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.search-bar-container {
position: relative;
width: 100%;
max-width: 400px;
}

.search-input {
width: 100%;
padding: 10px 40px 10px 15px;
font-size: 14px;
border: none;
border-radius: 0.375rem;
background-color: #2f2f2f;
color: #f3f3f3;
outline: none;
transition: all 0.3s ease;
}

.search-input::placeholder {
color: #a0a0a0;
}

.search-input:focus {
background-color: #3a3a3a;
box-shadow: 0 0 0 2px rgba(77, 77, 77, 0.5);
}

.clear-button {
position: absolute;
right: 10px;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
color: #a0a0a0;
font-size: 18px;
cursor: pointer;
padding: 5px;
display: flex;
align-items: center;
justify-content: center;
transition: color 0.2s ease;
}

.clear-button:hover {
color: #f3f3f3;
}

@media (max-width: 768px) {
.search-bar-container {
max-width: 100%;
}
}
21 changes: 20 additions & 1 deletion src/styles/pages/Projects.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
flex-direction: column;
}

.search-sort-row {
display: flex;
gap: 1rem;
align-items: center;
flex-wrap: wrap;
}

.filter-button {
border: none;
padding: 8px 15px;
Expand All @@ -35,8 +42,20 @@
font-weight: bold;
}

.results-info {
color: #a0a0a0;
font-size: 14px;
margin: 10px 0;
font-style: italic;
}

@media (max-width:1024px) {
.filter-container {
flex-direction: column;
}
}

.search-sort-row {
flex-direction: column;
width: 100%;
}
}
Loading