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

Jump to bottom

[OUR415-314] Fixes eligibility and category lists in Browse Experience #258

Merged
merged 22 commits into from
Nov 6, 2024
+62 −33
Merged

[OUR415-314] Fixes eligibility and category lists in Browse Experience #258

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
da97207
Expands limit
rosschapman Nov 4, 2024
c0b198a
Expands limit
rosschapman Nov 4, 2024
e675e37
Whoops
rosschapman Nov 4, 2024
1640b01
Fixes mobile filter overlay
rosschapman Nov 5, 2024
1428afb
Fixes dropdown overlay mobile
rosschapman Nov 5, 2024
c7e7121
Fix dropdown top
rosschapman Nov 5, 2024
ac139b6
Adds limit constant
rosschapman Nov 5, 2024
e7d924a
Adds new component template, search test helpers, and adds browse ref…
rosschapman Nov 5, 2024
4be2bd8
Undo package changes
rosschapman Nov 5, 2024
8f8a966
Undo webpack change
rosschapman Nov 6, 2024
970b00a
Creates template folder
rosschapman Nov 6, 2024
3cba11c
Updates test
rosschapman Nov 6, 2024
e7e19fe
Merge branch 'OUR415-314-testing-browse' into OUR415-314-cat-changes
rosschapman Nov 6, 2024
b019b84
Updates test
rosschapman Nov 6, 2024
e01c50c
Updates test comment and incrementing
rosschapman Nov 6, 2024
8c918ba
Updates test comment and incrementing
rosschapman Nov 6, 2024
b9587cf
Updates test comment and incrementing
rosschapman Nov 6, 2024
40f3ce7
Updates test title
rosschapman Nov 6, 2024
bf2dfa4
Removes console log
rosschapman Nov 6, 2024
50c061a
Merge branch 'OUR415-314-testing-browse' into OUR415-314-cat-changes
rosschapman Nov 6, 2024
b2616dd
Merge branch 'main' into OUR415-314-cat-changes
rosschapman Nov 6, 2024
f657c65
Fixes prettier error
rosschapman Nov 6, 2024
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
1 change: 1 addition & 0 deletions app/components/search/Refinements/BrowseRefinementList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const BrowseRefinementList = ({ attribute, transform }: Props) => {
attribute,
sortBy: ["name:asc"],
transformItems: transform,
limit: 9999,
});

useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion app/components/search/Refinements/SearchRefinementList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface Props extends UseRefinementListProps {
}

const DEFAULT_CONFIG = {
limit: 100,
limit: 9999,
operator: "or" as const,
};

Expand Down
3 changes: 2 additions & 1 deletion app/components/search/Sidebar/Sidebar.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
align-self: flex-start;
border-right: 0;
background-color: #fff;
z-index: $z-index-filters-menu;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

note: Discovered a bug where the filters were not on top.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Speaking of z-indexes. The category dropdown appears to have a higher z-index than the navigation bar. If that would be a quick fix, might make sense to put it in this PR

image

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

What browser/resolution is that? I don't even know how to get in that state 😅

}

@media screen and (max-width: $break-tablet-s) {
Expand Down Expand Up @@ -67,7 +68,7 @@

@media screen and (max-width: $break-tablet-s) {
width: 100%;
top: 65px;
top: 131px;
border-top-left-radius: 12px;
border-top-right-radius: 12px;
animation-name: slideUp;
Expand Down
23 changes: 9 additions & 14 deletions app/components/ui/Navigation/DropdownMenu.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
@import "../../../styles/utils/_helpers.scss";
@import "../../../styles/utils/_colors.scss";

.navigationMenuContainer {
// Important to override react-burger-menu lib styles
display: flex !important;
flex-direction: column;
align-items: center;
Comment on lines -5 to -8
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

note: We got rid of the react-burger-menu lib so these declarations are no longer necessary.


> * {
font-size: 18px;
font-family: Montserrat;
}
.navigationMenuContainer > * {
font-size: 18px;
font-family: Montserrat;
}

.navigationSubMenu {
position: absolute;
z-index: $z-index-top;
top: 65px;
top: 46px;
background: $white;
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.2);
border-radius: $rounded-md;
overflow: hidden;
font-weight: 400;
width: max-content;
}

.navigationMenuHeader {
Expand Down Expand Up @@ -92,11 +86,12 @@

.categoryMenuContainer {
position: relative;
min-width: 160px;


.navigationSubMenu {
top: 50px;
left: 0;
@include r_max($break-tablet-s) {
width: calc(100vw - $general-spacing-xs);
}
Comment on lines +95 to +97
Copy link
Collaborator Author

@rosschapman rosschapman Nov 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

note: This expands the top level category dropdown full width. Had not implemented it yet.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Just wondering - Is there a reason for choosing general-spacing-xs? Or for adding that only on the category dropdown rather the nav dropdown too?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Only that I discovered this variable defined the correct spacing.

}

.navigationMenuHeader {
Expand Down
Loading