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
AMStrix
fbbd20ae90
Fix avatar load renegade POST ( #58 )
2019-01-10 16:51:34 -06:00
Will O'Beirne
16051f5f7a
PR fixes
2019-01-10 12:27:04 -05:00
Will O'Beirne
badcb75203
Margins.
2019-01-09 18:05:45 -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
7a7cbb77c7
Delete expired transactions.
2019-01-09 16:32:51 -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
e28f1b50d7
Tsc fixes
2019-01-07 16:56:01 -05:00
Will O'Beirne
fc10366232
Fix type, dont close on mask click.
2019-01-07 12:56:27 -05:00
Will O'Beirne
c444e5152d
Hook up blockchain to backend, backend to frontend for contributions.
2019-01-07 01:58:33 -05:00
Will O'Beirne
e6fb844b40
Finish out UI for contribution.
2019-01-07 00:42:24 -05:00
William O'Beirne
99fdedb816
Initial work on contribution modal flow and contribution model overhaul.
2019-01-06 17:48:07 -05:00
William O'Beirne
98d68961b5
Merge develop in.
2019-01-04 14:29:09 -05:00
AMStrix
15acce1865
Rework Proposal Comments & Updates ( #36 )
...
* test proposal updates + adjustments for comments
* remove comment signed message stuff
* use authed user id to check if user can update, remove 'account'
* ts adjustment
2019-01-04 14:03:37 -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
4ac7bb0da8
Fix padding on create flow.
2018-12-27 11:58:48 -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
6ea75e6bda
User Recovery Flow ( #26 )
2018-12-17 12:33:33 -06:00
AMStrix
50cc377b48
User Auth Conversion ( #19 )
2018-12-14 13:36:22 -06:00
Daniel Ternyak
35eecc24db
Setup in-app SSL redirects for Heroku ( #238 )
...
* setup in-app ssl redirects for Heroku
* add typings
* use trustProtoHeader
* BE w3 read fix for read_user_proposal
* No HTTPS redirect on dev
2018-12-05 17:49:45 -06:00
AMStrix
1144b0b0e2
Remove Unserializables from Redux ( #234 )
...
* remove web3 instance from redux
* remove Web3Container, use redux state instead
* remove web3 from Web3Container ;)
* cache result of fetchCrowdFundJSON
* fix error action type
* remove contracts from redux
* fetchCrowdFundJSON error & reporting
* remove unused ref
* check factory networkId against MM networkId during initialization
2018-12-03 20:08:29 -06:00
AMStrix
e1b2d21532
Upgrade FE Nodemon ( #236 )
...
* upgrade nodemon
* exit nodemon when its child exits (fix lingering cmd output post-exit)
* travis cache yarn (frontend)
* adjust exit handler
* cancel travis cache experiment
2018-11-30 23:36:52 -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
Daniel Ternyak
138c4381fb
Remove dead team validation ( #231 )
2018-11-28 12:39:39 -06:00
AMStrix
a780b235b9
SSR Preload /proposals ( #230 )
...
* resolve web3 when page is interactive OR complete
* SSR preload `/proposals`
2018-11-28 12:33:21 -06:00
Will O'Beirne
a8778f20bf
I am an idiot.
2018-11-27 14:47:54 -05:00
Will O'Beirne
1438468768
Merge branch 'develop' into working-comments
2018-11-27 14:30:41 -05:00
Will O'Beirne
a37fb152b4
Rebuild contract if missing. Simplify some logic.
2018-11-27 13:21:54 -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
Daniel Ternyak
00219e65c8
Only Runtime Contracts ( #225 )
2018-11-25 22:02:35 -06:00
Daniel Ternyak
8a97142d82
Avoid childprocess until neccesasary
2018-11-22 15:42:07 -06: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
AMStrix
968974d8d7
E2E - Web3 interaction & more tests ( #202 )
...
* account switching & setting gas for e2e web3
* e2e web3 interaction + new specs
* refund after payout spec
* use send instead of sendAsync + update ganache script cmd
* sign intercept + deterministic accounts
* add authentication to creation tests
* adjust cy.request call
* refactor + WIP fiddle with xhr
* xhook to modify incoming api requests
2018-11-21 21:20:09 -06:00
AMStrix
d367e6e474
Track proposal contributions ( #219 )
...
* BE proposal contribution tracking
* FE proposal contribution tracking
* validate contributions
* make sure we catch errors in the 'confirmation' listener
* remove console.log
* lowercase from address compare
* remove validate_contribution_tx from post_proposal_contribution
2018-11-21 21:18:22 -06:00
AMStrix
a95a8ff080
Server-side API calling/preloading. ( #224 )
...
* make sure BACKEND_URL gets set for server in production mode
* ssr api calls by path
* turn off redux logger on server
* massage preloaded state (BNify JSONed BNs)
* make sure fetchProposal returns async/promise
* make sure render works on ssr (check window refs)
* linting issue
2018-11-21 21:17:49 -06:00