Commit Graph

72 Commits

Author SHA1 Message Date
Will O'Beirne 560f63847e
More considerations for anonymous contributions on the frontend. 2019-02-25 14:46:47 -05:00
Will O'Beirne 6f7de989e7
Merge branch 'develop' into anonymous-contributions 2019-02-25 11:43:36 -05:00
AMStrix 77e25b1c7c Various fixes (#260)
* remove linkedin social media option

* fix ProfileEdit social media button white-space

* fix default profile tab for non-authed user

* filter out non live proposal contributions for GET user/<id>

* admin: remove 255 char limit on reject_reason
2019-02-25 11:41:00 -05:00
Will O'Beirne 06add917b5
Merge branch 'develop' into anonymous-contributions 2019-02-23 16:53:59 -05:00
Will O'Beirne 115b127962
Initial pass at anon contributions on frontend. 2019-02-23 15:31:07 -05:00
William O'Beirne ae62b726ce
Rip sprout out. (#254) 2019-02-23 15:19:33 -05:00
Aaron 1a87cadc4d
Merge branch 'develop' into comment-moderation
# Conflicts:
#	backend/grant/utils/pagination.py
#	frontend/client/components/Proposal/Comments/index.tsx
2019-02-18 15:36:31 -06:00
Aaron e8c7dad87f
be & admin moderation & reporting for proposal comments 2019-02-18 15:31:20 -06:00
AMStrix 709a370284 Proposal stage and comment pagination (#214)
* hook up proposal stage filters

* paginate comments & "All" stages filter in frontend

* Add 'status' to 'create-proposals'
2019-02-17 21:13:24 -05:00
Will O'Beirne 31345c57b6
Merge develop in 2019-02-14 19:08:18 -05:00
Aaron fd9a4c5393
full payout flow operational 2019-02-13 10:54:46 -06:00
Aaron 380eec005e
payout endpoints + redux actions + ms UX refactors 2019-02-11 23:10:09 -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 263764255b
Frontend for new RFP fields. 2019-02-08 14:02:34 -05:00
Daniel Ternyak d11fa489d5 Remove comments option from updates (#177) 2019-02-08 11:18:58 -05: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
Aaron 2b78a17973
proposal_arbiter email 2019-02-06 14:56:21 -06:00
Will O'Beirne f4f8d9312d
Merge branch 'develop' into proposal-date-fixes 2019-02-05 16:29:46 -05: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 3b8d96ac51
Fix isImmediatePayout non-existant property on milestones. 2019-02-05 16:05:45 -05: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
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
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
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
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
Will O'Beirne 6c8ce3f87d
Show send instructions on profile pending contributions. 2019-01-09 17:26:28 -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
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 c444e5152d
Hook up blockchain to backend, backend to frontend for contributions. 2019-01-07 01:58:33 -05:00
William O'Beirne 98d68961b5 Merge develop in. 2019-01-04 14:29:09 -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 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 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
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -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
Will O'Beirne c3985a07a3
Merge in develop 2018-11-27 13:21:11 -05:00
Will O'Beirne 708eaca511
Merge upstream changes. 2018-11-26 20:29:33 -05:00