zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
305 Commits 10 Branches 21 Tags 9.5 MiB
Commit Graph

305 Commits

Author SHA1 Message Date
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
William O'Beirne 784e5d6fa2 Blockchain watcher microservice (#28) 2018-12-28 17:24:46 -06:00
William O'Beirne ec76cb414f Initial Proposal rework (#32) 
* Rework proposal model to remove ethereum specific stuff. Removed most traces of those fields around the backend.

* Refactor to a state where /proposlas loads.

* Get rid of the ProposalWithCrowdFund type.

* Fix padding on create flow.
 2018-12-28 17:05:34 -06:00
Will O'Beirne ba5e5e34a1
Fix all tsc issues. 2018-12-27 14:08:14 -05:00
Will O'Beirne ac053e7660
Fix hydration. Real milestone amount. 2018-12-27 13:37:30 -05:00
Will O'Beirne f954646170
Fill in target and funded amounts from real proposal data. Funded is stubbed. 2018-12-27 13:00:04 -05:00
Will O'Beirne f4e918481c
Convert all units to ZEC from ETH. 2018-12-27 12:41:26 -05:00
Will O'Beirne 4ac7bb0da8
Fix padding on create flow. 2018-12-27 11:58:48 -05:00
Will O'Beirne 9b555aa8fa
Get rid of the ProposalWithCrowdFund type. 2018-12-21 13:47:50 -05:00
Will O'Beirne 5931de5460
Refactor to a state where /proposlas loads. 2018-12-21 13:27:39 -05:00
Will O'Beirne eea3eea0f7
Rework proposal model to remove ethereum specific stuff. Removed most traces of those fields around the backend. 2018-12-19 16:27:58 -05:00
AMStrix 6ea75e6bda User Recovery Flow (#26) 2018-12-17 12:33:33 -06:00
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06:00
William O'Beirne 163ff62433
Merge pull request #240 from grant-project/requirements 
Update prod.txt
 2018-12-06 14:26:35 -05:00
Daniel Ternyak 73f3756f57
Update prod.txt 2018-12-06 11:36:47 -06:00
Daniel Ternyak 35eecc24db
Setup in-app SSL redirects for Heroku (#238) 
* setup in-app ssl redirects for Heroku

* add typings

* use trustProtoHeader

* BE w3 read fix for read_user_proposal

* No HTTPS redirect on dev
 2018-12-05 17:49:45 -06:00
AMStrix 00561f5121 Fix BE web3 read when proposal has no address (#239) 2018-12-05 12:05:57 -06:00
William O'Beirne 3b42295097 Team invite email (#237) 2018-12-03 20:45:18 -06:00
AMStrix 1144b0b0e2 Remove Unserializables from Redux (#234) 
* remove web3 instance from redux

* remove Web3Container, use redux state instead

* remove web3 from Web3Container ;)

* cache result of fetchCrowdFundJSON

* fix error action type

* remove contracts from redux

* fetchCrowdFundJSON error & reporting

* remove unused ref

* check factory networkId against MM networkId during initialization
 2018-12-03 20:08:29 -06:00
William O'Beirne 489de73d9b
Merge pull request #235 from grant-project/tests-tests-tests 
Bolster our backend endpoint tests
 2018-12-02 22:25:51 -05:00
William O'Beirne 4d0a6f2cf2
Merge branch 'develop' into tests-tests-tests 2018-12-01 01:30:46 -05:00
AMStrix e1b2d21532 Upgrade FE Nodemon (#236) 
* upgrade nodemon

* exit nodemon when its child exits (fix lingering cmd output post-exit)

* travis cache yarn (frontend)

* adjust exit handler

* cancel travis cache experiment
 2018-11-30 23:36:52 -06:00
AMStrix 4980670e8c Populate Profile Data (#233) 
* BE profile deets

* BE real user data web3 populate + misc

* FE real profile data
 2018-11-30 17:52:00 -06:00
William O'Beirne 11d804d591
Merge branch 'develop' into tests-tests-tests 2018-11-29 20:59:40 -05:00
Will O'Beirne c05bd6ab43
Add draft, publish, and update tests for proposals. 2018-11-29 20:55:14 -05:00
Will O'Beirne e40d046dd4
Invite acceptance tests. 2018-11-29 16:54:26 -05:00
Will O'Beirne b1b2717360
Tests around invites, and a few fixes along the way. 2018-11-28 16:56:19 -05:00
Daniel Ternyak 138c4381fb
Remove dead team validation (#231) 2018-11-28 12:39:39 -06:00
AMStrix a780b235b9 SSR Preload /proposals (#230) 
* resolve web3 when page is interactive OR complete

* SSR preload `/proposals`
 2018-11-28 12:33:21 -06:00
Will O'Beirne 043999c310
Dont send email in test environment. 2018-11-27 15:35:16 -05:00
Will O'Beirne e24ed31367
More invalid comment tests. 2018-11-27 15:29:41 -05:00
Will O'Beirne 8c6d5265bf
Comment tests. 2018-11-27 15:26:36 -05:00
William O'Beirne 96c4389e66
Merge pull request #228 from grant-project/hotfix-truffle-util 
Hotfix #227
 2018-11-27 14:49:08 -05:00