Merge branch 'master' into coupon

app/assets/v2/js/pages/onboard.js

@@ -259,3 +259,5 @@ var redirectURL = function() {
 
   document.location.href = url;
 };
+
+localStorage['onboarded_funder'] = true;

app/dashboard/management/commands/sync_es_profile.py

@@ -0,0 +1,61 @@
+'''
+    Copyright (C) 2019 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 <http://www.gnu.org/licenses/>.
+
+'''
+import time
+
+from django.core.management.base import BaseCommand
+
+# https://github.com/gitcoinco/web/issues/4424
+
+class Command(BaseCommand):
+
+    help = 'syncs email subscriber and profiles'
+
+    def handle(self, *args, **options):
+        from dashboard.models import Profile, SearchHistory
+        from marketing.models import EmailSubscriber
+
+        counter = 0 
+        # pull keywords by search history AND emailsubscriber
+        for profile in Profile.objects.filter(keywords=[]):
+
+            histories = SearchHistory.objects.filter(user__profile=profile)
+            keywords = []
+            for history in histories:
+                if history.data.get('keywords', None):
+                    keywords = history.data['keywords'][0].split(',')
+
+            es = EmailSubscriber.objects.filter(email=profile.email).exclude(keywords=[]).first()
+            if es:
+                keywords = keywords + es.keywords
+
+            if keywords:
+                print("1", counter, profile.handle, keywords)
+                counter += 1
+                profile.keywords = keywords
+                profile.save()
+
+
+        # pull keywords by profile into ES
+        for es in EmailSubscriber.objects.filter(keywords=[]):
+            profile = Profile.objects.filter(email=es.email).exclude(keywords=[]).first()
+            if profile:
+                print("2", profile.keywords, profile.handle)
+                es.keywords = es.keywords + profile.keywords
+                es.save()
+
+        #TODO: if a profile / emailsubscriber both have keywords we need to merge them

app/retail/templates/home/index.html

@@ -58,11 +58,7 @@ <h1>{% trans "Crowdfunding and freelance developers for your software projects"
               </span>
             </p>
             <div class="buttons">
-              {% if is_new_funder %}
-                <a class="btn btn-gc-green mr-2 shadow-none font-weight-bold py-3" href="/onboard/funder/">{% trans "Become a Funder" %}</a>
-              {% else %}
-                <a class="btn btn-gc-green mr-2 shadow-none font-weight-bold py-3" href="{% url "quickstart" %}">{% trans "Fund an Issue" %}</a>
-              {% endif %}
+              <a id="fund-issue" class="btn btn-gc-green mr-2 shadow-none font-weight-bold py-3" href="{% url "quickstart" %}">{% trans "Fund an Issue" %}</a>
               <a class="btn btn-outline-white ml-2 shadow-none font-weight-bold py-3" href="{% url "products" %}">{% trans "See Our Products" %}</a>
             </div>
           </div>
@@ -337,5 +333,8 @@ <h3 class="mt-3 mb-2">{{ article.title }}</h3>
       $(this).html(videoTemplate(url));
     });
 
+    if(!localStorage['onboarded_funder']) {
+      $('#fund-issue').attr('href', '/onboard/funder/');
+    }
   </script>
 </html>

app/retail/views.py

@@ -68,10 +68,6 @@ def get_activities(tech_stack=None, num_activities=15):
 def index(request):
 
     user = request.user.profile if request.user.is_authenticated else None
-    is_new_funder = True
-
-    if user and Bounty.objects.filter(bounty_owner_github_username=user).count() > 0:
-        is_new_funder = False
 
     products = [
         {
@@ -206,7 +202,6 @@ def index(request):
     ]
 
     context = {
-        'is_new_funder': is_new_funder,
         'products': products,
         'know_us': know_us,
         'press': press,

scripts/crontab

@@ -27,6 +27,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
 */10 * * * * cd gitcoin/coin; bash scripts/run_management_command.bash sync_gas_prices  >> /var/log/gitcoin/sync_gas_prices.log  2>&1
 1 * * * * cd gitcoin/coin; bash scripts/run_management_command.bash sync_gas_guzzlers  >> /var/log/gitcoin/sync_gas_guzzlers.log  2>&1
 15 */6 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash sync_profiles  >> /var/log/gitcoin/sync_profiles.log  2>&1
+15 2 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash sync_es_profiles  >> /var/log/gitcoin/sync_es_profiles.log  2>&1
 15 2 * * * cd gitcoin/coin; bash scripts/run_management_command.bash cleanup_dupe_profiles  >> /var/log/gitcoin/cleanup_dupe_profiles.log  2>&1
 15 2 * * * cd gitcoin/coin; bash scripts/run_management_command.bash cleanup_stray_activities  >> /var/log/gitcoin/cleanup_stray_activities.log  2>&1
 15 4 * * * cd gitcoin/coin; bash scripts/run_management_command.bash cleanup_db_space  >> /var/log/gitcoin/cleanup_db_space.log  2>&1