Merge branch 'master' of github.com:gitcoinco/web

Author: nutrina

app/app/urls.py

@@ -712,8 +712,6 @@
         retail.emails.bounty_expire_warning,
         name='bounty_expire_warning'
     ),
-    path('_administration/email/bounty_feedback', retail.emails.bounty_feedback, name='bounty_feedback'),
-    path('_administration/email/funder_stale', retail.emails.funder_stale, name='funder_stale'),
     path(
         '_administration/email/start_work_expire_warning',
         retail.emails.start_work_expire_warning,

app/assets/v2/images/top-bar/passport-symbol.svg

@@ -67,6 +67,18 @@
                   </div>
                 </a>
 
+                <a href="https://go.gitcoin.co/gitcoin-passport-0?utm_source=gitcoinco&utm_medium=referral&utm_campaign=topnav&utm_content=Passport" title="Gitcoin Passport" data-submenu="passport" class="dropdown-item text-grey-500 px-3 py-0 gc-menu-submenu-toggle gc-passport-toggle">
+                  <div class="row py-3">
+                    <div class="col align-self-center" style="max-width: 3.25rem;">
+                      <img class="logo-static d-block m-auto p-1" src="{% static 'v2/images/top-bar/passport-symbol.svg' %}" alt="Passport" height="36">
+                    </div>
+                    <div class="col">
+                      <b class="gc-megamenu-title d-block">{% trans "Passport" %}</b>
+                      <span class="text-wrap">{% trans "Safe, reliable identity verification" %}</span>
+                    </div>
+                  </div>
+                </a>
+
                 <a href="{% url 'funder_bounties' %}" data-submenu="bounties" class="dropdown-item text-grey-500 px-3 py-0 gc-menu-submenu-toggle gc-products-toggle {% if '/bount' in request.path or '/explorer' in request.path and 'grants/explorer' not in request.path %}gc-menu-submenu-toggle-active{% endif %}">
                   <div class="row py-3">
                     <div class="col align-self-center" style="max-width: 3.25rem;">
@@ -112,6 +124,23 @@
                     </li>
                   </ul>
                 </div>
+                <div class="gc-passport-submenu gc-menu-submenu gc-menu-submenu-passport position-absolute">
+                  <b class="gc-menu-submenu-title d-none d-md-block px-3 pt-3 pb-2">{% trans "Passport" %}</b>
+                  <ul class="list-unstyled">
+                    <li>
+                      <a class="dropdown-item dropdown-item-small" href="https://go.gitcoin.co/gitcoin-passport-0?utm_source=gitcoinco&utm_medium=referral&utm_campaign=topnav&utm_content=Privacy%20Preserving" title="Gitcoin Passport" class="btn btn-outline-primary interior px-4 py-3 py-md-2 mx-3 my-4 my-md-0">Privacy Preserving
+                      </a>
+                    </li>
+                    <li>
+                      <a class="dropdown-item dropdown-item-small" href="https://go.gitcoin.co/gitcoin-passport-0?utm_source=gitcoinco&utm_medium=referral&utm_campaign=topnav&utm_content=Cross%20chain%20verification" title="Gitcoin Passport" class="btn btn-outline-primary interior px-4 py-3 py-md-2 mx-3 my-4 my-md-0">Cross chain verification
+                      </a>
+                    </li>
+                    <li>
+                      <a class="dropdown-item dropdown-item-small" href="https://go.gitcoin.co/gitcoin-passport-0?utm_source=gitcoinco&utm_medium=referral&utm_campaign=topnav&utm_content=Increase%20sybil%20resistance" title="Gitcoin Passport" class="btn btn-outline-primary interior px-4 py-3 py-md-2 mx-3 my-4 my-md-0">Increase sybil resistance
+                      </a>
+                    </li>
+                  </ul>
+                </div>
                 <div class="gc-products-submenu gc-menu-submenu gc-menu-submenu-hackathons position-absolute {% if '/hackathon' in request.path %}active{% endif %}">
                   <b class="gc-menu-submenu-title d-none d-md-block px-3 pt-3 pb-2">{% trans "Hackathons" %}</b>
                   <ul class="list-unstyled">

app/dashboard/templates/shared/menu.html

@@ -287,52 +287,6 @@ def generate_hackathon_email_intro(sponsors_prizes):
         return f"{sponsors_prizes[0]['sponsor'].name} is"
 
 
-def handle_bounty_feedback(bounty):
-    from dashboard.models import Bounty, BountyFulfillment
-
-    to_fulfiller = to_funder = False
-    fulfiller_previous_bounties = funder_previous_bounties = None
-    statuses = ['done', 'cancelled']
-
-    # identity
-    submitter_email = bounty.bounty_owner_email
-    is_fulfiller_and_funder_same_person = False
-    
-    # send email to the fulfiller
-    accepted_fulfillments = bounty.fulfillments.filter(accepted=True)
-
-    if accepted_fulfillments.exists() and bounty.status == 'done':
-        accepted_fulfillment = accepted_fulfillments.first()
-        fulfiller_email = accepted_fulfillment.fulfiller_email
-        is_fulfiller_and_funder_same_person = (fulfiller_email == submitter_email)
-        fulfillment_pks = [
-            fulfillment.pk for fulfillment in BountyFulfillment.objects.filter(accepted=True) \
-                if fulfillment.fulfiller_email == fulfiller_email
-        ]
-        previous_bounties = Bounty.objects.current().filter(
-            idx_status__in=statuses,
-            fulfillments__pk__in=fulfillment_pks
-        ).exclude(pk=bounty.pk).distinct()
-        has_been_sent_before_to_persona = previous_bounties.count()
-        if not has_been_sent_before_to_persona and not is_fulfiller_and_funder_same_person:
-            to_fulfiller = True
-            fulfiller_previous_bounties = previous_bounties
-
-    # send email to the funder
-    previous_bounties = Bounty.objects.filter(
-        idx_status__in=statuses,
-        bounty_owner_email=submitter_email,
-        current_bounty=True
-    ).exclude(pk=bounty.pk).distinct()
-    has_been_sent_before_to_persona = previous_bounties.count()
-
-    if not has_been_sent_before_to_persona and not is_fulfiller_and_funder_same_person:
-        to_funder = True
-        funder_previous_bounties = previous_bounties
-
-    return (to_fulfiller, to_funder, fulfiller_previous_bounties, funder_previous_bounties)
-
-
 def func_name():
     """Determine the calling function's name.
 

app/marketing/common/utils.py

@@ -32,9 +32,9 @@
 from python_http_client.exceptions import HTTPError, UnauthorizedError
 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_expire_warning, render_bounty_hypercharged,
     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_funder_payout_reminder, render_gdpr_reconsent, render_gdpr_update,
     render_grant_cancellation_email, render_grant_match_distribution_final_txn, 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,
@@ -436,70 +436,6 @@ def admin_contact_funder(bounty, text, from_user):
         translation.activate(cur_language)
 
 
-def funder_stale(to_email, github_username, days=30, time_as_str='about a month'):
-    from_email = '[email protected]'
-    cur_language = translation.get_language()
-    try:
-        setup_lang(to_email)
-
-        subject = "hey from gitcoin.co" if not github_username else f"hey @{github_username}"
-        __, text = render_funder_stale(github_username, days, time_as_str)
-        cc_emails = []
-        if allowed_to_send_email(to_email, 'admin_contact_funder'):
-            send_mail(
-                from_email,
-                to_email,
-                subject,
-                text,
-                cc_emails=cc_emails,
-                from_name=from_email,
-                categories=['transactional', func_name()],
-            )
-    finally:
-        translation.activate(cur_language)
-
-
-def bounty_feedback(bounty, persona='fulfiller', previous_bounties=None):
-    from_email = '[email protected]'
-    to_email = None
-    cur_language = translation.get_language()
-    if previous_bounties is None:
-        previous_bounties = []
-
-    try:
-        setup_lang(to_email)
-        if persona == 'fulfiller':
-            accepted_fulfillments = bounty.fulfillments.filter(accepted=True)
-            to_email = accepted_fulfillments.first().fulfiller_email if accepted_fulfillments.exists() else ""
-        elif persona == 'funder':
-            to_email = bounty.bounty_owner_email
-            if not to_email:
-                if bounty.bounty_owner_profile:
-                    to_email = bounty.bounty_owner_profile.email
-            if not to_email:
-                if bounty.bounty_owner_profile and bounty.bounty_owner_profile.user:
-                    to_email = bounty.bounty_owner_profile.user.email
-        if not to_email:
-            return
-
-        subject = bounty.github_url
-        html, text = render_bounty_feedback(bounty, persona, previous_bounties)
-        cc_emails = [from_email, '[email protected]']
-        if allowed_to_send_email(to_email, 'bounty_feedback'):
-            send_mail(
-                from_email,
-                to_email,
-                subject,
-                text,
-                html,
-                cc_emails=cc_emails,
-                from_name="Gitcoin Product Team",
-                categories=['transactional', func_name()],
-            )
-    finally:
-        translation.activate(cur_language)
-
-
 def tip_email(tip, to_emails, is_new):
     round_decimals = 5
     if not tip or not tip.txid or not tip.amount or not tip.tokenName: