Skip to content

Commit

Permalink
Merge pull request #61 from thelia/fix/account-pages
Browse files Browse the repository at this point in the history
fix: account pages
  • Loading branch information
manonbecle authored Sep 25, 2024
2 parents aa0e7a6 + 375dd38 commit a06b39c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions assets/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { ModalFunction } from '@components/Molecules/Modal/Modal';
import { slider } from '@js/slider';
import ProductGallery from '@components/Layout/ProductGallery/ProductGallery';
import PasswordControlsFunction from '@components/Molecules/PasswordControls/PasswordControls';
import headerButtonProfileFunction from '@components/Molecules/HeaderButton/HeaderButtonProfile';

import StepsFunction from '@components/Molecules/Step/Steps.js';

Expand All @@ -35,6 +36,7 @@ function main() {
StepsFunction();
FieldInputFunction();
ModalFunction();
headerButtonProfileFunction();
}

document.addEventListener('DOMContentLoaded', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="h-full">
{% include '@components/Molecules/HeaderButton/HeaderButton.html.twig' with {icon: 'account-logged',inactive: inactive|default(true), text: 'Prénom N.', classes:"HeaderNav-btn HeaderButton--theme profile" } %}
<ul class="DropdownProfile">
<li>{% include '@components/Molecules/userMenu/UserMenu.html.twig' with {customText: 'Mes commandes', href: '#', variant: 'white'} %}</li>
<li>{% include '@components/Molecules/userMenu/UserMenu.html.twig' with {customText: 'Mon profil', href: '#', variant: 'white'} %}</li>
<li>{% include '@components/Molecules/userMenu/UserMenu.html.twig' with {customText: 'Mes adresses de livraison', href: '#', variant: 'white'} %}</li>
<li>{% include '@components/Molecules/UserMenu/UserMenu.html.twig' with {customText: 'Mes commandes', href: '/account-orders', variant: 'white'} %}</li>
<li>{% include '@components/Molecules/UserMenu/UserMenu.html.twig' with {customText: 'Mon profil', href: '/account', variant: 'white'} %}</li>
<li>{% include '@components/Molecules/UserMenu/UserMenu.html.twig' with {customText: 'Mes adresses de livraison', href: '/account-address', variant: 'white'} %}</li>
</ul>
</div>
4 changes: 3 additions & 1 deletion components/Organisms/HeaderNav/HeaderNav.html.twig
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<div class='HeaderNav'>
{% include '@components/Molecules/HeaderButton/HeaderButton.html.twig' with { icon: 'search', classes: 'HeaderNav-btn HeaderButton--light', text: 'Search'|trans, small: true } %}
{% include '@components/Molecules/HeaderButton/HeaderButton.html.twig' with { icon: 'heart-fill', classes: 'HeaderNav-btn HeaderButton--light', text: 'Wishlist'|trans, small: true } %}
{% include '@components/Molecules/HeaderButton/HeaderButtonProfile.html.twig' %}
{% include '@components/Molecules/HeaderButton/HeaderButton.html.twig' with { icon: 'account', classes: 'HeaderNav-btn HeaderButton--theme', text: 'Account'|trans, small: true } %}
{# Bouton mon profil à afficher quand on est connecté #}
{# {% include '@components/Molecules/HeaderButton/HeaderButtonProfile.html.twig' %} #}
{% include '@components/Molecules/HeaderButton/HeaderButton.html.twig' with { icon: 'cart', text: 'Cart'|trans, classes: 'HeaderNav-btn HeaderButton--dark ', small: true} %}
{% include '@components/Molecules/HeaderButton/HeaderButton.html.twig' with { icon: 'menu', id: "toggleMenu", classes: 'HeaderNav-btn HeaderButton--light lg:hidden', text: 'Menu'|trans, small: true } %}
</div></header>

0 comments on commit a06b39c

Please sign in to comment.