From d7a68a34a2cba2acaa680dea75d6c5a03fd6e3ac Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:23:46 -0500 Subject: [PATCH 1/9] fix(itinerary-body): wheelchair a11y for AT --- packages/itinerary-body/i18n/en-US.yml | 7 +++ .../ItineraryBody/accessibility-rating.tsx | 45 ++++++++++++++++--- .../src/ItineraryBody/place-row.tsx | 2 + 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/packages/itinerary-body/i18n/en-US.yml b/packages/itinerary-body/i18n/en-US.yml index 14b903182..2908a1c61 100644 --- a/packages/itinerary-body/i18n/en-US.yml +++ b/packages/itinerary-body/i18n/en-US.yml @@ -81,6 +81,13 @@ otpUi: car: by car escooter: by e-scooter walk: by walking + tripAccessibility: + itineraryAccessibility: "Wheelchair accessibility of this trip: " + legAccessibility: "Wheelchair accessibility of this trip leg: " + tripAccessibilityUnclear: unknown + tripIsAccessible: wheelchair accessible + tripIsInaccessible: wheelchair inaccessible + tripIsLikelyAccessible: likely wheelchair accessible viewOnMap: View on map TransitLegBody: AlertsBody: diff --git a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx index d5117c81e..25bfe0b20 100644 --- a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx +++ b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx @@ -2,10 +2,13 @@ import { GradationMap } from "@opentripplanner/types"; import React, { ReactElement } from "react"; import styled from "styled-components"; import { Wheelchair } from "@styled-icons/foundation/Wheelchair"; +import { useIntl } from "react-intl"; +import { InvisibleAdditionalDetails } from "../styled"; interface WrapperProps { border: boolean; color: string; + leg: boolean; large: boolean; } @@ -40,6 +43,7 @@ interface Props { gradationMap?: GradationMap; grayscale?: boolean; large?: boolean; + leg?: boolean; score: number; } @@ -51,16 +55,33 @@ const AccessibilityRating = ({ gradationMap, grayscale = false, large = false, + leg = false, score }: Props): ReactElement => { + const intl = useIntl(); // Provide default mapping const mapping = gradationMap || { - 0.0: { color: "#ffe4e5", text: "❌" }, + 0.0: { + color: "#ffe4e5", + icon: "❌", + text: intl.formatMessage({ + id: `otpUi.ItineraryBody.tripAccessibility.tripIsInaccessible` + }) + }, 0.5: { color: "#dbe9ff", - text: "？" + icon: "？", + text: intl.formatMessage({ + id: `otpUi.ItineraryBody.tripAccessibility.tripAccessibilityUnclear` + }) }, - 0.9: { color: "#bfffb5", text: "✅" } + 0.9: { + color: "#bfffb5", + icon: "✅", + text: intl.formatMessage({ + id: `otpUi.ItineraryBody.tripAccessibility.tripIsLikelyAccessible` + }) + } }; // Find the highest (including equality) key for our score. @@ -75,15 +96,29 @@ const AccessibilityRating = ({ // External configuration may report "0.0" as 0, so include fallback const mapped = mapping[mappedKey] || mapping[0.0]; + const accessibilityPreface = intl.formatMessage({ + id: `otpUi.ItineraryBody.tripAccessibility.${ + leg ? "legAccessibility" : "itineraryAccessibility" + }` + }); + + const accessibilityScore = mapped.text; + + const accessibilityLabel = accessibilityPreface + accessibilityScore; + return ( + + {accessibilityLabel} + - + {/* Show either icon or text if no icon given */} {mapped.icon || {mapped.text}} diff --git a/packages/itinerary-body/src/ItineraryBody/place-row.tsx b/packages/itinerary-body/src/ItineraryBody/place-row.tsx index 73d6168b0..efa973f5b 100755 --- a/packages/itinerary-body/src/ItineraryBody/place-row.tsx +++ b/packages/itinerary-body/src/ItineraryBody/place-row.tsx @@ -103,8 +103,10 @@ export default function PlaceRow({ {/* Custom rendering of the departure/arrival time of the specified leg. */} {!isDestination && leg.accessibilityScore && ( + // TODO: Reorder markup so accessibility info doesn't fall between time and destination. )} From 4c78dd2441ec26478ff5b54bf50a740a9c308d0c Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:20:56 -0500 Subject: [PATCH 2/9] remove redundancies in labeling --- packages/itinerary-body/i18n/en-US.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/itinerary-body/i18n/en-US.yml b/packages/itinerary-body/i18n/en-US.yml index 2908a1c61..dd5acdfb6 100644 --- a/packages/itinerary-body/i18n/en-US.yml +++ b/packages/itinerary-body/i18n/en-US.yml @@ -82,12 +82,12 @@ otpUi: escooter: by e-scooter walk: by walking tripAccessibility: + accessible: accessible + inaccessible: inaccessible itineraryAccessibility: "Wheelchair accessibility of this trip: " legAccessibility: "Wheelchair accessibility of this trip leg: " - tripAccessibilityUnclear: unknown - tripIsAccessible: wheelchair accessible - tripIsInaccessible: wheelchair inaccessible - tripIsLikelyAccessible: likely wheelchair accessible + likelyAccessible: likely accessible + unclear: unknown viewOnMap: View on map TransitLegBody: AlertsBody: From cd5f97eab5b5b479276c3dac8ef3d5721bfb4252 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:31:13 -0500 Subject: [PATCH 3/9] remove unnecessary leg prop --- .../itinerary-body/src/ItineraryBody/accessibility-rating.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx index 25bfe0b20..96733c8e3 100644 --- a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx +++ b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx @@ -8,7 +8,6 @@ import { InvisibleAdditionalDetails } from "../styled"; interface WrapperProps { border: boolean; color: string; - leg: boolean; large: boolean; } @@ -111,7 +110,6 @@ const AccessibilityRating = ({ border={grayscale} color={grayscale ? "transparent" : mapped.color} large={large} - leg title={accessibilityLabel} > From 5cad452f15aa7d4687441bb4cd7f8dc20be40134 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:40:20 -0500 Subject: [PATCH 4/9] apply i18n labels and change prop name --- .../src/ItineraryBody/accessibility-rating.tsx | 12 ++++++------ .../itinerary-body/src/ItineraryBody/place-row.tsx | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx index 96733c8e3..9f419d4ec 100644 --- a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx +++ b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx @@ -42,7 +42,7 @@ interface Props { gradationMap?: GradationMap; grayscale?: boolean; large?: boolean; - leg?: boolean; + isLeg?: boolean; score: number; } @@ -54,7 +54,7 @@ const AccessibilityRating = ({ gradationMap, grayscale = false, large = false, - leg = false, + isLeg = false, score }: Props): ReactElement => { const intl = useIntl(); @@ -64,21 +64,21 @@ const AccessibilityRating = ({ color: "#ffe4e5", icon: "❌", text: intl.formatMessage({ - id: `otpUi.ItineraryBody.tripAccessibility.tripIsInaccessible` + id: `otpUi.ItineraryBody.tripAccessibility.inaccessible` }) }, 0.5: { color: "#dbe9ff", icon: "？", text: intl.formatMessage({ - id: `otpUi.ItineraryBody.tripAccessibility.tripAccessibilityUnclear` + id: `otpUi.ItineraryBody.tripAccessibility.unclear` }) }, 0.9: { color: "#bfffb5", icon: "✅", text: intl.formatMessage({ - id: `otpUi.ItineraryBody.tripAccessibility.tripIsLikelyAccessible` + id: `otpUi.ItineraryBody.tripAccessibility.likelyAccessible` }) } }; @@ -97,7 +97,7 @@ const AccessibilityRating = ({ const accessibilityPreface = intl.formatMessage({ id: `otpUi.ItineraryBody.tripAccessibility.${ - leg ? "legAccessibility" : "itineraryAccessibility" + isLeg ? "legAccessibility" : "itineraryAccessibility" }` }); diff --git a/packages/itinerary-body/src/ItineraryBody/place-row.tsx b/packages/itinerary-body/src/ItineraryBody/place-row.tsx index efa973f5b..c1f354590 100755 --- a/packages/itinerary-body/src/ItineraryBody/place-row.tsx +++ b/packages/itinerary-body/src/ItineraryBody/place-row.tsx @@ -106,7 +106,7 @@ export default function PlaceRow({ // TODO: Reorder markup so accessibility info doesn't fall between time and destination. )} From 6e5931b602ffb219aa5b5392f5b5bc6db8d6cc20 Mon Sep 17 00:00:00 2001 From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> Date: Thu, 26 Oct 2023 10:06:09 -0400 Subject: [PATCH 5/9] chore(itinerary-body): Add French and i18n-exceptions. --- packages/itinerary-body/i18n/fr.yml | 7 +++++++ packages/itinerary-body/i18n/i18n-exceptions.json | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/itinerary-body/i18n/i18n-exceptions.json diff --git a/packages/itinerary-body/i18n/fr.yml b/packages/itinerary-body/i18n/fr.yml index 2187877fd..ea6fbd0c1 100644 --- a/packages/itinerary-body/i18n/fr.yml +++ b/packages/itinerary-body/i18n/fr.yml @@ -85,6 +85,13 @@ otpUi: car: en voiture escooter: en trottinette walk: à pied + tripAccessibility: + accessible: accessible + inaccessible: inaccessible + itineraryAccessibility: "Accessibilité de ce trajet en fauteuil roulant : " + legAccessibility: "Accessibilité de cette étape en fauteuil roulant : " + likelyAccessible: probablement accessible + unclear: inconnue viewOnMap: Afficher sur le plan TransitLegBody: AlertsBody: diff --git a/packages/itinerary-body/i18n/i18n-exceptions.json b/packages/itinerary-body/i18n/i18n-exceptions.json new file mode 100644 index 000000000..cde3d1483 --- /dev/null +++ b/packages/itinerary-body/i18n/i18n-exceptions.json @@ -0,0 +1,6 @@ +{ + "ignoredIds": ["otpUi.ItineraryBody.tripAccessibility.accessible"], + "groups": { + "otpUi.ItineraryBody.tripAccessibility.*Accessibility": ["itinerary", "leg"] + } +} From 12bfa5ce8d74671c22dd7e7498f2bd30f94c9353 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:33:05 -0500 Subject: [PATCH 6/9] refactor: address PR feedback --- packages/itinerary-body/i18n/en-US.yml | 1 - packages/itinerary-body/i18n/fr.yml | 1 - .../itinerary-body/src/ItineraryBody/accessibility-rating.tsx | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/itinerary-body/i18n/en-US.yml b/packages/itinerary-body/i18n/en-US.yml index dd5acdfb6..fdb663556 100644 --- a/packages/itinerary-body/i18n/en-US.yml +++ b/packages/itinerary-body/i18n/en-US.yml @@ -82,7 +82,6 @@ otpUi: escooter: by e-scooter walk: by walking tripAccessibility: - accessible: accessible inaccessible: inaccessible itineraryAccessibility: "Wheelchair accessibility of this trip: " legAccessibility: "Wheelchair accessibility of this trip leg: " diff --git a/packages/itinerary-body/i18n/fr.yml b/packages/itinerary-body/i18n/fr.yml index ea6fbd0c1..cd09ce35f 100644 --- a/packages/itinerary-body/i18n/fr.yml +++ b/packages/itinerary-body/i18n/fr.yml @@ -86,7 +86,6 @@ otpUi: escooter: en trottinette walk: à pied tripAccessibility: - accessible: accessible inaccessible: inaccessible itineraryAccessibility: "Accessibilité de ce trajet en fauteuil roulant : " legAccessibility: "Accessibilité de cette étape en fauteuil roulant : " diff --git a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx index 9f419d4ec..9144e773d 100644 --- a/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx +++ b/packages/itinerary-body/src/ItineraryBody/accessibility-rating.tsx @@ -41,8 +41,8 @@ const TextWrapper = styled.span` interface Props { gradationMap?: GradationMap; grayscale?: boolean; - large?: boolean; isLeg?: boolean; + large?: boolean; score: number; } @@ -53,8 +53,8 @@ interface Props { const AccessibilityRating = ({ gradationMap, grayscale = false, - large = false, isLeg = false, + large = false, score }: Props): ReactElement => { const intl = useIntl(); From 21c9b96a0feccbee8951025e7fa62b34cba98f0e Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:37:28 -0500 Subject: [PATCH 7/9] test: update snapshots --- __snapshots__/storybook.test.ts.snap | 2389 ++++++++++++++++++++------ 1 file changed, 1859 insertions(+), 530 deletions(-) diff --git a/__snapshots__/storybook.test.ts.snap b/__snapshots__/storybook.test.ts.snap index ea2ca378f..d1c386c48 100644 --- a/__snapshots__/storybook.test.ts.snap +++ b/__snapshots__/storybook.test.ts.snap @@ -1,5 +1,1328 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`Storyshots Building-Blocks/Colors Blue 1`] = ` + + + +`; + +exports[`Storyshots Building-Blocks/Colors Blue 2`] = ` +Array [ + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #E5ECF3; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 50 +

+

+ #E5ECF3 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #CCDAE7; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 100 +

+

+ #CCDAE7 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #B2C7DB; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 200 +

+

+ #B2C7DB +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #99B5CF; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 300 +

+

+ #99B5CF +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #7FA2C2; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 400 +

+

+ #7FA2C2 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #6690B7; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 500 +

+

+ #6690B7 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #4D7EAB; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 600 +

+

+ #4D7EAB +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #336B9E; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 700 +

+

+ #336B9E +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #1A5992; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 800 +

+

+ #1A5992 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #004686; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 900 +

+

+ #004686 +

+
, +] +`; + +exports[`Storyshots Building-Blocks/Colors Grey 1`] = ` + + + +`; + +exports[`Storyshots Building-Blocks/Colors Grey 2`] = ` +Array [ + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #ECECEC; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 50 +

+

+ #ECECEC +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #D9D9D9; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 100 +

+

+ #D9D9D9 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #C5C5C5; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 200 +

+

+ #C5C5C5 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #B3B3B3; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 300 +

+

+ #B3B3B3 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #9F9F9F; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 400 +

+

+ #9F9F9F +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #8C8C8C; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 500 +

+

+ #8C8C8C +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #797979; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 600 +

+

+ #797979 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #666666; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 700 +

+

+ #666666 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #535353; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 800 +

+

+ #535353 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #404040; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 900 +

+

+ #404040 +

+
, +] +`; + +exports[`Storyshots Building-Blocks/Colors Red 1`] = ` + + + +`; + +exports[`Storyshots Building-Blocks/Colors Red 2`] = ` +Array [ + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #F7E7E6; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 50 +

+

+ #F7E7E6 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #EFCFCE; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 100 +

+

+ #EFCFCE +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #E7B6B4; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 200 +

+

+ #E7B6B4 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #DF9E9C; + color: #000000; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 300 +

+

+ #DF9E9C +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #D78683; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 400 +

+

+ #D78683 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #CF6E6B; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 500 +

+

+ #CF6E6B +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #C75652; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 600 +

+

+ #C75652 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #BF3E3A; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 700 +

+

+ #BF3E3A +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #B72620; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 800 +

+

+ #B72620 +

+
, + .c0 { + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + background-color: #AF0E08; + color: #ffffff; + text-shadow: 1px 1px 2px black; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + font-family: Arial,Helvetica,sans-serif; + height: 40px; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + margin: 0; + padding: 10px; + width: 300px; +} + +.c0:first-of-type { + border-radius: 8px 8px 0 0; +} + +.c0:last-of-type { + border-radius: 0 0 8px 8px; +} + +
+

+ 900 +

+

+ #AF0E08 +

+
, +] +`; + exports[`Storyshots EndpointsOverlay Endpoints Overlay With Custom Map Markers 1`] = ` span { +.c37 > span { margin-right: 1ch; } -.c32 { +.c31 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -73931,7 +75254,7 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 margin-top: 10px; } -.c32 a { +.c31 a { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -73946,58 +75269,58 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 justify-content: center; } -.c33 { +.c32 { color: #676767; font-size: 13px; font-style: normal; padding: 0; } -.c37 { +.c36 { fill: #676767; float: left; height: 16px; width: 16px; } -.c36 { +.c35 { font-size: 13px; margin-top: 8px; color: #676767; font-style: normal; } -.c39 { +.c38 { font-weight: 500; } -.c40 { +.c39 { font-weight: 200; opacity: 0.8975; padding-left: 1ch; } -.c59 { +.c58 { float: left; margin-left: -36px; color: #fff; } -.c60 { +.c59 { color: #676767; margin-top: 3px; } -.c57 { +.c56 { z-index: 30; position: relative; } -.c52 { +.c51 { margin-top: 5px; } -.c53 { +.c52 { color: #676767; display: -webkit-box; display: -webkit-flex; @@ -74005,30 +75328,30 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 display: flex; } -.c55 { +.c54 { font-size: 14px; } -.c54 { +.c53 { padding: 0; } -.c51 { +.c50 { margin-top: 5px; } -.c51 a { +.c50 a { color: #337ab7; -webkit-text-decoration: none; text-decoration: none; } -.c51 a:hover { +.c50 a:hover { -webkit-text-decoration: underline; text-decoration: underline; } -.c51 img { +.c50 img { margin-left: 5px; vertical-align: middle; } @@ -74056,7 +75379,7 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 word-wrap: anywhere; } -.c42 { +.c41 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -74079,7 +75402,7 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 word-wrap: anywhere; } -.c61 { +.c60 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -74102,21 +75425,16 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 word-wrap: anywhere; } -.c20 { +.c21 { -webkit-flex: 1; -ms-flex: 1; flex: 1; } -.c20 span { +.c21 span { display: block; } -.c21 { - padding-top: 3px; - font-weight: 600; -} - .c1 { font-size: 16px; } @@ -74126,7 +75444,7 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 font-family: Hind,sans-serif; } -.c1 .c47 { +.c1 .c46 { background-color: rgb(15,106,172); border-color: white; border-image: initial; @@ -74170,7 +75488,7 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 width: 100%; } -.c1 .c58 { +.c1 .c57 { margin-left: -23px; } @@ -74205,7 +75523,7 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 z-index: 10; } -.c41 { +.c40 { background-color: gray; left: 5px; right: 5px; @@ -74300,8 +75618,13 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1
+ + otpUi.ItineraryBody.tripAccessibility.legAccessibilityotpUi.ItineraryBody.tripAccessibility.likelyAccessible + - - ✅ - + ✅
otpUi.TransitLegBody.fromLocation
- Walk 238 feet to SE Cesar Chavez Blvd & Brooklyn (long address that spans multiple lines)
@@ -74842,63 +76164,63 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 style={Object {}} >
  1. •
    SE Cesar Chavez Blvd & Clinton
  2. •
    SE Cesar Chavez Blvd & Division
  3. •
    SE Cesar Chavez Blvd & Lincoln
  4. •
    SE Cesar Chavez Blvd & Stephens
    @@ -74974,38 +76296,38 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 3:52 PM
otpUi.TransitLegBody.fromLocation
- Walk 440 feet to SE Hawthorne & Cesar Chavez Blvd
@@ -75519,63 +76843,63 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 style={Object {}} >
  1. •
    SE Hawthorne & 37th
  2. •
    SE Hawthorne & 34th
  3. •
    SE Hawthorne & 32nd
  4. •
    SE Hawthorne & 30th
    @@ -75650,10 +76974,15 @@ exports[`Storyshots ItineraryBody/otp-react-redux Walk Transit Transfer With A 1 > 4:04 PM
    + + otpUi.ItineraryBody.tripAccessibility.legAccessibilityotpUi.ItineraryBody.tripAccessibility.inaccessible + - - ❌ - + ❌
otpUi.TransitLegBody.fromLocation
- Walk 479 feet to 1415 SE 28th Ave, Portland, OR, USA 97214
otpUi.TransitLegBody.fromLocation
- Walk 238 feet to SE Cesar Chavez Blvd & Brooklyn (long address that spans multiple lines)
@@ -164465,14 +165788,14 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine className="c3" >
Cesar Chavez/Lombard (very long route name) @@ -164498,7 +165821,7 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine > SE Cesar Chavez Blvd & Brooklyn ID 7439 @@ -164509,13 +165832,18 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine > 3:47 PM
+ + otpUi.ItineraryBody.tripAccessibility.legAccessibilityotpUi.ItineraryBody.tripAccessibility.unclear + - - ？ - + ？
otpUi.TransitLegBody.fromLocation
- Ride
755X
Cesar Chavez/Lombard (very long route name) to @@ -164600,24 +165925,24 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine - Disembark at SE Cesar Chavez Blvd & Hawthorne ID 7459
otpUi.TransitLegBody.fromLocation
- Walk 440 feet to SE Hawthorne & Cesar Chavez Blvd
@@ -165096,14 +166421,14 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine className="c3" >
Hawthorne @@ -165129,7 +166454,7 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine > SE Hawthorne & Cesar Chavez Blvd ID 2626 @@ -165140,13 +166465,18 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine > 4:00 PM
+ + otpUi.ItineraryBody.tripAccessibility.legAccessibilityotpUi.ItineraryBody.tripAccessibility.inaccessible + - - ❌ - + ❌
otpUi.TransitLegBody.fromLocation
- Ride
1
Hawthorne to @@ -165231,24 +166558,24 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine - Disembark at SE Hawthorne & 27th ID 2613
otpUi.TransitLegBody.fromLocation
- Walk 479 feet to 1415 SE 28th Ave, Portland, OR, USA 97214
@@ -165772,11 +167101,11 @@ exports[`Storyshots ItineraryBody/otp-ui Walk Transit Transfer With A 11 Y Itine className="c5" >
Arrive at 1415 SE 28th Ave, Portland, OR, USA 97214
From a219045424f0f97cde4fc046803f48a15e045692 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Thu, 9 Nov 2023 12:33:16 -0600 Subject: [PATCH 8/9] Revert "Merge branch 'master' into wheelchair-accessible-labeling" This reverts commit da9e57a26b2558cbf50ecd7460c0c3ea3d47d8be, reversing changes made to 21c9b96a0feccbee8951025e7fa62b34cba98f0e. --- packages/building-blocks/README.md | 5 - packages/building-blocks/package.json | 34 ------- packages/building-blocks/src/colors/blue.ts | 16 --- packages/building-blocks/src/colors/grey.ts | 16 --- packages/building-blocks/src/colors/red.ts | 16 --- packages/building-blocks/src/index.ts | 5 - .../src/stories/ColorPalette.tsx | 56 ----------- .../src/stories/index.story.tsx | 22 ----- packages/building-blocks/tsconfig.json | 13 --- packages/core-utils/package.json | 2 +- packages/endpoints-overlay/i18n/ru.yml | 9 -- packages/endpoints-overlay/i18n/tl.yml | 9 -- packages/endpoints-overlay/i18n/tr.yml | 1 - packages/endpoints-overlay/package.json | 2 +- packages/from-to-location-picker/i18n/ru.yml | 5 - packages/from-to-location-picker/i18n/tl.yml | 5 - packages/from-to-location-picker/i18n/tr.yml | 1 - packages/from-to-location-picker/package.json | 2 +- packages/itinerary-body/i18n/ru.yml | 99 ------------------- packages/itinerary-body/i18n/tl.yml | 99 ------------------- packages/itinerary-body/i18n/tr.yml | 1 - packages/itinerary-body/package.json | 2 +- packages/location-field/i18n/es.yml | 6 +- packages/location-field/i18n/ru.yml | 20 ---- packages/location-field/i18n/tl.yml | 19 ---- packages/location-field/i18n/tr.yml | 1 - packages/location-field/package.json | 2 +- packages/map-popup/i18n/ru.yml | 9 -- packages/map-popup/i18n/tl.yml | 9 -- packages/map-popup/i18n/tr.yml | 1 - packages/map-popup/package.json | 2 +- packages/printable-itinerary/i18n/ru.yml | 16 --- packages/printable-itinerary/i18n/tl.yml | 18 ---- packages/printable-itinerary/i18n/tr.yml | 1 - packages/printable-itinerary/package.json | 2 +- packages/transit-vehicle-overlay/i18n/ru.yml | 8 -- packages/transit-vehicle-overlay/i18n/tl.yml | 9 -- packages/transit-vehicle-overlay/i18n/tr.yml | 1 - packages/transit-vehicle-overlay/package.json | 2 +- packages/trip-details/i18n/ko.yml | 1 - packages/trip-details/i18n/ru.yml | 23 ----- packages/trip-details/i18n/tl.yml | 23 ----- packages/trip-details/i18n/tr.yml | 1 - packages/trip-details/i18n/vi.yml | 1 - packages/trip-details/i18n/zh_Hans.yml | 1 - packages/trip-details/package.json | 2 +- packages/trip-form/i18n/fr.yml | 2 +- packages/trip-form/i18n/ru.yml | 48 --------- packages/trip-form/i18n/tl.yml | 48 --------- packages/trip-form/i18n/tr.yml | 19 ---- packages/trip-form/package.json | 2 +- 51 files changed, 14 insertions(+), 703 deletions(-) delete mode 100644 packages/building-blocks/README.md delete mode 100644 packages/building-blocks/package.json delete mode 100644 packages/building-blocks/src/colors/blue.ts delete mode 100644 packages/building-blocks/src/colors/grey.ts delete mode 100644 packages/building-blocks/src/colors/red.ts delete mode 100644 packages/building-blocks/src/index.ts delete mode 100644 packages/building-blocks/src/stories/ColorPalette.tsx delete mode 100644 packages/building-blocks/src/stories/index.story.tsx delete mode 100644 packages/building-blocks/tsconfig.json delete mode 100644 packages/endpoints-overlay/i18n/ru.yml delete mode 100644 packages/endpoints-overlay/i18n/tl.yml delete mode 100644 packages/endpoints-overlay/i18n/tr.yml delete mode 100644 packages/from-to-location-picker/i18n/ru.yml delete mode 100644 packages/from-to-location-picker/i18n/tl.yml delete mode 100644 packages/from-to-location-picker/i18n/tr.yml delete mode 100644 packages/itinerary-body/i18n/ru.yml delete mode 100644 packages/itinerary-body/i18n/tl.yml delete mode 100644 packages/itinerary-body/i18n/tr.yml delete mode 100644 packages/location-field/i18n/ru.yml delete mode 100644 packages/location-field/i18n/tl.yml delete mode 100644 packages/location-field/i18n/tr.yml delete mode 100644 packages/map-popup/i18n/ru.yml delete mode 100644 packages/map-popup/i18n/tl.yml delete mode 100644 packages/map-popup/i18n/tr.yml delete mode 100644 packages/printable-itinerary/i18n/ru.yml delete mode 100644 packages/printable-itinerary/i18n/tl.yml delete mode 100644 packages/printable-itinerary/i18n/tr.yml delete mode 100644 packages/transit-vehicle-overlay/i18n/ru.yml delete mode 100644 packages/transit-vehicle-overlay/i18n/tl.yml delete mode 100644 packages/transit-vehicle-overlay/i18n/tr.yml delete mode 100644 packages/trip-details/i18n/ru.yml delete mode 100644 packages/trip-details/i18n/tl.yml delete mode 100644 packages/trip-details/i18n/tr.yml delete mode 100644 packages/trip-form/i18n/ru.yml delete mode 100644 packages/trip-form/i18n/tl.yml delete mode 100644 packages/trip-form/i18n/tr.yml diff --git a/packages/building-blocks/README.md b/packages/building-blocks/README.md deleted file mode 100644 index 1ef175f30..000000000 --- a/packages/building-blocks/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Usage - -``` -TBD -``` diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json deleted file mode 100644 index 8f3a7ca9e..000000000 --- a/packages/building-blocks/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@opentripplanner/building-blocks", - "version": "1.0.0", - "description": "Styling and UI Component Lbrary", - "author": "@binh-dam-ibigroup", - "homepage": "https://github.com/opentripplanner/otp-ui/#readme", - "license": "MIT", - "main": "lib/index.js", - "module": "esm/index.js", - "private": false, - "dependencies": { - "mapbox-gl": "npm:empty-npm-package@1.0.0", - "maplibre-gl": "^2.1.9", - "react-map-gl": "^7.0.15", - "@opentripplanner/core-utils": "9.0.3" - }, - "peerDependencies": { - "@opentripplanner/types": "^6.1.0", - "react": "^16.14.0", - "styled-components": "^5.3.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/opentripplanner/otp-ui.git" - }, - "scripts": { - "test": "echo \"Error: run tests from root\" && exit 1", - "tsc": "tsc" - }, - "bugs": { - "url": "https://github.com/opentripplanner/otp-ui/issues" - }, - "gitHead": "0af1b7cda60bd4252b219dcf893e01c2acb2ed5d" -} diff --git a/packages/building-blocks/src/colors/blue.ts b/packages/building-blocks/src/colors/blue.ts deleted file mode 100644 index d13a1fc55..000000000 --- a/packages/building-blocks/src/colors/blue.ts +++ /dev/null @@ -1,16 +0,0 @@ -const blue = { - 50: "#E5ECF3", - 100: "#CCDAE7", - 200: "#B2C7DB", - 300: "#99B5CF", - 400: "#7FA2C2", - 500: "#6690B7", - 600: "#4D7EAB", - // 700 and above text is WCAG AA accessible on white backgrounds. - 700: "#336B9E", - // 800 and above text is WCAG AAA accessible on white backgrounds. - 800: "#1A5992", - 900: "#004686" -}; - -export default blue; diff --git a/packages/building-blocks/src/colors/grey.ts b/packages/building-blocks/src/colors/grey.ts deleted file mode 100644 index 383342910..000000000 --- a/packages/building-blocks/src/colors/grey.ts +++ /dev/null @@ -1,16 +0,0 @@ -const grey = { - 50: "#ECECEC", - 100: "#D9D9D9", - 200: "#C5C5C5", - 300: "#B3B3B3", - 400: "#9F9F9F", - 500: "#8C8C8C", - 600: "#797979", - // 700 and above text is WCAG AA accessible on white backgrounds. - 700: "#666666", - // 800 and above text is WCAG AAA accessible on white backgrounds. - 800: "#535353", - 900: "#404040" -}; - -export default grey; diff --git a/packages/building-blocks/src/colors/red.ts b/packages/building-blocks/src/colors/red.ts deleted file mode 100644 index 69c07694d..000000000 --- a/packages/building-blocks/src/colors/red.ts +++ /dev/null @@ -1,16 +0,0 @@ -const red = { - 50: "#F7E7E6", - 100: "#EFCFCE", - 200: "#E7B6B4", - 300: "#DF9E9C", - 400: "#D78683", - 500: "#CF6E6B", - 600: "#C75652", - // 700 and above text is WCAG AA accessible on white backgrounds. - 700: "#BF3E3A", - 800: "#B72620", - // 900 text is WCAG AAA accessible on white backgrounds. - 900: "#AF0E08" -}; - -export default red; diff --git a/packages/building-blocks/src/index.ts b/packages/building-blocks/src/index.ts deleted file mode 100644 index cfe8622a8..000000000 --- a/packages/building-blocks/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import blue from "./colors/blue"; -import red from "./colors/red"; -import grey from "./colors/grey"; - -export { blue, red, grey }; diff --git a/packages/building-blocks/src/stories/ColorPalette.tsx b/packages/building-blocks/src/stories/ColorPalette.tsx deleted file mode 100644 index 7c8490b57..000000000 --- a/packages/building-blocks/src/stories/ColorPalette.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import React from "react"; - -import styled from "styled-components"; -import { getMostReadableTextColor } from "@opentripplanner/core-utils/lib/route"; - -export interface Hue { - [key: number]: string; -} - -interface Props { - color: Hue; -} - -const ColorBlock = styled.div<{ hex: string }>` - align-items: center; - background-color: ${props => props.hex}; - color: ${props => getMostReadableTextColor(props.hex, "#ffffff")}; - text-shadow: ${props => - getMostReadableTextColor(props.hex, "#ffffff") === "#ffffff" - ? "1px 1px 2px black" - : ""}; - display: flex; - font-family: Arial, Helvetica, sans-serif; - height: 40px; - justify-content: space-between; - margin: 0; - padding: 10px; - width: 300px; - - &:first-of-type { - border-radius: 8px 8px 0 0; - } - &:last-of-type { - border-radius: 0 0 8px 8px; - } -`; - -const ColorPalette = ({ color }: Props): JSX.Element => { - const colorArray: Array = Object.entries(color); - - return ( - <> - {colorArray.map( - (hue: Hue): JSX.Element => { - return ( - -

{hue[0]}

-

{hue[1]}

- - ); - } - )} - - ); -}; -export default ColorPalette; diff --git a/packages/building-blocks/src/stories/index.story.tsx b/packages/building-blocks/src/stories/index.story.tsx deleted file mode 100644 index 642bc7835..000000000 --- a/packages/building-blocks/src/stories/index.story.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import React, { ReactElement } from "react"; -import ColorPalette from "./ColorPalette"; - -import grey from "../colors/grey"; -import blue from "../colors/blue"; -import red from "../colors/red"; - -export default { - title: "Building-Blocks/Colors" -}; - -export const Grey = (): ReactElement => { - return ; -}; - -export const Blue = (): ReactElement => { - return ; -}; - -export const Red = (): ReactElement => { - return ; -}; diff --git a/packages/building-blocks/tsconfig.json b/packages/building-blocks/tsconfig.json deleted file mode 100644 index 6309d302f..000000000 --- a/packages/building-blocks/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "composite": true, - "target": "es2019", - "outDir": "./lib", - "rootDir": "./src", - "lib": ["es2019", "dom"], - "skipLibCheck": true - }, - "include": ["src/**/*"], - "exclude": ["src/__tests__/**/*"] -} diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index da1e4e018..4be2013a4 100644 --- a/packages/core-utils/package.json +++ b/packages/core-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/core-utils", - "version": "11.1.2", + "version": "11.1.1", "description": "Core functionality that is shared among numerous UI components", "engines": { "node": ">=13" diff --git a/packages/endpoints-overlay/i18n/ru.yml b/packages/endpoints-overlay/i18n/ru.yml deleted file mode 100644 index d900a41bc..000000000 --- a/packages/endpoints-overlay/i18n/ru.yml +++ /dev/null @@ -1,9 +0,0 @@ -otpUi: - EndpointsOverlay: - clearLocation: Удалить как местоположение «{locationType}» - coordinates: "{lat, number, ::.00000}; {lon, number, ::.00000}" - forgetHome: Удалить местоположение дома - forgetWork: Удалить местоположение работы - saveAsHome: Сохранить как местоположение дома - saveAsWork: Сохранить как местоположение работы - swapLocation: Изменить на местоположение «{locationType}» diff --git a/packages/endpoints-overlay/i18n/tl.yml b/packages/endpoints-overlay/i18n/tl.yml deleted file mode 100644 index 87f45ee3a..000000000 --- a/packages/endpoints-overlay/i18n/tl.yml +++ /dev/null @@ -1,9 +0,0 @@ -otpUi: - EndpointsOverlay: - clearLocation: Alisin ang lokasyon ng {locationType} - coordinates: "{lat, number, ::.00000}, {lon, number, ::.00000}" - forgetHome: Kalimutan ang tirahan - forgetWork: Kalimutan ang trabaho - saveAsHome: I-save bilang tirahan - saveAsWork: I-save bilang trabaho - swapLocation: Gawing lokasyon ng {locationType} diff --git a/packages/endpoints-overlay/i18n/tr.yml b/packages/endpoints-overlay/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/endpoints-overlay/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json index 5cdd794f1..46fbf4fbc 100644 --- a/packages/endpoints-overlay/package.json +++ b/packages/endpoints-overlay/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/endpoints-overlay", - "version": "2.0.10", + "version": "2.0.9", "description": "A map overlay to show the from and to locations of an itinerary", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/from-to-location-picker/i18n/ru.yml b/packages/from-to-location-picker/i18n/ru.yml deleted file mode 100644 index 8305fb64a..000000000 --- a/packages/from-to-location-picker/i18n/ru.yml +++ /dev/null @@ -1,5 +0,0 @@ -otpUi: - FromToLocationPicker: - from: Отсюда - planATrip: "Запланировать поездку:" - to: Сюда diff --git a/packages/from-to-location-picker/i18n/tl.yml b/packages/from-to-location-picker/i18n/tl.yml deleted file mode 100644 index 8c5512b91..000000000 --- a/packages/from-to-location-picker/i18n/tl.yml +++ /dev/null @@ -1,5 +0,0 @@ -otpUi: - FromToLocationPicker: - from: Mula rito - planATrip: "Magplano ng biyahe:" - to: Papunta rito diff --git a/packages/from-to-location-picker/i18n/tr.yml b/packages/from-to-location-picker/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/from-to-location-picker/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/from-to-location-picker/package.json b/packages/from-to-location-picker/package.json index cf9869a23..e447d0412 100644 --- a/packages/from-to-location-picker/package.json +++ b/packages/from-to-location-picker/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/from-to-location-picker", - "version": "2.1.10", + "version": "2.1.9", "description": "Location Picker Component", "author": "@binh-dam-ibigroup", "homepage": "https://github.com/opentripplanner/otp-ui/#readme", diff --git a/packages/itinerary-body/i18n/ru.yml b/packages/itinerary-body/i18n/ru.yml deleted file mode 100644 index 9092f6118..000000000 --- a/packages/itinerary-body/i18n/ru.yml +++ /dev/null @@ -1,99 +0,0 @@ -otpUi: - AccessLegBody: - LegDiagramPreview: - elevationChart: График высот - noElevationData: Нет данных по высоте. - toggleElevationChart: Переключить график высот - RentedVehicleSubheader: - pickupRental: Возьмите {vehicleType} «{company}» {vehicleName} - resumeRentalRide: Продолжить аренду - vehicleType: - bike: велосипед - bikeshare: велосипед в прокат - car: aвто - escooter: Электросамокат - vehicle: транспортное средство - walkVehicle: Проведите средство вдоль места «{place}» - TncLeg: - bookRide: Забронировать поездку - bookRideLater: Для бронирования подождите до {timeMillis, time, short} - estimatedCost: "Предполагаемая стоимость: {minFare}\_— {maxFare}" - estimatedTravelTime: "Предполагаемое время поездки: {duration} (без учета дорожного движения)" - waitForPickup: "Подождите{minutes, plural, =0 {} other { # мин}} до приезда {company}" - mapillaryTooltip: Показать изображения улиц для этого местоположения - step: - circleClockwise: Двигайтесь по кругу по часовой стрелке - circleCounterClockwise: Двигайтесь по кругу против часовой стрелки - continue: Продолжайте движение - hardLeft: Строго налево - hardRight: Строго направо - left: Налево - right: Направо - slightlyLeft: Немного левее - slightlyRight: Немного правее - uTurnLeft: Левый разворот - uTurnRight: Правый разворот - stepDepart: Направляйтесь {heading} на улице {street} - stepElevator: Воспользуйтесь подъемом к улице {street} - stepGeneric: "{step} на улице {street}" - stepHeading: - east: на восток - north: на север - northeast: на северо-восток - northwest: на северо-запад - south: на юг - southeast: на юго-восток - southwest: на юго-запад - west: на запад - summary: "{mode} до места «{place}»" - summaryAndDistance: "{mode}{distance} до места «{place}»" - summaryMode: - bike: Велосипед - bikeshare: Прокат велосипедов - carDrive: Вождение - carHail: Поездка - escooter: Электросамокат - walk: Пешком - unnamedPath: Неизвестный путь - unnamedRoad: Неизвестная дорога - vehicleTitle: "{vehicleType} «{company}»" - vehicleType: - bike: Велосипед - car: Авто - escooter: Электросамокат - ItineraryBody: - common: - durationShort: "{hours, plural, =0 {} other {# ч }}{minutes} мин" - flexCallAhead: наберите заранее - flexCallNumber: наберите {phoneNumber} - flexPickupMessage: Чтобы воспользоваться этим маршрутом, {action}{advanceNotice}. - stayOnBoard: Не выходите в месте {place} - travelBy: Передвижение {mode} - travelByMode: - bike: на велосипеде - car: на авто - escooter: на электросамокате - walk: пешком - viewOnMap: Просмотреть на карте - TransitLegBody: - AlertsBody: - effectiveDate: Актуально на {dateTime, date, long} - effectiveTimeAndDate: Актуально на {dateTime, time, short}, {day} - today: Сегодня - tomorrow: Завтра - yesterday: Вчера - alertsHeader: >- - {alertCount, plural, =1 {# предупреждение!} other {Несколько - предупреждений (#)!}} - arriveAt: Прибытие в {place} - disembarkAt: Выходите в месте {legDestination} - fare: "Стоимость проезда: {fare}" - fromLocation: Из места «{location}» - operatedBy: Услуги, предоставляемые агентством «{agencyLink}» - rideDurationAndStops: "Поездка: {duration}{numStops, plural, =1 {} other { / остановки (#)}}" - routeDescription: "{routeName} — {headsign}" - stopId: Идентификатор остановки {stopId} - stopIdBasic: Идентификатор {stopId} - stopViewer: Средство просмотра остановок - tripViewer: Средство просмотра поездки - typicalWait: "Типичное время ожидания: {waitTime}" diff --git a/packages/itinerary-body/i18n/tl.yml b/packages/itinerary-body/i18n/tl.yml deleted file mode 100644 index a119f092a..000000000 --- a/packages/itinerary-body/i18n/tl.yml +++ /dev/null @@ -1,99 +0,0 @@ -otpUi: - AccessLegBody: - LegDiagramPreview: - elevationChart: Chart ng elevation - noElevationData: Walang available na data ng elevation. - toggleElevationChart: I-toggle ang chart ng elevation - RentedVehicleSubheader: - pickupRental: Pag-pick up {company} {vehicleType} {vehicleName} - resumeRentalRide: Magpatuloy gamit ang rental - vehicleType: - bike: bisikleta - bikeshare: shared bike - car: Sasakyan - escooter: E-scooter - vehicle: sasakyan - walkVehicle: Dumaan sa {place} - TncLeg: - bookRide: Mag-book ng Ride - bookRideLater: Maghintay hanggang {timeMillis, time, short} para mag-book - estimatedCost: "Tinatayang halaga: {minFare} - {maxFare}" - estimatedTravelTime: >- - Tinatayang tagal ng biyahe: {duration} (hindi isinasaalang-alang ang - trapiko) - waitForPickup: >- - Tagal ng paghihintay{minutes, plural, =0 {} other { # minutes}} para sa - pag-pick up ng {company} - mapillaryTooltip: Ipakita ang larawan ng kalye sa lokasyong ito - step: - circleClockwise: Follow circle clockwise - circleCounterClockwise: Follow circle counterclockwise - continue: Continue - hardLeft: Hard left - hardRight: Hard right - left: Left - right: Right - slightlyLeft: Slight left - slightlyRight: Slight right - uTurnLeft: Left U-turn - uTurnRight: Right U-turn - stepDepart: Head {heading} on {street} - stepElevator: Take elevator to {street} - stepGeneric: "{step} on {street}" - stepHeading: - east: east - north: north - northeast: northeast - northwest: northwest - south: south - southeast: southeast - west: west - summary: "{mode} to {place}" - summaryAndDistance: "{mode} {distance} to {place}" - summaryMode: - bike: Bisikleta - bikeshare: Bikeshare - carDrive: Nagmamaneho - carHail: Ride - escooter: E-Scooter - walk: Naglalakad - unnamedPath: Unnamed Path - unnamedRoad: Unnamed Road - vehicleTitle: "{company} {vehicleType}" - vehicleType: - bike: Bisikleta - car: Sasakyan - escooter: E-scooter - ItineraryBody: - common: - durationShort: "{hours, plural, =0 {} other {# hr }}{minutes} (na) minuto" - flexCallAhead: "" - flexPickupMessage: Para gamitin ang rutang ito, {action}{advanceNotice}. - stayOnBoard: Manatiling on board sa {place} - travelBy: Maglakbay sa pamamagitan ng {mode} - travelByMode: - bike: bisikleta - car: sasakyan - escooter: e-scooter - walk: walking - viewOnMap: Tingnan sa mapa - TransitLegBody: - AlertsBody: - effectiveDate: May bisa simula {dateTime, date, long} - effectiveTimeAndDate: May bisa simula {dateTime, time, short}, {day} - today: Ngayong Araw - tomorrow: Bukas - yesterday: Kahapon - alertsHeader: "{alertCount, plural, =1 {# alert} other {# alerts}}" - arriveAt: Darating nang {place} - disembarkAt: Bumaba sa {legDestination} - fare: "Pamasahe: {fare}" - fromLocation: mula sa {location} - operatedBy: Ang serbisyo ay pinapatakbo ng {agencyLink} - rideDurationAndStops: "Ride {duration}{numStops, plural, =1 {} other { / # stops}}" - routeDescription: "{routeName} papuntang {headsign}" - stopId: ID ng Hintuan {stopId} - stopIdBasic: ID {stopId} - stopViewer: Ihinto ang Viewer - tripViewer: Viewer ng Biyahe - typicalWait: "Karaniwang tagal ng paghihintay: {waitTime}" diff --git a/packages/itinerary-body/i18n/tr.yml b/packages/itinerary-body/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/itinerary-body/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json index 28c1f10c5..58a370334 100644 --- a/packages/itinerary-body/package.json +++ b/packages/itinerary-body/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/itinerary-body", - "version": "5.1.2", + "version": "5.1.1", "description": "A component for displaying an itinerary body of a trip planning result", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/location-field/i18n/es.yml b/packages/location-field/i18n/es.yml index 72be36019..4bad025c9 100644 --- a/packages/location-field/i18n/es.yml +++ b/packages/location-field/i18n/es.yml @@ -1,6 +1,5 @@ otpUi: LocationField: - beginTypingPrompt: Comience a escribir para buscar ubicaciones clearLocation: Restablecer la ubicación currentLocationUnavailable: Ubicación actual no disponible fetchingLocation: Buscando la ubicación… @@ -8,8 +7,8 @@ otpUi: geocoderUnreachable: No se pueden obtener sugerencias homeLocation: Hogar howToAccessResults: >- - Utiliza la tecla de flecha abajo para navegar por la lista de los - resultados. Para seleccionar un resultado, utiliza la tecla Intro. + Utilice la tecla de flecha hacia abajo para desplazarse por la lista de + resultados. Para seleccionar un resultado, utilice la tecla Intro. myPlaces: Mis lugares nearby: Paradas cercanas noResults: Ningún resultado @@ -26,3 +25,4 @@ otpUi: suggestedLocationsLong: Alternar la visualización de la lista de lugares recomendamos useCurrentLocation: Usar ubicación actual workLocation: Ubicación de trabajo + beginTypingPrompt: Comience a escribir para buscar ubicaciones diff --git a/packages/location-field/i18n/ru.yml b/packages/location-field/i18n/ru.yml deleted file mode 100644 index 6fa5f192a..000000000 --- a/packages/location-field/i18n/ru.yml +++ /dev/null @@ -1,20 +0,0 @@ -otpUi: - LocationField: - beginTypingPrompt: Начните вводить название, чтобы выполнить поиск местоположений - clearLocation: Очистить местоположение - currentLocationUnavailable: Текущее местоположение недоступно - fetchingLocation: Получение местоположения… - geocoderUnreachable: Не удалось связаться с геокодером - homeLocation: Дом - myPlaces: Мои места - nearby: Остановки поблизости - noResults: Нет результатов - other: Другое - parenthesisFormat: "{main} ({detail})" - recentlySearched: Недавние поисковые запросы - stationCount: "{count, plural, =1 {# станция} other {# cтанции}}" - stations: Станции - stopCount: "{count, plural, =1 {# остановка} other {# oстановки}}" - stops: Остановки - useCurrentLocation: Использовать текущее местоположение - workLocation: Работа diff --git a/packages/location-field/i18n/tl.yml b/packages/location-field/i18n/tl.yml deleted file mode 100644 index 4a4bf11b4..000000000 --- a/packages/location-field/i18n/tl.yml +++ /dev/null @@ -1,19 +0,0 @@ -otpUi: - LocationField: - beginTypingPrompt: Simulang mag-type para maghanap ng mga lokasyon - clearLocation: I-clear ang lokasyon - currentLocationUnavailable: Hindi available ang kasalukuyang lokasyon - fetchingLocation: Fine-fetch ang lokasyon… - geocoderUnreachable: Hind maabot ang geocoder - homeLocation: Tirahan - myPlaces: Aking Mga Lugar - nearby: Mga Hintuan sa Malapit - noResults: Walang nakitang resulta - other: Iba pa - parenthesisFormat: "{main} ({detail})" - recentlySearched: Kamakailang Hinanap - stationCount: "{count} mga istasyon" - stations: Mga Istasyon - stops: Mga Hintuan - useCurrentLocation: Gamitin ang Kasalukuyang Lokasyon - workLocation: Trabaho diff --git a/packages/location-field/i18n/tr.yml b/packages/location-field/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/location-field/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/location-field/package.json b/packages/location-field/package.json index 1cddee830..a6dcd5069 100644 --- a/packages/location-field/package.json +++ b/packages/location-field/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/location-field", - "version": "2.0.12", + "version": "2.0.11", "description": "A component for display and finding a location", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/map-popup/i18n/ru.yml b/packages/map-popup/i18n/ru.yml deleted file mode 100644 index 08fd5611d..000000000 --- a/packages/map-popup/i18n/ru.yml +++ /dev/null @@ -1,9 +0,0 @@ -otpUi: - MapPopup: - availableBikes: "Доступные велосипеды: {value}" - availableDocks: "Доступные станции: {value}" - floatingBike: "Арендный велосипед не на станции: {name}" - floatingCar: "{company} {name}" - floatingEScooter: "Электросамокат: {name}" - stopId: "Идентификатор остановки: {stopId}" - stopViewer: Средство просмотра остановок diff --git a/packages/map-popup/i18n/tl.yml b/packages/map-popup/i18n/tl.yml deleted file mode 100644 index 7acedc178..000000000 --- a/packages/map-popup/i18n/tl.yml +++ /dev/null @@ -1,9 +0,0 @@ -otpUi: - MapPopup: - availableBikes: "Mga available na bisikleta: {value}" - availableDocks: "Mga available na dock: {value}" - floatingBike: "Free-floating na bisikleta: {name}" - floatingCar: "{company} {name}" - floatingEScooter: "E-scooter: {name}" - stopId: "Stop ID: {stopId}" - stopViewer: Ihinto ang Viewer diff --git a/packages/map-popup/i18n/tr.yml b/packages/map-popup/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/map-popup/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/map-popup/package.json b/packages/map-popup/package.json index 4acac46a0..50d96f410 100644 --- a/packages/map-popup/package.json +++ b/packages/map-popup/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/map-popup", - "version": "2.0.7", + "version": "2.0.6", "description": "A component for displaying map popup contents", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/printable-itinerary/i18n/ru.yml b/packages/printable-itinerary/i18n/ru.yml deleted file mode 100644 index 96ed43056..000000000 --- a/packages/printable-itinerary/i18n/ru.yml +++ /dev/null @@ -1,16 +0,0 @@ -otpUi: - PrintableItinerary: - TncLeg: - estimatedTravelTime: >- - Предполагаемое время поездки: {duration} (без учета - дорожного движения) - estimatedWaitTime: "Предполагаемое время до посадки: {duration}" - header: >- - Воспользуйтесь услугами компании {company}, чтобы - добраться к месту {place} - TransitLeg: - alight: >- - Выходите в месте {place} ({stopId}) в {time, - time, short} - continuesAs: "Продолжение: {routeDescription}" - depart: Отправление с места {place} diff --git a/packages/printable-itinerary/i18n/tl.yml b/packages/printable-itinerary/i18n/tl.yml deleted file mode 100644 index def9aff48..000000000 --- a/packages/printable-itinerary/i18n/tl.yml +++ /dev/null @@ -1,18 +0,0 @@ -otpUi: - PrintableItinerary: - TncLeg: - estimatedTravelTime: >- - Tinatayang tagal ng biyahe: {duration} (hindi - isinasaalang-alang ang trapiko) - estimatedWaitTime: >- - Tinatayang tagal ng paghihintay para sa pag-pick up: - {duration} - header: >- - Gamitin ang {company} papuntang - {place} - TransitLeg: - alight: >- - Bumaba sa {place} ({stopId}) nang {time, time, - short} - continuesAs: Magpapatuloy bilang {routeDescription} - depart: Aalis sa {place} diff --git a/packages/printable-itinerary/i18n/tr.yml b/packages/printable-itinerary/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/printable-itinerary/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/printable-itinerary/package.json b/packages/printable-itinerary/package.json index 34d222d02..653ecf688 100644 --- a/packages/printable-itinerary/package.json +++ b/packages/printable-itinerary/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/printable-itinerary", - "version": "2.0.15", + "version": "2.0.14", "description": "A component for displaying a printable itinerary body of a trip planning result", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/transit-vehicle-overlay/i18n/ru.yml b/packages/transit-vehicle-overlay/i18n/ru.yml deleted file mode 100644 index 91aa9fc83..000000000 --- a/packages/transit-vehicle-overlay/i18n/ru.yml +++ /dev/null @@ -1,8 +0,0 @@ -otpUi: - TransitVehicleOverlay: - defaultTooltip: "{route}: {duration} назад" - durationWithSeconds: >- - {hours, plural, =0 {} other {# ч }}{minutes, plural, =0 {{seconds, plural, - =0 {# мин} other {}}} other {# мин}}{seconds, plural, =0 {} other { # с}} - routeTitle: "{type} {name}" - transitLine: Линия diff --git a/packages/transit-vehicle-overlay/i18n/tl.yml b/packages/transit-vehicle-overlay/i18n/tl.yml deleted file mode 100644 index eeb88d320..000000000 --- a/packages/transit-vehicle-overlay/i18n/tl.yml +++ /dev/null @@ -1,9 +0,0 @@ -otpUi: - TransitVehicleOverlay: - defaultTooltip: "{route}: {duration} ang nakalipas" - durationWithSeconds: >- - {hours, plural, =0 {} other {# hr }}{minutes, plural, =0 {{seconds, - plural, =0 {# min} other {}}} other {# min}}{seconds, plural, =0 {} other - { # sec}} - routeTitle: "{type} {name}" - transitLine: Line diff --git a/packages/transit-vehicle-overlay/i18n/tr.yml b/packages/transit-vehicle-overlay/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/transit-vehicle-overlay/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/transit-vehicle-overlay/package.json b/packages/transit-vehicle-overlay/package.json index f08d65a4d..0d2ea5268 100644 --- a/packages/transit-vehicle-overlay/package.json +++ b/packages/transit-vehicle-overlay/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/transit-vehicle-overlay", - "version": "4.0.7", + "version": "4.0.6", "description": "Realtime Transit Vehicles Component", "author": "Frank Purcell", "homepage": "https://github.com/opentripplanner/otp-ui/tree/master/packages/transit-vehicle-overlay/#readme", diff --git a/packages/trip-details/i18n/ko.yml b/packages/trip-details/i18n/ko.yml index 6eb4dcc5e..407a29a24 100644 --- a/packages/trip-details/i18n/ko.yml +++ b/packages/trip-details/i18n/ko.yml @@ -15,7 +15,6 @@ otpUi: {departureDate, time, short}에 {departureDate, date, long} 출발 hideDetail: 세부정보 숨기기 - minutesActive: "활동 시간: {minutes} 분" showDetail: 세부정보 표시 title: 트립 상세정보 tncFare: "{companies} 운임: {minTNCFare} - {maxTNCFare}" diff --git a/packages/trip-details/i18n/ru.yml b/packages/trip-details/i18n/ru.yml deleted file mode 100644 index b4e0b337f..000000000 --- a/packages/trip-details/i18n/ru.yml +++ /dev/null @@ -1,23 +0,0 @@ -otpUi: - TripDetails: - FareTable: - cash: Наличные - electronic: Электронный - regular: Взрослые - senior: Пожилые - special: Особые - youth: Детский - co2: "Выбросы CO₂: {co2}" - co2description: >- - Интенсивность выбросов CO₂ рассчитывается умножением расстояния каждого - этапа поездки на интенсивность выбросов CO₂ для каждого вида транспорта. - Данные об интенсивности выбросов CO₂ для каждого вида транспорта взяты из - этой таблицы. - departure: >- - Прибытие: {departureDate, date, long} в - {departureDate, time, short} - title: Подробные сведения о поездке - tncFare: "Стоимость проезда в компаниях {companies}: {minTNCFare}\_— {maxTNCFare}" - transitFare: Стоимость проезда в общественном транспорте - transitFareEntry: "{name}: {value}" - tripIncludesFlex: Эта поездка включает гибкие маршруты. {extraMessage} diff --git a/packages/trip-details/i18n/tl.yml b/packages/trip-details/i18n/tl.yml deleted file mode 100644 index 129721afe..000000000 --- a/packages/trip-details/i18n/tl.yml +++ /dev/null @@ -1,23 +0,0 @@ -otpUi: - TripDetails: - FareTable: - cash: Cash - electronic: Electronic - regular: Nasa Hustong Gulang - senior: Nakatatanda - special: Espesyal - youth: Kabataan - co2: "Na-emit na CO₂: {co2}" - co2description: >- - Kinakalkula ang intensity ng CO₂ sa pamamagitan ng pag-multiply sa - distansya ng bawat leg ng biyahe sa intensity ng CO₂ ng bawat mode. Ang - intensity ng CO₂ ng bawat mode ay nagmumula sa spreadsheet na - ito. - departure: >- - Aalis {departureDate, date, long} nang - {departureDate, time, short} - title: Mga Detalye ng Biyahe - tncFare: "{companies} Fare: {minTNCFare} - {maxTNCFare}" - transitFare: Pamasahe sa Pampublikong Transportasyon - transitFareEntry: "{name}: {value}" - tripIncludesFlex: May mga flexible na ruta ang biyaheng ito. {extraMessage} diff --git a/packages/trip-details/i18n/tr.yml b/packages/trip-details/i18n/tr.yml deleted file mode 100644 index 0967ef424..000000000 --- a/packages/trip-details/i18n/tr.yml +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packages/trip-details/i18n/vi.yml b/packages/trip-details/i18n/vi.yml index 3b2bfaf5e..dc5e82735 100644 --- a/packages/trip-details/i18n/vi.yml +++ b/packages/trip-details/i18n/vi.yml @@ -16,7 +16,6 @@ otpUi: Khởi hành {departureDate, date, long} lúc {departureDate, time, short} hideDetail: Ẩn chi tiết - minutesActive: "Thời gian hoạt động: {minutes} phút" showDetail: Hiển thị chi tiết title: Chi tiết chuyến đi tncFare: "{companies} Giá vé: {minTNCFare} - {maxTNCFare}" diff --git a/packages/trip-details/i18n/zh_Hans.yml b/packages/trip-details/i18n/zh_Hans.yml index 99e07bbc6..cbe393a91 100644 --- a/packages/trip-details/i18n/zh_Hans.yml +++ b/packages/trip-details/i18n/zh_Hans.yml @@ -13,7 +13,6 @@ otpUi: {departureDate, date, long} {departureDate, time, short} 出发 hideDetail: 隐藏细节 - minutesActive: "活动时间: {minutes} 分钟" showDetail: 显示详细资料 title: 行程详情 tncFare: "{companies} 票价: {minTNCFare} - {maxTNCFare}" diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json index b41acdd31..2f9f69bfb 100644 --- a/packages/trip-details/package.json +++ b/packages/trip-details/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/trip-details", - "version": "5.0.5", + "version": "5.0.4", "description": "A component for displaying details about a trip planning itinerary", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/trip-form/i18n/fr.yml b/packages/trip-form/i18n/fr.yml index ed86c7441..7eb215dd6 100644 --- a/packages/trip-form/i18n/fr.yml +++ b/packages/trip-form/i18n/fr.yml @@ -25,7 +25,7 @@ otpUi: rail-label: Train subway-label: Métro tram-label: Tram - walkReluctance-label: Éviter la marche + walkReluctance-label: Évitez de marcher walkTolerance-label: Tolérance pour la marche walkTolerance-labelHigh: Plus de marche walkTolerance-labelLow: Moins de marche diff --git a/packages/trip-form/i18n/ru.yml b/packages/trip-form/i18n/ru.yml deleted file mode 100644 index 9e7f104fe..000000000 --- a/packages/trip-form/i18n/ru.yml +++ /dev/null @@ -1,48 +0,0 @@ -otpUi: - DateTimeSelector: - arrive: Прибытие к - depart: Отправление в - now: Выйти - ModeSelector: - labels: - bicycle: Велосипед - car: Поездка в транспортном средстве - rent: Прокат - transit: Общественный транспорт - walk: Пешком - settings: - bus-label: Автобус - ferry-label: Паром - rail-label: Рельсовый транспорт - SettingsSelectorPanel: - bikeOnly: Только велосипед - escooterOnly: Только электросамокат - takeTransit: Воспользуйтесь общественным транспортом - travelPreferences: Параметры поездок - use: Воспользоваться - useCompanies: Воспользоваться услугами компаний - walkOnly: Только пешком - queryParameters: - bikeSpeed: Скорость велосипеда - distanceInMiles: | - {miles, number, :: unit/mile unit-width-full-name} - maxBikeDistance: Максимальная дальность езды на велосипеде - maxBikeTime: Максимальное время езды на велосипеде - maxEScooterDistance: Максимальная дальность поездки на электросамокате - maxWalkDistance: Максимальная дальность прогулки - maxWalkTime: Максимальное время прогулки - optimizeBikeFlat: Поездка на велосипеде по ровной местности - optimizeBikeFriendly: Поездка на велосипеде - optimizeBikeSpeed: Скорость - optimizeFor: Оптимизировать для - speedInMilesPerHour: "{mph} миль/ч" - walkReluctance: Без этапов прогулки пешком - walkReluctanceHigh: Больше общественного транспорта - walkReluctanceLow: Больше этапов пешком - walkSpeed: Скорость ходьбы - watts: Мощность электросамоката - watts125kidsHoverboard: "Детский ховерборд (6\_миль в час)" - watts1500powerfulEscooter: "Мощный электросамокат (24\_мили в час)" - watts250entryLevelEscooter: "Самокат начального уровня (11\_миль в час)" - watts500robustEscooter: "Электросамокат среднего уровня (18\_миль в час)" - wheelchair: Предпочитать маршруты с возможностью передвижения на инвалидной коляске diff --git a/packages/trip-form/i18n/tl.yml b/packages/trip-form/i18n/tl.yml deleted file mode 100644 index 89bd94e1a..000000000 --- a/packages/trip-form/i18n/tl.yml +++ /dev/null @@ -1,48 +0,0 @@ -otpUi: - DateTimeSelector: - arrive: Dumating bago ang - depart: Umalis nang - now: Umalis ngayon - ModeSelector: - labels: - bicycle: Bisikleta - car: Nagmamaneho - rent: Rental - transit: Pampublikong Transportasyon - walk: Naglalakad - settings: - bus-label: Bus - ferry-label: Ferry - rail-label: Tren - SettingsSelectorPanel: - bikeOnly: Bisikleta Lang - escooterOnly: E-scooter Lang - takeTransit: Gumamit ng Pampublikong Transportasyon - travelPreferences: Mga Kagustuhan sa Paglalakbay - use: Gamitin - useCompanies: Gumamit ng mga kumpanya - walkOnly: Maglakad Lang - queryParameters: - bikeSpeed: Bilis ng Bisikleta - distanceInMiles: | - {miles, number, :: unit/mile unit-width-full-name} - maxBikeDistance: Maximum na Pagbibisikleta - maxBikeTime: Max na Tagal ng Pagbibisikleta - maxEScooterDistance: Maximum na Layo ng E-scooter - maxWalkDistance: Maximum na Paglalakad - maxWalkTime: Max na Tagal ng Paglalakad - optimizeBikeFlat: Flat na Biyahe - optimizeBikeFriendly: Biyaheng Puwedeng Gumamit ng Bisikleta - optimizeBikeSpeed: Bilis - optimizeFor: I-optimize para sa - speedInMilesPerHour: "{mph} MPH" - walkReluctance: Pag-iwas sa Paglalakad - walkReluctanceHigh: Higit Pang Pampublikong Transportasyon - walkReluctanceLow: Higit Pang Paglalakad - walkSpeed: Bilis ng Paglalakad - watts: Power ng E-scooter - watts125kidsHoverboard: Pambatang hoverboard (6 mph) - watts1500powerfulEscooter: Powerful na E-scooter (24 mph) - watts250entryLevelEscooter: Entry-level na scooter (11 mph) - watts500robustEscooter: Robust na E-scooter (18 mph) - wheelchair: Mas Gusto ang Mga Ruta Kung Saan Accessible ang Wheelchair diff --git a/packages/trip-form/i18n/tr.yml b/packages/trip-form/i18n/tr.yml deleted file mode 100644 index 81f1fb1ee..000000000 --- a/packages/trip-form/i18n/tr.yml +++ /dev/null @@ -1,19 +0,0 @@ -otpUi: - DateTimeSelector: - date: Tarih - dateTimeSelector: Tarih/Saat Seçici - depart: Kalkış saati - time: Zaman - ModeSelector: - labels: - bicycle: Bisiklet - car: Sürücü - rent: Kira - transit: Geçiş - walk: Yürüme - settings: - bus-label: Otobüs - ferry-label: Feribot - rail-label: Tren - subway-label: Metro - tram-label: Tramvay diff --git a/packages/trip-form/package.json b/packages/trip-form/package.json index 3de331e4e..2c6fcb416 100644 --- a/packages/trip-form/package.json +++ b/packages/trip-form/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/trip-form", - "version": "3.3.6", + "version": "3.3.4", "description": "Trip Settings Form and Related Components", "author": "@binh-dam-ibigroup", "homepage": "https://github.com/opentripplanner/otp-ui/#readme", From e3aa95c9fc8b74ab12688eafee207db462c7e522 Mon Sep 17 00:00:00 2001 From: amy-corson-ibigroup <115499534+amy-corson-ibigroup@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:05:36 -0600 Subject: [PATCH 9/9] Revert "Merge branch 'master' into wheelchair-accessible-labeling" This reverts commit f8986b2a4233dcae9675075675a427bea87309ec, reversing changes made to a219045424f0f97cde4fc046803f48a15e045692. --- packages/building-blocks/package.json | 34 ----------------------- packages/core-utils/package.json | 2 +- packages/core-utils/src/planQuery.graphql | 7 ----- packages/trip-details/package.json | 2 +- packages/trip-details/src/fare-table.tsx | 2 +- packages/trip-details/src/index.tsx | 2 +- 6 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 packages/building-blocks/package.json diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json deleted file mode 100644 index 32331ea1b..000000000 --- a/packages/building-blocks/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@opentripplanner/building-blocks", - "version": "1.0.0", - "description": "Styling and UI Component Lbrary", - "author": "@binh-dam-ibigroup", - "homepage": "https://github.com/opentripplanner/otp-ui/#readme", - "license": "MIT", - "main": "lib/index.js", - "module": "esm/index.js", - "private": false, - "dependencies": { - "mapbox-gl": "npm:empty-npm-package@1.0.0", - "maplibre-gl": "^2.1.9", - "react-map-gl": "^7.0.15", - "@opentripplanner/core-utils": "11.1.2" - }, - "peerDependencies": { - "@opentripplanner/types": "^6.1.0", - "react": "^16.14.0", - "styled-components": "^5.3.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/opentripplanner/otp-ui.git" - }, - "scripts": { - "test": "echo \"Error: run tests from root\" && exit 1", - "tsc": "tsc" - }, - "bugs": { - "url": "https://github.com/opentripplanner/otp-ui/issues" - }, - "gitHead": "0af1b7cda60bd4252b219dcf893e01c2acb2ed5d" -} diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index b2d909922..4be2013a4 100644 --- a/packages/core-utils/package.json +++ b/packages/core-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/core-utils", - "version": "11.1.3", + "version": "11.1.1", "description": "Core functionality that is shared among numerous UI components", "engines": { "node": ">=13" diff --git a/packages/core-utils/src/planQuery.graphql b/packages/core-utils/src/planQuery.graphql index 551d012eb..5fb41c9aa 100644 --- a/packages/core-utils/src/planQuery.graphql +++ b/packages/core-utils/src/planQuery.graphql @@ -53,13 +53,6 @@ query Plan( timezone url } - alerts { - alertDescriptionText - alertHeaderText - alertUrl - effectiveStartDate - id - } arrivalDelay departureDelay distance diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json index b9a9135fa..2f9f69bfb 100644 --- a/packages/trip-details/package.json +++ b/packages/trip-details/package.json @@ -1,6 +1,6 @@ { "name": "@opentripplanner/trip-details", - "version": "5.0.6", + "version": "5.0.4", "description": "A component for displaying details about a trip planning itinerary", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/trip-details/src/fare-table.tsx b/packages/trip-details/src/fare-table.tsx index ed677b2f4..02b1d8c49 100644 --- a/packages/trip-details/src/fare-table.tsx +++ b/packages/trip-details/src/fare-table.tsx @@ -89,7 +89,7 @@ const FareTypeTable = ({ ...col, total: getItineraryCost(legs, col.mediumId, col.riderCategoryId) })) - .filter(col => col.total !== undefined); + .filter(col => col.total); const headerString = useGetHeaderString(headerKey); diff --git a/packages/trip-details/src/index.tsx b/packages/trip-details/src/index.tsx index 5e25d28b6..aa8f1eabb 100644 --- a/packages/trip-details/src/index.tsx +++ b/packages/trip-details/src/index.tsx @@ -126,7 +126,7 @@ export function TripDetails({ /> ); - fare = defaultFareTotal !== undefined && ( + fare = defaultFareTotal?.amount && ( 1 ? "list-item" : "" }}>