From 7f282e2ec524eb5a2fc1e4ad9504306a3ec38445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Tue, 28 Nov 2023 15:20:30 +0100 Subject: [PATCH] tried to desactivate SSR without success and fixed chromacase logo in scaffold auth --- front/Theme.tsx | 1 + front/components/UI/ScaffoldAuth.tsx | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/front/Theme.tsx b/front/Theme.tsx index fce67b0..8143459 100644 --- a/front/Theme.tsx +++ b/front/Theme.tsx @@ -36,6 +36,7 @@ const ThemeProvider = ({ children }: { children: JSX.Element }) => { return ( void): Promise => { const apiAccess = await API.createAndGetGuestAccount(); apiSetter(apiAccess); return translate('loggedIn'); }; -import { useAssets } from 'expo-asset'; interface ScaffoldAuthProps { title: string; @@ -48,10 +48,11 @@ const ScaffoldAuth: FunctionComponent = ({ const dispatch = useDispatch(); const toast = useToast(); const colorScheme = useColorScheme(); - const logo = + const [logo] = useAssets( colorScheme == 'light' ? require('../../assets/icon_light.png') - : require('../../assets/icon_dark.png'); + : require('../../assets/icon_dark.png') + ); // eslint-disable-next-line @typescript-eslint/no-var-requires const [banner] = useAssets(require('../../assets/banner.jpg')); @@ -69,14 +70,15 @@ const ScaffoldAuth: FunctionComponent = ({ - {/* Chromacase logo */} + /> {layout.width > 650 && ( ChromaCase