Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cm/crowding app wording updates #1888

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Cm/crowding app wording updates #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d238b7
Updated labels in plain JS app.
cmaddox5 Oct 16, 2023
e6d7a51
Updated React app so it matches what we are giving to OFM.
cmaddox5 Oct 16, 2023
a153a93
Version # change.
cmaddox5 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions assets/css/v2/train_crowding.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
.crowding-widget__header__destination-sentence {
@include font--heading-3;
margin-top: auto;
color: #FFFFFF;
color: #ffffff;
.destination {
padding-left: 109px;
}
Expand Down Expand Up @@ -116,15 +116,6 @@
.crowding-widget__you-are-here-arrow {
width: 180px;
height: 180px;
&--up {
animation: up-arrow 1.2s infinite ease-in-out;
}
&--up-left {
animation: up-left-arrow 1.2s infinite ease-in-out;
}
&--up-right {
animation: up-right-arrow 1.2s infinite ease-in-out;
}
}

.crowding-widget__you-are-here-text {
Expand Down
24 changes: 13 additions & 11 deletions assets/src/components/v2/train_crowding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type OccupancyStatus =
type CarOrientation = FrontCarDirection | "middle";
const lookupCarComponent = (
occupancyStatus: OccupancyStatus,
carOrientation: CarOrientation,
carOrientation: CarOrientation
) => {
const lookupKey: `${CarOrientation}/${OccupancyStatus}` = `${carOrientation}/${occupancyStatus}`;

Expand Down Expand Up @@ -131,7 +131,7 @@ const TrainCrowding: React.ComponentType<Props> = ({
const trains = crowding.map((occupancyStatus, i) => {
const CarComponent = lookupCarComponent(
occupancyStatus,
i == 0 ? frontCarDirection : "middle",
i == 0 ? frontCarDirection : "middle"
);
return <CarComponent key={i} className="crowding-widget__train-car" />;
});
Expand Down Expand Up @@ -188,14 +188,14 @@ const TrainCrowding: React.ComponentType<Props> = ({
<ArrowUp
className={classWithModifier(
"crowding-widget__you-are-here-arrow",
arrowDirection,
arrowDirection
)}
/>
) : (
<ArrowUpLeft
className={classWithModifier(
"crowding-widget__you-are-here-arrow",
arrowDirection,
arrowDirection
)}
/>
)}
Expand All @@ -204,7 +204,7 @@ const TrainCrowding: React.ComponentType<Props> = ({
style={{ marginLeft: textPadding }}
className={classWithModifier(
"crowding-widget__you-are-here-text",
[8, 16, 24].includes(arrowSlot) ? "right-align" : "left-align",
[8, 16, 24].includes(arrowSlot) ? "right-align" : "left-align"
)}
>
You are here
Expand All @@ -215,27 +215,29 @@ const TrainCrowding: React.ComponentType<Props> = ({
showIdentifiers={showIdentifiers}
identifiers={identifiers}
>
Current crowding on board
Space available
<br /> on board
</FooterSegment>
<FooterSegment
showIdentifiers={showIdentifiers}
identifiers={identifiers}
>
<div className="crowding-widget__footer__key-row">
<KeyNotCrowded width="137" height="100" className="key-icon" /> Not
crowded
<KeyNotCrowded width="137" height="100" className="key-icon" />
Seats available
</div>
<div className="crowding-widget__footer__key-row">
<KeySomeCrowding width="137" height="100" className="key-icon" />{" "}
Some crowding
<KeySomeCrowding width="137" height="100" className="key-icon" />
Space available
</div>
</FooterSegment>
<FooterSegment
showIdentifiers={showIdentifiers}
identifiers={identifiers}
>
<div className="crowding-widget__footer__key-row">
<KeyCrowded width="137" height="100" className="key-icon" /> Crowded
<KeyCrowded width="137" height="100" className="key-icon" /> Limited
space
</div>
<div className="crowding-widget__footer__key-row">
{crowding.includes("closed") ? (
Expand Down
2 changes: 1 addition & 1 deletion assets/src/components/v2/triptych/version.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const TRIPTYCH_VERSION = "23.8.11.1";
export const TRIPTYCH_VERSION = "23.10.18.1";
8 changes: 4 additions & 4 deletions priv/plain-js-triptych-app/triptych-app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
/////////////////////////
// CONSTANTS & GLOBALS //
/////////////////////////
const TRIPTYCH_VERSION = "23.10.5.1";
const TRIPTYCH_VERSION = "23.10.18.1";

// Custom element names must adhere to naming rules
// https://developer.mozilla.org/en-US/docs/Web/API/Web_Components/Using_custom_elements#registering_a_custom_element
Expand Down Expand Up @@ -769,7 +769,7 @@
<div class="crowding-widget__footer" id="train-crowding-footer-root">
<train-crowding-footer-segment class="crowding-widget__footer__segment">
<div slot="segment-content" id="segment-content">
Current crowding on board
Space available<br> on board
<div class="crowding-widget__footer__identifiers" id="footer-identifiers"></div>
</div>
</train-crowding-footer-segment>
Expand All @@ -781,7 +781,7 @@
</train-crowding-footer-key-row>
<train-crowding-footer-key-row class="crowding-widget__footer__key-row">
<img src="images/svgr_bundled/train_crowding/Car-SomeCrowding-Key.svg" width="137" height="100"
class="key-icon" /> Some crowding
class="key-icon" /> Space available
</train-crowding-footer-key-row>
<div class="crowding-widget__footer__identifiers" id="footer-identifiers"></div>
</div>
Expand All @@ -790,7 +790,7 @@
<div slot="segment-content">
<train-crowding-footer-key-row class="crowding-widget__footer__key-row">
<img src="images/svgr_bundled/train_crowding/Car-Crowded-Key.svg" width="137" height="100" class="key-icon" />
Crowded
Limited space
</train-crowding-footer-key-row>
<train-crowding-footer-key-row id="footer-optional-last-key"
class="crowding-widget__footer__key-row"></train-crowding-footer-key-row>
Expand Down
Loading