summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added fields for t-shirt option labelsdonatePeter Haight2020-10-08
| | | | | | They want to be able to change the t-shirts. A lot of the t-shirt stuff is sort of hard-coded, but we can change the lables pretty easily as long as it's undrstood that the names don't get changed on the back end.
* Added loading dialog after paypal approval before thank you page.skirtiadi2020-10-02
| | | | | | | | Before redirecting to thank you page, we have a loading modal after successful paypal payment on the initial donate.torproject.org non-react landing page. We want to also include that. Issue #48515
* Cryptocurrency page addition to Lektor site.skirtiadi2020-09-30
| | | | | | | | Ported from the donate site. Now redirects to /donate-thank-you page (specified in the donate server) until /cryptocurrency-thank-you page is built. Issue #48280
* Render perk description with no double escaping (donate page).skirtiadi2020-09-29
| | | | | | | | Apparently passing a text with escaped character will be automatically escaped again by react. https://shripadk.github.io/react/docs/jsx-gotchas.html Issue #48617
* Validate the credit card if payment is cc on donate page.skirtiadi2020-09-29
| | | | | | | Check the stripe errors only if the payment method is credit card on submit. Issue #47847
* Moved the Javascript outside the div.Peter Haight2020-09-29
| | | | Trying to keep the Javascript separate from the HTML.
* Make the credit card error not confusing.skirtiadi2020-09-29
| | | | | | | Credit card errors now appear at the same time as the other errors, which is during form submission. Issue #47847
* Rearrange the donate-form.htmlskirtiadi2020-09-28
| | | | | | For html and js clarity as per code review. Issue #48613
* Not render counter on the html on donate page if counter is not checked.skirtiadi2020-09-24
| | | | | | As per code review. Issue #48277
* Updated the styling for shoveling coal message on donate page.skirtiadi2020-09-23
| | | | | | | This styling is for the overlay on the donate page while waiting for the payment processor. Issue #48515
* Only make the counter appears when the show counter checkbox is checked.skirtiadi2020-09-22
| | | | Issue #48277
* Leading zeros need to be greyPeter Haight2020-09-21
| | | | | | The production one has the leading zeros stay grey. Issue #48277
* Refactored campaign countersPeter Haight2020-09-21
| | | | | | | | | | I wanted to reduce the amount of props passing between the components and combine the character component into one, simpler component. We want the counter to keep updating indefinitely on the page. It should check for new totals every 5 seconds. Issue #48277
* Corrected Stripe key for stagingPeter Haight2020-09-21
| | | | | | | The staging.donate.torproject.org uses the test key in the "torproject.org" account, not the test key in the "Tor Project Donations" account (which is the account they use for real donations) for some reason.
* Addition of templates related to donate pages.skirtiadi2020-09-19
| | | | | | | | Added donate-empty.html and donate-page model for miscellaneous static donate page. This particular commit is for the donate thank you page. Issue #48276
* Added styling commit in lego for error box stylign on Donate page.skirtiadi2020-09-18
| | | | | | | Added vertical distance between error box and Donate button on the donate page. Issue #47847
* Select highest default perk on price change on Donation pageskirtiadi2020-09-18
| | | | | | | As per conversation with Richard and Peter to be applied on the donate page. Issue #48575
* Use separate tshirt pack options images for both single and monthly.skirtiadi2020-09-17
| | | | | | | | Images for options follow the tshirt pack images for now because there is only 1 option for T-Shirt pack. Addition of options need code change in the future. Issue #48273
* Remove flasher.jsskirtiadi2020-09-17
| | | | | | | Added by mistake, no longer needed when counter on donate page is made with React. Issue #48277
* Change the machine name of header image on donate page.skirtiadi2020-09-17
| | | | | | As per code review feedback to remove confusion. Issue #48275
* Added a boolean field on donate page for donation counter.skirtiadi2020-09-17
| | | | | | | | | Part of the porting of donation site to the main Tor site. This counter will need to request to the donate server and if the field is checked, the counter will show up on the donate page. Issue #48277
* Cleaned up some javascript stuffPeter Haight2020-09-16
| | | | | | | | | | | | | | Added 'Accept: application/json' to the fetch headers which causes Slim to return errors as JSON so we can output the errors nicely. Added --no-hmr to the parcel watch because it's not working and I don't want to spend time to figure it out right now. Moved all the Javascript in donate-form out of the div that gets used for the React component because that gets entirely replaced by the React component which has been working, but I think it's weird and for debugging its nicer if you can see the original Javascript in the DOM in the browser.
* Added redirect URL field to donate pagePeter Haight2020-09-16
| | | | | | | | We want to be able to redirect to a different thank you page for some donate pages. It will default to /donate-thank-you, but otherwise you can put in any full URL. Issue #48274
* Incorporate Donate page header image.skirtiadi2020-09-14
| | | | | | | Part of porting donate site to main Tor site. This allows adding centered header image on donate pages. Issue #48275
* Implements fields for donation label, img and desc based on frequency.skirtiadi2020-09-10
| | | | Issue #48273
* Fixed PayPalPeter Haight2020-09-09
| | | | | | | | | | It needed to be modified to permit cookies in the cross-site requests with fetch and also needed to use the donateProccessorBaseUrl for calling the endpoints on the donate site. Also removed some of the pre-react js files that we don't need any more. Issue #47134
* Updated to rebased lego donate branchPeter Haight2020-09-09
|
* Specify type="button" to all nonsubmit buttons on donation pageskirtiadi2020-09-09
| | | | | | The default of button onClick would be submit otherwise. Issue #47847
* Added 10 prices on donation page for single and montly donation page.skirtiadi2020-09-09
| | | | | | Now Lektor users can change the values on the buttons from the GUI Issue #48272
* Change .gitsubmodules for our GR reposkirtiadi2020-09-09
|
* Remove layout-donate.htmlskirtiadi2020-09-09
| | | | Issue #45540
* Style the donate page and the donate thank you page.skirtiadi2020-09-09
| | | | | | Moved the styling in lego. Issue #45540
* Removed donate-single and donate-monthly pages.skirtiadi2020-09-09
| | | | Issue #45530
* Change process-stripe and captcha base url to donate site.skirtiadi2020-09-09
| | | | | | | | The lektor donate pages should request to the donate site urls to process payment and get captcha image. In Progress. Issue #45530
* Bringing react elements to prepare for single, monthly & both donationsskirtiadi2020-09-09
| | | | | | | In preparation to bring donate site to the main Tor lektor site. Doesn't include styling and payment processing. Issue #45541
* Added a model for the donate formpeterh2020-09-09
| | | | | | | | | | We want to be able to create some different donate forms with different settings on different pages. This is the bare bones of that with just one field called frequency that decides whether it's a monthly form, a single form, or both. It still needs to be hooked up to the React component in order to work. Issue #45066
* Made 3rd party keys dependentent on LEKTOR_ENVPeter Haight2020-09-09
| | | | | | | | | | We want to use test keys for Paypal and Stripe when in dev or staging environments, so I set things up to work based on the LEKTOR_ENV environment variable. I wanted to make the environment variable optional for dev environments, but I'm using the lektor-envvars plugin and it throws an error if the environment variable doesn't exist. Issue #45066
* Nearly working donate pagepeterh2020-09-09
|
* Add about submenu to the membership pageantonela2020-09-09
|
* Add menu itemantonela2020-09-09
|
* Update README instructions to GitLabgus2020-09-09
|
* Merge branch 'watch-privchat-2'gus2020-09-08
|\
| * Update privchat.htmlAntonela2020-09-07
| |
* | Close https://gitlab.torproject.org/tpo/web/tpo/-/issues/100Antonela2020-09-04
|/
* Update templates/membership.htmlAntonela2020-09-02
|
* Update assets/static/images/membership/logos/avast.png, ↵Antonela2020-08-31
| | | | assets/static/images/membership/logos/cymru.png files
* Merge branch 'update-membership' into 'master'Antonela2020-08-31
|\ | | | | | | | | | | | | Update membership Closes tpo/operations/communications#11 See merge request antonela/tpo!1
| * Add Vidalia members linksantonela2020-08-31
| |
| * Fix UI bugsantonela2020-08-31
| |
| * Add Cymru - Vidaliaantonela2020-08-31
| |