- fix Paul's comments

OpenRailAssociation · Jan 14, 2025 · bf5c79a · bf5c79a
1 parent 23fa75a
commit bf5c79a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/front/src/applications/stdcm/components/StdcmResults/SimulationReportStyleSheet.ts b/front/src/applications/stdcm/components/StdcmResults/SimulationReportStyleSheet.ts
@@ -44,8 +44,7 @@ const styles = {
     },
     lmrLogo: {
       width: 'auto',
-      height: 'auto',
-      marginTop: 'auto',
+
       marginRight: 'auto',
     },
     simulationTitle: {

diff --git a/front/src/common/BootstrapSNCF/NavBarSNCF.tsx b/front/src/common/BootstrapSNCF/NavBarSNCF.tsx
@@ -32,7 +32,7 @@ const LegacyNavBarSNCF = ({ appName, logo }: Props) => {
   const { t } = useTranslation('home/navbar');
   const { logout, username } = useAuth();
 
-  const headerLogo = logo ?? digitalTwin.logo;
+  const headerLogo = logo ?? digitalTwin?.logo;
 
   return (
     <div className="mastheader">

diff --git a/front/src/main/home.tsx b/front/src/main/home.tsx
@@ -24,7 +24,7 @@ export default function Home() {
 
   return (
     <ModalProvider>
-      <NavBarSNCF logo={digitalTwin.digitalTwinLogo} />
+      <NavBarSNCF logo={digitalTwin.logoWithName} />
       <main className="mastcontainer mastcontainer-no-mastnav">
         <div className="cardscontainer">
           <div className="row justify-content-center mb-2">

diff --git a/front/src/utils/hooks/useLogo.ts b/front/src/utils/hooks/useLogo.ts
@@ -13,9 +13,9 @@ const MONTH_VALUES = {
 };
 
 const useLogo = () => {
-  const [digitalTwin, setDigitalTwin] = useState<{ logo: string; digitalTwinLogo: string }>({
+  const [digitalTwin, setDigitalTwin] = useState<{ logo: string; logoWithName: string }>({
     logo: defaultLogo,
-    digitalTwinLogo: defaultOsrdLogo,
+    logoWithName: defaultOsrdLogo,
   });
   const [stdcm, setStdcm] = useState<{ stdcmLogo?: string; stdcmPngLogo?: string }>({
     stdcmLogo: undefined,
@@ -30,10 +30,10 @@ const useLogo = () => {
         if (!response.ok || response.headers.get('Content-Type') !== 'application/json') {
           setCustomizedDeployment(false);
           if (new Date().getMonth() === MONTH_VALUES.JUNE) {
-            setDigitalTwin({ logo: proudLogo, digitalTwinLogo: proudOsrdLogo });
+            setDigitalTwin({ logo: proudLogo, logoWithName: proudOsrdLogo });
           }
           if (new Date().getMonth() === MONTH_VALUES.DECEMBER) {
-            setDigitalTwin({ logo: xmasLogo, digitalTwinLogo: xmasOsrdLogo });
+            setDigitalTwin({ logo: xmasLogo, logoWithName: xmasOsrdLogo });
           }
         } else {
           const overridesData = await response.json();
@@ -46,7 +46,7 @@ const useLogo = () => {
 
           setCustomizedDeployment(true);
           setStdcm({ stdcmLogo: lmrLogoPath, stdcmPngLogo: lmrPngLogoPath });
-          setDigitalTwin({ logo: horizonLogoPath, digitalTwinLogo: horizonFullLogoPath });
+          setDigitalTwin({ logo: horizonLogoPath, logoWithName: horizonFullLogoPath });
         }
       } catch {
         setCustomizedDeployment(false);