Zksync Checkout supports only [[maxCartItems]] items.
Please remove [[ grantsByTenant.length - maxCartItems ]] items
- from your cart to use zksync checkout / use standard checkout instead.
+ from your cart to use zksync checkout or use standard checkout instead.
zkSync is down at the moment, so if you'd like to checkout now you may need to use standard checkout
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 390cbe3d9ad..8f06fd35c85 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -25,9 +25,9 @@
contribution_addr_from_grant_as_json, contribution_addr_from_grant_during_round_as_json,
contribution_addr_from_round_as_json, contribution_info_from_grant_during_round_as_json, create_matching_pledge_v1,
flag, get_collection, get_collections_list, get_ethereum_cart_data, get_grant_payload, get_grants,
- get_interrupted_contributions, get_replaced_tx, grant_activity, grant_categories, grant_details, grant_details_api,
- grant_details_contributions, grant_details_contributors, grant_edit, grant_fund, grant_new, grants,
- grants_addr_as_json, grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_info, grants_landing,
+ get_interrupted_contributions, get_replaced_tx, get_trust_bonus, grant_activity, grant_categories, grant_details,
+ grant_details_api, grant_details_contributions, grant_details_contributors, grant_edit, grant_fund, grant_new,
+ grants, grants_addr_as_json, grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_info, grants_landing,
grants_type_redirect, ingest_contributions, ingest_contributions_view, invoice, leaderboard,
manage_ethereum_cart_data, new_matching_partner, profile, quickstart, remove_grant_from_collection, save_collection,
toggle_grant_favorite, verify_grant,
@@ -99,6 +99,7 @@
path('v1/api/grant/
/cancel', cancel_grant_v1, name='cancel_grant_v1'),
+ path('v1/api/trust-bonus', get_trust_bonus, name='get_trust_bonus'),
path('v1/api//cart_payload', get_grant_payload, name='grant_payload'),
path('v1/api//verify', verify_grant, name='verify_grant'),
path('v1/api/collections/new', save_collection, name='create_collection'),
diff --git a/app/grants/views.py b/app/grants/views.py
index 1e018b539bd..f4bb92c94ee 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -3494,3 +3494,35 @@ def handle_ingestion(profile, network, identifier, do_write):
return JsonResponse({ 'success': False, 'message': err })
return JsonResponse({ 'success': True, 'ingestion_types': ingestion_types })
+
+
+@csrf_exempt
+def get_trust_bonus(request):
+ '''
+ JSON POST endpoint which returns the trust bonus score of given addresses
+ '''
+
+ try:
+ json_body = json.loads(request.body)
+ addresses = json_body.get('addresses')
+ if not addresses:
+ return HttpResponse(status=204)
+ except:
+ return HttpResponse(status=400)
+
+ query = Q()
+ for address in addresses:
+ query |= Q(contributor_address=address)
+
+ subscriptions = Subscription.objects.filter(query).prefetch_related('contributor_profile')
+ response = []
+ _addrs = []
+ for subscription in subscriptions:
+ if subscription.contributor_address not in _addrs:
+ response.append({
+ 'address': subscription.contributor_address,
+ 'score': subscription.contributor_profile.trust_bonus
+ })
+ _addrs.append(subscription.contributor_address)
+
+ return JsonResponse(response, safe=False)
diff --git a/app/marketing/mails.py b/app/marketing/mails.py
index 0bdbb7585c8..131533d0b94 100644
--- a/app/marketing/mails.py
+++ b/app/marketing/mails.py
@@ -33,19 +33,18 @@
from retail.emails import (
email_to_profile, get_notification_count, render_admin_contact_funder, render_bounty_changed,
render_bounty_expire_warning, render_bounty_feedback, render_bounty_hypercharged, render_bounty_request,
- render_bounty_startwork_expire_warning, render_bounty_unintersted, render_comment, render_faucet_rejected,
- render_faucet_request, render_featured_funded_bounty, render_funder_payout_reminder, render_funder_stale,
- render_gdpr_reconsent, render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute,
- render_grant_txn_failed, render_grant_update, render_match_distribution, render_match_email, render_mention,
- render_new_bounty, render_new_bounty_acceptance, render_new_bounty_rejection, render_new_bounty_roundup,
- render_new_contributions_email, render_new_grant_approved_email, render_new_grant_email, render_new_work_submission,
- render_no_applicant_reminder, render_pending_contribution_email, render_quarterly_stats, render_remember_your_cart,
- render_request_amount_email, render_reserved_issue, render_start_work_applicant_about_to_expire,
- render_start_work_applicant_expired, render_start_work_approved, render_start_work_new_applicant,
- render_start_work_rejected, render_subscription_terminated_email, render_successful_contribution_email,
- render_support_cancellation_email, render_tax_report, render_thank_you_for_supporting_email, render_tip_email,
- render_tribe_hackathon_prizes, render_unread_notification_email_weekly_roundup, render_wallpost,
- render_weekly_recap,
+ render_bounty_startwork_expire_warning, render_bounty_unintersted, render_comment, render_featured_funded_bounty,
+ render_funder_payout_reminder, render_funder_stale, render_gdpr_reconsent, render_gdpr_update,
+ render_grant_cancellation_email, render_grant_recontribute, render_grant_txn_failed, render_grant_update,
+ render_match_distribution, render_match_email, render_mention, render_new_bounty, render_new_bounty_acceptance,
+ render_new_bounty_rejection, render_new_bounty_roundup, render_new_contributions_email,
+ render_new_grant_approved_email, render_new_grant_email, render_new_work_submission, render_no_applicant_reminder,
+ render_pending_contribution_email, render_quarterly_stats, render_remember_your_cart, render_request_amount_email,
+ render_reserved_issue, render_start_work_applicant_about_to_expire, render_start_work_applicant_expired,
+ render_start_work_approved, render_start_work_new_applicant, render_start_work_rejected,
+ render_subscription_terminated_email, render_successful_contribution_email, render_support_cancellation_email,
+ render_tax_report, render_thank_you_for_supporting_email, render_tip_email, render_tribe_hackathon_prizes,
+ render_unread_notification_email_weekly_roundup, render_wallpost, render_weekly_recap,
)
from sendgrid.helpers.mail import Attachment, Content, Email, Mail, Personalization
from sendgrid.helpers.stats import Category
@@ -660,28 +659,6 @@ def grant_update_email(activity):
translation.activate(cur_language)
-def new_faucet_request(fr):
- to_email = "support@gitcoin.co"
- from_email = settings.SERVER_EMAIL
- cur_language = translation.get_language()
- try:
- setup_lang(to_email)
- subject = _("New Faucet Request")
- body_str = _("A new faucet request was completed. You may fund the request here")
- body = f"{body_str}: https://gitcoin.co/_administration/process_faucet_request/{fr.pk}"
- if not should_suppress_notification_email(to_email, 'faucet'):
- send_mail(
- from_email,
- to_email,
- subject,
- body,
- from_name=_("No Reply from Gitcoin.co"),
- categories=['admin', func_name()],
- )
- finally:
- translation.activate(cur_language)
-
-
def new_grant_admin(grant):
to_emails = ['new-grants@gitcoin.co']
from_email = settings.SERVER_EMAIL
@@ -866,7 +843,7 @@ def notify_deadbeat_quest(quest):
setup_lang(to_email)
subject = _("Dead Quest Alert")
body = f"This quest is dead ({quest.title}): https://gitcoin.co/{quest.admin_url} "
- if not should_suppress_notification_email(to_email, 'faucet'):
+ if not should_suppress_notification_email(to_email, 'quest'):
send_mail(
from_email,
to_email,
@@ -887,7 +864,7 @@ def notify_kudos_minted(token_request):
setup_lang(to_email)
subject = _("Kudos has been minted")
body = f"Your kudos '{token_request.name}' has been minted and should be available on https://gitcoin.co/kudos/marketplace soon."
- if not should_suppress_notification_email(to_email, 'faucet'):
+ if not should_suppress_notification_email(to_email, 'kudos'):
send_mail(
from_email,
to_email,
@@ -908,7 +885,7 @@ def notify_kudos_rejected(token_request):
setup_lang(to_email)
subject = _("Kudos has been rejected")
body = f"Your kudos '{token_request.name}', with the file {token_request.artwork_url} has been rejected. The reason stated was '{token_request.rejection_reason}. \n\n You can resubmit the token request at https://gitcoin.co/kudos/new "
- if not should_suppress_notification_email(to_email, 'faucet'):
+ if not should_suppress_notification_email(to_email, 'kudos'):
send_mail(
from_email,
to_email,
@@ -951,7 +928,7 @@ def new_kudos_request(obj):
subject = _("New Kudos Request")
body_str = _("A new kudos request was completed. You may approve the kudos request here")
body = f"{body_str}: https://gitcoin.co/{obj.admin_url} \n\n {obj.profile.email}"
- if not should_suppress_notification_email(to_email, 'faucet'):
+ if not should_suppress_notification_email(to_email, 'kudos'):
send_mail(
from_email,
to_email,
@@ -1292,35 +1269,6 @@ def new_reserved_issue(from_email, user, bounty):
translation.activate(cur_language)
-def processed_faucet_request(fr):
- from_email = settings.SERVER_EMAIL
- subject = _("Faucet Request Processed")
- to_email = fr.email
- cur_language = translation.get_language()
- try:
- setup_lang(to_email)
- html, text = render_faucet_request(fr)
-
- if not should_suppress_notification_email(to_email, 'faucet'):
- send_mail(from_email, to_email, subject, text, html, categories=['transactional', func_name()])
- finally:
- translation.activate(cur_language)
-
-
-def reject_faucet_request(fr):
- from_email = settings.SERVER_EMAIL
- subject = _("Faucet Request Rejected")
- to_email = fr.email
- cur_language = translation.get_language()
- try:
- setup_lang(to_email)
- html, text = render_faucet_rejected(fr)
- if not should_suppress_notification_email(to_email, 'faucet'):
- send_mail(from_email, to_email, subject, text, html, categories=['transactional', func_name()])
- finally:
- translation.activate(cur_language)
-
-
def new_bounty_daily(es):
from dashboard.models import Bounty
to_email = es.email
diff --git a/app/marketing/management/commands/pull_stats.py b/app/marketing/management/commands/pull_stats.py
index c0f16a77ef7..f75b1f9a974 100644
--- a/app/marketing/management/commands/pull_stats.py
+++ b/app/marketing/management/commands/pull_stats.py
@@ -61,7 +61,6 @@ def handle(self, *args, **options):
stats.joe_dominance_index,
stats.avg_time_bounty_turnaround,
stats.user_actions,
- stats.faucet,
stats.email_events,
stats.bounties_hourly_rate
]
diff --git a/app/marketing/stats.py b/app/marketing/stats.py
index 42eb5ef7564..e59661a2871 100644
--- a/app/marketing/stats.py
+++ b/app/marketing/stats.py
@@ -97,30 +97,6 @@ def profiles_ingested():
)
-def faucet():
- from faucet.models import FaucetRequest
-
- Stat.objects.create(
- key='FaucetRequest',
- val=FaucetRequest.objects.count(),
- )
-
- Stat.objects.create(
- key='FaucetRequest_rejected',
- val=FaucetRequest.objects.filter(rejected=True).count(),
- )
-
- Stat.objects.create(
- key='FaucetRequest_fulfilled',
- val=FaucetRequest.objects.filter(fulfilled=True).count(),
- )
-
- Stat.objects.create(
- key='FaucetRequest_pending',
- val=FaucetRequest.objects.filter(fulfilled=False, rejected=False).count(),
- )
-
-
def user_actions():
from dashboard.models import UserAction
diff --git a/app/perftools/management/commands/create_jtbd_cache.py b/app/perftools/management/commands/create_jtbd_cache.py
index 0d92d7d2d8d..1d8d4b32f6c 100644
--- a/app/perftools/management/commands/create_jtbd_cache.py
+++ b/app/perftools/management/commands/create_jtbd_cache.py
@@ -65,7 +65,7 @@ def create_jtbd_earn_cache():
# WalletConnect
grant_id = 275
else:
- grant_id = 19
+ grant_id = 1
try:
grant_data = Grant.objects.filter(pk=grant_id).values(
diff --git a/app/quadraticlands/router.py b/app/quadraticlands/router.py
new file mode 100644
index 00000000000..c8bf7264a8d
--- /dev/null
+++ b/app/quadraticlands/router.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""Define dashboard specific DRF API routes.
+
+Copyright (C) 2021 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 .
+
+"""
+from quadraticlands.serializer import GTCStewardSerializer
+from rest_framework import routers, viewsets
+from rest_framework.pagination import PageNumberPagination
+
+from .models import GTCSteward
+
+
+class GTCStewardPagination(PageNumberPagination):
+ page_size = 30
+ page_size_query_param = 'page_size'
+
+
+class GTCStewardViewSet(viewsets.ModelViewSet):
+ queryset = GTCSteward.objects.all()
+ serializer_class = GTCStewardSerializer
+ pagination_class = GTCStewardPagination
+
+
+router = routers.DefaultRouter()
+router.register(r'stewards', GTCStewardViewSet)
diff --git a/app/quadraticlands/serializer.py b/app/quadraticlands/serializer.py
new file mode 100644
index 00000000000..36fb161f844
--- /dev/null
+++ b/app/quadraticlands/serializer.py
@@ -0,0 +1,15 @@
+from dashboard.models import ProfileSerializer
+from rest_flex_fields import FlexFieldsModelSerializer
+
+from .models import GTCSteward
+
+
+class GTCStewardSerializer(FlexFieldsModelSerializer):
+ """Handle serializing of GTCSteward"""
+ class Meta:
+ """Define the GrantCLR serializer metadata."""
+ model = GTCSteward
+ fields = ('profile', 'real_name', 'bio', 'gtc_address', 'profile_link', 'custom_steward_img')
+ expandable_fields = {
+ 'profile': ProfileSerializer
+ }
diff --git a/app/quadraticlands/urls.py b/app/quadraticlands/urls.py
index 133bd99eb54..bb69f964305 100644
--- a/app/quadraticlands/urls.py
+++ b/app/quadraticlands/urls.py
@@ -18,9 +18,11 @@
"""
from django.conf import settings
+from django.conf.urls import include, url
from django.urls import path, re_path
from quadraticlands.helpers import vote
+from quadraticlands.router import router
from quadraticlands.views import (
base, base_auth, dashboard_index, handler400, handler403, handler404, handler500, index, mission_diplomacy,
mission_diplomacy_room, mission_index, mission_lore, mission_postcard, mission_postcard_svg, mission_schwag,
@@ -52,6 +54,7 @@
path('mission/diplomacy//', mission_diplomacy_room, name='mission_diplomacy_room'),
re_path(r'^mission/diplomacy/?', mission_diplomacy, name='mission_diplomacy'),
+ url(r'^api/v1/', include(router.urls)),
]
diff --git a/app/retail/emails.py b/app/retail/emails.py
index dd35527e723..3399b256b03 100644
--- a/app/retail/emails.py
+++ b/app/retail/emails.py
@@ -57,7 +57,6 @@
TRANSACTIONAL_EMAILS = [
('tip', _('Tip Emails'), _('Only when you are sent a tip')),
- ('faucet', _('Faucet Notification Emails'), _('Only when you are sent a faucet distribution')),
('bounty', _('Bounty Notification Emails'), _('Only when you\'re active on a bounty')),
('bounty_match', _('Bounty Match Emails'), _('Only when you\'ve posted a open bounty and you have a new match')),
('bounty_feedback', _('Bounty Feedback Emails'), _('Only after a bounty you participated in is finished.')),
@@ -1127,37 +1126,6 @@ def render_bounty_unintersted(to_email, bounty, interest):
return response_html, response_txt
-def render_faucet_rejected(fr):
-
- params = {
- 'fr': fr,
- 'amount': settings.FAUCET_AMOUNT,
- 'utm_tracking': build_utm_tracking('faucet_rejected'),
- 'subscriber': get_or_save_email_subscriber(fr.email, 'internal'),
- }
-
- response_html = premailer_transform(render_to_string("emails/faucet_request_rejected.html", params))
- response_txt = render_to_string("emails/faucet_request_rejected.txt", params)
-
- return response_html, response_txt
-
-
-def render_faucet_request(fr):
-
- params = {
- 'fr': fr,
- 'amount': settings.FAUCET_AMOUNT,
- 'email_type': 'faucet',
- 'utm_tracking': build_utm_tracking('faucet_request'),
- 'subscriber': get_or_save_email_subscriber(fr.email, 'internal'),
- }
-
- response_html = premailer_transform(render_to_string("emails/faucet_request.html", params))
- response_txt = render_to_string("emails/faucet_request.txt", params)
-
- return response_html, response_txt
-
-
def render_bounty_startwork_expired(to_email, bounty, interest, time_delta_days):
params = {
'bounty': bounty,
@@ -1677,22 +1645,6 @@ def start_work_expire_warning(request):
return HttpResponse(response_html)
-@staff_member_required
-def faucet(request):
- from faucet.models import FaucetRequest
- fr = FaucetRequest.objects.last()
- response_html, _ = render_faucet_request(fr)
- return HttpResponse(response_html)
-
-
-@staff_member_required
-def faucet_rejected(request):
- from faucet.models import FaucetRequest
- fr = FaucetRequest.objects.exclude(comment_admin='').last()
- response_html, _ = render_faucet_rejected(fr)
- return HttpResponse(response_html)
-
-
def roundup(request):
email = request.user.email if request.user.is_authenticated else 'test@123.com'
response_html, _, _, _, _ = render_new_bounty_roundup(email)
diff --git a/app/retail/templates/admin/index.html b/app/retail/templates/admin/index.html
index 6481784b68f..f484a709379 100644
--- a/app/retail/templates/admin/index.html
+++ b/app/retail/templates/admin/index.html
@@ -117,9 +117,6 @@ {% trans 'Administrative Tasks' %}
-
diff --git a/app/retail/templates/emails/faucet_request.html b/app/retail/templates/emails/faucet_request.html
deleted file mode 100644
index e30c3fbb5c2..00000000000
--- a/app/retail/templates/emails/faucet_request.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends 'emails/template.html' %}
-{% comment %}
-Copyright (C) 2021 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 humanize %}
-{% load static %}
-
-{% block content %}
-
-
-
{% trans "Faucet Request Processed" %}⛽️
-
-
-
-
- {% trans "Hey" %} @{{fr.github_username}},
-
-
-
-
- {% blocktrans %}Gitcoin has distributed your faucet request for {{amount}} ETH to{% endblocktrans %} {{fr.address}}.
-
-
-
-
- {% trans "This should be enough gas to send your first Ethereum Transaction. We hope you'll consider using it on Gitcoin!" %}
-
-
-
-
-
-
{% trans "Faucet Request Rejected ‼️" %}
-
-
-
-
- {% trans "Hey" %} @{{ fr.github_username }},
-
-
-
-
- {% blocktrans %}Gitcoin *could not* approve your faucet request for {{ amount }} ETH to{% endblocktrans %} {{ fr.address }}.
-
-
-
-
- {% if fr.comment_admin %}
-
- {% trans "Here are some comments from the administrator:" %}
-
-
-
-
- > {{ fr.comment_admin }}
-
-
-
-
- {% endif %}
-
- {% trans "You are welcome to re-apply at" %} {% url 'faucet' %}
-
-
-
-
-
-
-
{% trans "Your Funded Bounty is Expiring" %}
{% blocktrans %}If you have any questions, feel free to reach out {% endblocktrans %}{% blocktrans %}on slack{% endblocktrans %}.
+ href="https://discord.gg/gitcoin">{% blocktrans %}on Discord{% endblocktrans %}.
{% else %}
@@ -62,8 +62,7 @@ {% trans "Your Funded Bounty is Expiring" %}
- {% blocktrans %}If you have any problems, feel free to reach out {% endblocktrans %}{% blocktrans %}on slack{% endblocktrans %}.
+ {% blocktrans %}If you have any problems, feel free to reach out {% endblocktrans %}{% blocktrans %}on Discord{% endblocktrans %}.
{% endif %}
diff --git a/app/retail/templates/emails/render_bounty_startwork_expired.html b/app/retail/templates/emails/render_bounty_startwork_expired.html
index 03638e5df2a..98a0efd9617 100644
--- a/app/retail/templates/emails/render_bounty_startwork_expired.html
+++ b/app/retail/templates/emails/render_bounty_startwork_expired.html
@@ -56,7 +56,7 @@ 👇 {% trans "You've been removed from this task ..." %} 👇
- If you have any questions, feel free to reach out on slack.
+ If you have any questions, feel free to reach out on Discord.
{% trans "Funded Issue Details" %}
diff --git a/app/retail/templates/gas_faq.html b/app/retail/templates/gas_faq.html
index d082663572b..7e85314cc0e 100644
--- a/app/retail/templates/gas_faq.html
+++ b/app/retail/templates/gas_faq.html
@@ -12,8 +12,6 @@
{% trans "FAQ" %}
-{% trans "I need gas money, where can I get it?" %}
-
{% trans "Why isn't my Ethereum transaction confirming?" %}
{% trans "What is Ethereum?" %}
diff --git a/app/retail/templates/gas_faucet_list.html b/app/retail/templates/gas_faucet_list.html
deleted file mode 100644
index c84c0bdc56a..00000000000
--- a/app/retail/templates/gas_faucet_list.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends 'onepager/base.html' %}
-{% load i18n static %}
-{% block 'scripts' %}
-
-{% endblock %}
-
-
-
-
-{% block 'main' %}
-
-
-{% include 'shared/gas_nav.html' %}
-
-{% trans "Mainnet" %}
-
-
-{% trans "Rinkeby Testnet" %}
-
-
-
-{% trans "Ropsten Testnet" %}
-
-
-
-
-
-{% endblock %}
diff --git a/app/retail/templates/jtbd/earn.html b/app/retail/templates/jtbd/earn.html
index bd362e9e6f8..65e13f104bc 100644
--- a/app/retail/templates/jtbd/earn.html
+++ b/app/retail/templates/jtbd/earn.html
@@ -311,7 +311,7 @@ Earn in hackathons
Earn while working on top open source projects with great leaders in crypto.
![loading...]({% static "v2/images/loading_v2.gif" %})
- 
+