diff --git a/src/app/ui/AppBreadcrumbs.tsx b/src/app/ui/AppBreadcrumbs.tsx index 20fce7a..f9c8464 100644 --- a/src/app/ui/AppBreadcrumbs.tsx +++ b/src/app/ui/AppBreadcrumbs.tsx @@ -27,7 +27,7 @@ const AppBreadcrumbs: FC = () => { return ; if (operations) return ( - + { ); if (events) return ( - + { ); if (income) return ( - + { ); if (account) return ( - + diff --git a/src/pages/account-events/ui/components/AccountEventsPageEmpty.view.tsx b/src/pages/account-events/ui/components/AccountEventsPageEmpty.view.tsx index 825bdd9..6318a6c 100644 --- a/src/pages/account-events/ui/components/AccountEventsPageEmpty.view.tsx +++ b/src/pages/account-events/ui/components/AccountEventsPageEmpty.view.tsx @@ -7,7 +7,7 @@ import type { EventsRefreshState } from "../AccountEventsPage.vm"; const AccountEventsPageEmpty: FC = (props) => { const { t } = useTranslation(); return ( - + {t("events.title")} {props.refreshing ? ( diff --git a/src/pages/account-events/ui/components/AccountEventsPageLoaded.view.tsx b/src/pages/account-events/ui/components/AccountEventsPageLoaded.view.tsx index 1f80437..6067a8d 100644 --- a/src/pages/account-events/ui/components/AccountEventsPageLoaded.view.tsx +++ b/src/pages/account-events/ui/components/AccountEventsPageLoaded.view.tsx @@ -14,7 +14,7 @@ type AccountEventsPageLoadedProps = EventsRefreshState & { const AccountEventsPageLoaded: FC = (props) => { const { t } = useTranslation(); return ( - + {t("events.title")} {props.refreshing ? ( diff --git a/src/pages/account-income/ui/components/AccountIncomePageLoaded.view.tsx b/src/pages/account-income/ui/components/AccountIncomePageLoaded.view.tsx index 0be4570..4e36b1e 100644 --- a/src/pages/account-income/ui/components/AccountIncomePageLoaded.view.tsx +++ b/src/pages/account-income/ui/components/AccountIncomePageLoaded.view.tsx @@ -33,7 +33,7 @@ const AccountIncomePageLoaded: FC = (props) => { } = props; const { t } = useTranslation(); return ( - + {t("income.title")} { const { t } = useTranslation(); return ( - + diff --git a/src/pages/account-operations/ui/components/AccountOperationsPageLoaded.view.tsx b/src/pages/account-operations/ui/components/AccountOperationsPageLoaded.view.tsx index 774128e..1a5f921 100644 --- a/src/pages/account-operations/ui/components/AccountOperationsPageLoaded.view.tsx +++ b/src/pages/account-operations/ui/components/AccountOperationsPageLoaded.view.tsx @@ -73,7 +73,7 @@ const AccountOperationsPageLoaded: FC = ( })); return ( - + {t("ledger.title")} {props.refreshing ? ( diff --git a/src/pages/account/ui/AccountPage.module.css b/src/pages/account/ui/AccountPage.module.css index a684fac..f5aa21c 100644 --- a/src/pages/account/ui/AccountPage.module.css +++ b/src/pages/account/ui/AccountPage.module.css @@ -1,7 +1,3 @@ -.page { - max-width: 960px; -} - .tile, .cash { border-color: var(--mantine-color-gray-3); diff --git a/src/pages/account/ui/components/AccountPageLoaded.view.tsx b/src/pages/account/ui/components/AccountPageLoaded.view.tsx index b4cb5fd..5c0a6c6 100644 --- a/src/pages/account/ui/components/AccountPageLoaded.view.tsx +++ b/src/pages/account/ui/components/AccountPageLoaded.view.tsx @@ -36,7 +36,7 @@ type AccountPageLoadedProps = { const AccountPageLoaded: FC = (props) => { const { t } = useTranslation(); return ( - + = (props) => { const { vm } = props; const { t } = useTranslation(); return ( - +
{t("bond.searchTitle")} diff --git a/src/pages/stocks/ui/StocksPage.view.tsx b/src/pages/stocks/ui/StocksPage.view.tsx index a94d6b3..2bdd122 100644 --- a/src/pages/stocks/ui/StocksPage.view.tsx +++ b/src/pages/stocks/ui/StocksPage.view.tsx @@ -25,7 +25,7 @@ const StocksPageView: FC = (props) => { const { vm } = props; const { t } = useTranslation(); return ( - +
{t("stock.searchTitle")} diff --git a/src/shared/ui/AppShell.module.css b/src/shared/ui/AppShell.module.css index af22541..7ab20b1 100644 --- a/src/shared/ui/AppShell.module.css +++ b/src/shared/ui/AppShell.module.css @@ -1,3 +1,8 @@ +.content { + max-width: 1120px; + margin-inline: auto; +} + .header { align-items: center; display: flex; diff --git a/src/shared/ui/AppShell.tsx b/src/shared/ui/AppShell.tsx index 342cc3e..ca36524 100644 --- a/src/shared/ui/AppShell.tsx +++ b/src/shared/ui/AppShell.tsx @@ -13,10 +13,30 @@ const AppShell: FC = (props) => { const { t } = useTranslation(); const { pathname } = useLocation(); const items = [ - { to: "/accounts", label: t("navigation.accounts") }, - { to: "/stocks", label: t("navigation.stocks") }, - { to: "/bonds", label: t("navigation.bonds") }, - { to: "/settings", label: t("navigation.settings") }, + { + to: "/accounts", + label: t("navigation.accounts"), + icon: ( + + ), + }, + { + to: "/stocks", + label: t("navigation.stocks"), + icon: , + }, + { + to: "/bonds", + label: t("navigation.bonds"), + icon: , + }, + { + to: "/settings", + label: t("navigation.settings"), + icon: ( + + ), + }, ]; return ( @@ -35,13 +55,31 @@ const AppShell: FC = (props) => { key={item.to} to={item.to} label={item.label} + leftSection={ + + } active={pathname.startsWith(item.to)} /> ))} - {contentAboveOutlet} - +
+ {contentAboveOutlet} + +