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

32 Commits

Author SHA1 Message Date
AMStrix 1d2228a394 Flexible Matching/Bounties + KYC (#277) 
* BE: proposal rfp opt in & proposal bounty

* admin: proposal rfp opt in display & modify bounty

* FE: proposal rfp opt in / proposal.contributionBounty

* fix github merge (so close)

* add status field to update_rfp

* handle only showing canel and refund popover correctly

* undo unneeded change

* BE: make sure rfp.bounty is None when it is set to '0' or null during create/update
 2019-03-06 14:25:58 -06:00
Aaron fd9a4c5393
full payout flow operational 2019-02-13 10:54:46 -06:00
Aaron dc92d3f297
Merge branch 'develop' into zcash-milestones 
# Conflicts:
#	backend/grant/proposal/models.py
#	backend/grant/utils/enums.py
#	frontend/client/modules/create/utils.ts
#	frontend/stories/props.tsx
#	frontend/types/proposal.ts
 2019-02-11 16:51:31 -06:00
Aaron ac5bef5c6f
FE: rework milestones first pass 2019-02-11 15:22:40 -06:00
Aaron 7a036058f6
FE: more robust arbiter + arbiter accept email validation code page 2019-02-09 21:03:19 -06:00
Will O'Beirne 6cd6520fbc
Use datePublished for deadline wherever possible. Disable past dates during milestone create, disable field when immediate payout is set. 2019-02-05 15:56:07 -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
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 5a922cefee
Merge latest develop in. 2019-01-09 16:57:15 -05:00
Will O'Beirne b338fc9d2e
Contributions tab on proposal view. 2019-01-09 15:48:41 -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 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 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 02b1260573
Merge in latest changes. 2018-11-26 20:14:00 -05:00
Will O'Beirne f9b4f65ac4
Merge develop in. 2018-11-26 18:47:24 -05:00
Will O'Beirne d7e4c1c533
Check in user refactor. Incomplete, but computer is crashing routinely. 2018-11-16 18:05:17 -05:00
Will O'Beirne 95a963f2c8
Fix cyclic dependency. 2018-11-16 14:17:09 -05:00
Will O'Beirne a3cfbda3e2
Working invitations + deletions. 2018-11-16 11:16:52 -05:00
Will O'Beirne 8c96470826
Merge server-side-drafts in 2018-11-15 11:27:27 -05:00
AMStrix b177e7efa9 Backend Proposal Reads Pt. 2 (#209) 
* web3 flask + read proposal

* tests

* use build/contracts indtead of build/abi

* fail if endpoint not set

* batched calls

* add web3 read to GET proposal(s) endpoints

* basic  integration of BE crowdFund data into FE

* handle dead contracts & omit on FE

* allow web3-free viewing & move crowdFundContract out of redux store

* upgrade flask-yolo2API to 0.2.6

* MetaMaskRequiredButton + use it in CampaignBlock

* convert to tuples

* farewell tuples

* flter dead proposals on BE

* give test_proposal_funded deadline more time
 2018-11-14 17:24:56 -05: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
Will O'Beirne 8245795306
Temporary checkin, fuckup all of the types on the frontend. 2018-11-14 11:43:00 -05:00
Will O'Beirne 95c765834a
Setup draft list component, edit page from route. 2018-11-13 17:51:02 -05:00
Will O'Beirne 829d072b8c
Check in work on proposals, drafts 2018-11-13 11:07:09 -05:00
AMStrix d8eba48847 Readable Proposal URLs (#190) 
* proposal_id -> proposal_address & exposed proposal_id is prooposal.id

* FE proposalId to number + proposalUrlId generation and use
 2018-11-07 12:33:19 -05:00
William O'Beirne 118d7b645e
Proposal updates (#171) 
* Add models & endpoints

* Implement proposal updates.

* Reset state on close. Add missing key. Prompt on close if they will lose stuff.

* Dont warn if they submitted.
 2018-11-02 12:24:28 -04:00
William O'Beirne f406cec255
Strict Typescript (pt. 1) (#150) 
* Enable noImplicitThis, alwaysStrict, and strictFunctionTypes configs.

* Enable all strict rules. Implement typedKeys function for better typing. (#152)
 2018-10-19 18:03:37 -04:00
AMStrix 1aab0915c0 Type Refactor (#133) 2018-10-04 23:27:02 -05:00