-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Implement filtering and sorting features #1835
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
Open
RupertWisdomjm
wants to merge
2
commits into
mate-academy:master
Choose a base branch
from
RupertWisdomjm:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,24 @@ | ||
| import { Navigate, Route, Routes } from 'react-router-dom'; | ||
|
|
||
| import { PeoplePage } from './components/PeoplePage'; | ||
| import { Navbar } from './components/Navbar'; | ||
|
|
||
| import './App.scss'; | ||
|
|
||
| export const App = () => { | ||
| return ( | ||
| <div data-cy="app"> | ||
| <Navbar /> | ||
| export const App = () => ( | ||
| <div data-cy="app"> | ||
| <Navbar /> | ||
|
|
||
| <div className="section"> | ||
| <div className="container"> | ||
| <h1 className="title">Home Page</h1> | ||
| <h1 className="title">Page not found</h1> | ||
| <PeoplePage /> | ||
| </div> | ||
| <div className="section"> | ||
| <div className="container"> | ||
| <Routes> | ||
| <Route path="/" element={<h1 className="title mt-6">Home Page</h1>} /> | ||
| <Route path="home" element={<Navigate to="/" replace />} /> | ||
| <Route path="people"> | ||
| <Route index element={<PeoplePage />} /> | ||
| <Route path=":slug" element={<PeoplePage />} /> | ||
| </Route> | ||
| <Route path="*" element={<h1 className="title">Page not found</h1>} /> | ||
| </Routes> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
| </div> | ||
| ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import classNames from 'classnames'; | ||
| import { useSearchParams } from 'react-router-dom'; | ||
| import { SearchLink } from './SearchLink'; | ||
|
|
||
| const AVAILABLE_CENTURIES = ['16', '17', '18', '19', '20']; | ||
|
|
||
| export const CenturyFilter = () => { | ||
| const [searchParams] = useSearchParams(); | ||
| const centuries = searchParams.getAll('centuries'); | ||
|
|
||
| return ( | ||
| <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter"> | ||
| <div className="level-left"> | ||
| {AVAILABLE_CENTURIES.map(century => ( | ||
| <SearchLink | ||
| data-cy="century" | ||
| key={century} | ||
| className={classNames('button', 'mr-1', { | ||
| 'is-info': centuries.includes(century), | ||
| })} | ||
| params={{ | ||
| centuries: centuries.includes(century) // if this century is already selected | ||
| ? centuries.filter(c => c !== century) // we remove it from the selected | ||
| : [...centuries, century], // otherwise we add it to the selected | ||
| }} | ||
| > | ||
| {century} | ||
| </SearchLink> | ||
| ))} | ||
| </div> | ||
|
|
||
| <div className="level-right ml-4"> | ||
| <SearchLink | ||
| data-cy="centuryALL" | ||
| params={{ centuries: null }} | ||
| className={classNames('button', 'is-success', { | ||
| 'is-outlined': centuries.length > 0, | ||
| })} | ||
| > | ||
| All | ||
| </SearchLink> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { useSearchParams } from 'react-router-dom'; | ||
| import { getSearchWith } from '../utils/searchHelper'; | ||
|
|
||
| export const NameFilter = () => { | ||
| const [searchParams, setSearchParams] = useSearchParams(); | ||
| const query = searchParams.get('query') || ''; | ||
|
|
||
| return ( | ||
| <p className="control has-icons-left"> | ||
| <input | ||
| data-cy="NameFilter" | ||
| value={query} | ||
| onChange={event => | ||
| setSearchParams( | ||
| getSearchWith(searchParams, { | ||
| query: event.target.value || null, | ||
| }), | ||
| ) | ||
| } | ||
| className="input" | ||
| type="text" | ||
| placeholder="Search" | ||
| /> | ||
| <span className="icon is-left"> | ||
| <i className="fas fa-search" aria-hidden="true" /> | ||
| </span> | ||
| </p> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Leaving
console.login production code is usually discouraged; consider removing it after you finish debugging to keep the console clean and avoid noise during automated checks.