review

BaseAdresseNationale · Jun 4, 2024 · f002958 · f002958
1 parent 071008f
commit f002958
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/components/evenement/event-modal.js b/components/evenement/event-modal.js
@@ -7,6 +7,7 @@ import theme from '@/styles/theme'
 
 import {formatTag} from '@/lib/tag'
 import {dateWithDay} from '@/lib/date'
+import {removeAccents} from '@/lib/format-strings'
 
 import ButtonLink from '@/components/button-link'
 import SectionText from '@/components/section-text'
@@ -35,13 +36,13 @@ function EventModal({event, isPassed, onClose}) {
   return (
     <div className='modal-wrapper'>
       <div className='modal' ref={modalRef}>
-        <div className={`header ${type}-backg`}>
+        <div className={`header ${removeAccents(type)}-backg`}>
           <ActionButtonNeutral label='Fermer la fenêtre'>
             <XCircle onClick={onClose} color={theme.colors.white} />
           </ActionButtonNeutral>
 
-          <div className='presentation'>
-            <Image src={`/images/icons/event-${type}.svg`} height={150} width={170} alt='' aria-hidden='true' />
+          <div className='presentation-wrapper'>
+            <Image src={`/images/icons/event-${removeAccents(type)}.svg`} height={150} width={170} alt='' aria-hidden='true' />
             <div className='header-infos'>
               <div className='title-container'>
                 <h5>{title}</h5>
@@ -87,7 +88,7 @@ function EventModal({event, isPassed, onClose}) {
           align-items: center;
         }
 
-        .modal, .header-infos, .presentation, .target, .tags {
+        .modal, .header-infos, .presentation-wrapper, .target, .tags {
           display: flex;
         }
 
@@ -127,7 +128,7 @@ function EventModal({event, isPassed, onClose}) {
           opacity: 70%;
         }
 
-        .presentation {
+        .presentation-wrapper {
           gap: 2em;
           justify-content: space-between;
           margin-top: .5em;
@@ -184,6 +185,10 @@ function EventModal({event, isPassed, onClose}) {
           background: ${theme.colors.blue};
         }
 
+        .presentation-backg {
+          background: rgb(26, 168, 255);
+        }
+
         .adresse-region-backg {
           background: ${theme.colors.purple};
         }
@@ -205,7 +210,7 @@ function EventModal({event, isPassed, onClose}) {
         }
 
         @media (max-width: 624px) {
-          .presentation {
+          .presentation-wrapper {
             flex-wrap: wrap;
             justify-content: flex-end;
           }

diff --git a/components/evenement/event.js b/components/evenement/event.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
 import Image from 'next/legacy/image'
 
 import {dateWithDay} from '@/lib/date'
+import {removeAccents} from '@/lib/format-strings'
 
 import theme from '@/styles/theme'
 
@@ -17,9 +18,9 @@ function Event({event, background, isPassed}) {
 
   return (
     <div className='event-container'>
-      <div className={`header ${type}`}>
-        <div className='presentation'>
-          <Image src={`/images/icons/event-${type}.svg`} height={50} width={50} alt='' aria-hidden='true' />
+      <div className={`header ${removeAccents(type)}`}>
+        <div className='presentation-wrapper'>
+          <Image src={`/images/icons/event-${removeAccents(type)}.svg`} height={50} width={50} alt='' aria-hidden='true' />
           <div className='title-container'>
             <h5>{title}</h5>
             <div>{subtitle}</div>
@@ -70,7 +71,7 @@ function Event({event, background, isPassed}) {
           gap: 1em;
         }
 
-        .presentation {
+        .presentation-wrapper {
           display: flex;
           flex-direction: column;
           align-items: center;
@@ -119,7 +120,7 @@ function Event({event, background, isPassed}) {
           background: ${theme.colors.green};
         }
 
-        .présentation {
+        .presentation {
           background: rgb(26, 168, 255);
         }
 

diff --git a/lib/format-strings.js b/lib/format-strings.js
@@ -0,0 +1 @@
+export const removeAccents = str => str.normalize('NFD').replace(/[\u0300-\u036f]/g, '') // eslint-disable-line unicorn/escape-case
diff --git a/public/images/icons/event-présentation.svg → public/images/icons/event-presentation.svg b/public/images/icons/event-présentation.svg → public/images/icons/event-presentation.svg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const removeAccents = str => str.normalize('NFD').replace(/[\u0300-\u036f]/g, '') // eslint-disable-line unicorn/escape-case