From f33f2b6db49f44612bdb3d67dbd83947dbd2120f Mon Sep 17 00:00:00 2001 From: Danel Kungla Date: Tue, 26 Aug 2025 16:36:06 +0300 Subject: [PATCH] feat: update AppLogo component to use pathsConfig for home navigation --- app/home/(user)/(dashboard)/layout.tsx | 7 ++- .../_components/home-menu-navigation.tsx | 55 +++++++++++++------ .../team-account-navigation-menu.tsx | 7 ++- app/home/[account]/layout.tsx | 12 ++-- 4 files changed, 54 insertions(+), 27 deletions(-) diff --git a/app/home/(user)/(dashboard)/layout.tsx b/app/home/(user)/(dashboard)/layout.tsx index 8344158..99d2bdc 100644 --- a/app/home/(user)/(dashboard)/layout.tsx +++ b/app/home/(user)/(dashboard)/layout.tsx @@ -8,7 +8,10 @@ import { z } from 'zod'; import { UserWorkspaceContextProvider } from '@kit/accounts/components'; import { AppLogo } from '@kit/shared/components/app-logo'; -import { personalAccountNavigationConfig } from '@kit/shared/config'; +import { + pathsConfig, + personalAccountNavigationConfig, +} from '@kit/shared/config'; import { Page, PageMobileNavigation, PageNavigation } from '@kit/ui/page'; import { SidebarProvider } from '@kit/ui/shadcn-sidebar'; @@ -92,7 +95,7 @@ function MobileNavigation({ }) { return ( <> - + diff --git a/app/home/(user)/_components/home-menu-navigation.tsx b/app/home/(user)/_components/home-menu-navigation.tsx index c6b91c2..fb91de9 100644 --- a/app/home/(user)/_components/home-menu-navigation.tsx +++ b/app/home/(user)/_components/home-menu-navigation.tsx @@ -1,27 +1,35 @@ import Link from 'next/link'; + +import { createI18nServerInstance } from '@/lib/i18n/i18n.server'; +import { pathsConfig } from '@/packages/shared/src/config'; +import { formatCurrency } from '@/packages/shared/src/utils'; +import { SIDEBAR_WIDTH_PROPERTY } from '@/packages/ui/src/shadcn/constants'; +import { StoreCart } from '@medusajs/types'; import { ShoppingCart } from 'lucide-react'; -import { Trans } from '@kit/ui/trans'; import { AppLogo } from '@kit/shared/components/app-logo'; import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container'; import { Search } from '@kit/shared/components/ui/search'; -import { SIDEBAR_WIDTH_PROPERTY } from '@/packages/ui/src/shadcn/constants'; import { Button } from '@kit/ui/button'; +import { Card } from '@kit/ui/shadcn/card'; +import { Trans } from '@kit/ui/trans'; import { UserNotifications } from '../_components/user-notifications'; import { type UserWorkspace } from '../_lib/server/load-user-workspace'; -import { StoreCart } from '@medusajs/types'; -import { formatCurrency } from '@/packages/shared/src/utils'; -import { createI18nServerInstance } from '@/lib/i18n/i18n.server'; -export async function HomeMenuNavigation(props: { workspace: UserWorkspace, cart: StoreCart | null }) { +export async function HomeMenuNavigation(props: { + workspace: UserWorkspace; + cart: StoreCart | null; +}) { const { language } = await createI18nServerInstance(); const { workspace, user, accounts } = props.workspace; - const totalValue = props.cart?.total ? formatCurrency({ - currencyCode: props.cart.currency_code, - locale: language, - value: props.cart.total, - }) : 0; + const totalValue = props.cart?.total + ? formatCurrency({ + currencyCode: props.cart.currency_code, + locale: language, + value: props.cart.total, + }) + : 0; const cartItemsCount = props.cart?.items?.length ?? 0; const hasCartItems = cartItemsCount > 0; @@ -29,8 +37,7 @@ export async function HomeMenuNavigation(props: { workspace: UserWorkspace, cart return (
- - +
+ + € {Number(0).toFixed(2).replace('.', ',')} + {hasCartItems && ( - )} - - diff --git a/app/home/[account]/_components/team-account-navigation-menu.tsx b/app/home/[account]/_components/team-account-navigation-menu.tsx index b224ca9..d0be16d 100644 --- a/app/home/[account]/_components/team-account-navigation-menu.tsx +++ b/app/home/[account]/_components/team-account-navigation-menu.tsx @@ -1,6 +1,9 @@ import { useMemo } from 'react'; -import { getTeamAccountSidebarConfig } from '@/packages/shared/src/config'; +import { + getTeamAccountSidebarConfig, + pathsConfig, +} from '@/packages/shared/src/config'; import { AppLogo } from '@kit/shared/components/app-logo'; import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container'; @@ -47,7 +50,7 @@ export function TeamAccountNavigationMenu(props: { return (
- +
diff --git a/app/home/[account]/layout.tsx b/app/home/[account]/layout.tsx index 42620f2..104eb72 100644 --- a/app/home/[account]/layout.tsx +++ b/app/home/[account]/layout.tsx @@ -5,19 +5,21 @@ import { cookies } from 'next/headers'; import { z } from 'zod'; import { AppLogo } from '@kit/shared/components/app-logo'; -import { getTeamAccountSidebarConfig } from '@kit/shared/config'; +import { getTeamAccountSidebarConfig, pathsConfig } from '@kit/shared/config'; import { CompanyGuard, TeamAccountWorkspaceContextProvider, } from '@kit/team-accounts/components'; import { Page, PageMobileNavigation, PageNavigation } from '@kit/ui/page'; import { SidebarProvider } from '@kit/ui/shadcn-sidebar'; + +import { withI18n } from '~/lib/i18n/with-i18n'; + // local imports import { TeamAccountLayoutMobileNavigation } from './_components/team-account-layout-mobile-navigation'; import { TeamAccountLayoutSidebar } from './_components/team-account-layout-sidebar'; import { TeamAccountNavigationMenu } from './_components/team-account-navigation-menu'; import { loadTeamWorkspace } from './_lib/server/team-account-workspace.loader'; -import { withI18n } from '~/lib/i18n/with-i18n'; type TeamWorkspaceLayoutProps = React.PropsWithChildren<{ params: Promise<{ account: string }>; @@ -66,7 +68,7 @@ function SidebarLayout({ - +
- +
- +