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

Mer develop into master - Remove duplicate rail lines #729

Merged
merged 30 commits into from
Mar 30, 2023
Merged

Conversation

sudheer-rk
Copy link
Contributor

Disruptions - remove duplicate rail lines
Disruptions - show the affected train company below the train lines.

sudheer-rk and others added 30 commits August 11, 2022 08:27
* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* moved feedback link to env variable and updated the header

* add keys to netlify and remove unused vars on header

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

* updating twitter and email links

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* align the filter options and change the button styling for map and list

* replacing locate map icon and updating zoom map icons

* alignment of filter options and map button styling

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* npm-check-updates applied to project

* updated comments

* clear npm cache and replace propTypes any with propTypes object

* fix es-lint error to move disruptionsData in its own useMemo() hook

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

* update node module and adjusted title margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* adjusted header for mobile screen

* adjusted header margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
…ce' (#670)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

* replacing GoodServiceMessage with NoKnownDisruptionMessage

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* integrating rail station graph with tram disruptions

* replaced atcoCode filter with naPTAN

* Empty-Commit

* removed unexpected console statement.

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* amendments to toggle more affected items

* Restyled by prettier (#700)

Co-authored-by: Restyled.io <commits@restyled.io>

* resolving prettier build issue

* resolving prettier issue

* Restyled by prettier (#702)

Co-authored-by: Restyled.io <commits@restyled.io>

* Restyled by prettier is not working

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
)

* Feature/203 links and branding (#642)

* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Bug/203 links filter and video (#645)

* moved feedback link to env variable and updated the header

* add keys to netlify and remove unused vars on header

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/203 links and branding (#649)

* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

* updating twitter and email links

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/204 upgrade disruptions UI in line with tfwm (#650)

* align the filter options and change the button styling for map and list

* replacing locate map icon and updating zoom map icons

* alignment of filter options and map button styling

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* ncu updates applied to project (#653)

* npm-check-updates applied to project

* updated comments

* clear npm cache and replace propTypes any with propTypes object

* fix es-lint error to move disruptionsData in its own useMemo() hook

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/upgrade node and other dependencies (#656)

* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/upgrade node and other dependencies (#657)

* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

* update node module and adjusted title margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/adjust header and footer (#658)

* adjusted header for mobile screen

* adjusted header margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* npm install changes updated after mergt

* added new message type NoKnownDisruptionMessage replacing 'good service' (#670)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Bug/change good service to unknown disruption (#671)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

* replacing GoodServiceMessage with NoKnownDisruptionMessage

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* Feature/revise text on Disruptions when no known disruption (#677)

* Feature/203 links and branding (#642)

* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Bug/203 links filter and video (#645)

* moved feedback link to env variable and updated the header

* add keys to netlify and remove unused vars on header

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/203 links and branding (#649)

* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

* updating twitter and email links

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/204 upgrade disruptions UI in line with tfwm (#650)

* align the filter options and change the button styling for map and list

* replacing locate map icon and updating zoom map icons

* alignment of filter options and map button styling

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* ncu updates applied to project (#653)

* npm-check-updates applied to project

* updated comments

* clear npm cache and replace propTypes any with propTypes object

* fix es-lint error to move disruptionsData in its own useMemo() hook

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/upgrade node and other dependencies (#656)

* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/upgrade node and other dependencies (#657)

* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

* update node module and adjusted title margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/adjust header and footer (#658)

* adjusted header for mobile screen

* adjusted header margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* npm install changes updated after mergt

* added new message type NoKnownDisruptionMessage replacing 'good service' (#670)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Bug/change good service to unknown disruption (#671)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

* replacing GoodServiceMessage with NoKnownDisruptionMessage

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* added random string with api call

* Empty-Commit

* remove spaces

* remove log info

---------

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* Feature/revise text on Disruptions when no known disruption (#677)

* Feature/203 links and branding (#642)

* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Bug/203 links filter and video (#645)

* moved feedback link to env variable and updated the header

* add keys to netlify and remove unused vars on header

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/203 links and branding (#649)

* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

* updating twitter and email links

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/204 upgrade disruptions UI in line with tfwm (#650)

* align the filter options and change the button styling for map and list

* replacing locate map icon and updating zoom map icons

* alignment of filter options and map button styling

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* ncu updates applied to project (#653)

* npm-check-updates applied to project

* updated comments

* clear npm cache and replace propTypes any with propTypes object

* fix es-lint error to move disruptionsData in its own useMemo() hook

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/upgrade node and other dependencies (#656)

* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/upgrade node and other dependencies (#657)

* ncu updates applied to project

* updated comments

* clear npm cache and replacing propTypes any with propTypes object

* fix eslint error to move disruptionsData in its own useMemo() hook

* applied npm upgrade and show header title smaller for mobiles

* update node module and adjusted title margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Feature/adjust header and footer (#658)

* adjusted header for mobile screen

* adjusted header margin

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* npm install changes updated after mergt

* added new message type NoKnownDisruptionMessage replacing 'good service' (#670)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* Bug/change good service to unknown disruption (#671)

* added new message type NoKnownDisruptionMessage replacing 'good service'

* remove strike message

* replacing GoodServiceMessage with NoKnownDisruptionMessage

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>

* added random string with api call

* Empty-Commit

* remove spaces

* remove log info

* log randomString

---------

Co-authored-by: Sudheer Kotha <SudheerKotha@wmca.org.uk>
Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
* group disruptions linas and operators and new styles

* refined to display routes grouped by operators

* updated styles

* amendments to the disruption list

* applying styles and adding severity setting

---------

Co-authored-by: Sudheer Kotha <sudheer.kotha@wmca@org.uk>
@sudheer-rk sudheer-rk added the bug Something isn't working label Mar 30, 2023
@sudheer-rk sudheer-rk self-assigned this Mar 30, 2023
@gitguardian
Copy link

gitguardian bot commented Mar 30, 2023

⚠️ GitGuardian has uncovered 9 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id Secret Commit Filename
1065342 Generic High Entropy Secret 10b2183 .env.development View secret
1065341 Generic High Entropy Secret 10b2183 .env.production View secret
1065342 Generic High Entropy Secret 10b2183 netlify.toml View secret
1065342 Generic High Entropy Secret 3243d9a .env.development View secret
1489744 Generic High Entropy Secret 3243d9a .env.development View secret
1489744 Generic High Entropy Secret bee26a4 .env.development View secret
1065342 Generic High Entropy Secret bee26a4 .env.development View secret
1065342 Generic High Entropy Secret 7d9b4cc .env.development View secret
1489744 Generic High Entropy Secret 7d9b4cc .env.development View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@sudheer-rk sudheer-rk merged commit 63cbb17 into master Mar 30, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
Status: 🔜 To Do
Development

Successfully merging this pull request may close these issues.

None yet

2 participants