diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index f08d1924e..487c41b10 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -4,6 +4,7 @@ "about": { "about-project": "За проекта", "about-us": "За нас", + "who-are-we": "Кои сме ние?", "support_us": "Подкрепете ни", "support-us": "Станете доброволец", "reports": "Отчети", @@ -11,6 +12,7 @@ }, "campaigns": { "index": "Кампании", + "all-campaigns": "Всички кампании", "create": "Предложете кампания", "faq": "Често задавани въпроси" }, @@ -26,9 +28,10 @@ "open-source": "Отворен Код", "open-data": "Отворени Данни" }, - "donation-menu": "Дарете", + "donatе": "Дарете", + "donation-menu": "Кампании", "blog": "Блог", - "support_us_button": "Подкрепи Подкрепи.бг", + "support_us_button": "Подкрепете ни", "profile": "Моят профил", "login": "Вход", "login-with": "Вход с", diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a1f148267..8e67d2640 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -4,6 +4,7 @@ "about": { "about-project": "The Project", "about-us": "About us", + "who-are-we": "Who are we?", "support_us": "Support us", "support-us": "Join us", "reports": "Reports", @@ -11,7 +12,8 @@ }, "campaigns": { "index": "Campaigns", - "create": "Suggest campaign", + "all-campaigns": "All campaigns", + "create": "Suggest a campaign", "faq": "Frequently Asked Questions" }, "admin": { @@ -26,9 +28,10 @@ "open-source": "Open Source", "open-data": "Open Data" }, - "donation-menu": "Donatе", + "donatе": "Donate", + "donation-menu": "Campaigns", "blog": "Blog", - "support_us_button": "Support Podkrepi.bg", + "support_us_button": "Support us", "profile": "Profile", "login": "Login", "login-with": "Login with", diff --git a/src/components/index/sections/Jumbotron.tsx b/src/components/index/sections/Jumbotron.tsx index eefa4bd32..db6d1d1eb 100644 --- a/src/components/index/sections/Jumbotron.tsx +++ b/src/components/index/sections/Jumbotron.tsx @@ -40,7 +40,6 @@ export default function Jumbotron() { xs: 3, md: 5, lg: 7, - xl: 9, }, textAlign: 'center', color: theme.palette.common.white, diff --git a/src/components/layout/AppNavBar.tsx b/src/components/layout/AppNavBar.tsx index 40ccb7762..afc6dd51a 100644 --- a/src/components/layout/AppNavBar.tsx +++ b/src/components/layout/AppNavBar.tsx @@ -30,14 +30,13 @@ export default function AppNavBar({ navMenuToggle }: AppBarDeckProps) { sx={(theme) => ({ overflow: 'hidden', transition: 'height .5s, background-color .5s ease 0s', - height: theme.spacing(14), - lineHeight: theme.spacing(14), + height: theme.spacing(11), [theme.breakpoints.down('md')]: { - height: theme.spacing(10), + height: theme.spacing(8), }, '&.shrink': { - height: theme.spacing(10), - lineHeight: theme.spacing(10), + height: theme.spacing(8), + lineHeight: theme.spacing(8), backgroundColor: 'hsla(0,0%,100%,0.85)', backdropFilter: 'saturate(180%) blur(5px)', }, diff --git a/src/components/layout/LocaleButton.tsx b/src/components/layout/LocaleButton.tsx index a11756dda..2b2dc0a08 100644 --- a/src/components/layout/LocaleButton.tsx +++ b/src/components/layout/LocaleButton.tsx @@ -20,14 +20,14 @@ export default function LocaleButton() { if (router.locale === 'bg') { return ( - ) } return ( - ) diff --git a/src/components/layout/nav/DonationMenu.tsx b/src/components/layout/nav/DonationMenu.tsx index 38f575440..0d431327b 100644 --- a/src/components/layout/nav/DonationMenu.tsx +++ b/src/components/layout/nav/DonationMenu.tsx @@ -24,11 +24,7 @@ const StyledGenericMenu = styled(GenericMenu)(({ theme }) => ({ }, [`& .${classes.dropdownLinkText}`]: { - color: theme.palette.primary.dark, width: '100%', - '&:hover': { - color: theme.palette.primary.main, - }, }, })) @@ -41,20 +37,12 @@ type NavItem = { const allNavItems: NavItem[] = [ { href: routes.campaigns.index, - label: 'nav.campaigns.index', + label: 'nav.campaigns.all-campaigns', }, { href: routes.faq_campaigns, //temporarily lead to FAQ label: 'nav.campaigns.create', }, - { - href: routes.termsOfService, - label: 'components.footer.terms-of-service', - }, - { - href: routes.faq, - label: 'nav.campaigns.faq', - }, ] export const navItems = allNavItems.filter((el) => typeof el.enabled === 'undefined' ?? el.enabled) diff --git a/src/components/layout/nav/GenericMenu.tsx b/src/components/layout/nav/GenericMenu.tsx index d61aeeb62..d366ffcc5 100644 --- a/src/components/layout/nav/GenericMenu.tsx +++ b/src/components/layout/nav/GenericMenu.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import { Button, Menu } from '@mui/material' -import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' -import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' +import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' +import ArrowDropUpIcon from '@mui/icons-material/ArrowDropUp' type Props = { label: string @@ -19,10 +19,12 @@ export default function GenericMenu({ label, children }: Props) { <> + + + + - + {/* - - - - - - - + */} {children} ) diff --git a/src/components/layout/nav/PrivateMenu.tsx b/src/components/layout/nav/PrivateMenu.tsx index c0c82836e..48f5488e4 100644 --- a/src/components/layout/nav/PrivateMenu.tsx +++ b/src/components/layout/nav/PrivateMenu.tsx @@ -67,7 +67,7 @@ export default function PrivateMenu() { return ( - + {session?.user?.picture ? ( ) : ( diff --git a/src/components/layout/nav/ProjectMenu.tsx b/src/components/layout/nav/ProjectMenu.tsx index 5208a0e1f..38588c763 100644 --- a/src/components/layout/nav/ProjectMenu.tsx +++ b/src/components/layout/nav/ProjectMenu.tsx @@ -40,12 +40,12 @@ type NavItem = { const allNavItems: NavItem[] = [ { - href: routes.aboutProject, - label: 'nav.about.about-project', + href: routes.about, + label: 'nav.about.who-are-we', }, { - href: routes.about, - label: 'nav.about.about-us', + href: routes.aboutProject, + label: 'nav.about.about-project', }, { href: routes.support_us, @@ -63,6 +63,14 @@ const allNavItems: NavItem[] = [ href: routes.contact, label: 'nav.about.contacts', }, + { + href: routes.termsOfService, + label: 'components.footer.terms-of-service', + }, + { + href: routes.faq, + label: 'nav.campaigns.faq', + }, ] export const navItems = allNavItems.filter((el) => typeof el.enabled === 'undefined' ?? el.enabled) @@ -72,7 +80,7 @@ export default function ProjectMenu() { const router = useRouter() return ( - + {navItems.map(({ href, label }, key) => ( ({ @@ -31,12 +33,17 @@ const StyledGrid = styled(Grid)(({ theme }) => ({ color: theme.palette.primary.main, }, }, + + [`& .${classes.dropdownArrowIcon}`]: { + marginLeft: '2px', + }, })) export default function PublicMenu() { const { t } = useTranslation() const { data: session } = useSession() const [anchorEl, setAnchorEl] = useState(null) + const open = Boolean(anchorEl) const handleMenu = (event: React.MouseEvent) => setAnchorEl(event.currentTarget) const handleClose = () => setAnchorEl(null) @@ -47,16 +54,16 @@ export default function PublicMenu() { return ( - - - - - +