-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Nwz/bugfixes and minor cosmetic corrections (#2638)
* front: transform map carto in hook & add new icon * front: hook & change icon for osrd/timetable * front: hook & change icon of editor home * front: hook & change icon for stdcm * front: change icon for opendataimport * front: change icon on customget * front: spelling corrections to please Céline * front: correct customGet data conversion on stops * front: CrudInfra: working rename endpoint * front: spelling corrections * front: CrudInfra: rework of edition/selection switch * front: RollingStocks selector: better & smaller UI * front: RollingStocks: isolate & moving to common * front: correct checkbox & radio selectors * front: map: a bit of cleaning
- Loading branch information
1 parent
9937378
commit a25c3bb
Showing
43 changed files
with
316 additions
and
377 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,25 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { withTranslation } from 'react-i18next'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { Route, Routes } from 'react-router-dom'; | ||
| import config from 'config/config'; | ||
| import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF'; | ||
| import logo from 'assets/logo_osrd_seul_blanc.svg'; | ||
| import logo from 'assets/pictures/home/map.svg'; | ||
| import Map from './Map'; | ||
|
|
||
| class HomeCartoLegacy extends React.Component { | ||
| static propTypes = { | ||
| t: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| render() { | ||
| const { t } = this.props; | ||
| return ( | ||
| <> | ||
| <NavBarSNCF appName={t('Home.map')} logo={logo} /> | ||
| <div className="no-mastnav"> | ||
| <Routes> | ||
| <Route path="/" element={<Map urlmap={config.proxy} />} /> | ||
| <Route | ||
| path="/:urlLat/:urlLon/:urlZoom/:urlBearing/:urlPitch" | ||
| element={<Map urlmap={config.proxy} />} | ||
| /> | ||
| </Routes> | ||
| </div> | ||
| </> | ||
| ); | ||
| } | ||
| export default function HomeCartoLegacy() { | ||
| const { t } = useTranslation('home'); | ||
| return ( | ||
| <> | ||
| <NavBarSNCF appName={t('map')} logo={logo} /> | ||
| <div className="no-mastnav"> | ||
| <Routes> | ||
| <Route path="/" element={<Map urlmap={config.proxy} />} /> | ||
| <Route | ||
| path="/:urlLat/:urlLon/:urlZoom/:urlBearing/:urlPitch" | ||
| element={<Map urlmap={config.proxy} />} | ||
| /> | ||
| </Routes> | ||
| </div> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| const HomeCarto = withTranslation()(HomeCartoLegacy); | ||
|
|
||
| export default HomeCarto; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,23 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { withTranslation } from 'react-i18next'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { Route, Routes } from 'react-router-dom'; | ||
|
|
||
| import config from '../../config/config'; | ||
| import logo from '../../assets/logo_osrd_seul_blanc.svg'; | ||
| import NavBarSNCF from '../../common/BootstrapSNCF/NavBarSNCF'; | ||
| import config from 'config/config'; | ||
| import logo from 'assets/pictures/home/editor.svg'; | ||
| import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF'; | ||
| import Editor from './Editor'; | ||
|
|
||
| class HomeEditorUnplugged extends React.Component { | ||
| static propTypes = { | ||
| t: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| render() { | ||
| const { t } = this.props; | ||
| return ( | ||
| <> | ||
| <NavBarSNCF appName={t('Editor.title')} logo={logo} /> | ||
| <div className="no-mastnav"> | ||
| <Routes> | ||
| <Route path="/" element={<Editor urlmap={config.proxy} />} /> | ||
| <Route path="/:infra" element={<Editor urlmap={config.proxy} />} /> | ||
| </Routes> | ||
| </div> | ||
| </> | ||
| ); | ||
| } | ||
| export default function HomeEditorUnplugged() { | ||
| const { t } = useTranslation('home'); | ||
| return ( | ||
| <> | ||
| <NavBarSNCF appName={t('editor')} logo={logo} /> | ||
| <div className="no-mastnav"> | ||
| <Routes> | ||
| <Route path="/" element={<Editor urlmap={config.proxy} />} /> | ||
| <Route path="/:infra" element={<Editor urlmap={config.proxy} />} /> | ||
| </Routes> | ||
| </div> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| const HomeEditor = withTranslation()(HomeEditorUnplugged); | ||
|
|
||
| export default HomeEditor; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
front/src/applications/opendata/views/OpenDataGlobalSettings.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.