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

92 Commits

Author SHA1 Message Date
Aaron fd9a4c5393
full payout flow operational 2019-02-13 10:54:46 -06:00
Aaron 6a0961a015
disable arbiter button when proposal status not LIVE 2019-02-09 21:18:26 -06:00
Aaron 5b44f5dcd7
admin: more robust arbiter 2019-02-09 21:00:49 -06:00
Will O'Beirne 74fba18f99
Fix contribution matching. Add deets to rfp detail admin. 2019-02-08 14:11:52 -05:00
Will O'Beirne 263764255b
Frontend for new RFP fields. 2019-02-08 14:02:34 -05:00
Will O'Beirne 64da535650
Fix status lock 2019-02-08 11:59:52 -05:00
Will O'Beirne 1d1f3bb007
Admin interface for new fields. 2019-02-08 11:54:20 -05:00
Aaron 239c7a3432
make Pageable filters more generic (not just statuses) 2019-02-07 11:51:16 -06:00
Aaron 60575b4024
Merge branch 'develop' into proposal-arbiter 
# Conflicts:
#	admin/src/components/Proposals/index.tsx
#	admin/src/store.ts
#	backend/grant/admin/views.py
#	backend/grant/proposal/models.py
 2019-02-07 09:57:56 -06:00
Will O'Beirne 126beec1dc
Convert txid deet to input. 2019-02-06 17:35:33 -05:00
Will O'Beirne df96094ed9
Fix deet style. 2019-02-06 17:33:43 -05:00
Will O'Beirne 9fd60cabaa
Button to create contribution. 2019-02-06 17:24:07 -05:00
Aaron 2b78a17973
proposal_arbiter email 2019-02-06 14:56:21 -06:00
Will O'Beirne e4290c76cf
Contribution create / edit form 2019-02-06 14:01:46 -05:00
Aaron 649d4c220f
admin set/change proposal arbiter 2019-02-06 12:38:07 -06:00
Will O'Beirne d4917dfd51
Contribution detail page. 2019-02-06 13:01:14 -05:00
Will O'Beirne 2f3161ae4b
Generecize pageable. List view of contributions. 2019-02-06 12:47:47 -05:00
Will O'Beirne de1f1080a5
Setup components and routes for contributions. 2019-02-06 10:54:43 -05:00
Aaron eb8c1ec258
add ARBITER proposal filter 2019-02-05 21:30:31 -06:00
Aaron 3f51b4f774
Merge branch 'develop' into proposal-arbiter 2019-02-05 14:46:16 -06:00
Aaron 2868d93fa1
proposal arbiter BE basics + initial admin work 2019-02-05 14:45:26 -06:00
AMStrix d696f7978d Proposal pagination & 404 fix (#151) 
* BE: command to create fake proposals

* BE: pagination system + implemented for GET proposals/

* FE: overlay mode for Loader component

* FE: paginated Proposals

* refactor pagination.py a bit

* Proposals: set search input from store on construction

* admin: switch proposals to new pagination regime

* BE: test adjustments

* set app.proposals.page after fetch in a less-creepy way

* optimictic proposal.detail from proposal.page

* keep api interfacing on the api surface (one-dimentional page filters vs structured)

* rem MOST & LEAST_FUNDED prop sort + rename NEWST & OLDEST

* ProposalPagination fix default sort
 2019-02-05 15:34:19 -05:00
Will O'Beirne 77bf47bf18
Implement user deleting. 2019-02-04 16:18:50 -05:00
William O'Beirne c17145986f
Request for Proposal (Pt. 3 - Create & Link Proposals) (#131) 
* Adjust rfp <-> proposal models. Add button to rfp detail page to make linked proposal.

* Add a block that links to the original request. Fix a bunch of preview issues.

* List proposals on RFP.

* Admin view for connected RFPs and proposals

* Fix TSC issues.

* Fix tab badge misalignment

* Redesign list page.

* Resolve PR issues.
 2019-02-01 14:13:30 -05:00
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
Will O'Beirne 656bbd04ae
Replace admin instances too. 2019-01-24 15:17:36 -05:00
Will O'Beirne 3654bcb854
Send notif email to old email address on email change. 2019-01-24 14:47:22 -05:00
Will O'Beirne f22acfede0
Change password email. 2019-01-24 14:08:15 -05:00
Will O'Beirne 3b9d15e62e
Implement change email & email confirmation. Adjust layout of settings more. 2019-01-24 13:53:26 -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 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
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
Will O'Beirne 5a922cefee
Merge latest develop in. 2019-01-09 16:57:15 -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
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
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06:00
Will O'Beirne 84daa1cba9
Rename a bunch of fields to their original values. Get draft saves working. 2018-11-14 12:59:48 -05:00
AMStrix 22487b331b Fix regressions from Readable URLs #190 (#200) 
* admin adjustments for proposalId / proposalAddress

* ensure fetchProposal called with proposalId

* have ProposalCard display proposalAddress
 2018-11-09 13:48:55 -05:00
AMStrix 7c651be138 Admin adjustments (#167) 
* disable admin delete user & proposal endpoints

* handle absence of web3 gracefully
 2018-11-02 02:35:14 +01:00
AMStrix d4298e62cc Admin (#164) 
* admin backend

* admin ui

* tslint ignore contracts

* fix name

* build & serve
 2018-10-30 12:35:47 -04:00