diff --git a/src/frontend/public/assets/devise.svg b/src/frontend/public/assets/devise.svg new file mode 100644 index 00000000..75636ac1 --- /dev/null +++ b/src/frontend/public/assets/devise.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/frontend/public/assets/marianne.svg b/src/frontend/public/assets/marianne.svg new file mode 100644 index 00000000..ece27f41 --- /dev/null +++ b/src/frontend/public/assets/marianne.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/frontend/src/assets/logo.svg b/src/frontend/src/assets/logo.svg new file mode 100644 index 00000000..9f4e8881 --- /dev/null +++ b/src/frontend/src/assets/logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/frontend/src/layout/Header.tsx b/src/frontend/src/layout/Header.tsx index 4c5ec89e..99f2cb4f 100644 --- a/src/frontend/src/layout/Header.tsx +++ b/src/frontend/src/layout/Header.tsx @@ -1,18 +1,98 @@ import { Link } from 'wouter' import { css } from '@/styled-system/css' -import { Stack } from '@/styled-system/jsx' +import { HStack, Stack } from '@/styled-system/jsx' import { useTranslation } from 'react-i18next' -import { Text, Button } from '@/primitives' +import { Button } from '@/primitives' import { SettingsButton } from '@/features/settings' import { logoutUrl, useUser } from '@/features/auth' import { useMatchesRoute } from '@/navigation/useMatchesRoute' -import { FeedbackBanner } from '@/components/FeedbackBanner.tsx' +import { FeedbackBanner } from '@/components/FeedbackBanner' import { Menu } from '@/primitives/Menu' import { MenuList } from '@/primitives/MenuList' import { ProConnectButton } from '@/components/ProConnectButton' import { terminateAnalyticsSession } from '@/features/analytics/hooks/useAnalytics' import { terminateSupportSession } from '@/features/support/hooks/useSupport' +import LogoAsset from '@/assets/logo.svg' + +const Marianne = () => { + return ( +
+

+ gouvernement +

+
+ ) +} + +const BetaBadge = () => ( + + Beta + +) + +const Logo = () => { + const { t } = useTranslation() + return ( + {t('app')} + ) +} + export const Header = () => { const { t } = useTranslation() const isHome = useMatchesRoute('home') @@ -24,37 +104,43 @@ export const Header = () => {
-
+
- - { - if ( - isRoom && - !window.confirm(t('leaveRoomPrompt', { ns: 'rooms' })) - ) { - event.preventDefault() - } - }} - to="/" - > - {t('app')} - - + { + if ( + isRoom && + !window.confirm(t('leaveRoomPrompt', { ns: 'rooms' })) + ) { + event.preventDefault() + } + }} + to="/" + > + + + + + +
-
+
)