Skip to content

Commit

Permalink
fix: fix Clara comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Uriel-Sautron committed Jan 15, 2025
1 parent 8a20f1d commit e83a2ad
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions front/src/applications/stdcm/components/StdcmHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ const StdcmHeader = ({
}: StdcmHeaderProps) => {
const { t } = useTranslation(['stdcm', 'translation']);
const isSuperUser = useSelector(getIsSuperUser);
const { stdcm } = useLogo();
const { stdcmLogo } = useLogo();

return (
<div className="stdcm-header d-flex">
<LogoSTDCM logo={stdcm.stdcmLogo} />
<LogoSTDCM logo={stdcmLogo} />
<div className="flex-grow-1 d-flex justify-content-center">
<span className="stdcm-header__notification " id="notification">
{t('stdcm:notificationTitle')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const SimulationReportSheet = ({
simulationReportSheetNumber,
operationalPointsList,
}: SimulationReportSheetProps) => {
const { stdcm } = useLogo();
const { stdcmSimulationSheetLogo } = useLogo();
const { t } = useTranslation(['stdcm-simulation-report-sheet', 'stdcm']);
let renderedIndex = 0;

Expand All @@ -77,7 +77,7 @@ const SimulationReportSheet = ({
<View style={styles.header.numberDateBanner}>
<View style={styles.header.stdcmTitleBox}>
<View style={styles.header.stdcm}>
<LogoSTDCM logo={stdcm.stdcmPngLogo} t={t} />
<LogoSTDCM logo={stdcmSimulationSheetLogo} t={t} />
</View>
</View>
<View style={styles.header.numericInfo}>
Expand Down
12 changes: 7 additions & 5 deletions front/src/common/BootstrapSNCF/NavBarSNCF.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,25 @@ type Props = {

const LegacyNavBarSNCF = ({ appName, logo }: Props) => {
const { openModal } = useModal();
const { digitalTwin, customizedDeployment } = useLogo();
const { digitalTwinLogo, digitalTwinName, isCustomizedDeployment } = useLogo();
const safeWord = useSelector(getUserSafeWord);
const { t } = useTranslation('home/navbar');
const { logout, username } = useAuth();

const headerLogo = logo ?? digitalTwin?.logo;

return (
<div className="mastheader">
<div
className={cx(
customizedDeployment && logo ? `mastheader-logo__horizon` : `mastheader-logo`,
isCustomizedDeployment && logo ? `mastheader-logo__horizon` : `mastheader-logo`,
`flex-grow-0`
)}
>
<Link to="/">
<img src={headerLogo} data-testid="osrd-logo" alt="OSRD Logo" />
<img
src={logo ?? digitalTwinLogo}
data-testid={`${digitalTwinName.toLowerCase()}-logo`}
alt={`${digitalTwinName.toUpperCase()} Logo`}
/>
</Link>
</div>
<header role="banner" className="mastheader-title d-flex flex-grow-1">
Expand Down
4 changes: 2 additions & 2 deletions front/src/common/ReleaseInformations/ReleaseInformations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import LicenseAttributions from './LicenseAttributions';

function ReleaseInformations() {
const { t } = useTranslation('home/navbar');
const { digitalTwin } = useLogo();
const { digitalTwinLogo } = useLogo();
const { data: editoastVersion } = osrdEditoastApi.endpoints.getVersion.useQuery();
const { data: coreVersion } = osrdEditoastApi.endpoints.getVersionCore.useQuery();

Expand Down Expand Up @@ -46,7 +46,7 @@ function ReleaseInformations() {
rel="noopener noreferrer"
onMouseEnter={motriceParty}
>
<img src={digitalTwin.logo} alt="OSRD logo" width={192} />
<img src={digitalTwinLogo} alt="OSRD logo" width={192} />
</a>
<h2>OSRD</h2>
<h3>Open Source Railway Designer</h3>
Expand Down

0 comments on commit e83a2ad

Please sign in to comment.