From d83ccb3d9dd34b6aa4e30eace3946ade6c702d0b Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Mon, 2 Dec 2024 20:32:42 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8(frontend)=20add=20all=20official=20lo?= =?UTF-8?q?gos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on Florian and Stéphanie feedbacks, add the 'Marianne' logo, and a beta tag on our visio's logo. I've slightly updated the header. Its responsive is broken in certain situations. --- src/frontend/public/assets/devise.svg | 5 + src/frontend/public/assets/marianne.svg | 8 ++ src/frontend/src/assets/logo.svg | 6 + src/frontend/src/layout/Header.tsx | 148 +++++++++++++++++++----- 4 files changed, 136 insertions(+), 31 deletions(-) create mode 100644 src/frontend/public/assets/devise.svg create mode 100644 src/frontend/public/assets/marianne.svg create mode 100644 src/frontend/src/assets/logo.svg 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="/" + > + + + + + +
-
+
)