Commit Graph

81 Commits

Author SHA1 Message Date
AMStrix f8f3bd1707 Proposal staking (#134)
* BE: proposal/<id>/stake end-point basics

* BE: proposal staking tests

* add STAKING to ProposalStatusEnum

* BE: incremental staking related changes

* admin: staking status

* FE: proposal staking first pass

* ZCash -> Zcash spelling

* staking contribution confirmed email

* FE: staking related minor style changes

* FE proposal staking env var

* notify user of partially staked proposal contributions
2019-01-31 17:56:16 -05:00
William O'Beirne 4091deaf2f
Request for Proposal (Pt. 1 - Models & Admin) (#120)
* Convert constants into enums

* Initial RFP models and views.

* Fix model and enums

* RFP admin fully fleshed out.

* Fix tsc

* Fix tests and tsc

* Fix closed tag display

* Request for Proposal (Pt. 2 - Public View) (#125)

* RFP list page and backend endpoints. Scaffold of detail view.

* RFP detail view. Fix faulty addRfp action.

* Fix 0 showing up

* PR cleanup
2019-01-30 12:59:15 -05:00
AMStrix b0d16ace7d Proposal contribution matching (#117)
* BE: contribution_matching + admin proposal update end-point + tests

* admin: set proposal matching status

* frontend: contributionMatching

* improve CampaignBlock matching callout - thx Will

* adjust ProposalDetail matching confirmation popover child scope

* contributed & funded Proposal fields (hybrid props) + remove funded derivation from FE

* include "contributed" sum for ProposalDetail view

* fix branched migration revision
2019-01-29 18:50:27 -05:00
Daniel Ternyak 2c8a52013c
simplify authorization/validation logic for verified users making proposals. Prevent unverified users from making proposals of any kind 2019-01-28 18:51:10 -06:00
Daniel Ternyak 8d8dda46e6
Oofdah. Backend refactoring based on PR review, and adding a more obvious UI for users who haven't yet verified their email before posting comments. 2019-01-28 16:46:04 -06:00
Daniel Ternyak f9237c8544
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into require-email-verification 2019-01-28 15:48:29 -06:00
Daniel Ternyak 5b985e7fd7
Merge branch 'develop' into remove-profile 2019-01-28 15:45:36 -06:00
Daniel Ternyak 50c2812208
really fix tests 2019-01-27 20:51:05 -06:00
Daniel Ternyak 85c50a47c1
Prevent publishing proposal without email verification + refactor 2019-01-27 20:04:11 -06:00
Daniel Ternyak b0a5a8e03d
Handle comment prevention without email verification 2019-01-27 20:03:38 -06:00
Daniel Ternyak 5ecf3d83fb
Partition UserSchema into SelfUserSchema (mostly used to power /me/ endpoint) and UserSchema (used everywhere else). 2019-01-27 16:13:12 -06:00
Will O'Beirne 3c8894fb12
Env var-ify the block explorer url 2019-01-23 16:30:03 -05:00
Daniel Ternyak c51e850cb0 Run reformatter on all files (#98) 2019-01-23 10:00:30 -05:00
Daniel Ternyak 9727134ac0
Run reformatter on all files 2019-01-22 23:35:22 -06:00
William O'Beirne 0e4626157f
Blockchain watcher bootstrap (#92)
* Initial work on bootstrap refactor. Still results in delayed bootstrapping and double bootstrapping.

* Remove logging.

* Fix invalid json in body on non-post requests. Reduce error verbosity.

* Adjust error output.
2019-01-21 12:51:49 -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 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
Will O'Beirne 311fdb298d
Dont show unconfirmed txs unless its you 2019-01-09 17:54:41 -05:00
Will O'Beirne 5a922cefee
Merge latest develop in. 2019-01-09 16:57:15 -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
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
Will O'Beirne c444e5152d
Hook up blockchain to backend, backend to frontend for contributions. 2019-01-07 01:58:33 -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
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 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 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 3b42295097 Team invite email (#237) 2018-12-03 20:45:18 -06:00
William O'Beirne 4d0a6f2cf2
Merge branch 'develop' into tests-tests-tests 2018-12-01 01:30:46 -05: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
Will O'Beirne 8c6d5265bf
Comment tests. 2018-11-27 15:26:36 -05:00
Will O'Beirne c3985a07a3
Merge in develop 2018-11-27 13:21:11 -05:00
Will O'Beirne bc076c8736
Remove prints. 2018-11-27 12:39:36 -05:00
Will O'Beirne 02b1260573
Merge in latest changes. 2018-11-26 20:14:00 -05:00
Will O'Beirne c95dde2cda
Merge upstream changes. 2018-11-26 18:51:48 -05:00
Will O'Beirne f9b4f65ac4
Merge develop in. 2018-11-26 18:47:24 -05:00
Will O'Beirne 5afdb2011d
Merge develop in. 2018-11-26 18:25:02 -05:00
Daniel Ternyak 00219e65c8
Only Runtime Contracts (#225) 2018-11-25 22:02:35 -06:00
AMStrix d367e6e474 Track proposal contributions (#219)
* BE proposal contribution tracking

* FE proposal contribution tracking

* validate contributions

* make sure we catch errors in the 'confirmation' listener

* remove console.log

* lowercase from address compare

* remove validate_contribution_tx from post_proposal_contribution
2018-11-21 21:18:22 -06:00