-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #627 from GeotrekCE/develop
Develop > Master / 3.8.0
- Loading branch information
Showing
96 changed files
with
1,957 additions
and
532 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import * as React from 'react'; | ||
| import { SVGProps } from 'react'; | ||
|
|
||
| const SvgComponent = (props: SVGProps<SVGSVGElement>) => ( | ||
| <svg width={22} height={22} fill="none" xmlns="http://www.w3.org/2000/svg" {...props}> | ||
| <path | ||
| clipRule="evenodd" | ||
| d="M21 15.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.499 19.499 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 3.11 1h3a2 2 0 0 1 2 1.72c.126.96.36 1.903.7 2.81a2 2 0 0 1-.45 2.11L7.09 8.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45c.907.339 1.85.574 2.81.7A2 2 0 0 1 21 15.92Z" | ||
| stroke="currentColor" | ||
| strokeWidth={2} | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| /> | ||
| </svg> | ||
| ); | ||
|
|
||
| export default SvgComponent; |
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 |
|---|---|---|
| @@ -0,0 +1,261 @@ | ||
| import { SmallCarousel } from 'components/Carousel'; | ||
| import { RemoteIconInformation } from 'components/Information/RemoteIconInformation'; | ||
| import { Modal } from 'components/Modal'; | ||
| import { CardSingleImage } from 'components/pages/details/components/DetailsCard'; | ||
| import { HtmlText } from 'components/pages/details/utils'; | ||
| import parse from 'html-react-parser'; | ||
| import { sum } from 'lodash'; | ||
| import { AccessibilityAttachment, Details } from 'modules/details/interface'; | ||
| import { getGlobalConfig } from 'modules/utils/api.config'; | ||
| import { FormattedMessage } from 'react-intl'; | ||
| import styled, { css } from 'styled-components'; | ||
| import { colorPalette, desktopOnly } from 'stylesheet'; | ||
| import PhoneIcon from './PhoneIcon'; | ||
|
|
||
| const Accessibility = ({ details, language }: { details: Details; language: string }) => { | ||
| const accessibilityCodeNumber = getGlobalConfig().accessibilityCodeNumber; | ||
|
|
||
| const shouldPictureRowBeDisplayed = details.attachmentsAccessibility | ||
| ? sum( | ||
| ['slope', 'width', 'signage'] | ||
| .filter(k => (details as any)[`accessibility_${k}`]) | ||
| .map(k => { | ||
| const attachments = details.attachmentsAccessibility.filter( | ||
| a => a.info_accessibility === k, | ||
| ); | ||
| return attachments.length; | ||
| }), | ||
| ) > 0 | ||
| : false; | ||
|
|
||
| return ( | ||
| <div> | ||
| {details.disabledInfrastructure && ( | ||
| <HtmlText>{parse(details.disabledInfrastructure)}</HtmlText> | ||
| )} | ||
| {details.accessibilities && details.accessibilities.length > 0 && ( | ||
| <div className="flex"> | ||
| {details.accessibilities | ||
| .filter(e => e) | ||
| .map((accessibility, i) => ( | ||
| <StyledRemoteIconInformation | ||
| key={i} | ||
| iconUri={accessibility.pictogramUri} | ||
| className="mr-6 mt-3 desktop:mt-4 text-primary" | ||
| > | ||
| {accessibility.name} | ||
| </StyledRemoteIconInformation> | ||
| ))} | ||
| </div> | ||
| )} | ||
| {details.accessbilityLevel && ( | ||
| <Section> | ||
| <strong> | ||
| <FormattedMessage id="details.accessibility_level" /> | ||
| </strong>{' '} | ||
| : {details.accessbilityLevel.name[language]} | ||
| </Section> | ||
| )} | ||
|
|
||
| {accessibilityCodeNumber && ( | ||
| <Section> | ||
| <strong> | ||
| <FormattedMessage id="details.emergency_number" /> | ||
| </strong>{' '} | ||
| : | ||
| <EmergencyNumber> | ||
| <PhoneIcon /> | ||
| {accessibilityCodeNumber} | ||
| </EmergencyNumber> | ||
| </Section> | ||
| )} | ||
| <Columns> | ||
| {details.attachmentsAccessibility && | ||
| ['slope', 'width', 'signage'] | ||
| .filter(k => (details as any)[`accessibility_${k}`]) | ||
| .map(k => { | ||
| let attachments = details.attachmentsAccessibility.filter( | ||
| a => a.info_accessibility === k, | ||
| ); | ||
| if (attachments.length === 0) { | ||
| attachments = [ | ||
| { | ||
| url: getGlobalConfig().fallbackImageUri, | ||
| } as AccessibilityAttachment, | ||
| ]; | ||
| } | ||
|
|
||
| return ( | ||
| <div key={k}> | ||
| {shouldPictureRowBeDisplayed && ( | ||
| <Modal> | ||
| {({ isFullscreen, toggleFullscreen }) => ( | ||
| <div id="details_cover" className={!isFullscreen ? '' : 'h-full'}> | ||
| <StyledSmallCarousel isFullscreen={isFullscreen}> | ||
| {attachments.map((attachment, i) => ( | ||
| <div className="relative" key={attachment.uuid}> | ||
| {isFullscreen && ( | ||
| <Legend> | ||
| {attachment.author} - {attachment.legend} | ||
| </Legend> | ||
| )} | ||
| <CardSingleImage | ||
| key={i} | ||
| src={attachment.url} | ||
| height={200} | ||
| onClick={toggleFullscreen} | ||
| /> | ||
| </div> | ||
| ))} | ||
| </StyledSmallCarousel> | ||
| </div> | ||
| )} | ||
| </Modal> | ||
| )} | ||
|
|
||
| <h2> | ||
| <FormattedMessage id={`details.accessibility_${k}`} /> : | ||
| </h2> | ||
| <p> | ||
| <HtmlText>{parse((details as any)[`accessibility_${k}`])}</HtmlText> | ||
| </p> | ||
| </div> | ||
| ); | ||
| })} | ||
| </Columns> | ||
| {['accessibility_covering', 'accessibility_exposure', 'accessibility_advice'] | ||
| .filter(k => (details as any)[k]) | ||
| .map(k => ( | ||
| <Row key={k}> | ||
| <h2> | ||
| <FormattedMessage id={`details.${k}`} /> : | ||
| </h2> | ||
| <p> | ||
| <HtmlText>{parse((details as any)[k])}</HtmlText> | ||
| </p> | ||
| </Row> | ||
| ))} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| const Legend = styled.div` | ||
| position: absolute; | ||
| color: white; | ||
| font-size: 14px; | ||
| left: 50%; | ||
| top: 15px; | ||
| transform: translateX(-50%); | ||
| `; | ||
|
|
||
| const StyledRemoteIconInformation = styled(RemoteIconInformation)` | ||
| * { | ||
| font-size: 16px; | ||
| } | ||
| `; | ||
|
|
||
| const EmergencyNumber = styled.div` | ||
| color: ${colorPalette.primary1}; | ||
| display: flex; | ||
| /* border: 3px solid ${colorPalette.primary1}; */ | ||
| background-color: ${colorPalette.primary2}; | ||
| border-radius: 30px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
| padding: 8px; | ||
| margin-left: 10px; | ||
| margin-top: auto; | ||
| margin-bottom: auto; | ||
| & svg { | ||
| margin-right: 10px; | ||
| } | ||
| `; | ||
|
|
||
| const Section = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| margin-top: 10px; | ||
| & strong { | ||
| font-weight: bold; | ||
| } | ||
| `; | ||
|
|
||
| const Row = styled.div` | ||
| margin-top: 20px; | ||
| & h2 { | ||
| font-size: 20px; | ||
| font-weight: 700; | ||
| } | ||
| & p { | ||
| margin-top: 10px; | ||
| } | ||
| `; | ||
|
|
||
| const Columns = styled.div` | ||
| display: flex; | ||
| margin-left: -10px; | ||
| flex-flow: column; | ||
| ${desktopOnly(css` | ||
| flex-flow: row; | ||
| `)} | ||
| & h2 { | ||
| font-size: 20px; | ||
| font-weight: 700; | ||
| margin-bottom: 10px; | ||
| margin-top: 10px; | ||
| } | ||
| & > div { | ||
| min-width: 150px; | ||
| flex: 1; | ||
| display: flex; | ||
| flex-flow: column; | ||
| margin: 10px; | ||
| } | ||
| `; | ||
|
|
||
| const StyledSmallCarousel = styled(SmallCarousel)<{ isFullscreen: boolean }>` | ||
| height: auto; | ||
| & img { | ||
| border-radius: ${props => (props.isFullscreen ? 0 : '30px')}; | ||
| height: ${props => (props.isFullscreen ? '100vh' : '200px')}; | ||
| margin: auto; | ||
| cursor: pointer; | ||
| width: 100%; | ||
| ${desktopOnly(css` | ||
| width: 'auto'; | ||
| `)} | ||
| } | ||
| `; | ||
|
|
||
| export const shouldDisplayAccessibility = (details: Details) => { | ||
| return Boolean( | ||
| // eslint-disable-next-line | ||
| details.disabledInfrastructure || | ||
| // eslint-disable-next-line | ||
| details.accessibilities.length > 0 || | ||
| // eslint-disable-next-line | ||
| details.accessbilityLevel || | ||
| // eslint-disable-next-line | ||
| details.accessibility_covering || | ||
| // eslint-disable-next-line | ||
| details.accessibility_exposure || | ||
| // eslint-disable-next-line | ||
| details.accessibility_advice || | ||
| // eslint-disable-next-line | ||
| details.accessibility_signage || | ||
| // eslint-disable-next-line | ||
| details.accessibility_slope || | ||
| // eslint-disable-next-line | ||
| details.accessibility_width, | ||
| ); | ||
| }; | ||
|
|
||
| export default Accessibility; |
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.