From 448854a7d947da1343f894cf389c6e847cc7592f Mon Sep 17 00:00:00 2001 From: Owocki Date: Wed, 25 Apr 2018 15:12:19 -0600 Subject: [PATCH 01/13] moves action url links server side --- app/assets/v2/js/pages/bounty_details.js | 10 +++++----- app/dashboard/models.py | 17 +++++++++++++++++ app/dashboard/router.py | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js index 47ac055141b..d00e9155a61 100644 --- a/app/assets/v2/js/pages/bounty_details.js +++ b/app/assets/v2/js/pages/bounty_details.js @@ -491,7 +491,7 @@ var do_actions = function(result) { var enabled = submit_work_enabled; var _entry = { enabled: enabled, - href: '/funding/fulfill?source=' + result['github_url'], + href: result['action_urls']['fulfill'], text: gettext('Submit Work'), parent: 'right_actions', title: gettext('Submit work for the funder to review'), @@ -506,7 +506,7 @@ var do_actions = function(result) { var enabled = start_stop_work_enabled; var interest_entry = { enabled: enabled, - href: is_interested ? '/uninterested' : '/interested', + href: is_interested ? result['action_urls']['stop_work'] : result['action_urls']['start_work'], text: is_interested ? gettext('Stop Work') : gettext('Start Work'), parent: 'right_actions', title: is_interested ? gettext('Notify the funder that you will not be working on this project') : gettext('Notify the funder that you would like to take on this project'), @@ -521,7 +521,7 @@ var do_actions = function(result) { var enabled = kill_bounty_enabled; var _entry = { enabled: enabled, - href: '/funding/kill?source=' + result['github_url'], + href: result['action_urls']['kill'], text: gettext('Cancel Bounty'), parent: 'right_actions', title: gettext('Cancel bounty and reclaim funds for this issue') @@ -536,7 +536,7 @@ var do_actions = function(result) { var enabled = show_accept_submission; var _entry = { enabled: enabled, - href: '/funding/process?source=' + result['github_url'], + href: result['action_urls']['process'], text: gettext('Accept Submission'), title: gettext('This will payout the bounty to the submitter.'), parent: 'right_actions', @@ -550,7 +550,7 @@ var do_actions = function(result) { var enabled = increase_bounty_enabled; var _entry = { enabled: enabled, - href: '/funding/increase?source=' + result['github_url'], + href: result['action_urls']['increase'], text: gettext('Add Contribution'), parent: 'right_actions', title: gettext('Increase the funding for this issue'), diff --git a/app/dashboard/models.py b/app/dashboard/models.py index 479f4633ee1..5063e766108 100644 --- a/app/dashboard/models.py +++ b/app/dashboard/models.py @@ -600,6 +600,23 @@ def fetch_issue_comments(self, save=True): self.save() return comments + @property + def action_urls(self): + """ + + Returns: + dict - a dictionary of action URLS for this bounty + + """ + return { + 'fulfill': f"/funding/fulfill?source={self.github_url}", + 'increase': f"/funding/increase?source={self.github_url}", + 'process': f"/funding/process?source={self.github_url}", + 'cancel': f"/funding/kill?source={self.github_url}", + 'start_work': f"/interested", + 'stop_work': f"/uninterested", + } + class BountyFulfillmentQuerySet(models.QuerySet): """Handle the manager queryset for BountyFulfillments.""" diff --git a/app/dashboard/router.py b/app/dashboard/router.py index c5252de8aa1..aa02202857e 100644 --- a/app/dashboard/router.py +++ b/app/dashboard/router.py @@ -75,7 +75,7 @@ class Meta: 'standard_bounties_id', 'web3_type', 'can_submit_after_expiration_date', 'github_issue_number', 'github_org_name', 'github_repo_name', 'idx_status', 'token_value_time_peg', 'fulfillment_accepted_on', 'fulfillment_submitted_on', - 'fulfillment_started_on', 'canceled_on', + 'fulfillment_started_on', 'canceled_on', 'action_urls', ) def create(self, validated_data): From 8937bc707a5ee76c7af492e59f20af44233fc21e Mon Sep 17 00:00:00 2001 From: Owocki Date: Wed, 25 Apr 2018 15:13:12 -0600 Subject: [PATCH 02/13] removes legacy urls --- app/legacy/urls.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/app/legacy/urls.py b/app/legacy/urls.py index 36a6326183b..abbd969d041 100644 --- a/app/legacy/urls.py +++ b/app/legacy/urls.py @@ -20,24 +20,9 @@ from django.urls import re_path -from dashboard.views import bounty_details, fulfill_bounty, kill_bounty, process_bounty, sync_web3 +from dashboard.views import bounty_details app_name = 'legacy' urlpatterns = [ - # Path changed during migration to standard bounties. - re_path(r'^bounty/claim/?', fulfill_bounty, name='legacy_claim_bounty'), - re_path(r'^funding/claim/?', fulfill_bounty, name='legacy_claim_funding'), - re_path(r'^funding/fulfill/?', fulfill_bounty, name='legacy_claim_funding1'), - re_path(r'^bounty/fulfill/?', fulfill_bounty, name='legacy_claim_funding2'), - re_path(r'^funding/clawback/?', kill_bounty, name='legacy_clawback_expired_bounty'), - - # Endpoints that need to support old logic. - # Bounties - re_path(r'^bounty/process/?', process_bounty, name='legacy_process_bounty'), - re_path(r'^funding/process/?', process_bounty, name='legacy_process_funding'), - re_path(r'^bounty/details/?', bounty_details, name='legacy_bounty_details'), - re_path(r'^funding/details/?', bounty_details, name='legacy_funding_details'), re_path(r'^issue/(?P.*)/(?P.*)/(?P.*)', bounty_details, name='legacy_issue_details_new2'), - # sync methods - re_path(r'^sync/web3', sync_web3, name='legacy_sync_web3'), ] From 3fe03720a407631535e5d6f23abdf429c5d0f932 Mon Sep 17 00:00:00 2001 From: Owocki Date: Wed, 25 Apr 2018 15:52:34 -0600 Subject: [PATCH 03/13] end to end integration --- app/app/urls.py | 31 ++++--- app/assets/v2/js/pages/bounty_details.js | 6 +- app/assets/v2/js/pages/fulfill_bounty.js | 3 +- app/assets/v2/js/pages/increase_bounty.js | 2 + app/assets/v2/js/pages/kill_bounty.js | 3 +- app/assets/v2/js/pages/process_bounty.js | 4 +- app/assets/v2/js/shared.js | 12 +++ app/dashboard/models.py | 10 +-- app/dashboard/templates/fulfill_bounty.html | 3 +- app/dashboard/templates/increase_bounty.html | 11 +-- app/dashboard/templates/kill_bounty.html | 3 +- app/dashboard/templates/process_bounty.html | 3 +- .../shared/bounty_actions_hidden_vars.html | 19 +++++ app/dashboard/templates/submit_bounty.html | 3 +- app/dashboard/views.py | 84 +++++++++++-------- docs/API.md | 1 + 16 files changed, 128 insertions(+), 70 deletions(-) create mode 100644 app/dashboard/templates/shared/bounty_actions_hidden_vars.html diff --git a/app/app/urls.py b/app/app/urls.py index 4129e71fd88..3707570d0bd 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -66,28 +66,37 @@ url(r'^dashboard/?', dashboard.views.dashboard, name='dashboard'), url(r'^explorer/?', dashboard.views.dashboard, name='explorer'), + + # action URLs url(r'^bounty/new/?', dashboard.views.new_bounty, name='new_bounty'), url(r'^funding/new/?', dashboard.views.new_bounty, name='new_funding'), url(r'^new/?', dashboard.views.new_bounty, name='new_funding_short'), + url(r'^issue/fulfill/(?P.*)?', dashboard.views.fulfill_bounty, name='fulfill_bounty'), + url(r'^issue/accept/(?P.*)?', dashboard.views.accept_bounty, name='process_funding'), + url(r'^issue/increase/(?P.*)?', dashboard.views.increase_bounty, name='increase_bounty'), + url(r'^issue/cancel/(?P.*)?', dashboard.views.cancel_bounty, name='kill_bounty'), + + # Interests + path('actions/bounty//interest/new/', dashboard.views.new_interest, name='express-interest'), + path('actions/bounty//interest/remove/', dashboard.views.remove_interest, name='remove-interest'), + path('actions/bounty//interest//uninterested/', dashboard.views.uninterested, name='uninterested'), - url(r'^bounty/fulfill/?', dashboard.views.fulfill_bounty, name='fulfill_bounty'), - url(r'^funding/fulfill/?', dashboard.views.fulfill_bounty, name='fulfill_funding'), - url(r'^bounty/process/?', dashboard.views.process_bounty, name='process_bounty'), - url(r'^funding/process/?', dashboard.views.process_bounty, name='process_funding'), + # View Bounty url(r'^bounty/details/(?P.*)/(?P.*)/(?P.*)', dashboard.views.bounty_details, name='bounty_details_new'), url(r'^funding/details/(?P.*)/(?P.*)/(?P.*)', dashboard.views.bounty_details, name='funding_details_new'), url(r'^issue/(?P.*)/(?P.*)/(?P.*)/(?P.*)', dashboard.views.bounty_details, name='issue_details_new3'), url(r'^issue/(?P.*)/(?P.*)/(?P.*)', dashboard.views.bounty_details, name='issue_details_new2'), url(r'^bounty/details/?', dashboard.views.bounty_details, name='bounty_details'), url(r'^funding/details/?', dashboard.views.bounty_details, name='funding_details'), - url(r'^legacy/funding/details/?', dashboard.views.bounty_details, name='legacy_funding_details'), - url(r'^funding/increase/?', dashboard.views.increase_bounty, name='increase_bounty'), - url(r'^funding/kill/?', dashboard.views.kill_bounty, name='kill_bounty'), + + # Tips url(r'^tip/receive/?', dashboard.views.receive_tip, name='receive_tip'), url(r'^tip/send/2/?', dashboard.views.send_tip_2, name='send_tip_2'), url(r'^tip/send/?', dashboard.views.send_tip, name='send_tip'), url(r'^send/?', dashboard.views.send_tip, name='tip'), url(r'^tip/?', dashboard.views.send_tip, name='tip'), + + # Legal url(r'^legal/?', dashboard.views.terms, name='legal'), url(r'^terms/?', dashboard.views.terms, name='_terms'), url(r'^legal/terms/?', dashboard.views.terms, name='terms'), @@ -95,6 +104,8 @@ url(r'^legal/cookie/?', dashboard.views.cookie, name='cookie'), url(r'^legal/prirp/?', dashboard.views.prirp, name='prirp'), url(r'^legal/apitos/?', dashboard.views.apitos, name='apitos'), + + # Alpha functionality url(r'^profile/(.*)?', dashboard.views.profile, name='profile'), url(r'^toolbox/?', dashboard.views.toolbox, name='toolbox'), path('actions/tool//voteUp', dashboard.views.vote_tool_up, name='vote_tool_up'), @@ -113,6 +124,7 @@ url(r'^sync/get_amount?', dashboard.helpers.amount, name='helpers_amount'), url(r'^sync/get_issue_details?', dashboard.helpers.issue_details, name='helpers_issue_details'), url(r'^sync/search_save?', dashboard.views.save_search, name='save_search'), + # brochureware views url(r'^about/?', retail.views.about, name='about'), url(r'^mission/?', retail.views.mission, name='mission'), @@ -128,6 +140,7 @@ url(r'^extension/chrome?', retail.views.browser_extension_chrome, name='browser_extension_chrome'), url(r'^extension/firefox?', retail.views.browser_extension_firefox, name='browser_extension_firefox'), url(r'^extension/?', retail.views.browser_extension_chrome, name='browser_extension'), + # basic redirect retail views url(r'^press/?', retail.views.presskit, name='press'), url(r'^presskit/?', retail.views.presskit, name='presskit'), @@ -200,10 +213,6 @@ # for robots url(r'^robots.txt/?', retail.views.robotstxt, name='robotstxt'), url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'), - # Interests - path('actions/bounty//interest/new/', dashboard.views.new_interest, name='express-interest'), - path('actions/bounty//interest/remove/', dashboard.views.remove_interest, name='remove-interest'), - path('actions/bounty//interest//uninterested/', dashboard.views.uninterested, name='uninterested'), # Legacy Support path('legacy/', include('legacy.urls', namespace='legacy')), re_path(r'^logout/$', auth_views.logout, name='logout'), diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js index d00e9155a61..833fd9040dd 100644 --- a/app/assets/v2/js/pages/bounty_details.js +++ b/app/assets/v2/js/pages/bounty_details.js @@ -506,7 +506,7 @@ var do_actions = function(result) { var enabled = start_stop_work_enabled; var interest_entry = { enabled: enabled, - href: is_interested ? result['action_urls']['stop_work'] : result['action_urls']['start_work'], + href: is_interested ? '/uninterested' : '/interested', text: is_interested ? gettext('Stop Work') : gettext('Start Work'), parent: 'right_actions', title: is_interested ? gettext('Notify the funder that you will not be working on this project') : gettext('Notify the funder that you would like to take on this project'), @@ -521,7 +521,7 @@ var do_actions = function(result) { var enabled = kill_bounty_enabled; var _entry = { enabled: enabled, - href: result['action_urls']['kill'], + href: result['action_urls']['cancel'], text: gettext('Cancel Bounty'), parent: 'right_actions', title: gettext('Cancel bounty and reclaim funds for this issue') @@ -536,7 +536,7 @@ var do_actions = function(result) { var enabled = show_accept_submission; var _entry = { enabled: enabled, - href: result['action_urls']['process'], + href: result['action_urls']['accept'], text: gettext('Accept Submission'), title: gettext('This will payout the bounty to the submitter.'), parent: 'right_actions', diff --git a/app/assets/v2/js/pages/fulfill_bounty.js b/app/assets/v2/js/pages/fulfill_bounty.js index 1a82894f307..7894c259e98 100644 --- a/app/assets/v2/js/pages/fulfill_bounty.js +++ b/app/assets/v2/js/pages/fulfill_bounty.js @@ -2,6 +2,7 @@ window.onload = function() { // a little time for web3 injection setTimeout(function() { + waitforWeb3(actions_page_warn_if_not_on_same_network); var account = web3.eth.accounts[0]; if (typeof localStorage['githubUsername'] != 'undefined') { @@ -137,7 +138,7 @@ window.onload = function() { }; // Get bountyId from the database - var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + document.web3network; + var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + $('input[name=network]').val() + '&standard_bounties_id=' + $('input[name=standard_bounties_id]').val(); $.get(uri, function(results, status) { results = sanitizeAPIResults(results); diff --git a/app/assets/v2/js/pages/increase_bounty.js b/app/assets/v2/js/pages/increase_bounty.js index 82625e57ffe..6bcf62d8a48 100644 --- a/app/assets/v2/js/pages/increase_bounty.js +++ b/app/assets/v2/js/pages/increase_bounty.js @@ -2,6 +2,8 @@ load_tokens(); // Wait until page is loaded, then run the function $(document).ready(function() { + waitforWeb3(actions_page_warn_if_not_on_same_network); + $('input[name=amount]').keyup(setUsdAmount); $('input[name=amount]').blur(setUsdAmount); $('select[name=deonomination]').change(setUsdAmount); diff --git a/app/assets/v2/js/pages/kill_bounty.js b/app/assets/v2/js/pages/kill_bounty.js index 052e628c6de..4a763b0a2cb 100644 --- a/app/assets/v2/js/pages/kill_bounty.js +++ b/app/assets/v2/js/pages/kill_bounty.js @@ -2,6 +2,7 @@ window.onload = function() { // a little time for web3 injection setTimeout(function() { + waitforWeb3(actions_page_warn_if_not_on_same_network); var account = web3.eth.accounts[0]; if ( @@ -116,7 +117,7 @@ window.onload = function() { }; // Get bountyId from the database - var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + document.web3network; + var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + $('input[name=network]').val() + '&standard_bounties_id=' + $('input[name=standard_bounties_id]').val(); $.get(uri, apiCallback); } diff --git a/app/assets/v2/js/pages/process_bounty.js b/app/assets/v2/js/pages/process_bounty.js index 65d4dfc47d6..7fcb9674cbe 100644 --- a/app/assets/v2/js/pages/process_bounty.js +++ b/app/assets/v2/js/pages/process_bounty.js @@ -2,6 +2,7 @@ window.onload = function() { // a little time for web3 injection setTimeout(function() { + waitforWeb3(actions_page_warn_if_not_on_same_network); var account = web3.eth.accounts[0]; if (getParam('source')) { @@ -167,9 +168,8 @@ window.onload = function() { }; // Get bountyId from the database - waitforWeb3(function() { - var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + document.web3network; + var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + $('input[name=network]').val() + '&standard_bounties_id=' + $('input[name=standard_bounties_id]').val(); $.get(uri, apiCallback); }); diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index 0226aae0f2e..d130561fa31 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -706,6 +706,18 @@ var listen_for_web3_changes = function() { } }; +var actions_page_warn_if_not_on_same_network = function(){ + var user_network = document.web3network; + if (typeof user_network == 'undefined'){ + user_network = 'no network' + } + var bounty_network = $('input[name=network]').val(); + if(bounty_network != user_network){ + var msg = "Warning: You are on "+user_network+" and this bounty is on the "+bounty_network+" network. Please change your network to the "+bounty_network+" network." + _alert({message: gettext(msg)}, 'error'); + } +} + $(document).ready(function() { sidebar_redirect_triggers(); attach_change_element_type(); diff --git a/app/dashboard/models.py b/app/dashboard/models.py index 5063e766108..9aae7ef1d8b 100644 --- a/app/dashboard/models.py +++ b/app/dashboard/models.py @@ -609,12 +609,10 @@ def action_urls(self): """ return { - 'fulfill': f"/funding/fulfill?source={self.github_url}", - 'increase': f"/funding/increase?source={self.github_url}", - 'process': f"/funding/process?source={self.github_url}", - 'cancel': f"/funding/kill?source={self.github_url}", - 'start_work': f"/interested", - 'stop_work': f"/uninterested", + 'fulfill': f"/issue/fulfill/{self.pk}", + 'increase': f"/issue/increase/{self.pk}", + 'accept': f"/issue/accept/{self.pk}", + 'cancel': f"/issue/cancel/{self.pk}", } diff --git a/app/dashboard/templates/fulfill_bounty.html b/app/dashboard/templates/fulfill_bounty.html index 9468feeac2c..56b39aa9c60 100644 --- a/app/dashboard/templates/fulfill_bounty.html +++ b/app/dashboard/templates/fulfill_bounty.html @@ -45,7 +45,7 @@

{% trans "Submit Work" %}

- +
{% include 'shared/github_username.html' %} {% include 'shared/notification_email.html' %} @@ -57,6 +57,7 @@

{% trans "Submit Work" %}

+ {% include 'shared/bounty_actions_hidden_vars.html' %} {% include 'shared/wallet_estimate.html' %}
diff --git a/app/dashboard/templates/increase_bounty.html b/app/dashboard/templates/increase_bounty.html index f555ad9a876..b302739d608 100644 --- a/app/dashboard/templates/increase_bounty.html +++ b/app/dashboard/templates/increase_bounty.html @@ -37,21 +37,22 @@ {% include 'shared/zero_balance_error.html' %} {% include 'shared/unlock_metamask.html' %} + value="{{bounty.standard_bounties_id}}"> + value="{{bounty.bounty_owner_address}}"> + value="{{bounty.value_in_token}}">

Increase Funding

+ {% include 'shared/bounty_actions_hidden_vars.html' %} {% include 'shared/network_status.html' %}
- +
@@ -61,7 +62,7 @@

Increase Funding

- +
diff --git a/app/dashboard/templates/kill_bounty.html b/app/dashboard/templates/kill_bounty.html index 2d1f5113324..7dbc412c884 100644 --- a/app/dashboard/templates/kill_bounty.html +++ b/app/dashboard/templates/kill_bounty.html @@ -45,7 +45,7 @@
{% trans "(Issue Submitters only)" %}
- +
@@ -53,6 +53,7 @@
{% trans "(Issue Submitters only)" %}
+ {% include 'shared/bounty_actions_hidden_vars.html' %} {% include 'shared/wallet_estimate.html' %}
diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html index 7301dae3a35..d07e4bba468 100644 --- a/app/dashboard/templates/process_bounty.html +++ b/app/dashboard/templates/process_bounty.html @@ -45,7 +45,7 @@

{% trans "Accept Bounty Fulfillment" %}

{% include 'shared/network_status.html' %}
- +
@@ -57,6 +57,7 @@

{% trans "Accept Bounty Fulfillment" %}

+ {% include 'shared/bounty_actions_hidden_vars.html' %} {% include 'shared/wallet_estimate.html' %}
diff --git a/app/dashboard/templates/shared/bounty_actions_hidden_vars.html b/app/dashboard/templates/shared/bounty_actions_hidden_vars.html new file mode 100644 index 00000000000..44c51c1b86f --- /dev/null +++ b/app/dashboard/templates/shared/bounty_actions_hidden_vars.html @@ -0,0 +1,19 @@ +{% comment %} + Copyright (C) 2018 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +{% endcomment %} + + + diff --git a/app/dashboard/templates/submit_bounty.html b/app/dashboard/templates/submit_bounty.html index b1a0ccb4ec0..1c14b998fdf 100644 --- a/app/dashboard/templates/submit_bounty.html +++ b/app/dashboard/templates/submit_bounty.html @@ -48,7 +48,7 @@

{% trans "Fund an Issue" %}

{% include 'shared/network_status.html' %}
- +
@@ -136,6 +136,7 @@

{% trans "Fund an Issue" %}

Terms of Service:{% endblocktrans %}
+ {% include 'shared/bounty_actions_hidden_vars.html' %} {% include 'shared/wallet_estimate.html' %}
diff --git a/app/dashboard/views.py b/app/dashboard/views.py index 1ae0d880dfd..436de6111fc 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -436,21 +436,6 @@ def send_tip_2(request): return TemplateResponse(request, 'yge/send2.html', params) -def process_bounty(request): - """Process the bounty.""" - params = { - 'issueURL': request.GET.get('source'), - 'fulfillment_id': request.GET.get('id'), - 'fulfiller_address': request.GET.get('address'), - 'title': _('Process Issue'), - 'recommend_gas_price': recommend_min_gas_price_to_confirm_in_time(confirm_time_minutes_target), - 'eth_usd_conv_rate': eth_usd_conv_rate(), - 'conf_time_spread': conf_time_spread(), - } - - return TemplateResponse(request, 'process_bounty.html', params) - - def dashboard(request): """Handle displaying the dashboard.""" params = { @@ -478,7 +463,7 @@ def new_bounty(request): issue_url = request.GET.get('source') or request.GET.get('url', '') is_user_authenticated = request.user.is_authenticated params = { - 'issueURL': issue_url, + 'issueURL': request.GET.get('source'), 'amount': request.GET.get('amount'), 'active': 'submit_bounty', 'title': _('Create Funded Issue'), @@ -493,11 +478,39 @@ def new_bounty(request): return TemplateResponse(request, 'submit_bounty.html', params) -def fulfill_bounty(request): + +def accept_bounty(request, pk): + """Process the bounty.""" + + try: + bounty = Bounty.objects.get(pk=pk) + except: + raise Http404 + + params = { + 'bounty': bounty, + 'fulfillment_id': request.GET.get('id'), + 'fulfiller_address': request.GET.get('address'), + 'title': _('Process Issue'), + 'recommend_gas_price': recommend_min_gas_price_to_confirm_in_time(confirm_time_minutes_target), + 'eth_usd_conv_rate': eth_usd_conv_rate(), + 'conf_time_spread': conf_time_spread(), + } + + return TemplateResponse(request, 'process_bounty.html', params) + + +def fulfill_bounty(request, pk): """Fulfill a bounty.""" + + try: + bounty = Bounty.objects.get(pk=pk) + except: + raise Http404 + is_user_authenticated = request.user.is_authenticated params = { - 'issueURL': request.GET.get('source'), + 'bounty': bounty, 'githubUsername': request.GET.get('githubUsername'), 'title': _('Submit Work'), 'active': 'fulfill_bounty', @@ -511,11 +524,16 @@ def fulfill_bounty(request): return TemplateResponse(request, 'fulfill_bounty.html', params) -def increase_bounty(request): +def increase_bounty(request, pk): """Increase a bounty (funder)""" - issue_url = request.GET.get('source') + + try: + bounty = Bounty.objects.get(pk=pk) + except: + raise Http404 + params = { - 'issue_url': issue_url, + 'bounty': bounty, 'title': _('Increase Bounty'), 'active': 'increase_bounty', 'recommend_gas_price': recommend_min_gas_price_to_confirm_in_time(confirm_time_minutes_target), @@ -523,27 +541,19 @@ def increase_bounty(request): 'conf_time_spread': conf_time_spread(), } - try: - bounties = Bounty.objects.current().filter(github_url=issue_url) - if bounties: - bounty = bounties.order_by('pk').first() - params['standard_bounties_id'] = bounty.standard_bounties_id - params['bounty_owner_address'] = bounty.bounty_owner_address - params['value_in_token'] = bounty.value_in_token - params['token_address'] = bounty.token_address - except Bounty.DoesNotExist: - pass - except Exception as e: - print(e) - logging.error(e) - return TemplateResponse(request, 'increase_bounty.html', params) -def kill_bounty(request): +def cancel_bounty(request, pk): """Kill an expired bounty.""" + + try: + bounty = Bounty.objects.get(pk=pk) + except: + raise Http404 + params = { - 'issueURL': request.GET.get('source'), + 'bounty': bounty, 'title': _('Kill Bounty'), 'active': 'kill_bounty', 'recommend_gas_price': recommend_min_gas_price_to_confirm_in_time(confirm_time_minutes_target), diff --git a/docs/API.md b/docs/API.md index 4db2d26f97e..c843422a721 100644 --- a/docs/API.md +++ b/docs/API.md @@ -45,6 +45,7 @@ The bounties endpoint provides a listing of bounties and their current status. T | `value_in_usdt` | `float` | Approximation of value in USD at bounty web3_created timestamp | | `value_in_usdt_now`| `float` | Approximation of current value in USD | | `now` | `date_time` | Current date_time on the server | +| `action_urls` | `dict` | a list of urls where user can take action against the bounty | **Current Status** From 6e3ea15f5a711453e3bce3ef2578979d401b7403 Mon Sep 17 00:00:00 2001 From: Owocki Date: Wed, 25 Apr 2018 15:58:19 -0600 Subject: [PATCH 04/13] make fix. also makes it so that you can have more than one bounty per github url --- app/assets/v2/js/pages/new_bounty.js | 53 +++++++++--------------- app/assets/v2/js/pages/process_bounty.js | 1 + app/assets/v2/js/shared.js | 15 ++++--- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/app/assets/v2/js/pages/new_bounty.js b/app/assets/v2/js/pages/new_bounty.js index 8aa3c61b2ad..2244d487428 100644 --- a/app/assets/v2/js/pages/new_bounty.js +++ b/app/assets/v2/js/pages/new_bounty.js @@ -297,41 +297,28 @@ $(document).ready(function() { web3Callback // callback for web3 ); } - // Check if the bounty already exists - var uri = '/api/v0.1/bounties/?github_url=' + issueURL; - $.get(uri, function(results, status) { - results = sanitizeAPIResults(results); - var result = results[0]; - - if (result != null) { - _alert({ message: 'A bounty already exists for that Github Issue.' }); - unloading_button($('.js-submit')); - return; - } + var approve_success_callback = function(callback) { + // Add data to IPFS and kick off all the callbacks. + ipfsBounty.payload.issuer.address = account; + ipfs.addJson(ipfsBounty, newIpfsCallback); + }; - var approve_success_callback = function(callback) { - // Add data to IPFS and kick off all the callbacks. - ipfsBounty.payload.issuer.address = account; - ipfs.addJson(ipfsBounty, newIpfsCallback); - }; - - if (isETH) { - // no approvals needed for ETH - approve_success_callback(); - } else { - token_contract.approve( - bounty_address(), - amount, - { - from: account, - value: 0, - gasPrice: web3.toHex($('#gasPrice').val() * Math.pow(10, 9)) - }, - approve_success_callback - ); - } - }); + if (isETH) { + // no approvals needed for ETH + approve_success_callback(); + } else { + token_contract.approve( + bounty_address(), + amount, + { + from: account, + value: 0, + gasPrice: web3.toHex($('#gasPrice').val() * Math.pow(10, 9)) + }, + approve_success_callback + ); + } } }); }); diff --git a/app/assets/v2/js/pages/process_bounty.js b/app/assets/v2/js/pages/process_bounty.js index 7fcb9674cbe..1b29ca86315 100644 --- a/app/assets/v2/js/pages/process_bounty.js +++ b/app/assets/v2/js/pages/process_bounty.js @@ -168,6 +168,7 @@ window.onload = function() { }; // Get bountyId from the database + waitforWeb3(function() { var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + $('input[name=network]').val() + '&standard_bounties_id=' + $('input[name=standard_bounties_id]').val(); diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index d130561fa31..462d7e6a0e4 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -706,17 +706,20 @@ var listen_for_web3_changes = function() { } }; -var actions_page_warn_if_not_on_same_network = function(){ +var actions_page_warn_if_not_on_same_network = function() { var user_network = document.web3network; - if (typeof user_network == 'undefined'){ - user_network = 'no network' + + if (typeof user_network == 'undefined') { + user_network = 'no network'; } var bounty_network = $('input[name=network]').val(); - if(bounty_network != user_network){ - var msg = "Warning: You are on "+user_network+" and this bounty is on the "+bounty_network+" network. Please change your network to the "+bounty_network+" network." + + if (bounty_network != user_network) { + var msg = 'Warning: You are on ' + user_network + ' and this bounty is on the ' + bounty_network + ' network. Please change your network to the ' + bounty_network + ' network.'; + _alert({message: gettext(msg)}, 'error'); } -} +}; $(document).ready(function() { sidebar_redirect_triggers(); From 94329280e20175c62c798b38c148d96bbd55931f Mon Sep 17 00:00:00 2001 From: Owocki Date: Wed, 25 Apr 2018 16:09:56 -0600 Subject: [PATCH 05/13] route fixes --- app/assets/v2/js/pages/bounty_details.js | 6 +++++- app/dashboard/views.py | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js index 833fd9040dd..46e7fbb25ba 100644 --- a/app/assets/v2/js/pages/bounty_details.js +++ b/app/assets/v2/js/pages/bounty_details.js @@ -370,7 +370,11 @@ var wait_for_tx_to_mine_and_then_ping_server = function() { // clear local data localStorage[document.issueURL] = ''; - document.location.href = document.location.href; + if (response['url']) { + document.location.href = response['url']; + } else { + document.location.href = document.location.href; + } } else { console.log('error from sync/web', response); error(response); diff --git a/app/dashboard/views.py b/app/dashboard/views.py index 436de6111fc..201322498c1 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -798,17 +798,21 @@ def sync_web3(request): did_change = False max_tries_attempted = False counter = 0 + url = None while not did_change and not max_tries_attempted: - did_change, _, _ = web3_process_bounty(bounty) + did_change, _, new_bounty = web3_process_bounty(bounty) if not did_change: print("RETRYING") time.sleep(3) counter += 1 max_tries_attempted = counter > 3 + if new_bounty: + url = new_bounty.url result = { 'status': '200', 'msg': "success", - 'did_change': did_change + 'did_change': did_change, + 'url': url, } return JsonResponse(result, status=result['status']) From 47334acff6b5fc418a880ed78a61da14e63fdb16 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:12:28 -0400 Subject: [PATCH 06/13] Switch to re_path over url for changed lines --- app/app/urls.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app/urls.py b/app/app/urls.py index 3707570d0bd..a7d8b64da83 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -71,10 +71,10 @@ url(r'^bounty/new/?', dashboard.views.new_bounty, name='new_bounty'), url(r'^funding/new/?', dashboard.views.new_bounty, name='new_funding'), url(r'^new/?', dashboard.views.new_bounty, name='new_funding_short'), - url(r'^issue/fulfill/(?P.*)?', dashboard.views.fulfill_bounty, name='fulfill_bounty'), - url(r'^issue/accept/(?P.*)?', dashboard.views.accept_bounty, name='process_funding'), - url(r'^issue/increase/(?P.*)?', dashboard.views.increase_bounty, name='increase_bounty'), - url(r'^issue/cancel/(?P.*)?', dashboard.views.cancel_bounty, name='kill_bounty'), + re_path(r'^issue/fulfill/(?P.*)?', dashboard.views.fulfill_bounty, name='fulfill_bounty'), + re_path(r'^issue/accept/(?P.*)?', dashboard.views.accept_bounty, name='process_funding'), + re_path(r'^issue/increase/(?P.*)?', dashboard.views.increase_bounty, name='increase_bounty'), + re_path(r'^issue/cancel/(?P.*)?', dashboard.views.cancel_bounty, name='kill_bounty'), # Interests path('actions/bounty//interest/new/', dashboard.views.new_interest, name='express-interest'), From 9ba7e409100c32dac79ef85c8a1f0595b705fb69 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:14:26 -0400 Subject: [PATCH 07/13] Update docstring --- app/dashboard/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dashboard/models.py b/app/dashboard/models.py index 9aae7ef1d8b..0967fd09fb1 100644 --- a/app/dashboard/models.py +++ b/app/dashboard/models.py @@ -602,10 +602,10 @@ def fetch_issue_comments(self, save=True): @property def action_urls(self): - """ + """Provide URLs for bounty related actions. Returns: - dict - a dictionary of action URLS for this bounty + dict: A dictionary of action URLS for this bounty. """ return { From cf1f16de910089d44cdb3f4f3fa2883e9b8c7101 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:17:29 -0400 Subject: [PATCH 08/13] Update docstring --- app/dashboard/views.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/dashboard/views.py b/app/dashboard/views.py index 201322498c1..bb896e28331 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -525,7 +525,18 @@ def fulfill_bounty(request, pk): def increase_bounty(request, pk): - """Increase a bounty (funder)""" + """Increase a bounty as the funder. + + Args: + pk (int): The primary key of the bounty to be increased. + + Raises: + Http404: The exception is raised if no associated Bounty is found. + + Returns: + TemplateResponse: The increase bounty view. + + """ try: bounty = Bounty.objects.get(pk=pk) From b6ff9f08b5230654095e258225258d382572e463 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:20:44 -0400 Subject: [PATCH 09/13] Update docstrings --- app/dashboard/views.py | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/app/dashboard/views.py b/app/dashboard/views.py index bb896e28331..fdbc5841767 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -480,8 +480,18 @@ def new_bounty(request): def accept_bounty(request, pk): - """Process the bounty.""" + """Process the bounty. + Args: + pk (int): The primary key of the bounty to be accepted. + + Raises: + Http404: The exception is raised if no associated Bounty is found. + + Returns: + TemplateResponse: The accept bounty view. + + """ try: bounty = Bounty.objects.get(pk=pk) except: @@ -501,8 +511,18 @@ def accept_bounty(request, pk): def fulfill_bounty(request, pk): - """Fulfill a bounty.""" + """Fulfill a bounty. + + Args: + pk (int): The primary key of the bounty to be fulfilled. + + Raises: + Http404: The exception is raised if no associated Bounty is found. + + Returns: + TemplateResponse: The fulfill bounty view. + """ try: bounty = Bounty.objects.get(pk=pk) except: @@ -526,7 +546,7 @@ def fulfill_bounty(request, pk): def increase_bounty(request, pk): """Increase a bounty as the funder. - + Args: pk (int): The primary key of the bounty to be increased. @@ -537,7 +557,6 @@ def increase_bounty(request, pk): TemplateResponse: The increase bounty view. """ - try: bounty = Bounty.objects.get(pk=pk) except: @@ -556,7 +575,18 @@ def increase_bounty(request, pk): def cancel_bounty(request, pk): - """Kill an expired bounty.""" + """Kill an expired bounty. + + Args: + pk (int): The primary key of the bounty to be cancelled. + + Raises: + Http404: The exception is raised if no associated Bounty is found. + + Returns: + TemplateResponse: The cancel bounty view. + + """ try: bounty = Bounty.objects.get(pk=pk) From d51d353751898a6d76ce725f7c749c09b03c574d Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:21:32 -0400 Subject: [PATCH 10/13] Remove extra line --- app/dashboard/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/dashboard/views.py b/app/dashboard/views.py index fdbc5841767..f31a9cdbefc 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -587,7 +587,6 @@ def cancel_bounty(request, pk): TemplateResponse: The cancel bounty view. """ - try: bounty = Bounty.objects.get(pk=pk) except: From 306b50f3571469847397b5754d3c381093ffb40d Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:22:28 -0400 Subject: [PATCH 11/13] Extra linez --- app/dashboard/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/dashboard/views.py b/app/dashboard/views.py index f31a9cdbefc..25a60a372d4 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -478,7 +478,6 @@ def new_bounty(request): return TemplateResponse(request, 'submit_bounty.html', params) - def accept_bounty(request, pk): """Process the bounty. From c30885c4178d84acbdc0bd307e96a8ebd3b9739c Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:23:15 -0400 Subject: [PATCH 12/13] Update views.py --- app/dashboard/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/views.py b/app/dashboard/views.py index 25a60a372d4..c80b3c46449 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -554,7 +554,7 @@ def increase_bounty(request, pk): Returns: TemplateResponse: The increase bounty view. - + """ try: bounty = Bounty.objects.get(pk=pk) From 28f70798fd93839cc0f3c0982385311a6bf0595b Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 26 Apr 2018 10:25:39 -0400 Subject: [PATCH 13/13] Get rid of bare exceptions --- app/dashboard/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/dashboard/views.py b/app/dashboard/views.py index c80b3c46449..d395444a8e2 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -493,7 +493,7 @@ def accept_bounty(request, pk): """ try: bounty = Bounty.objects.get(pk=pk) - except: + except Bounty.DoesNotExist: raise Http404 params = { @@ -524,7 +524,7 @@ def fulfill_bounty(request, pk): """ try: bounty = Bounty.objects.get(pk=pk) - except: + except Bounty.DoesNotExist: raise Http404 is_user_authenticated = request.user.is_authenticated @@ -558,7 +558,7 @@ def increase_bounty(request, pk): """ try: bounty = Bounty.objects.get(pk=pk) - except: + except Bounty.DoesNotExist: raise Http404 params = { @@ -588,7 +588,7 @@ def cancel_bounty(request, pk): """ try: bounty = Bounty.objects.get(pk=pk) - except: + except Bounty.DoesNotExist: raise Http404 params = {