Commit Graph

321 Commits

Author SHA1 Message Date
Will O'Beirne ac3bfb66c8
Tags for list view, bold bounty and matching on detail view. 2019-02-15 12:46:50 -05: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
Will O'Beirne 31345c57b6
Merge develop in 2019-02-14 19:08:18 -05: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 47f827693d
mileston payout emails + some bug fixes 2019-02-13 14:30:58 -06: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 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
Daniel Ternyak 7d6d38552c
remove DApp category 2019-02-10 16:15:36 -06:00
Daniel Ternyak f15c110f92
Merge branch 'develop' into arbiter-management 2019-02-10 15:53:29 -06:00
Daniel Ternyak c4b7e281a5
Merge branch 'develop' into comment-placeholder 2019-02-10 13:34:36 -06:00
Daniel Ternyak 536a98694c
handle not signed in users 2019-02-10 13:33:02 -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 2a0e12194c
Add resend button to email settings 2019-02-08 14:57:54 -05:00
Will O'Beirne 263764255b
Frontend for new RFP fields. 2019-02-08 14:02:34 -05:00
Daniel Ternyak fee2708334
Replace placeholder comment blocker with disabled markdown input and message 2019-02-08 11:14:16 -06: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
Daniel Ternyak bd9c870e5c
Merge branch 'develop' into stake-topoff 2019-02-06 17:58:45 -06:00
Aaron 048cda8216
FE: user profile arbitrations tab 2019-02-06 16:37:45 -06:00
Aaron 2b78a17973
proposal_arbiter email 2019-02-06 14:56:21 -06:00
Will O'Beirne a1283f24eb
Allow topping off of partial stake contributions. Fix float innaccuracy errors in python. Allow staking proposals to be deleted. 2019-02-05 20:45:57 -05: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 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
Will O'Beirne f0303b26b4
Set valid dates on auto-create. 2019-02-05 16:05:16 -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 08ed3e0417
Address validation (#156)
* Fix create step query

* Add basic regex validation for addresses to frontend.

* Check with zcash node if address is valid before final proposal submission.

* tsc

* Mock requests where needed. Come up with a function that mocks all blockchain requests.

* Remove print
2019-02-05 15:26:37 -05:00
Daniel Ternyak fe0cb6c220
Merge branch 'develop' into gdpr-and-cookies 2019-02-05 09:35:31 -06:00
Will O'Beirne fdc293185b
tsc 2019-02-05 01:26:05 -05:00
Will O'Beirne fa462175f3
Merge branch 'develop' into address-validation 2019-02-05 01:25:20 -05:00
William O'Beirne ce95dd7b0c
Fix create step query (#154) 2019-02-05 01:25:02 -05:00
Will O'Beirne df4b077a4a
Check with zcash node if address is valid before final proposal submission. 2019-02-05 01:24:17 -05:00
Will O'Beirne c7e18d19b0
Add basic regex validation for addresses to frontend. 2019-02-05 00:52:09 -05:00
Daniel Ternyak 2dc3e1df86
Merge branch 'develop' into gdpr-and-cookies 2019-02-04 21:58:52 -06:00
Will O'Beirne 7620d7f577
Fix create step query 2019-02-04 17:50:11 -05:00
Will O'Beirne 3967358531
Minimum tab heights on proposals and profiles. 2019-02-04 17:39:46 -05:00
Will O'Beirne 949f0cb115
Remove unused redux persist. 2019-02-04 15:45:20 -05:00
Will O'Beirne 29f59aa81d
Require agreement on signup. 2019-02-04 15:45:11 -05:00
Aaron 70adb40b75
replace antdp Ellipsis component 2019-02-01 16:07:15 -06:00
William O'Beirne 1f41181f33
Move loadables into dependencies. (#145) 2019-02-01 16:27:08 -05:00
AMStrix 1c72178b86 Create and use ExceptionPage for 404s (#138)
* create & use ExceptionPage for 404s, remove LinkButton

* ExceptionPage: set default 'desc' if not set on props
2019-02-01 14:25:17 -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
Will O'Beirne 5310e813fe
Fix bad ssr action path. 2019-01-31 22:13:38 -05:00
Will O'Beirne 33ac4db564
Fix SSR, fix uncaught async errors, fix style cascade. 2019-01-31 22:09:52 -05:00
Will O'Beirne 95c63b8974
Merge develop in. 2019-01-31 20:50:26 -05:00
William O'Beirne 006ece5fe4 Check in WIP 2019-01-31 20:49:13 -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 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 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
Daniel Ternyak f9237c8544
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into require-email-verification 2019-01-28 15:48:29 -06:00
Daniel Ternyak 5b985e7fd7
Merge branch 'develop' into remove-profile 2019-01-28 15:45:36 -06:00
Daniel Ternyak 18bab43a65
Merge branch 'develop' into explorer-url-env-var 2019-01-28 15:21:24 -06:00
Daniel Ternyak 7e41de9c81
Styling to Create proposal error page 2019-01-27 21:16:04 -06:00
Daniel Ternyak b0a5a8e03d
Handle comment prevention without email verification 2019-01-27 20:03:38 -06:00
Daniel Ternyak 01d61fce9f
Undo errouneous reformats 2019-01-27 16:17:09 -06:00
Daniel Ternyak 97db9d69f9
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into remove-profile 2019-01-27 16:13:49 -06:00
Daniel Ternyak 5f606d6204
merge 'develop' into 'remove-profile 2019-01-27 15:44:16 -06:00
Will O'Beirne af9486ef52
Keep new email in the field after changing it. 2019-01-24 14:49:04 -05:00
William O'Beirne 69fefdb2ea
Merge branch 'develop' into change-email 2019-01-24 14:29:26 -05:00
Will O'Beirne 8d15a473fc
Adjusted settings mobile behavior. Fixed tsc error. 2019-01-24 14:19:33 -05:00
Will O'Beirne 3b9d15e62e
Implement change email & email confirmation. Adjust layout of settings more. 2019-01-24 13:53:26 -05:00
Will O'Beirne b6e921879e
Rework settings page frontend. Add account tab for email changes. 2019-01-23 17:28:27 -05:00
Daniel Ternyak 61d9b08a02
Remove user email on Profile view 2019-01-23 15:53:29 -06:00
Will O'Beirne 26aec7d530
Sort it alphabetically you LINT NAZI. 2019-01-23 16:34:14 -05:00
Will O'Beirne 3c8894fb12
Env var-ify the block explorer url 2019-01-23 16:30:03 -05:00
Will O'Beirne f8be65f6a3
Remove console logs 2019-01-23 15:53:24 -05:00
Will O'Beirne 737ec0e59c
Fix SSR, upgrade react router and loadable components. 2019-01-23 15:48:22 -05:00
Will O'Beirne 5b3e5522b0
Remove loadable-components. 2019-01-23 11:44:34 -05:00
Will O'Beirne da88825c7c
Standardize loader size 2019-01-23 11:35:03 -05:00
Will O'Beirne eddc0671d7
Replace spin with loader everywhere. 2019-01-23 10:15:59 -05:00
Will O'Beirne 80e658593b
Darken default user image. 2019-01-22 15:50:43 -05:00
Will O'Beirne 9181dec164
New logos (placeholder until approval.) 2019-01-22 15:46:50 -05:00
Will O'Beirne 31b4167c09
Remove alpha banner. Update markdown pages. Replace default user icon. 2019-01-22 14:56:48 -05:00
Will O'Beirne 32840da648
Grant.io -> ZF Grants 2019-01-22 13:40:20 -05:00
Will O'Beirne 837f6b0c95
Remove a bunch of leftover ETH platform stuff. 2019-01-22 13:09:42 -05:00
Will O'Beirne 0f979412aa
Basic color and font changes. 2019-01-22 13:01:21 -05:00
Aaron e41892898f
Merge branch 'sentry-release-env-no-git' of https://github.com/dternyak/zcash-grant-system into sentry-release-env-no-git 2019-01-21 12:53:11 -06:00
Aaron f8def1ae67
comment out SENTRY env vars for frontend .env example 2019-01-21 12:52:58 -06:00
Will O'Beirne 244a9f9168
Merge branch 'develop' into sentry-release-env-no-git 2019-01-21 12:52:35 -05:00
William O'Beirne 92ad6d3436
Better logging & add sentry to blockchain watcher (#93)
* Add sentry to blockchain watcher. Adjust frontend to allow for environment override.

* Replace all logging with winston. Fix sentry error reporting. Improve error logging for uncaught express errors.

* Remove dsn from .env.example
2019-01-18 19:34:11 -05:00
Aaron 5fd086c83a
linter doesn't like console.log, just remove it 2019-01-18 13:17:07 -06:00
Aaron 3383c0757b
remove git hashes for SENTRY_RELEASE 2019-01-18 12:33:51 -06:00
AMStrix 5848d33f29 code of conduct MD page (#89) 2019-01-18 12:21:03 -05:00
AMStrix c8ab0d0f37 location forward after authentication (#90) 2019-01-18 01:40:30 -05:00
Aaron f7d485db3c
Revert "code of conduct MD page"
This reverts commit 14c546b528.
2019-01-17 10:52:56 -06:00
Aaron 14c546b528
code of conduct MD page 2019-01-17 09:15:30 -06:00
AMStrix 48912c95cc markdown driven static pages (#40) 2019-01-16 18:19:34 -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
William O'Beirne 994b680f04
Link to specific tabs from query param (#71)
* Linkable tabs with scrolling behaior. Replace all tabs with linkable tabs.

* Link to specific tab wherever relevant.

* Fix bad tab name.
2019-01-15 15:19:59 -05:00
William O'Beirne f008b0fcfa
Word wrap (#70) 2019-01-15 15:19:44 -05:00
William O'Beirne 91efc28fa3
Fade auth in, invisible while checking. (#69) 2019-01-15 15:19:31 -05:00
William O'Beirne 98209f5fa6
Fix incorrect pending invites count. (#68) 2019-01-15 14:13:57 -05:00