diff --git a/app/assets/v2/js/pages/kudos_receive.js b/app/assets/v2/js/pages/kudos_receive.js index 856fc5c118b..e326d21adde 100644 --- a/app/assets/v2/js/pages/kudos_receive.js +++ b/app/assets/v2/js/pages/kudos_receive.js @@ -148,7 +148,8 @@ $(document).ready(function() { numClones: numClones, holding_address: holding_address, kudosPriceInWei: kudosPriceInWei.toString(10) - } + }; + console.log('params for kudos clone:'); console.log(params); diff --git a/app/dashboard/templates/grants_index.html b/app/dashboard/templates/grants_index.html index b37623a90c5..8e0a3636768 100644 --- a/app/dashboard/templates/grants_index.html +++ b/app/dashboard/templates/grants_index.html @@ -19,7 +19,6 @@ - - - diff --git a/app/kudos/templates/transaction/receive_legacy.html b/app/kudos/templates/transaction/receive_legacy.html deleted file mode 100644 index 3c34734955d..00000000000 --- a/app/kudos/templates/transaction/receive_legacy.html +++ /dev/null @@ -1,84 +0,0 @@ -{% extends 'transaction/base.html' %} -{% 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 %} -{% load i18n static %} -{% block 'scripts' %} - - - - - - - - - - - - -{% endblock %} - -{% block 'world' %} - -{% endblock %} -{% block 'main' %} -
-
- - - - - -
-
-

{% trans "Loading" %}

- -

{% trans "waiting for web3..." %}

-
- - - -
-{% endblock %} diff --git a/app/kudos/templates/transaction/receive_v2.html b/app/kudos/templates/transaction/receive_v2.html deleted file mode 100644 index 974db388db1..00000000000 --- a/app/kudos/templates/transaction/receive_v2.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends 'transaction/base.html' %} -{% 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 %} -{% load i18n static %} -{% block 'scripts' %} - - - - -{% endblock %} - -{% block 'world' %} -
- -
-{% endblock %} -{% block 'main' %} -
-
- - - - - -
- - -{% if tip.receive_txid %} - -{% endif %} -
- -{% endblock %} diff --git a/app/kudos/templates/transaction/send.html b/app/kudos/templates/transaction/send.html index 71ecf5cf7e9..79ea93b1de9 100644 --- a/app/kudos/templates/transaction/send.html +++ b/app/kudos/templates/transaction/send.html @@ -15,8 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . {% endcomment %} -{% load i18n static %} -{% load kudos_extras %} +{% load i18n static kudos_extras %} {% block 'scripts' %} {% include 'shared/current_profile.html' %} @@ -45,81 +44,44 @@ } }) - {% endblock %} - + {% block 'main' %}
- -

{% trans "Send Kudos" %}

-
{% if kudos.name %} - {{ kudos.name }} - {{ kudos.name|humanize_name }} - - - {{ kudos.price_in_eth }} ETH USD + {{ kudos.name }} + {{ kudos.name|humanize_name }} + + + {{ kudos.price_in_eth }} ETH USD {% else %} - - - Select kudos. - - - Pick a kudos - - - - Pick a Kudos + + + {% trans "Select kudos" %} + + + {% trans "Pick a kudos" %} + + + + {% trans "Pick a Kudos" %} {% endif %}
-
- -
- - +
- -
@@ -128,7 +90,6 @@

{% trans "Send Kudos" %}

-
{% trans "Advanced" %} >>
@@ -145,16 +106,14 @@

{% trans "Send Kudos" %}

-
-
@@ -166,7 +125,6 @@

{% trans "Woo hoo!" %}

{% trans "The transaction is still pending." %}
{% trans "This page will auto-update when the transaction is confirmed" %}
({% trans "but you can close the browser window if you want" %}).

-
@@ -176,5 +134,4 @@

{% blocktrans %}the user⬅ {% trans "Start Over" %}

- {% endblock %} diff --git a/app/kudos/templates/transaction/send1.html b/app/kudos/templates/transaction/send1.html deleted file mode 100644 index dfad8397baa..00000000000 --- a/app/kudos/templates/transaction/send1.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends 'transaction/base.html' %} -{% 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 %} -{% load i18n static %} -{% block 'scripts' %} - - -{% endblock %} - -{% block 'main' %} -
-
- - - - - -

{% trans "Send Tip" %} ⚡

-

{% trans "It's Fast. It's Easy. It's Free.️" %}

-

({% trans "Supports any github username or email address" %})

-
- -
- {% trans "Send Ether" %} 💰 -
-{% endblock %} diff --git a/app/kudos/views.py b/app/kudos/views.py index be46b3452ca..af1bd6172e9 100644 --- a/app/kudos/views.py +++ b/app/kudos/views.py @@ -33,18 +33,18 @@ from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt -from eth_utils import is_address, to_checksum_address, to_normalized_address -from web3 import Web3 from cacheops import cached_view_as from dashboard.models import Activity, Profile from dashboard.notifications import maybe_market_kudos_to_email from dashboard.utils import get_web3 from dashboard.views import record_user_action +from eth_utils import is_address, to_checksum_address, to_normalized_address from gas.utils import recommend_min_gas_price_to_confirm_in_time from git.utils import get_emails_master, get_github_primary_email from ratelimit.decorators import ratelimit from retail.helpers import get_ip +from web3 import Web3 from .forms import KudosSearchForm from .helpers import get_token