Skip to content

fix: merge staging3 into main #320

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

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

fix: merge staging3 into main #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e01cc5a
Refactor locator.js with distance updates and improvements
awasthiruchi Jan 31, 2026
9199c2a
Added calendar
awasthiruchi Jan 31, 2026
db8ce90
Update gap size and add new layout styles
awasthiruchi Jan 31, 2026
bdc1ef9
Merge pull request #314 from aemsites/fix-add-to-cart
dylandepass Feb 3, 2026
8be6b50
Merge pull request #319 from aemsites/wtb-edge
awasthiruchi Feb 3, 2026
ea6b959
Update geocode API endpoint to new service
awasthiruchi Feb 6, 2026
88f33de
Increase EVENTS_MAX_DISTANCE and update fetch limit
awasthiruchi Feb 13, 2026
7e2bcfa
Increase max distance for distributors and local reps
awasthiruchi Feb 16, 2026
052209b
Refactor geoCode function and update state handling
awasthiruchi Feb 19, 2026
f97a45d
Refactor geoCode function for improved readability
awasthiruchi Feb 19, 2026
41161f7
Remove distance element from locator display
awasthiruchi Mar 2, 2026
2422439
Update store location URLs in locator.js
awasthiruchi Mar 2, 2026
494f26c
Remove distance information from locator items
awasthiruchi Mar 2, 2026
685c89d
chore: merge main
davidnuescheler Mar 2, 2026
c737ea5
Resolve merge conflict while merging main into staging3
awasthiruchi Mar 6, 2026
3c006cb
Add email display functionality to locator
awasthiruchi Mar 13, 2026
862036b
Refactor locator.js and update data source URLs
awasthiruchi Mar 27, 2026
8f88545
Enhance localization and refactor locator logic
awasthiruchi Mar 27, 2026
05eee95
Fix missing newline at end of locator.js
awasthiruchi Mar 27, 2026
933298e
Increase max distance for HH distributors to 1500
awasthiruchi Mar 27, 2026
fb8c6a5
Merge pull request #382 from aemsites/Fixed-hh-dealers
awasthiruchi Mar 27, 2026
2c60b08
Refactor countryComponent handling in locator.js
awasthiruchi Mar 30, 2026
b9c0bf7
Refactor findCommResults function parameters
awasthiruchi Mar 30, 2026
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
125 changes: 124 additions & 1 deletion widgets/locator/locator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ main > .locator-container.section {
position: relative;
display: flex;
flex-direction: column;
gap: var(--spacing-60);
gap: var(--spacing-100);
margin-bottom: var(--spacing-200);
padding: var(--spacing-200);
background-color: var(--color-white);
Expand Down Expand Up @@ -207,3 +207,126 @@ main > .locator-container.section {
.locator .locator-results[aria-hidden='true'] {
display: none;
}

.locator-events-layout{
display: flex;
gap: 24px;
align-items: flex-start;

max-width: 1000px;
margin: 0 auto;
padding: var(--spacing-300);
background: var(--color-white);
}

.locator-events-layout .locator-tabpanels{
max-width: none;
margin: 0;
padding: 0;
background: transparent;
flex: 1 1 auto;
min-width: 0;
}

.locator-events-calendar{
flex: 0 0 360px;
max-width: 360px;
background: var(--color-white);
padding: var(--spacing-200);
border-radius: 8px;
}

.locator-cal-header{
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
margin-bottom: 12px;
}

.locator-cal-title{
font-weight: 600;
}

.locator-cal-grid{
display: grid;
grid-template-columns: repeat(7, minmax(0, 1fr));
gap: 6px;
}

.locator-cal-dow{
font-size: 12px;
opacity: 0.8;
text-align: center;
padding: 6px 0;
}

.locator-cal-cell{
height: 40px;
border: 1px solid rgba(0,0,0,.15);
border-radius: 6px;
background: transparent;
cursor: pointer;
}

.locator-cal-cell.is-blank{
border: none;
background: transparent;
cursor: default;
}

.locator-cal-cell.has-event{
outline: 2px solid rgba(180,0,60,.6);
}

.locator-cal-cell.is-selected{
outline: 2px solid rgba(180,0,60,1);
}
.locator-hh-layout,
.locator-comm-layout{
display: flex;
gap: 24px;
align-items: flex-start;

max-width: 1000px;
margin: 0 auto;
padding: var(--spacing-300);
background-color: var(--color-white);
}

/* IMPORTANT: override global .locator-tabpanels styles INSIDE these layouts */
.locator-hh-layout .locator-tabpanels,
.locator-comm-layout .locator-tabpanels{
max-width: none;
margin: 0;
padding: 0;
background: transparent;
flex: 1 1 auto;
min-width: 0;
}


/* Mobile */
@media (max-width: 900px){
.locator-events-layout{
flex-direction: column;
}
.locator-events-calendar{
flex: 1 1 auto;
max-width: 100%;
width: 100%;
}
.locator-hh-layout,
.locator-comm-layout{
flex-direction: column;
}

.locator-hh-side,
.locator-comm-side{
max-width: 100%;
width: 100%;
}
}



30 changes: 20 additions & 10 deletions widgets/locator/locator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ <h1 id="find-locally">Find Locally</h1>
<button role="tab" aria-selected="false" aria-controls="locator-hh-online-tabpanel" id="locator-hh-online-tab" class="locator-online">Online Retailers</button>
<button role="tab" aria-selected="false" aria-controls="locator-hh-distributors-tabpanel" id="locator-hh-distributors-tab" class="locator-distributors">Distributors</button>
</div>
<div class="locator-tabpanels">
<div class="locator-tabpanel locator-retailers" role="tabpanel" aria-labelledby="locator-hh-retailers-tab" aria-hidden="false" id="locator-hh-retailers-tabpanel"></div>
<div class="locator-tabpanel locator-online" role="tabpanel" aria-labelledby="locator-hh-online-tab" aria-hidden="true" id="locator-hh-online-tabpanel"></div>
<div class="locator-tabpanel locator-distributors" role="tabpanel" aria-labelledby="locator-hh-distributors-tab" aria-hidden="true" id="locator-hh-distributors-tabpanel"></div>
<div class="locator-hh-layout">
<div class="locator-tabpanels">
<div class="locator-tabpanel locator-retailers" role="tabpanel" aria-labelledby="locator-hh-retailers-tab" aria-hidden="false" id="locator-hh-retailers-tabpanel"></div>
<div class="locator-tabpanel locator-online" role="tabpanel" aria-labelledby="locator-hh-online-tab" aria-hidden="true" id="locator-hh-online-tabpanel"></div>
<div class="locator-tabpanel locator-distributors" role="tabpanel" aria-labelledby="locator-hh-distributors-tab" aria-hidden="true" id="locator-hh-distributors-tabpanel"></div>
</div>
</div>
</div>

Expand All @@ -51,9 +53,11 @@ <h1 id="find-locally">Find Locally</h1>
<button role="tab" aria-selected="true" aria-controls="locator-comm-distributors-tabpanel" id="locator-comm-distributors-tab" class="locator-distributors">Distributors</button>
<button role="tab" aria-selected="false" aria-controls="locator-comm-localrep-tabpanel" id="locator-comm-localrep-tab" class="locator-online">Local Representatives</button>
</div>
<div class="locator-tabpanels">
<div class="locator-tabpanel locator-distributors" role="tabpanel" aria-labelledby="locator-comm-distributors-tab" id="locator-comm-distributors-tabpanel"></div>
<div class="locator-tabpanel locator-online" role="tabpanel" aria-labelledby="locator-comm-localrep-tab" aria-hidden="true" id="locator-comm-localrep-tabpanel"></div>
<div class="locator-comm-layout">
<div class="locator-tabpanels">
<div class="locator-tabpanel locator-distributors" role="tabpanel" aria-labelledby="locator-comm-distributors-tab" id="locator-comm-distributors-tabpanel"></div>
<div class="locator-tabpanel locator-online" role="tabpanel" aria-labelledby="locator-comm-localrep-tab" aria-hidden="true" id="locator-comm-localrep-tabpanel"></div>
</div>
</div>
</div>

Expand All @@ -63,11 +67,17 @@ <h1 id="find-locally">Find Locally</h1>
<button role="tab" aria-selected="true" aria-controls="locator-events-hh-tabpanel" id="locator-events-hh-tab" class="locator-events">Household Events</button>
<button role="tab" aria-selected="false" aria-controls="locator-events-comm-tabpanel" id="locator-events-comm-tab" class="locator-events">Commercial Events</button>
</div>
<div class="locator-tabpanels">
<div class="locator-tabpanel locator-events" role="tabpanel" aria-labelledby="locator-events-hh-tab" id="locator-events-hh-tabpanel"></div>
<div class="locator-tabpanel locator-events" role="tabpanel" aria-labelledby="locator-events-comm-tab" aria-hidden="true" id="locator-events-comm-tabpanel"></div>

<div class="locator-events-layout">
<div class="locator-tabpanels">
<div class="locator-tabpanel locator-events" role="tabpanel" aria-labelledby="locator-events-hh-tab" id="locator-events-hh-tabpanel"></div>
<div class="locator-tabpanel locator-events" role="tabpanel" aria-labelledby="locator-events-comm-tab" aria-hidden="true" id="locator-events-comm-tabpanel"></div>
</div>

<div id="locator-events-calendar" class="locator-events-calendar" aria-label="Events calendar"></div>
</div>
</div>


</div>
</div>
Loading
Loading