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(companions-pane): Add new companions pane to saved trip editor and account settings screen #1289

Merged
merged 37 commits into from
Nov 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ec66a9b
feat(AddEmailForm): Introduce new component.
binh-dam-ibigroup Sep 25, 2024
1fc76aa
feat(CompanionsPane): Add basic companions pane
binh-dam-ibigroup Sep 26, 2024
122428b
improvement(CompanionsPane): Add delete companion, improve adding one.
binh-dam-ibigroup Sep 26, 2024
c8ee71a
improvement(AddEmailForm): Tweak email validation
binh-dam-ibigroup Sep 26, 2024
f41b91a
refactor(SubmitButton): Extract submit button
binh-dam-ibigroup Sep 26, 2024
2f9b299
refactor(StatusBadge): Extract status badge component.
binh-dam-ibigroup Sep 27, 2024
d186fc9
refactor: Add companions pane to acct pages, remove from mob wiz.
binh-dam-ibigroup Sep 27, 2024
cf1c9b1
refactor: Fix types
binh-dam-ibigroup Sep 27, 2024
be648df
feat(saved-trip-editor): add companions pane to editor
josh-willis-arcadis Oct 9, 2024
b5a7c25
refactor(companions-pane): update styling of companions row to match …
josh-willis-arcadis Oct 10, 2024
8b3d4ab
refactor(add-email-form): make input field full width
josh-willis-arcadis Oct 11, 2024
ac4c41f
refactor(add-email-form): don't use control strip component
josh-willis-arcadis Oct 11, 2024
32d87f9
fix(add-email-form): add back form component
josh-willis-arcadis Oct 11, 2024
7496183
feat(companions-pane): make pane collapsible
josh-willis-arcadis Oct 14, 2024
d07b51f
feat(companions-pane): add i18n key/vals
josh-willis-arcadis Oct 15, 2024
600fd50
refactor: address PR feedback
josh-willis-arcadis Oct 21, 2024
7349731
Merge branch 'mobility-profile-routing-2' into trusted-companions
josh-willis-arcadis Oct 23, 2024
b7ef0af
Merge branch 'dev' into trusted-companions
josh-willis-arcadis Oct 23, 2024
186b634
Merge branch 'dev' into trusted-companions
josh-willis-arcadis Oct 23, 2024
6b2da61
refactor(CompanionsPane): Don't pass userId when requesting new compa…
binh-dam-ibigroup Oct 30, 2024
0f57130
feat: Add confirmation and error landing pages.
binh-dam-ibigroup Oct 30, 2024
ba97b8e
refactor(confirmation.html): Merge error and confirmation pages
binh-dam-ibigroup Oct 31, 2024
f039959
Merge pull request #1298 from opentripplanner/trusted-companions-qbd
josh-willis-arcadis Nov 4, 2024
6599af5
address pr feedback
josh-willis-arcadis Nov 4, 2024
3732363
refactor(user/types): add status values
josh-willis-arcadis Nov 4, 2024
a032296
Fix code scanning alert no. 7: Client-side cross-site scripting
josh-willis-arcadis Nov 4, 2024
a0fa2c7
Merge branch 'dev' into trusted-companions
josh-willis-arcadis Nov 4, 2024
c741d54
Merge branch 'dev' into trusted-companions
binh-dam-ibigroup Nov 7, 2024
f07d9bc
chore(i18n): Add FR translations
binh-dam-ibigroup Nov 7, 2024
f937cbd
refactor: use plural travelCompanions
josh-willis-arcadis Nov 7, 2024
574dc91
fix(en-us): fix spelling
josh-willis-arcadis Nov 7, 2024
55a49fa
refactor(status-badge): use implicit return syntax
josh-willis-arcadis Nov 7, 2024
532800a
Merge branch 'dev' into trusted-companions
josh-willis-arcadis Nov 7, 2024
af90e01
refactor(existing-account-display): remove collapsible prop
josh-willis-arcadis Nov 15, 2024
5fbf59d
refactor(saved-trip-editor): remove collapsible prop
josh-willis-arcadis Nov 15, 2024
7c80158
Merge branch 'dev' into trusted-companions
josh-willis-arcadis Nov 15, 2024
994d9f8
Merge branch 'dev' into trusted-companions
josh-willis-arcadis Nov 19, 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
Prev Previous commit
Next Next commit
address pr feedback
josh-willis-arcadis committed Nov 4, 2024
commit 6599af58c5ad54408b6cc02e60794ca6c7d553f7
2 changes: 1 addition & 1 deletion lib/components/util/status-badge.tsx
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ function getStatusLabel(status?: string) {
<FormattedMessage id="components.StatusBadge.pending" />
</StyledStatusLabel>
)
case 'verified':
case 'confirmed':
return (
<StyledStatusLabel style={{ background: 'green' }}>
<FormattedMessage id="components.StatusBadge.verified" />

Unchanged files with check annotations Beta

import { replace, push } from 'connected-react-router'

Check failure on line 1 in lib/actions/auth.js

GitHub Actions / test-build-release

Member 'push' of the import declaration should be sorted alphabetically
import { setPathBeforeSignIn } from '../actions/user'
* @param {Error} err
* @param {AccessTokenRequestOptions} options
*/
export function showAccessTokenError (err, options) {

Check failure on line 11 in lib/actions/auth.js

GitHub Actions / test-build-release

Delete `·`
return function (dispatch, getState) {
// TODO: improve this.
console.error('Failed to retrieve access token: ', err)
* when signing-in fails for some reason.
* @param {Error} err
*/
export function showLoginError (err) {

Check failure on line 23 in lib/actions/auth.js

GitHub Actions / test-build-release

Delete `·`
return function (dispatch, getState) {
// TODO: improve this.
if (err) dispatch(push('/oops'))
* @param {Object} appState The state stored when calling useAuth0().loginWithRedirect
* or when instantiating a component that uses withAuhenticationRequired.
*/
export function processSignIn (appState) {

Check failure on line 36 in lib/actions/auth.js

GitHub Actions / test-build-release

Delete `·`
return function (dispatch, getState) {
if (appState && appState.returnTo) {
// Remove URL parameters that were added by auth0-react
import { createAction } from 'redux-actions'
if (typeof (fetch) === 'undefined') require('isomorphic-fetch')

Check failure on line 2 in lib/actions/zipcar.js

GitHub Actions / test-build-release

Replace `(fetch)` with `fetch`
export const receivedZipcarLocationsError = createAction('ZIPCAR_LOCATIONS_ERROR')

Check failure on line 4 in lib/actions/zipcar.js

GitHub Actions / test-build-release

Replace `'ZIPCAR_LOCATIONS_ERROR'` with `⏎··'ZIPCAR_LOCATIONS_ERROR'⏎`
export const receivedZipcarLocationsResponse = createAction('ZIPCAR_LOCATIONS_RESPONSE')

Check failure on line 5 in lib/actions/zipcar.js

GitHub Actions / test-build-release

Replace `'ZIPCAR_LOCATIONS_RESPONSE'` with `⏎··'ZIPCAR_LOCATIONS_RESPONSE'⏎`
export const requestZipcarLocationsResponse = createAction('ZIPCAR_LOCATIONS_REQUEST')

Check failure on line 6 in lib/actions/zipcar.js

GitHub Actions / test-build-release

Replace `'ZIPCAR_LOCATIONS_REQUEST'` with `⏎··'ZIPCAR_LOCATIONS_REQUEST'⏎`
export function zipcarLocationsQuery (url) {

Check failure on line 8 in lib/actions/zipcar.js

GitHub Actions / test-build-release

Delete `·`
return async function (dispatch, getState) {
dispatch(requestZipcarLocationsResponse())
let json
import { Field, Form, Formik } from 'formik'
import React, {Component} from 'react'

Check failure on line 2 in lib/components/admin/editable-section.js

GitHub Actions / test-build-release

Replace `Component` with `·Component·`
import {
Button,
var urlParams = search.split(";");
var errorParam = urlParams.find(p => p.startsWith("error="));
if (errorParam) {
document.getElementById("contents").innerHTML = `An error occurred: ${decodeURIComponent(errorParam.split("=")[1])}`;

Check failure

Code scanning / CodeQL

Client-side cross-site scripting High

Cross-site scripting vulnerability due to
user-provided value
.
}
}
</script>