Skip to content

Commit a458a0c

Browse files
committed
Squashed 'template/pages/' changes from 4437182..2dc9250
2dc9250 Update with @ecomplus/storefront-template v2.0.0-beta.164 git-subtree-dir: template/pages git-subtree-split: 2dc925018e72830a4904dd0f2c1d824e95d9c86c
1 parent ea04bc8 commit a458a0c

File tree

3 files changed

+37
-7
lines changed

3 files changed

+37
-7
lines changed

@/layout/header.ejs

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ if (header.categories_list) {
4343
}
4444
isCategoriesNavFull = header.categories_list.full_width
4545
}
46+
const hasMegamenu = header.desktop_megamenu
4647
%>
4748

4849
<div id="overlay" class="fade"></div>
@@ -123,7 +124,7 @@ if (header.categories_list) {
123124
<div class="header__row row">
124125
<div class="col-auto p-0">
125126
<button
126-
class="btn header__toggler"
127+
class="btn header__toggler<%= hasMegamenu ? ' d-lg-none' : '' %>"
127128
type="button"
128129
onclick="toggleSidenav()"
129130
aria-label="Toggle side navigation"
@@ -254,10 +255,38 @@ if (header.categories_list) {
254255
<% if (categories && categories.length) { %>
255256
<div class="d-none d-lg-block <%= isCategoriesNavFull ? 'col-12 order-lg-last' : 'col' %>">
256257
<nav class="header__nav<%= isCategoriesNavFull ? ' header__nav--full' : '' %>">
257-
<% categories.forEach(({ slug, name }) => { %>
258-
<a href="javascript:;" onclick="toggleSidenav('<%= slug %>')">
259-
<%= ` ${name} ` %>
260-
</a>
258+
<% categories.forEach(({ slug, name}) => { %>
259+
<% let $categoryLink %>
260+
<div class="d-inline-block">
261+
<a
262+
href="javascript:;"
263+
class="header__category"
264+
<%- hasMegamenu
265+
? `onmouseover="toggleSubmenu('${slug}', this)" onclick="toggleSubmenu('${slug}', this, true)"`
266+
: `onclick="toggleSidenav('${slug}')"` %>
267+
>
268+
<%= name %>
269+
</a>
270+
<%- $categoryLink %>
271+
<% if (slug && hasMegamenu) { %>
272+
<% const subcategories = _.categories.filter(({ parent }) => parent && parent.slug === slug) %>
273+
<% if (subcategories.length) { %>
274+
<nav class="header__submenu" id="<%= `s-${slug.replace(/\//g, '_')}` %>">
275+
<% subcategories.forEach(subcategory => { %>
276+
<div>
277+
<a href="<%= subcategory.slug %>"><%= subcategory.name %></a>
278+
<% const thirdCategories = _.categories.filter(({ parent }) => parent && parent.slug === subcategory.slug) %>
279+
<% thirdCategories.forEach(thirdCategory => { %>
280+
<a class="header__submenu-subcategory" href="<%= thirdCategory.slug %>">
281+
<%= thirdCategory.name %>
282+
</a>
283+
<% }) %>
284+
</div>
285+
<% }) %>
286+
</nav>
287+
<% } %>
288+
<% } %>
289+
</div>
261290
<% }) %>
262291
</nav>
263292
</div>

@/layout/menu.ejs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,4 @@ if (mainCategories) {
178178
<% } %>
179179
</footer>
180180
</aside>
181+

admin/index.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<% if (!_.settings.repository || !_.settings.repository.startsWith('ecomplus-stores/')) { %>
3333
<script src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script>
3434
<% } %>
35-
<script src="https://unpkg.com/netlify-cms-app/dist/netlify-cms-app.js"></script>
35+
<script src="https://unpkg.com/@ecomplus/storefront-cms/dist/storefront-cms.min.js"></script>
3636
<script>
37-
window.CMS = NetlifyCmsApp;
37+
window.CMS = StorefrontCMS;
3838
</script>
3939

4040
<%- await include('@/json', { _ }) %>

0 commit comments

Comments
 (0)