Skip to content

Develop #600

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

Merged
RobinMeles merged 3 commits into from
Feb 21, 2025
Merged

Develop #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0edf932
fix translation key and profile menu item
dev-rminds Feb 21, 2025
fad92ed
add profile link to mobile menu
dev-rminds Feb 21, 2025
e2061e2
Merge pull request #597 from teamforus/fixes.translation-key
RobinMeles Feb 21, 2025
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
21 changes: 17 additions & 4 deletions react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktopMenuUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ export const TopNavbarDesktopMenuUser = () => {
<em className="mdi mdi-ticket-percent-outline" />
{translate('top_navbar.user_menu.my_vouchers')}
</StateNavLink>

<div
id="open_pincode_popup"
tabIndex={0}
Expand All @@ -120,6 +121,7 @@ export const TopNavbarDesktopMenuUser = () => {
<em className="mdi mdi-cellphone" />
{translate('top_navbar.user_menu.authorize')}
</div>

<StateNavLink
id="bookmarked_products"
name={'bookmarked-products'}
Expand All @@ -128,6 +130,7 @@ export const TopNavbarDesktopMenuUser = () => {
<em className="mdi mdi-cards-heart-outline" />
{translate('top_navbar.user_menu.bookmarks')}
</StateNavLink>

<StateNavLink
id="reservations"
name={'reservations'}
Expand All @@ -136,6 +139,7 @@ export const TopNavbarDesktopMenuUser = () => {
<em className="mdi mdi-calendar-outline" />
{translate('top_navbar.user_menu.reservations')}
</StateNavLink>

{appConfigs.has_reimbursements && (
<StateNavLink
id="reimbursements"
Expand All @@ -146,6 +150,7 @@ export const TopNavbarDesktopMenuUser = () => {
{translate('top_navbar.user_menu.reimbursements')}
</StateNavLink>
)}

<StateNavLink
id="fund-requests"
name={'fund-requests'}
Expand All @@ -155,6 +160,7 @@ export const TopNavbarDesktopMenuUser = () => {
<em className="mdi mdi-card-account-details-outline" />
{translate('top_navbar.user_menu.fund_requests')}
</StateNavLink>

{appConfigs.has_payouts && (
<StateNavLink
id="payouts"
Expand All @@ -165,10 +171,12 @@ export const TopNavbarDesktopMenuUser = () => {
{translate('top_navbar.user_menu.payouts')}
</StateNavLink>
)}

<StateNavLink name={'notifications'} className="auth-user-menu-item" tabIndex={0}>
<em className="mdi mdi-bell-outline" />
{translate('top_navbar.user_menu.notifications')}
</StateNavLink>

<StateNavLink
id="notification_preferences"
name="preferences-notifications"
Expand All @@ -177,16 +185,21 @@ export const TopNavbarDesktopMenuUser = () => {
<em className="mdi mdi-cog-outline" />
{translate('top_navbar.user_menu.preferences_notifications')}
</StateNavLink>
<StateNavLink id="profile" name="profile" className="auth-user-menu-item" tabIndex={0}>
<em className="mdi mdi-account-check" />
{translate('top_navbar.user_menu.profile')}
</StateNavLink>

{authIdentity?.profile && (
<StateNavLink id="profile" name="profile" className="auth-user-menu-item" tabIndex={0}>
<em className="mdi mdi-account-check" />
{translate('top_navbar.user_menu.profile')}
</StateNavLink>
)}

{envData.config.sessions && (
<StateNavLink name={'security-sessions'} className="auth-user-menu-item" tabIndex={0}>
<em className="mdi mdi-shield-account" />
{translate('top_navbar.user_menu.security_sessions')}
</StateNavLink>
)}

<StateNavLink
id="identity_emails"
name="identity-emails"
Expand Down
14 changes: 14 additions & 0 deletions react/src/webshop/components/elements/top-navbar/mobile/TopNavbarMobileMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,20 @@ export default function TopNavbarMobileMenu() {
</StateNavLink>
)}

{authIdentity?.profile && (
<StateNavLink
className="mobile-menu-item"
name="profile"
onClick={hideMobileMenu}
aria-current={route.state?.name == 'profile' ? 'true' : undefined}
onKeyDown={clickOnKeyEnter}
tabIndex={0}
role="link">
<em className="mobile-menu-item-icon mdi mdi-account-check" />
{translate('top_navbar.buttons.mobile.dropdown.profile')}
</StateNavLink>
)}

{authIdentity && envData.config.sessions && (
<StateNavLink
className="mobile-menu-item"
Expand Down
2 changes: 1 addition & 1 deletion react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ export default function ModalProductReserve({
<button
className="button button-primary button-sm"
onClick={() => selectVoucher(voucher)}>
{translate('modal_reserve_product.choose')}
{translate('modal_reserve_product.choose_credit')}
</button>
</div>
)}
Expand Down