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.

Sign up for GitHub

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

Jump to bottom

feat(donate):add donation modal and certification message #37822

Merged
merged 37 commits into from Dec 2, 2019
Merged

feat(donate):add donation modal and certification message #37822

merged 37 commits into from Dec 2, 2019

Commits on Dec 1, 2019

  1. feat: add donation modal on block completion and donation message on … 

    …certificate
    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    a2b62cb View commit details
    Browse the repository at this point in the history

  2. fix: make completion percentage use props

    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    2e15a1f View commit details
    Browse the repository at this point in the history

  3. fix: wait for completion modal to close and one second to pass before… 

    … opening donation modal.
    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    1c97678 View commit details
    Browse the repository at this point in the history

  4. fix: close Donation modal on /donate redirection

    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    4bda3ff View commit details
    Browse the repository at this point in the history

  5. fix: hide certificate message for the session if user clicks on /dona… 

    …te link
    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    f4798b6 View commit details
    Browse the repository at this point in the history

  6. Update client/src/client-only-routes/ShowCertification.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    c045131 View commit details
    Browse the repository at this point in the history

  7. WIP: trigger donation modal on all learn pages

    @ojeytonwilliams @ahmaxed
    ojeytonwilliams authored and ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    9e29936 View commit details
    Browse the repository at this point in the history

  8. fix: only show modal if block has been finished

    @ojeytonwilliams @ahmaxed
    ojeytonwilliams authored and ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    c53b62b View commit details
    Browse the repository at this point in the history

  9. fix: show donate message when cert is reloaded 

    Tries to fetch the user if they appear not to be signed in and logs the
pageview with ga.
    @ojeytonwilliams @ahmaxed
    ojeytonwilliams authored and ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    6a642d9 View commit details
    Browse the repository at this point in the history

  10. fix: change styles and add heart svg

    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    bb65992 View commit details
    Browse the repository at this point in the history

  11. feat: add heart anim

    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    54a1ab7 View commit details
    Browse the repository at this point in the history

  12. feat: add example test

    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    ff22e03 View commit details
    Browse the repository at this point in the history

  13. feat: adjust syles

    @ahmaxed
    ahmaxed committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    1566045 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Update client/src/assets/icons/Heart.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    136c12b View commit details
    Browse the repository at this point in the history

  2. Update client/src/assets/icons/Heart.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    4b91382 View commit details
    Browse the repository at this point in the history

  3. Update client/src/assets/icons/Heart.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    83342a0 View commit details
    Browse the repository at this point in the history

  4. Update client/src/assets/icons/Heart.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    1c7f19d View commit details
    Browse the repository at this point in the history

  5. Update client/src/components/Donation/components/DonationModal.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    5f92379 View commit details
    Browse the repository at this point in the history

  6. Update client/src/templates/Challenges/redux/current-challenge-saga.t… 

    …est.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    0ff431e View commit details
    Browse the repository at this point in the history

  7. Update client/src/templates/Challenges/redux/current-challenge-saga.t… 

    …est.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    a4596b9 View commit details
    Browse the repository at this point in the history

  8. Update client/src/templates/Challenges/redux/current-challenge-saga.t… 

    …est.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    9b24778 View commit details
    Browse the repository at this point in the history

  9. Update client/src/templates/Challenges/redux/current-challenge-saga.t… 

    …est.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    c8f4bd3 View commit details
    Browse the repository at this point in the history

  10. Update client/src/templates/Challenges/redux/current-challenge-saga.t… 

    …est.js

Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    cd53ba9 View commit details
    Browse the repository at this point in the history

  11. Update client/src/components/Donation/Donation.css 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    ca3abfa View commit details
    Browse the repository at this point in the history

  12. Update client/src/components/Donation/Donation.css 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    a0f5402 View commit details
    Browse the repository at this point in the history

  13. Update client/src/templates/Challenges/redux/current-challenge-saga.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    3791520 View commit details
    Browse the repository at this point in the history

  14. Update client/src/templates/Challenges/redux/current-challenge-saga.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    78c4e03 View commit details
    Browse the repository at this point in the history

  15. Update client/src/redux/index.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    26b766d View commit details
    Browse the repository at this point in the history

  16. Update client/src/redux/index.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    aeef0f5 View commit details
    Browse the repository at this point in the history

  17. Update client/src/redux/index.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    e93c6fa View commit details
    Browse the repository at this point in the history

  18. Update client/src/templates/Challenges/redux/current-challenge-saga.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    8f65322 View commit details
    Browse the repository at this point in the history

  19. Update client/src/templates/Challenges/redux/current-challenge-saga.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    4fa07fb View commit details
    Browse the repository at this point in the history

  20. refactor: make action name more descriptive

    @ojeytonwilliams
    ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    01b7c14 View commit details
    Browse the repository at this point in the history

  21. Update client/src/components/Donation/components/DonationModal.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    593024b View commit details
    Browse the repository at this point in the history

  22. Update client/src/components/Donation/components/DonationModal.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    4470850 View commit details
    Browse the repository at this point in the history

  23. Update client/src/components/Donation/components/DonationModal.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    e3bb6c6 View commit details
    Browse the repository at this point in the history

  24. Update client/src/components/Donation/components/DonationModal.js 

    Co-Authored-By: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
    @ahmaxed @ojeytonwilliams
    ahmaxed and ojeytonwilliams committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    aec0feb View commit details
    Browse the repository at this point in the history