Skip to content
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

Nmp79/implementing filtering #184

Merged
merged 25 commits into from
Apr 30, 2024
Merged

Nmp79/implementing filtering #184

merged 25 commits into from
Apr 30, 2024

Conversation

nit0107
Copy link
Contributor

@nit0107 nit0107 commented Apr 14, 2024

Summary

This pull request is related to the filtering functionality of challenges/journeys. When a user selects certain filters on the filterForm, the search will result only displays events that match those filters.

  • Added state values for FilterForm to track selected options and passed them to/from the Challenge form
  • Defaults for location/category is empty selections, difficulty level is "easy" (as per the design handoff Figma file)
  • Implemented logic in ChallengeForm to not display events where the selected Difficulty and Locations do not match
  • Implemented Clear function to remove previous selections & view all challenges
  • Implemented full filtering on both Journeys & Challenges screen
  • Takes in user inputs from search bar and filter form
  • Modified UI to match Figma designs & be responsive

Remaining TODOs:

Test Plan

filtering4.14.mov

nit0107 and others added 2 commits April 9, 2024 18:45
@nit0107 nit0107 marked this pull request as draft April 14, 2024 13:58
nit0107 added 2 commits April 14, 2024 13:17
removed commented code
Implemented Filtering changes (except for categories)
@nit0107 nit0107 marked this pull request as ready for review April 15, 2024 01:31
Copy link
Contributor

@cgu2020 cgu2020 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just suggestions. The filter defaults too easy difficulty (not sure if we should clear all filters when the app opens). The difficulty section also is not togglable like the other categories. Location names look like how they are in the DB which we should parse into actually names. Otherwise, good work, ui looks good!

neketka
neketka previously approved these changes Apr 18, 2024
Copy link
Collaborator

@neketka neketka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, but resolve conflicts

@neketka neketka dismissed their stale review April 21, 2024 15:44

Does not apply

@dti-github-bot
Copy link
Member

dti-github-bot commented Apr 21, 2024

[diff-counting] Significant lines: 455.

Copy link
Contributor

@cathli66 cathli66 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything overall looks great and works as expected! I went ahead and fixed some minor errors with the height of the home nav bar and search bar. You hard coded it the height in pixels which didn't look right on my screen! I also changed filtering such that it takes into account search and filters together (you had the filters only apply when the search bar is empty).

@cathli66 cathli66 merged commit 7d306cf into master Apr 30, 2024
12 checks passed
@cathli66 cathli66 deleted the nmp79/filterbackend branch April 30, 2024 19:45
shah-esha pushed a commit that referenced this pull request Dec 4, 2024
* beginning structure, wip

* Filters mostly working now (except Category)

Filters mostly working now (except Category)

* removed commented code

removed commented code

* Implemented Filtering changes (except for categories)

Implemented Filtering changes (except for categories)

* removed api keys from server env

* fixed filtering bugs after merging

* added friendly names, fixed category filtering

* partial checkin for search/filter change

partial checkin for search/filter change

* partial checkin...search bar implementation

partial checkin...search bar implementation

* now the old filtering works

now the old filtering works

* Searching by challenge name and location now work from search bar

Searching by challenge name and location now work from search bar

* Fixed issue with filters not filtering correctly

Fixed issue with filters not filtering correctly

* font

* Filter UI changes

* Now journeys also do filtering

Now journeys also do filtering

* search bar ui fixed

* ran formatting commands

* tab bar matches figma

* fixed ui

* minor changes

* minor UI fixes and filter logic fixes

---------

Co-authored-by: cathli66 <[email protected]>
Co-authored-by: cathli66 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants