Commit Graph

11 Commits

Author SHA1 Message Date
Ahmad Abdolsaheb
cb201a8e8b feat: add grid map (#44557)
* feat: add map grid

* fix: lint/prettier/ts

Co-authored-by: Tom <20648924+moT01@users.noreply.github.com>
Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
2021-12-23 10:29:52 -06:00
Ahmad Abdolsaheb
449c37fb33 feat(client): add donate faq (#44380)
* feat: add donate faq

* Apply suggestions from code review

Co-authored-by: Kristofer Koishigawa <scissorsneedfoodtoo@gmail.com>

* clean up

* Apply suggestions from code review

Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>

* Update client/src/components/Donation/donation-text-components.tsx

Co-authored-by: Kristofer Koishigawa <scissorsneedfoodtoo@gmail.com>
Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
2021-12-21 14:42:10 -08:00
Ahmad Abdolsaheb
bcb0465a50 fix: donation clean up (#44257)
* fix: donation clean up

* rename file

* rename2
2021-11-30 07:30:21 -08:00
Sem Bauke
ab2e85978f chore(client): migrate-landing-components (#43769)
* feat: migrate landing components

* fix: import declarations

* fix: interface names

* fix: typing

* fix: attribute name

* fix: interface names

* Update client/src/declarations.d.ts

Co-authored-by: RobertoMSousa <beto.sousa22@gmail.com>

* Update client/src/components/landing/components/campers-image.tsx

* Update client/src/components/landing/components/campers-image.tsx

* Apply suggestions from code review

Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>

* fix: linting issues

Co-authored-by: Tom <20648924+moT01@users.noreply.github.com>
Co-authored-by: RobertoMSousa <beto.sousa22@gmail.com>
Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
2021-10-28 08:19:45 -07:00
Maciek Sitkowski
3eae0645ab fix: add translated close button label in alert messages (#43810) 2021-10-13 11:07:29 +02:00
awu43
f8aa621672 delete old ts-ignore comments (#43329) 2021-08-27 23:38:30 +02:00
Ahmad Abdolsaheb
1fec73cdf7 feat(client): Unify donation loading state (#43179)
* initial loading state unification

* feat(client): show buttons after 3 seconds

* fix: use window.setInterval explicitly

Otherwise TS assumes that it's node's setInterval

* feat(client): remove spinner when first button load

* feat(client): move the loader to the donate page button area

* feat(client): extract grid from modal donation form

* feat(client): remove duplicate donation forms

* feat(client):extract unused components from donationForm

* feat(client): load paypal on load not onInit (for perf)

* feat(client): set paypal loading state if stripe already loaded

* feat(clinet):make lpaypal oading condition strickt.

* Apply suggestions from code review

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* feat: clean up

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
2021-08-19 14:47:25 -05:00
Nicolás Restrepo
e34ec814ef feat(client): migrate donate module to ts (#42561)
* change DonationTextComponent extension to tsx

* migrate DonationTextComponents to ts

* change DonationModal extension to tsx

* add @types/react-redux

* migrate DonationModal to ts

* change PaypalButton extension to ts

* change DonateCompletion extension to tsx

* migrate DonateCompletion to TypeScript

* change PayPalButtonLoader extension to tsx

* first changes in paypal button (help needed)

* first changes in PayPalButtonScriptLoader (help needed)

* change DonateForm extension to tsx

* migrate donate module to ts

* Update client/src/components/Donation/DonateForm.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/components/Donation/DonationModal.tsx

Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>

* Update client/src/components/Donation/DonationModal.tsx

Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>

* Update client/src/components/Donation/DonateForm.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/components/Donation/DonateForm.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Delete console.log client/src/components/Donation/DonationModal.tsx

Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>

* applied changes requested

* fix: readjust default one time amount

* fix types

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* chore: restore comments.json

* fix: type assertion

* fix: specific DonateForm props

* Apply suggestions from code review

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* Update client/src/components/Donation/PaypalButton.tsx

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* fix:set default stat for paypalbutton

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
Co-authored-by: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
2021-08-04 11:21:11 +01:00
Oliver Eyton-Williams
e118dda13a fix: order imports and remove circular dependencies (#41824)
* fix: remove circular dependency

redux depended on templates/Challenges/redux and vice versa.  This
meant that import order mattered and confusing bugs could arise.

(cherry picked from commit 7d67a4e70922bbb3051f2f9982dcc69e240d43dc)

* feat: require imports to be in alphabetical order

Import order generally does not matter, but there are edge cases
(circular  imports and css imports, for example) where changing order
changes behaviour

(cherry picked from commit b8d1393a91ec6e068caf8e8498a5c95df68c2b2c)

* chore: order imports

* fix: lift up challenge description + title comps

This brings the classic Show closer to the others as they
now all create the description and title components

* fix: remove donation-saga/index circular import

(cherry picked from commit 51a44ca668a700786d2744feffeae4fdba5fd207)

* refactor: extract action-types from settings

(cherry picked from commit 25e26124d691c84a0d0827d41dafb761c686fadd)

* fix: lint errors

* feat: prevent useless renames
2021-08-02 08:39:40 -05:00
Shaun Hamilton
31486b368b fix(client): refactor to use correct i18n t type (#42865)
* fix(client): refactor to use correct i18n t type

* appease Oliver by importing directly from react-i18n

* fix: use default TFunction type variable

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
2021-07-19 09:48:02 -07:00
awu43
e54e2588bf feat(client): ts-migrate client/src/pages (#42445)
* Renamed .js files to .tsx

* Migrated 404 to TS

TODO: Ask about default prop

* Migrated certification to TS

Converted to functional component

* Partially migrated challenges to TS

TODO: Ask about Redirect props

* Installed @types/react-helmet and @types/react-redux

Prep for migrating donate, this caused two new TS errors on 404 and certification

* Migrated donate to TS

TODO: Ask about prop spreading

* Migrated email-sign-up to TS

Converted to functional component and removed unused isSignedIn prop

* Migrated index to TS

Removed unused props

* Migrated learn to TS

* Installed @types/react-instantsearch-dom

Prep for migrating search

* Migrated search to TS

Converted to functional component

* Migrated settings to TS

* Migrated unsubscribed to TS

* Installed @types/validator and @types/lodash-es

Prep for migrating update-email

* Migrated update-email to TS

Converted to functional component

* Migrated user to TS

* Updated effect hook dependencies

Also removed unnecessary comments from 404

* Renamed challenges.test.tsx to .ts

* remove search.tsx, as search.js was removed

* revert: packages

* revert: packages

Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
Co-authored-by: moT01 <20648924+moT01@users.noreply.github.com>
2021-06-30 20:50:57 +05:30