Commit Graph

387 Commits

Author SHA1 Message Date
AMStrix 5848d33f29 code of conduct MD page (#89) 2019-01-18 12:21:03 -05:00
AMStrix c8ab0d0f37 location forward after authentication (#90) 2019-01-18 01:40:30 -05:00
AMStrix 9829f3f1ea Blockchain default and required environment variables (#91)
* blockchain: default & required env vars

* blockchain: ignore env var check for NODE_ENV=test
2019-01-18 01:24:03 -05:00
Aaron f7d485db3c
Revert "code of conduct MD page"
This reverts commit 14c546b528.
2019-01-17 10:52:56 -06:00
Aaron 14c546b528
code of conduct MD page 2019-01-17 09:15:30 -06:00
AMStrix b3e3a28957 Admin authentication environment variable + generation command (#78)
* store admin pass hash in ENV + add gen-admin-auth command

* allow custom salt for hash generation

* remove unused import

* dynamically pull salt for testing admin password hash generator func

* Fix middleware name.
2019-01-17 00:20:10 -05:00
AMStrix c0557a9fa6 Admin - rework user list/user detail (#80)
* fix UserCommentSchema to no longer exclude contributions (no longer on ProposalSchema)

* return more detail for /admin/users/<id>

* admin: add UserDetail + refactoring

* remove unused state from UserItem.tsx
2019-01-17 00:01:29 -05:00
AMStrix 48912c95cc markdown driven static pages (#40) 2019-01-16 18:19:34 -05:00
AMStrix 8de3b4e3c8 Email settings + unsubscribe (#75)
* user subscription_settings utils + tests

* UserSettings user/models updates

* GET /<user_id>/settings endpoint

* PUT /<user_id>/settings + more tests + refactoring

* Email Notifications settings tab

* email subscription verbiage

* email-unsubscribe page + refactors

* hook up send_email for proposal approval + add subscription checks to send_email

* fix merge bug

* Send email on contribution. Dont double-count contributions from the blockchain watcher.

* Proposal contribution email, and fix email admin.

* Send email to team on contribution received.

* Email comment creator of their replies.

* Send comments to proposal creator. Adjust templates for all comment emails.

* Send email on contribution update.
2019-01-16 17:26:44 -05:00
William O'Beirne 4ab5c2b66b
Run tests and make a build of blockchain in CI. (#72) 2019-01-16 16:59:00 -05:00
Daniel Ternyak 8e89db4d3e Update ReadMe with "Zcash" Typo (#83) 2019-01-16 16:46:50 -05:00
William O'Beirne 994b680f04
Link to specific tabs from query param (#71)
* Linkable tabs with scrolling behaior. Replace all tabs with linkable tabs.

* Link to specific tab wherever relevant.

* Fix bad tab name.
2019-01-15 15:19:59 -05:00
William O'Beirne f008b0fcfa
Word wrap (#70) 2019-01-15 15:19:44 -05:00
William O'Beirne 91efc28fa3
Fade auth in, invisible while checking. (#69) 2019-01-15 15:19:31 -05:00
William O'Beirne 98209f5fa6
Fix incorrect pending invites count. (#68) 2019-01-15 14:13:57 -05:00
Daniel Ternyak 1e5f7323fe
Merge pull request #63 from dternyak/fix-sendgrid
Fix sendgrid 400 error
2019-01-10 17:50:46 -06:00
Will O'Beirne 4540dbde1a
Remove flask-sendgrid. Use sendgrid directly. Improve error logging. 2019-01-10 18:48:44 -05:00
William O'Beirne b01b7726a7 Log sendgrid error (#62) 2019-01-10 17:21:41 -06:00
AMStrix fbbd20ae90 Fix avatar load renegade POST (#58) 2019-01-10 16:51:34 -06:00
William O'Beirne bd17bf2a9a Switch env var to PORT for heroku compatibility. (#57) 2019-01-10 14:27:11 -06:00
William O'Beirne 82a7033c45 Productionify blockchain microservice (#56) 2019-01-10 14:18:31 -06:00
Daniel Ternyak 133ecd4d7e
Herokuify Admin (#53)
* Create Procfile for Admin

* Add heroku-postbuild to build 'admin' before serving
2019-01-10 14:01:26 -06:00
Daniel Ternyak f6ba6e3dcb
Merge pull request #50 from dternyak/contribution-validation
Blockchain validation into develop
2019-01-10 13:51:19 -06:00
William O'Beirne a0fc1bd54e
Merge branch 'develop' into contribution-validation 2019-01-10 14:39:34 -05:00
Will O'Beirne 16051f5f7a
PR fixes 2019-01-10 12:27:04 -05:00
Will O'Beirne badcb75203
Margins. 2019-01-09 18:05:45 -05:00
Daniel Ternyak c50b3bf53e
Merge pull request #38 from dternyak/zcash-contributions
Zcash contributions (Pt. 1 - Contribution modal)
2019-01-09 17:04:10 -06:00
Will O'Beirne 311fdb298d
Dont show unconfirmed txs unless its you 2019-01-09 17:54:41 -05:00
Will O'Beirne 6c8ce3f87d
Show send instructions on profile pending contributions. 2019-01-09 17:26:28 -05:00
Will O'Beirne 5a922cefee
Merge latest develop in. 2019-01-09 16:57:15 -05:00
Will O'Beirne 749dc40ea4
Re-wipe migrations. 2019-01-09 16:35:47 -05:00
Will O'Beirne 7a7cbb77c7
Delete expired transactions. 2019-01-09 16:32:51 -05:00
Will O'Beirne b338fc9d2e
Contributions tab on proposal view. 2019-01-09 15:48:41 -05:00
Will O'Beirne da537e2498
Calculate funded from confirmed contributions. 2019-01-09 14:45:16 -05:00
Will O'Beirne f97a8dfb8d
Convert webhook amount to zcash from zats. Order contributions correctly. 2019-01-09 14:35:37 -05:00
William O'Beirne 7ade6b5715
Merge branch 'develop' into zcash-contributions 2019-01-09 14:08:51 -05:00
William O'Beirne b65f02a29f
Email admin + more email templates (#37)
* Email admin page with previews.

* Move example args to backend since emails take in Python classes.

* Text version of invite email.

* Proposal approval / rejection emails.

* Back button.

* Contribution confirmed email.
2019-01-09 14:08:25 -05:00
Will O'Beirne 57e65e26d5
Rework proposal api a bit, render contributions and their status. 2019-01-09 14:07:50 -05:00
AMStrix 47c695f43b Proposal Approval Process (#39)
* endpoints and model support for proposal approval

* admin test + proposal approval tests

* GET user/<id> withPending support

* basic withPending suport for Profile

* change create publish to sumbit for approval

* admin proposal filter by status + some refactoring

* admin: update antd

* backend: admin get single proposal + populate date_approved

* admin: rework Proposals + support approval

* backend: approval process updates

* admin: review count on home + cosmetic

* frontend: proposal approval flow

* Profile ZEC/ZAT adjustments

* fix regression in formatUserFromGet + update error type in users/reducers

* fix merge tsc issues

* publish warning vebiage change

* fix ssr fetchProposal 404 hang bug

* proposals/<id> - limit status non-LIVE to team member, exclude DELETED

* various adjustments to Proposal based on `status`

* remove comments

* Proposal statuses to banner style + fix up CreateFlow - Preview mode

* Proposal tsc fix
2019-01-09 13:23:08 -05:00
Will O'Beirne 00ee2888b4
Convert blockchain microservice to use webhooks instead of websocket. Confirm contributions via webhook. 2019-01-08 17:58:32 -05:00
Will O'Beirne 6066b7adf0
Wipe migrations. Fix tests. 2019-01-08 12:44:54 -05:00
Daniel Ternyak a0d115a703
Merge pull request #33 from dternyak/proposal-rework-amounts
Proposal rework amounts
2019-01-07 19:09:33 -06:00
Will O'Beirne e28f1b50d7
Tsc fixes 2019-01-07 16:56:01 -05:00
Will O'Beirne fc10366232
Fix type, dont close on mask click. 2019-01-07 12:56:27 -05:00
Will O'Beirne c444e5152d
Hook up blockchain to backend, backend to frontend for contributions. 2019-01-07 01:58:33 -05:00
Will O'Beirne e6fb844b40
Finish out UI for contribution. 2019-01-07 00:42:24 -05:00
William O'Beirne 99fdedb816 Initial work on contribution modal flow and contribution model overhaul. 2019-01-06 17:48:07 -05:00
William O'Beirne 98d68961b5 Merge develop in. 2019-01-04 14:29:09 -05:00
AMStrix 15acce1865 Rework Proposal Comments & Updates (#36)
* test proposal updates + adjustments for comments

* remove comment signed message stuff

* use authed user id to check if user can update, remove 'account'

* ts adjustment
2019-01-04 14:03:37 -05:00
AMStrix 22f8a0415c Verify User Social via OAuth (#30)
* BE social oauth verify

* FE social oauth verification

* readme updates

* README social verification setup instructions

* adjust tests socialMedias

* BE add social verify tests

* save changes before leaving to OAuth

* Fix migration.

* Adjust social button styles.

* Remove question mark.

* merge fix

* fix migration branch
2019-01-02 12:23:02 -06:00