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 32 commits
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
24 changes: 12 additions & 12 deletions i18n/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ common:
tuesday: Tuesday
wednesday: Wednesday
daysOfWeekCompact:
friday: Fri.
monday: Mon.
saturday: Sat.
sunday: Sun.
thursday: Thu.
tuesday: Tue.
wednesday: Wed.
friday: F
monday: M
saturday: S
sunday: Su
thursday: Th
tuesday: T
wednesday: W
amy-corson-ibigroup marked this conversation as resolved.
Show resolved Hide resolved
daysOfWeekPlural:
friday: Fridays
monday: Mondays
Expand Down Expand Up @@ -676,11 +676,11 @@ components:
arriveAt: "Arrive at "
leaveAt: "Leave at "
TripSummaryPane:
happensOnDays: "Happens on: <strong>{days}</strong>"
notifications: >-
Notifications: <strong>{leadTimeInMinutes} min. before scheduled
departure</strong>
notificationsDisabled: "Notifications: <strong>Disabled</strong>"
happensOnDays: "Happens on: {days}"
monitoredTripDays: Trip monitored days
notifications: "{leadTimeInMinutes} min. before scheduled departure"
notificationsDisabled: Notifications disabled
timeAndDuration: Trip time and duration
TripTools:
copyLink: Copy Link
header: Trip Tools
Expand Down
22 changes: 10 additions & 12 deletions i18n/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ common:
tuesday: Martes
wednesday: Miércoles
daysOfWeekCompact:
friday: Vie.
monday: Lun.
saturday: Sáb.
sunday: Dom.
thursday: Jue.
tuesday: Mar.
wednesday: Mié.
friday: V
monday: L
saturday: S
sunday: D
thursday: J
tuesday: M
wednesday: X
daysOfWeekPlural:
friday: Viernes
monday: Lunes
Expand Down Expand Up @@ -702,11 +702,9 @@ components:
arriveAt: "Llegue a las "
leaveAt: "Salida a las "
TripSummaryPane:
happensOnDays: "Ocurre en: <strong>{days}</strong>"
notifications: >-
Notificaciones: <strong>{leadTimeInMinutes} minutos antes de la salida
programada</strong>
notificationsDisabled: "Notificaciones: <strong>Desactivadas</strong>"
happensOnDays: "Ocurre en: {days}"
notifications: "{leadTimeInMinutes} minutos antes de la salida programada"
notificationsDisabled: Notificaciones desactivadas
TripTools:
copyLink: Copiar enlace
header: Herramientas
Expand Down
24 changes: 12 additions & 12 deletions i18n/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ common:
tuesday: mardi
wednesday: mercredi
daysOfWeekCompact:
friday: ven.
monday: lun.
saturday: sam.
sunday: dim.
thursday: jeu.
tuesday: mar.
wednesday: mer.
friday: V
monday: L
saturday: S
sunday: D
thursday: J
tuesday: M
wednesday: M
daysOfWeekPlural:
friday: vendredis
monday: lundis
Expand Down Expand Up @@ -710,11 +710,11 @@ components:
arriveAt: "Arrivée à "
leaveAt: "Partez à "
TripSummaryPane:
happensOnDays: "Effectué : <strong>{days}</strong>"
notifications: >-
Notifications : <strong>{leadTimeInMinutes} mn avant l'heure de départ
prévue</strong>
notificationsDisabled: "Notifications : <strong>Désactivées</strong>"
happensOnDays: "Effectué : {days}"
monitoredTripDays: Jours de suivi de ce trajet
notifications: "{leadTimeInMinutes} mn avant l'heure de départ prévue"
notificationsDisabled: Notifications désactivées
timeAndDuration: Heure et durée du trajet
TripTools:
copyLink: Copier le lien
header: Outils
Expand Down
6 changes: 3 additions & 3 deletions i18n/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,9 @@ components:
arriveAt: "도착 "
leaveAt: "출발 "
TripSummaryPane:
happensOnDays: "발생: <strong>{days}</strong>"
notifications: "알림: <strong>출발 예정 시간 {leadTimeInMinutes} 분 전</strong>"
notificationsDisabled: "알림: <strong>비활성화됨</strong>"
happensOnDays: "발생: {days}"
notifications: 출발 예정 시간 {leadTimeInMinutes} 분 전
notificationsDisabled: "알림: 비활성화됨"
TripTools:
copyLink: 링크 복사
header: 도구
Expand Down
8 changes: 3 additions & 5 deletions i18n/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -652,11 +652,9 @@ components:
arriveAt: "Прибытие в "
leaveAt: "Оставить "
TripSummaryPane:
happensOnDays: "Проходит в такие дни: <strong>{days}</strong>"
notifications: >-
Уведомления: за <strong>{leadTimeInMinutes} мин до запланированного
времени отправления</strong>
notificationsDisabled: "Уведомления: <strong>отключены</strong>"
happensOnDays: "Проходит в такие дни: {days}"
notifications: за <strong>{leadTimeInMinutes} мин до запланированного времени отправления
notificationsDisabled: "Уведомления: отключены"
TripTools:
copyLink: Скопировать ссылку
header: Инструменты маршрута
Expand Down
8 changes: 3 additions & 5 deletions i18n/tl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -670,11 +670,9 @@ components:
arriveAt: "Darating nang "
leaveAt: "Umalis sa "
TripSummaryPane:
happensOnDays: "Mangyayari sa: <strong>{days}</strong>"
notifications: >-
Mga Notification: <strong>{leadTimeInMinutes} (na) minuto bago ang
nakaiskedyul na pag-alis</strong>
notificationsDisabled: "Mga Notification: <strong>Naka-disable</strong>"
happensOnDays: "Mangyayari sa: {days}"
notifications: "{leadTimeInMinutes} (na) minuto bago ang nakaiskedyul na pag-alis"
notificationsDisabled: "Mga Notification: Naka-disable"
TripTools:
copyLink: Kopyahin ang Link
header: Mga Tool sa Biyahe
Expand Down
22 changes: 10 additions & 12 deletions i18n/vi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ common:
tuesday: Thứ ba
wednesday: Thứ tư
daysOfWeekCompact:
friday: Thứ sáu
monday: Thứ hai
saturday: Thứ bảy
sunday: Chủ nhật
thursday: Thứ năm
tuesday: Thứ ba
wednesday: Thứ tư
friday: T6
monday: T2
saturday: T7
sunday: CN
thursday: T5
tuesday: T3
wednesday: T4
daysOfWeekPlural:
friday: Các thứ sáu
monday: Các thứ hai
Expand Down Expand Up @@ -659,11 +659,9 @@ components:
arriveAt: "Đến nơi "
leaveAt: "Rời đi lúc "
TripSummaryPane:
happensOnDays: "Xảy ra vào: <strong>{days}</strong>"
notifications: >-
Thông báo: <strong>{leadTimeInMinutes} phút trước khi khởi hành theo lịch
trình</strong>
notificationsDisabled: "Thông báo: <strong>Đã tắt</strong>"
happensOnDays: "Xảy ra vào: {days}"
notifications: "{leadTimeInMinutes} phút trước khi khởi hành theo lịch trình"
notificationsDisabled: Thông báo đã tắt
TripTools:
copyLink: Sao chép URL
header: Công cụ
Expand Down
6 changes: 3 additions & 3 deletions i18n/zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,9 @@ components:
arriveAt: "到达 "
leaveAt: "离开 "
TripSummaryPane:
happensOnDays: "发生在: <strong>{days}</strong>"
notifications: "通知: <strong>预定出发前 {leadTimeInMinutes} </strong>"
notificationsDisabled: "通知: <strong>已禁用</strong>"
happensOnDays: "发生在: {days}"
notifications: 预定出发前 {leadTimeInMinutes}
notificationsDisabled: "通知: 已禁用"
TripTools:
copyLink: 复制链接
header: 工具
Expand Down
10 changes: 4 additions & 6 deletions lib/components/form/batch-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import { Search } from '@styled-icons/fa-solid/Search'
import { SyncAlt } from '@styled-icons/fa-solid/SyncAlt'
import { useIntl } from 'react-intl'
import React, { useCallback, useContext, useState } from 'react'
import tinycolor from 'tinycolor2'

