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.

Sign up for GitHub

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

DEV 97: Search Page Redesign + Card Components Redesign #79

Open
wants to merge 95 commits into
base: main
Choose a base branch
from
Open

DEV 97: Search Page Redesign + Card Components Redesign #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
2fd10de
set up structure for filter sidebar
eficklin Oct 11, 2022
11e50c9
header
eficklin Oct 12, 2022
60cec41
provisional form elements
eficklin Oct 12, 2022
186a377
improve markup; add click handlers to controls
eficklin Oct 15, 2022
a2a0fbe
state for filter vals; attempt at collapsing list
eficklin Oct 19, 2022
b443302
Merge branch 'main' into feature/DEV-94/filter-panes
eficklin Oct 26, 2022
ac165b5
collapse indicators
eficklin Oct 26, 2022
df1a5d6
add update search logic
eficklin Oct 26, 2022
52b3918
price filter; start on styles
eficklin Nov 2, 2022
4ed9e80
styles
eficklin Nov 9, 2022
ceb07d1
cleanup
eficklin Nov 9, 2022
41a52ef
more descritive button text for AT
eficklin Nov 15, 2022
c88ae34
Removed margins between navbar and results page
ApplePieAngel Dec 10, 2022
6433ee7
Aligning filter with filter number and applying new font css
ApplePieAngel Dec 10, 2022
2a547fb
Centering the filter panel content in the container
ApplePieAngel Dec 10, 2022
112a904
Growing button with flexgrow to make it easier to click
ApplePieAngel Dec 10, 2022
a6350aa
Shrunk clear all button and aligned them lower in the contaienr
ApplePieAngel Dec 10, 2022
ee51952
Changed search bar into outlined variant
ApplePieAngel Dec 10, 2022
39c183f
Updated filter titles and checkbox + label with new font sizes
ApplePieAngel Dec 10, 2022
e5a8d66
Changed indicator title to inclusion
ApplePieAngel Dec 10, 2022
53a8744
Extended the filter bar to fill the entire height
ApplePieAngel Dec 10, 2022
7ececf6
Fixed a bug where pagination was blocking the filter from extending c…
ApplePieAngel Dec 10, 2022
f8e754e
Updated price label fontweights
ApplePieAngel Dec 10, 2022
614dd3b
Added some bottom margins to the apply button
ApplePieAngel Dec 10, 2022
baea3b4
Switched textfield label with placeholder element
ApplePieAngel Dec 10, 2022
81d9468
Made placeholder text shorter, as it was overflowing
ApplePieAngel Dec 10, 2022
1d75844
Added margin between pagination and search result
ApplePieAngel Dec 10, 2022
fd714c7
Modified the color, spacing, and alignment of the mobile buttons
ApplePieAngel Dec 12, 2022
1a97ecc
Modified Search Results in mobile view to be bolder
ApplePieAngel Dec 12, 2022
2316b34
Modified mobile filter prompt button to the proper styling
ApplePieAngel Dec 12, 2022
a3ad69d
Aligned the search result as single card rows
ApplePieAngel Dec 12, 2022
290a5e2
Removed BusinessCard minimum width
ApplePieAngel Dec 12, 2022
8c6def5
Added 8px of margins at the top
ApplePieAngel Dec 12, 2022
c01bd85
Aligned the cards in rows extending the length of the page
ApplePieAngel Dec 12, 2022
d318f32
Extended the length of business card based on grid
ApplePieAngel Dec 12, 2022
8d0a339
Extended the length of business card based on grid
ApplePieAngel Dec 12, 2022
3cba068
Deleted card components to create a custom card.
ApplePieAngel Dec 12, 2022
64c8fd2
Added additional css. Implemented icon + address
ApplePieAngel Dec 12, 2022
5e0f39b
Aligned CTAs at the bottom of the card
ApplePieAngel Dec 12, 2022
191bcbc
Replaced filler text with the chiplist and business titles
ApplePieAngel Dec 12, 2022
11a3061
Changed card color and border colors
ApplePieAngel Dec 12, 2022
f07da25
Added rating and 2 other filler CTAs
ApplePieAngel Dec 12, 2022
90104e2
Replaced CTAs with their proper text.
ApplePieAngel Dec 12, 2022
696e13b
Increased the margin for the CTA border
ApplePieAngel Dec 12, 2022
66ce39d
Increased fontWeight of title and size of location icon
ApplePieAngel Dec 12, 2022
01af7de
Removed minimum width and height on card dimensions
ApplePieAngel Dec 12, 2022
694fd46
Added a google maps link to the address
ApplePieAngel Dec 12, 2022
dc77ad6
Modified chips to be gray with black text
ApplePieAngel Dec 12, 2022
7b8b0a3
Rounded chips, increased fontSize for title, icon now links to maps
ApplePieAngel Dec 12, 2022
f1efff1
Added vertical menu button to card
ApplePieAngel Dec 12, 2022
66b5bbc
Added count for search result at the top of the search page
ApplePieAngel Dec 13, 2022
3ff247f
Made the card compontent more responsive and added coloring to the fi…
ApplePieAngel Dec 13, 2022
fd11600
Centered dropdown arrows with the text
ApplePieAngel Dec 13, 2022
bcf3d17
Centered pagination relative to the card components
ApplePieAngel Dec 13, 2022
0af480f
Replaced next and back buttons with arrows
ApplePieAngel Dec 13, 2022
fb5ce6b
Abstracted out pagination button logic
ApplePieAngel Dec 13, 2022
a198590
Added formatting for phone numbers and phone icon
ApplePieAngel Dec 13, 2022
d94a434
Clicking on the card image now redirects users to the respective page
ApplePieAngel Dec 13, 2022
30b24a2
Add review button now redirects to the respective page
ApplePieAngel Dec 13, 2022
c5fe1f0
Added the correct icon for Visit Website
ApplePieAngel Dec 13, 2022
8595719
Search results now render the correct number next to title
ApplePieAngel Dec 13, 2022
ba498c1
Phone number and add review href now encomapss the entire CTA
ApplePieAngel Dec 13, 2022
8712dc4
Fixed a error with 0 results, showing x of y results now displays pro…
ApplePieAngel Dec 13, 2022
43a9799
Fixed a bug with Search Results count not displaying at the top
ApplePieAngel Dec 13, 2022
c848f69
Showing x of y results now displays for results with 1 page
ApplePieAngel Dec 13, 2022
c1e4a63
Pagination now renders the proper logic for displaying the menu
ApplePieAngel Dec 14, 2022
116711b
Added input for pagination's go to page feature
ApplePieAngel Dec 14, 2022
febf1bd
Added gray container styling to the Go to page feature
ApplePieAngel Dec 14, 2022
e822ca2
Readjusted margins to fit new component, fixed a bug with pagination …
ApplePieAngel Dec 14, 2022
3b01eac
Deleted unused BusinessCard classes
ApplePieAngel Dec 14, 2022
15c42d6
Added a minimum height to card images
ApplePieAngel Dec 14, 2022
a5ef160
Refactored some of BusinessCard classes
ApplePieAngel Dec 14, 2022
f38883f
Fixed a bug where no results page wouldn't be centered
ApplePieAngel Dec 14, 2022
d94d570
Aligned searchResults margins as one variable
ApplePieAngel Dec 14, 2022
76f4db7
Abstracted margins from filterbar to the search content
ApplePieAngel Dec 14, 2022
0e88e7f
Abstracted margins from filterbar to the search content
ApplePieAngel Dec 14, 2022
a6b15e8
Shrunk chips and removed grid from searchResults
ApplePieAngel Dec 14, 2022
941f837
Filterbar now disappears after the breakpoint
ApplePieAngel Dec 14, 2022
78caeae
Fixed a bug with no search results and filterBar height
ApplePieAngel Dec 14, 2022
806c250
Searchresults is now more responsive based on screen width
ApplePieAngel Dec 14, 2022
5701ea2
Fixed a bug regarding filterBar height
ApplePieAngel Dec 14, 2022
41cdb87
Added conditional css for searchBody margins
ApplePieAngel Dec 14, 2022
b5b8093
Refactored businessCard components into functions
ApplePieAngel Dec 15, 2022
22b4b39
Business Card now has a mobile version
ApplePieAngel Dec 15, 2022
6fe27ba
Refactored desktop and mobile cards into one component
ApplePieAngel Dec 15, 2022
8b13dc0
Refactored some redudancy and functions to improve performance
ApplePieAngel Dec 15, 2022
64f5359
Refactored redundant state variable
ApplePieAngel Dec 15, 2022
4804100
Adjusted the searchbar width
ApplePieAngel Dec 15, 2022
14459b7
DEV-97.1: Finishing and Refactoring Pagination (#80)
ApplePieAngel Mar 5, 2023
06dbeb0
Merge branch 'main' into DEV-97-Card-Components-Redesign
ApplePieAngel Mar 6, 2023
60e7338
Update Search.jsx
ApplePieAngel Mar 6, 2023
09ddf02
Fixed css error regarding withStyles
ApplePieAngel Mar 6, 2023
399888c
Update Search.jsx
ApplePieAngel Mar 6, 2023
3ad8977
Attempted fix of parse errors in imported module
ApplePieAngel Mar 6, 2023
0fc486f
Added destructuring to user context
ApplePieAngel Apr 23, 2023
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
5 changes: 3 additions & 2 deletions src/components/AppBar/AppBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const AppBar = ({
const [showSearchBar, setShowSearchBar] = useState(false);

const userContext = useContext(UserContext);
const { userProfile } = userContext;
const location = useLocation();
const path = location.pathname;
const history = useHistory();
Expand Down Expand Up @@ -139,7 +140,7 @@ const AppBar = ({
onClick={handleClick}
data-testid="open-user-dropdown"
>
{TruncateUserName(userContext.userProfile.username)}
{TruncateUserName(userProfile?.username)}
</Button>
<Menu
id="log-in-positioned-menu"
Expand Down Expand Up @@ -201,7 +202,7 @@ const AppBar = ({
&& <Box className={classes.expandedContent}><SearchBar /></Box>}
<Box className={classes.navLinkBar}>
<AddASpace />
{userContext.userProfile?.username ? <LoggedInDropdown /> : <LogIn />}
{userProfile?.username ? <LoggedInDropdown /> : <LogIn />}
</Box>
</Toolbar>
{!isDesktopWidth && showSearchBar
Expand Down
Loading