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

front: fix icons in editor, reference map, stdcm #5669

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

RomainValls
Copy link
Contributor

@RomainValls RomainValls commented Nov 13, 2023

closes #5524

@RomainValls RomainValls self-assigned this Nov 13, 2023
@RomainValls RomainValls requested a review from a team as a code owner November 13, 2023 15:52
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR, great job !!
Here are some additional specifications:

  • use the icons Thibaut chose (sorry, I forgot to write them in the ticket, my bad 😞 )
    • layers : BsSliders2
    • compass (boussole) : FaRegCompass
  • remove the button to recenter the map in the editor
  • reorder the buttons so they are in the same order:
    • zoom-in/zoom-out
    • compass
    • search (only for reference map)
    • layers
    • infra
    • error (only for editor) / legend (only for reference map)
  • remove the space between icons in editor (between compass and layers)

front/src/applications/editor/nav.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/ButtonMapKey.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/ButtonMapInfras.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/ButtonMapKey.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/ButtonMapSearch.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/ButtonZoomOut.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/MapButtons.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/MapButtons.tsx Outdated Show resolved Hide resolved
front/src/common/Map/Buttons/MapButtons.tsx Outdated Show resolved Hide resolved
@RomainValls RomainValls force-pushed the rvs/front-fix-icons-in-editor-and-reference-map branch from e152f99 to 98318f3 Compare November 29, 2023 16:28
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 last small things:

  • the infra button should be above the legend one on the reference map (current app here:)
    image
  • the pop up text for the infra selector button is "choose infra to edit" even in the reference map, but it should be "choose infrastructure" simply. Can you add a new translation key for that ?
    image

front/src/applications/editor/Editor.tsx Outdated Show resolved Hide resolved
@RomainValls RomainValls force-pushed the rvs/front-fix-icons-in-editor-and-reference-map branch 2 times, most recently from 05311e6 to 240275f Compare December 5, 2023 14:32
- re work icons, remove dead code, add translation key

- add translation key and modify button order

- Update front/src/applications/editor/Editor.tsx

Co-authored-by: clarani <clara.ni@student-cs.fr>
@RomainValls RomainValls force-pushed the rvs/front-fix-icons-in-editor-and-reference-map branch from 240275f to b15bf5d Compare December 5, 2023 14:36
Copy link

codecov bot commented Dec 5, 2023

Codecov Report

Attention: 208 lines in your changes are missing coverage. Please review.

Comparison is base (5ac767c) 25.80% compared to head (b15bf5d) 25.85%.
Report is 14 commits behind head on dev.

Files Patch % Lines
front/src/common/Map/Buttons/MapButtons.tsx 0.00% 48 Missing ⚠️
front/src/common/Map/Buttons/ButtonZoomIn.tsx 0.00% 22 Missing and 1 partial ⚠️
front/src/common/Map/Buttons/ButtonZoomOut.tsx 0.00% 22 Missing and 1 partial ⚠️
...ont/src/common/Map/Buttons/ButtonResetViewport.tsx 0.00% 21 Missing ⚠️
front/src/common/Map/Buttons/ButtonMapSettings.tsx 0.00% 20 Missing ⚠️
front/src/common/Map/Buttons/ButtonMapKey.tsx 0.00% 19 Missing ⚠️
front/src/common/Map/Buttons/ButtonMapSearch.tsx 0.00% 19 Missing ⚠️
front/src/common/Map/Buttons/ButtonMapInfras.tsx 0.00% 16 Missing ⚠️
front/src/applications/editor/nav.tsx 0.00% 14 Missing ⚠️
...src/applications/editor/components/EntityError.tsx 0.00% 2 Missing ⚠️
... and 2 more
Additional details and impacted files
@@             Coverage Diff              @@
##                dev    #5669      +/-   ##
============================================
+ Coverage     25.80%   25.85%   +0.05%     
  Complexity     2117     2117              
============================================
  Files           926      928       +2     
  Lines        122492   122691     +199     
  Branches       2665     2667       +2     
============================================
+ Hits          31605    31722     +117     
- Misses        89314    89394      +80     
- Partials       1573     1575       +2     
Flag Coverage Δ
core 79.01% <ø> (ø)
editoast 74.39% <ø> (+0.24%) ⬆️
front 8.42% <0.00%> (-0.02%) ⬇️
gateway 2.75% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, the buttons are amazing now, thanks ! 🎉 🚀

@RomainValls RomainValls added this pull request to the merge queue Dec 5, 2023
Merged via the queue into dev with commit 6d3a4ee Dec 5, 2023
17 checks passed
@RomainValls RomainValls deleted the rvs/front-fix-icons-in-editor-and-reference-map branch December 5, 2023 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Have the same icons in editor and reference maps
3 participants