Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add xmas logo 🎅 #7962

Merged
merged 1 commit into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions front/src/applications/editor/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Route, Routes } from 'react-router-dom';
import { ModalProvider } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
import { useCurrentInfra } from 'modules/infra/useInfra';
import { getLogo } from 'utils/logo';

import Editor from './Editor';

Expand All @@ -17,6 +18,7 @@ export default function HomeEditorUnplugged() {
return (
<ModalProvider>
<NavBarSNCF
logo={getLogo()}
appName={
<>
{t('editor')}
Expand Down
8 changes: 6 additions & 2 deletions front/src/applications/operationalStudies/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { useSelector } from 'react-redux';

import FilterTextField from 'applications/operationalStudies/components/FilterTextField';
import {
osrdEditoastApi,
type PostSearchApiArg,
type ProjectWithStudies,
type SearchResultItemProject,
osrdEditoastApi,
} from 'common/api/osrdEditoastApi';
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
import OptionsSNCF from 'common/BootstrapSNCF/OptionsSNCF';
Expand All @@ -17,6 +17,7 @@ import ProjectCard from 'modules/project/components/ProjectCard';
import ProjectCardEmpty from 'modules/project/components/ProjectCardEmpty';
import ProjectSelectionToolbar from 'modules/project/components/ProjectSelectionToolbar';
import { getUserSafeWord } from 'reducers/user/userSelectors';
import { getLogo } from 'utils/logo';

type SortOptions =
| 'NameAsc'
Expand Down Expand Up @@ -140,7 +141,10 @@ export default function HomeOperationalStudies() {

return (
<>
<NavBarSNCF appName={<div className="navbar-breadcrumbs">{t('projects')}</div>} />
<NavBarSNCF
logo={getLogo()}
appName={<div className="navbar-breadcrumbs">{t('projects')}</div>}
/>
<main className="mastcontainer mastcontainer-no-mastnav">
<div className="p-3">
<div className="projects-toolbar">
Expand Down
2 changes: 2 additions & 0 deletions front/src/applications/referenceMap/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { ModalProvider } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
import { useInfraActions, useInfraID } from 'common/osrdContext';
import { useAppDispatch } from 'store';
import { getLogo } from 'utils/logo';

import Map from './Map';

Expand Down Expand Up @@ -39,6 +40,7 @@ const HomeReferenceMap = () => {
return (
<ModalProvider>
<NavBarSNCF
logo={getLogo()}
appName={
<>
{t('map')}
Expand Down
3 changes: 2 additions & 1 deletion front/src/applications/rollingStockEditor/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';

import { ModalProvider } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
import { getLogo } from 'utils/logo';

import RollingStockEditor from './views/RollingStockEditor';

Expand All @@ -12,7 +13,7 @@ const HomeRollingStockEditor: FC = () => {

return (
<ModalProvider>
<NavBarSNCF appName={<>{t('rollingStockEditor')}</>} />
<NavBarSNCF logo={getLogo()} appName={<>{t('rollingStockEditor')}</>} />
<RollingStockEditor />
</ModalProvider>
);
Expand Down
3 changes: 2 additions & 1 deletion front/src/applications/stdcm/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import StdcmViewV1 from 'applications/stdcm/views/StdcmViewV1';
import StdcmViewV2 from 'applications/stdcmV2/views/StdcmViewV2';
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
import { getStdcmV2Activated } from 'reducers/user/userSelectors';
import { getLogo } from 'utils/logo';

export default function HomeStdcm() {
const stdcmV2Activated = useSelector(getStdcmV2Activated);
Expand All @@ -22,7 +23,7 @@ export default function HomeStdcm() {

return (
<>
<NavBarSNCF appName={t('stdcm')} />
<NavBarSNCF logo={getLogo()} appName={t('stdcm')} />
<Routes>
<Route path="" element={<StdcmViewV1 />} />
</Routes>
Expand Down
1 change: 0 additions & 1 deletion front/src/assets/fav-osrd-color.svg

This file was deleted.

22 changes: 22 additions & 0 deletions front/src/assets/logo-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading