Enhanced-search-brian merge to enhanced-search

[brianlogic]

GitHub Issues addressed

• This PR closes

What I did

1. Fixed querying and filters not working together.

Files changed: Search.py

• Original logic of having fetch_courses() and filter_courses() return the search has remained the same.
• However, fetch_courses now takes in filters as a parameter rather than just query so filters are also applied when searching.
• Accordingly, the if statements to apply filters to results was copied from filter_courses to fetch_courses (check screenshot)

2. Implemented UI improvements from Chai

Files changed: searchbar.html

Multiple changes to the styling to improve color consistency and size of elements.

• Changed colors of the day selection to be orange
• Added search bar for disciplines and implemented JavaScript for it
• Reduced the list size for subjects and disciplines
• Search icons in the search bar for subjects and disciplines were not working correctly so they were replaced with
• Changed apply filters button

4. Removed active filters indicator in the search bar and filters button displays "Filters Active"

Files changed: searchbar.html

• The JavaScript to display the filters indicators was removed.
• If any filters are activated the filters button will display "Filters Active" and change to orange.
• JavaScript implemented to achieve this (check screenshot).
• Note: since all days are selected automatically, unselecting any filter will be considered activating a filter.

Screenshots

• After

If statements added to fetch_courses and filters added as parameter

New design implemented

Main JavaScript logic for filters active

Testing

Questions/Discussions/Notes