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

58 Commits

Author SHA1 Message Date
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
Aaron 00dedfbfc0
trigger redux auth state update based on custom auth header 2019-02-15 21:07:41 -06:00
Daniel Ternyak 7b365a28c7
Address user directly in error messages 2019-02-15 13:09:51 -06:00
Aaron f30d53c21c
Merge branch 'develop' into user-banning 
# Conflicts:
#	backend/grant/utils/pagination.py
 2019-02-14 22:25:03 -06:00
Aaron 1d811bb7d3
BE: user banning + silencing + pagination 2019-02-14 22:11:47 -06:00
Aaron 16ed593304
Merge branch 'develop' into zcash-milestones 
# Conflicts:
#	frontend/client/modules/create/utils.ts
 2019-02-13 14:38:52 -06: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
Daniel Ternyak f2e685b1d6
Merge branch 'develop' into finalize-categories 2019-02-11 16:47:07 -06:00
Aaron 72c3d6b507
join arbiter filter queries + use flush to get proposal.id on create 2019-02-11 15:59:29 -06:00
Aaron 4e5c0eaea7
BE: more milestone fields 2019-02-11 15:08:51 -06:00
Daniel Ternyak 7d6d38552c
remove DApp category 2019-02-10 16:15:36 -06:00
Aaron 9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code 2019-02-09 20:58:40 -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
Aaron 40e73f9ee6
arbiters: admin views + pagination filter imp. 2019-02-06 12:31:53 -06:00
Will O'Beirne 2f3161ae4b
Generecize pageable. List view of contributions. 2019-02-06 12:47:47 -05:00
Will O'Beirne aeb0932120
Initial crack at admin endpoints. 2019-02-06 11:21:19 -05:00
Aaron eb8c1ec258
add ARBITER proposal filter 2019-02-05 21:30:31 -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
William O'Beirne b920b73a4b
Enforce email verification server side (#142) 
* Add new auth middleware for ensuring user has verified email account.

* Fix test.
 2019-02-01 15:43:43 -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
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 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 b3e3a28957 Admin authentication environment variable + generation command (#78) 
* store admin pass hash in ENV + add gen-admin-auth command

* allow custom salt for hash generation

* remove unused import

* dynamically pull salt for testing admin password hash generator func

* Fix middleware name.
 2019-01-17 00:20:10 -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
Will O'Beirne 5a922cefee
Merge latest develop in. 2019-01-09 16:57:15 -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
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
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
AMStrix 50cc377b48 User Auth Conversion (#19) 2018-12-14 13:36:22 -06:00
Will O'Beirne b1b2717360
Tests around invites, and a few fixes along the way. 2018-11-28 16:56:19 -05: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
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 5afdb2011d
Merge develop in. 2018-11-26 18:25:02 -05:00
AMStrix 7abeac7bd7 Sentry Integration (#221) 
* BE sentry setup w/ user scope

* FE sentry integration + user scope

* FE env adjustments

* FE: use NODE_ENV for Sentry

* BE: use FLASK_ENV for Sentry

* BE: remove email, acct & ip from Sentry user scope

* comment .env.example SENTRY* for CI

* fix merge artifact
 2018-11-21 23:45:29 -06:00
Aaron cd2bd8f0b7
interpolate AVATAR_MAX_SIZE into error message 2018-11-19 17:58:30 -06:00
Will O'Beirne c51b1e2dab
Finish up user and social media conversions. 2018-11-19 15:23:56 -05:00
Aaron 52f1f54442
avatar upload & download 2018-11-16 21:33:25 -06: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 a3cfbda3e2
Working invitations + deletions. 2018-11-16 11:16:52 -05:00
Will O'Beirne a6175e530c
Merge in develop 2018-11-14 12:03:40 -05:00
Will O'Beirne 829d072b8c
Check in work on proposals, drafts 2018-11-13 11:07:09 -05:00
Daniel Ternyak 56df655c05
Merge branch 'auth-endpoints' into working-comments 2018-11-13 15:24:25 +01:00