Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

feat(SavedTripList): Updated trip card design #1151

Merged
merged 35 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6bfe97f
feat(SavedTripList): Updated trip card design
amy-corson-ibigroup Feb 9, 2024
97d21ff
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Feb 22, 2024
e910a00
mobile styling
amy-corson-ibigroup Feb 23, 2024
4cb1250
Cleanup + sort props
amy-corson-ibigroup Mar 8, 2024
3ceffb1
Rename duration summary file
amy-corson-ibigroup Mar 8, 2024
96cd4d7
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Mar 27, 2024
b56988d
fix(saved-trip-list): Update edit trip Button to Link
amy-corson-ibigroup Mar 27, 2024
d8832bb
fix: clean up code
amy-corson-ibigroup Mar 27, 2024
6893bfa
Update a11y and i18n
amy-corson-ibigroup Mar 27, 2024
9e5cb4f
style(trip-summary-pane): clean up styles
amy-corson-ibigroup Apr 2, 2024
7618044
refactor(base-color): create base-color util
amy-corson-ibigroup Apr 2, 2024
495213c
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Apr 2, 2024
6264698
style: update mobile breakpoints to align with bootstrap grid
amy-corson-ibigroup Apr 2, 2024
1f59e15
fix(base-color): create function from variable
amy-corson-ibigroup Apr 2, 2024
07b3cfa
Merge branch 'update-trip-card' of https://github.com/opentripplanner…
amy-corson-ibigroup Apr 2, 2024
beb2dd2
refactor basecolor util to getBaseColor
amy-corson-ibigroup Apr 2, 2024
8f950e3
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Apr 2, 2024
1551399
call baseColor within component
amy-corson-ibigroup Apr 2, 2024
2bddcb8
refactor: i18n, linting, a11y
amy-corson-ibigroup Apr 5, 2024
1dc9c70
style: sort css and adjust styling
amy-corson-ibigroup Apr 5, 2024
44cb54b
chore(i18n): Update compact weekdays for FR, ES, VN
binh-dam-ibigroup Apr 9, 2024
73ba6a6
chore(i18n): Add missing FR text, remove unused bold formatting
binh-dam-ibigroup Apr 9, 2024
c19479d
refactor: fix imports, css, and linting
amy-corson-ibigroup Apr 10, 2024
60f910a
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Apr 15, 2024
80631d7
update base-color to include accent color util
amy-corson-ibigroup Apr 16, 2024
9a79c25
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Apr 16, 2024
65f3e26
Merge branch 'update-trip-card' of https://github.com/opentripplanner…
amy-corson-ibigroup Apr 16, 2024
2b0da05
refactor: address PR feedback
amy-corson-ibigroup Apr 17, 2024
14d9b99
fix typo
amy-corson-ibigroup Apr 17, 2024
95c89df
remove route-block-wrapper
amy-corson-ibigroup Apr 18, 2024
d1f1e9b
style: clean up css
amy-corson-ibigroup Apr 18, 2024
b5c8d2e
refactor: change variable names
amy-corson-ibigroup Apr 18, 2024
c2a3353
Merge branch 'dev' into update-trip-card
amy-corson-ibigroup Apr 22, 2024
926bb2a
refactor: css tweaks
amy-corson-ibigroup Apr 22, 2024
6458025
Use baseColor for unmonitored day
amy-corson-ibigroup Apr 23, 2024
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
16 changes: 0 additions & 16 deletions lib/components/user/monitored-trip/route-block-wrapper.tsx

This file was deleted.

12 changes: 10 additions & 2 deletions lib/components/user/monitored-trip/saved-trip-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ import withLoggedInUserSupport from '../with-logged-in-user-support'

import getRenderData from './trip-status-rendering-strategies'
import InvisibleA11yLabel from '../../util/invisible-a11y-label'
import RouteBlockWrapper from './route-block-wrapper'
amy-corson-ibigroup marked this conversation as resolved.
Show resolved Hide resolved

import { ComponentContext } from '../../../util/contexts'
import Link from '../../util/link'
import MetroItineraryRoutes from '../../narrative/metro/metro-itinerary-routes'

import TripSummaryPane from './trip-summary-pane'

Expand Down Expand Up @@ -82,6 +83,8 @@ class TripListItem extends Component<ItemProps, ItemState> {
}
}

static contextType = ComponentContext

componentDidUpdate = (prevProps: ItemProps) => {
if (prevProps.trip.isActive !== this.props.trip.isActive) {
this.setState({ pendingRequest: false })
Expand All @@ -108,6 +111,7 @@ class TripListItem extends Component<ItemProps, ItemState> {
const from = legs[0].from
const to = legs[legs.length - 1].to
const editTripPath = `${TRIPS_PATH}/${trip.id}`
const { LegIcon } = this.context
return (
<Panel>
<TripPanelHeading>
Expand All @@ -128,7 +132,11 @@ class TripListItem extends Component<ItemProps, ItemState> {
</Link>
</TripPanelTitle>
<RouteBlockGrid>
<RouteBlockWrapper itinerary={itinerary} />
<MetroItineraryRoutes
amy-corson-ibigroup marked this conversation as resolved.
Show resolved Hide resolved
expanded={false}
itinerary={itinerary}
LegIcon={LegIcon}
/>
</RouteBlockGrid>
</TripPanelHeading>
<Panel.Body>
Expand Down