import * as apiActions from '../../actions/api'
import * as formActions from '../../actions/form'
import { ComponentContext } from '../../util/contexts'
import { generateModeSettingValues } from '../../util/api'
import { getActiveSearch, hasValidLocation } from '../../util/state'
import { getBaseColor, getDarkenedBaseColor } from '../util/base-color'
import { getFormattedMode } from '../../util/i18n'
import { RoutingQueryCallResult } from '../../actions/api-constants'
import { StyledIconWrapper } from '../util/styledIcon'
Expand Down Expand Up @@ -217,11 +217,9 @@ function BatchSettings({
setModeSelectorPopup(!!modeSelectorPopup)
}, [setModeSelectorPopup])

// We can rely on this existing, as there is a default
const baseColor = getComputedStyle(document.documentElement).getPropertyValue(
'--main-base-color'
)
const accentColor = tinycolor(baseColor).darken(10)
const baseColor = getBaseColor()

const accentColor = getDarkenedBaseColor()

return (
<MainSettingsRow onMouseMove={checkModeSelectorPopup}>
Expand Down
7 changes: 7 additions & 0 deletions lib/components/mobile/mobile.css
Original file line number Diff line number Diff line change
Expand Up @@ -269,3 +269,10 @@
.otp.mobile .route-viewer-header {
margin: 0;
}

@media (max-width: 768px){
.panel-default {
width: 90%;
amy-corson-ibigroup marked this conversation as resolved.
Show resolved Hide resolved
}
}

Loading
Loading