-
Notifications
You must be signed in to change notification settings - Fork 687
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
feature: Layered Navigation (Filters) #797
Merged
jimbo
merged 134 commits into
magento:develop
from
codeAdrian:feature/layered-navigation
Jun 3, 2019
+1,368
−80
Merged
Changes from 1 commit
Commits
Show all changes
134 commits
Select commit
Hold shift + click to select a range
9d16fb3
Create components for filter button in category page header, filter m…
AlexeyKaryka 2789247
Merge & Update
3bd1548
Adjusted Category components for filters and replaced placeholder fil…
c6fc7af
Adjusting Icon components to optimized syntax
8185ced
Filter component improvements, Added swatch and default renderer, imp…
116890a
Filter render components and styles
0227917
Design adjustments
507430a
Filters adjustments
0443d60
Current filters
ea32f32
Filter lists & block adjustment - improving state management
cf6f4da
Style adjustments
b715208
Attempting to fix re-render issue
56fb22c
Removing state and using props again, partial fix
31927b4
Current filters adjustment, code cleanup
0c1f981
Code cleanup and swatch styles adjustments
7459cd4
Merge branch 'temp/layered-nav-fix' into feature/layered-navigation
1841af1
Component styles, code cleanup
f6c9f9a
Swatch adjustment
f5a7002
Code cleanup
ad39d5c
Code cleanup, code splitting, URL functionality
1819a91
URL clear feature
663274c
Get Filter params from URL
6b7d7eb
Filters URL query
0a3c6cd
Cleanup
1b32eca
Cleanup console logs
6ea2274
Drawer adjustment & styles update
f56578d
Update to newest release
a5d0760
Merge branch 'feature/yarn-upgrade' into feature/layered-navigation
b138454
Code cleanup & fixing pagination functions
b352057
PropTypes work in progress
fef24a6
Adding PropTypes
cd2adad
Filter Search update
ca879ac
PropTypes update
58d51e0
Merge branch 'release/2.0' into feature/layered-navigation
codeAdrian 2d4157b
Merge branch 'release/2.0' of https://github.com/magento-research/pwa…
4be992e
Merge branch 'feature/layered-navigation' of github.com:codeAdrian/pw…
bcc416a
Fixed uppercase component name
744e3b5
Fixed uppercase component name
9da2ecd
Component uppercase name fix
d448e46
Revert filter changes
97996ca
Update failing test
e1ce65b
Merge with latest release, fix conflicts
0c42774
Fix test for PurchaseHistory page filter
fc4b72a
Improving graphql query & code cleanup
99e1b88
Code cleanup & Fix static typing
ec04f3c
Fix failing test
482fc8e
Merge branch 'develop' into feature/layered-navigation
supernova-at 8c1fb94
Fix z-index
942eecf
Merge with develop and fix conflicts
e277144
Merge branch 'feature/layered-navigation' of github.com:codeAdrian/pw…
5742255
Merge branch 'develop' into feature/layered-navigation
codeAdrian 9426a50
Merge branch 'develop' into feature/layered-navigation
codeAdrian 7516fbe
Add required props to small_image in category gql
sirugh 153f68b
Merge branch 'develop' into feature/layered-navigation
sirugh f55e52d
Merge branch 'develop' into feature/layered-navigation
sirugh f66e083
Merge branch 'develop' into feature/layered-navigation
codeAdrian f1ff6f6
Improved URL generation on filter clear, added extra actions, code cl…
4cc4415
CSS Fix
8b73800
CSS z-index fix
dd37636
Fix layered navigation bug
123655a
Merge branch 'develop' into feature/layered-navigation
codeAdrian fef6c31
Merge branch 'develop' into feature/layered-navigation
codeAdrian 3f98d38
Remove prevPageTotal
895fbfd
CSS cleanup
61d03a2
Rename filter props
a034291
Removed generateColor constant
ca81667
Remove unused option
f7ab947
Filter redux store init with URL instead of component mount
e8ab64f
Replace getDerivedStateFromProps with connected catalog store in redux
468509a
Replace duplicate filterOption.add and filterOption.remove with filte…
438b6f7
Merge branch 'develop' into feature/layered-navigation
codeAdrian 1174a66
Revert commit
f000b0e
Remove unused reducer, connect filterModal to redux
7df6d8d
Added conditional rendering to filter button
5c43965
Clean up modal controls on filter modal
19cd3da
Replaced var with const in iterator
82c3500
Rename add and remove filter functions
6922ad0
Replace filter swatch with default swatch component
47e8aee
filterSearch improvements
76af05c
Fix filter modal css - replace value with var
eb2d531
Merge branch 'develop' into feature/layered-navigation
codeAdrian b6aa5a5
Split categoryContent component into container and component, fix bro…
571fd1b
Merge branch 'develop' into feature/layered-navigation
codeAdrian 920a2bb
Merge branch 'develop' into feature/layered-navigation
codeAdrian efa17bb
Fix eslint errors
7298060
Merge branch 'develop' into feature/layered-navigation
codeAdrian 1a85088
Strip HTML from filter label and remove dangerouslySetInnerHtml - tem…
74fef5c
Remove unused const and improved filter search
8603257
Merge branch 'develop' into feature/layered-navigation
jimbo b59f969
Merge branch 'develop' into feature/layered-navigation
codeAdrian 2941768
Refactoring with React portal
264d84d
Merge branch 'feature/layered-navigation-withPortal' into feature/lay…
7a7e52c
Merge branch 'develop' into feature/layered-navigation
codeAdrian c3d4b92
Replace div element with more appropriate aside element for modal
c95df08
Move Portal to root div
a547039
Merge branch 'develop' into feature/layered-navigation
codeAdrian c0dc68d
Added focus shifting
c13975b
Revert focus fix
1f5da7c
Add filers to search results page and style them
c0bef34
Filter modal CSS adjusments - positioning and transition
d822143
Merge branch 'develop' into feature/layered-navigation
codeAdrian cf1dc80
Merge branch 'feature/layered-navigation' of github.com:codeAdrian/pw…
f30bc57
Style guide & CSS update
2027e4a
Proptype updates & code cleanup
17b852e
Merge branch 'develop' into feature/layered-navigation
jimbo f07c0a8
Merge branch 'develop' into feature/layered-navigation
codeAdrian a404541
Code cleanup and improving modal component
77a22b5
Quick fix: var name
c49d9b5
Adjust modal props
jimbo 0ca5b48
Minor fixes
5a52a88
Styles update
361d6dd
Merge branch 'develop' into feature/layered-navigation
codeAdrian 1d27903
Fix reset filter search issue
d0bbdbd
Fix page reset on filter reset
1ddcc11
Class apply fix
361e7b0
Preserve page number on filter change
073242e
Merge branch 'develop' into feature/layered-navigation
codeAdrian 3f93c0f
Fix Search page filter
ac7fc04
Merge branch 'develop' into feature/layered-navigation
codeAdrian 8707335
Fix filter UX issues
87bc75b
Add comment to util functions
a0d0b2d
Merge branch 'develop' into feature/layered-navigation
codeAdrian e640fe0
Fix filters persistence issue
156fa22
Fix filter persistence on modal close
ccf5444
Remove unused import
605a46b
Merge branch 'develop' into feature/layered-navigation
dpatil-magento 9110c3c
CSS fixes
06f4963
Merge branch 'develop' into feature/layered-navigation
codeAdrian 0e122d3
Merge branch 'develop' into feature/layered-navigation
dpatil-magento a64cc38
Merge branch 'develop' into feature/layered-navigation
codeAdrian 66e92cb
Merge branch 'develop' into feature/layered-navigation
codeAdrian c4bf3cc
Resolve conflicts with hooks refactor
jimbo 23f7ffe
Merge branch 'develop' into feature/layered-navigation
jimbo 696b825
Minor fixes and cleanup
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
Code cleanup and swatch styles adjustments
There are no files selected for viewing
This file contains 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 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 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 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 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 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
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.
Is this prop necessary anymore? I couldn't see it used anywhere.
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.
You are right, thanks for catching that. It must have slipped through the previous conflicts I have resolved. Code has been updated with "prevPageTotal" references, reducers and tests removed.