Commit Graph

28 Commits

Author SHA1 Message Date
Danny Skubak fb6b9b5af7 Proposal Lifecycle & Crowdfunding (#23)
* add proposal versioning

* remove deadlines

* update proposal lifecycle for admin

* update proposal lifecycle for backend

* update proposal lifecycle for frontend

* fix tests

* remove acceptedWithFunding

* fix lint, remove commented code

* remove commented code

* refactor backend to provide isVersionTwo

* refactor backend to provide isVersionTwo

* Revert "refactor backend to provide isVersionTwo"

This reverts commit e3b9bc661081e482326f83fa6aa517cf6bdebe6c.

* use isVersionTwo in admin

* add acceptedWithFunding

* trigger ci

* remove "version"

* remove "version"

* remove rejected from campaign block
2019-10-16 22:43:20 -05:00
Danny Skubak 746398c59b Proposal Versioning (#21)
* add proposal versioning

* refactor backend to provide isVersionTwo

* trigger ci

* remove "version"
2019-10-11 14:51:10 -05:00
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
Will O'Beirne 828be6ca01
Fix tsc 2019-02-26 12:41:39 -05:00
Aaron fd9a4c5393
full payout flow operational 2019-02-13 10:54:46 -06:00
Aaron c47c69ea3c
tsc fixes 2019-02-11 23:42:21 -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 a3a2392135
Convert milestone dates to unix timestamps to be inline with the rest of our entities. 2019-02-05 16:25:58 -05:00
Will O'Beirne bd740bd9fa
Fix tsc 2019-02-05 16:06:45 -05:00
Will O'Beirne 3b8d96ac51
Fix isImmediatePayout non-existant property on milestones. 2019-02-05 16:05:45 -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
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 ba5e5e34a1
Fix all tsc issues. 2018-12-27 14:08:14 -05:00
Will O'Beirne 9b555aa8fa
Get rid of the ProposalWithCrowdFund type. 2018-12-21 13:47:50 -05:00
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06: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
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
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
AMStrix 1aab0915c0 Type Refactor (#133) 2018-10-04 23:27:02 -05:00
AMStrix 94aec1fdd3 Milestone Enhancements (#117)
* use antd Steps for Proposal/Milestones

* MilestoneAction component.

* Proposal/Milestones modifications.

* Proposal/Governance modifications.

* rename Governance tab to Refunds + hide if not contributor

* Story modifications for ProposalMilestones.

* Remove old Governance/Milestones + update story

* Make sure active step updates after mount via componentDidUpdate.

* have ProposalMilestones fill horizontal space

* allow outsiders to view state of MilestoneAction

* refactor + add is-count-n style

* count styles

* dynamic num milestones + rando titles

* geometryCases of 1 - 10 milestones

* better selected milestone visual hint

* dynamic step title overflow check + styles

* nowrap milestone title
2018-10-03 14:04:08 -05:00
William O'Beirne e47b598739 Functioning proposal teams (pt 2 - the views) (#116)
* Team create flow step

* Show team on review step.

* Fix image types.

* Get team into ideal format. Properly post it to backend.

* Validate team forms and show errors.

* Adjust team member buttons.

* Add social medias to examples.

* Transform post and get responses to align with the TeamMember type.

* Split out user row and address row components. Use user row in the team block on proposal view.

* Use team on proposal card. Make user avatar component, use in create flow.

* Fix proposal preview.

* Fix up stories, add new one for UserRow
2018-09-27 15:39:37 -05:00
AMStrix 8be518fff7 Integrate Storybook (#98)
* add missing static alias + include ./stories in tsconfig

* add storybook dep + script + babel-core bridge dep.

* storybook setup

* expose unconnected Component for storybook

* fix discovered styling issue

* dummy props (ProposalWithCrowdFund)

* Basic stories.
2018-09-25 15:02:29 -04:00