Merge branch 'stable' of github.com:gitcoinco/web into stable

gitcoinco · Sep 9, 2020 · 32a40c3 · 32a40c3
2 parents 8addd27 + fc1df2c
commit 32a40c3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/app/assets/v2/js/pages/hackathon-onboard.js b/app/assets/v2/js/pages/hackathon-onboard.js
@@ -28,7 +28,7 @@ $('#edit-btn').on('click', function() {
     return quill;
   };
 
-  loadDynamicScript(activateQuill, 'https://cdn.quilljs.com/1.3.6/quill.js', 'quill-js');
+  loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js');
 
 });
 

diff --git a/app/assets/v2/js/pages/tribe-edit.js b/app/assets/v2/js/pages/tribe-edit.js
@@ -36,7 +36,7 @@ $('#edit-btn').on('click', function() {
     style.rel = 'stylesheet';
     document.getElementsByTagName('head')[0].appendChild(style);
   }
-  loadDynamicScript(activateQuill, 'https://cdn.quilljs.com/1.3.6/quill.js', 'quill-js');
+  loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js');
 
 });
 
@@ -156,7 +156,7 @@ if ($('#edit-tribe_priority').length) {
   style.rel = 'stylesheet';
   document.getElementsByTagName('head')[0].appendChild(style);
 
-  loadDynamicScript(activateQuill, 'https://cdn.quilljs.com/1.3.6/quill.js', 'quill-js');
+  loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js');
 }
 
 tokens(document.web3network).forEach(function(ele) {

diff --git a/app/dashboard/templates/profiles/tribes-vue.html b/app/dashboard/templates/profiles/tribes-vue.html
@@ -1541,7 +1541,7 @@ <h4 class="px-2 pt-3 font-body font-weight-semibold text-muted">{% trans "Top id
         <slot></slot>
       </select>
     </script>
-    <script defer src='https://cdn.quilljs.com/1.3.6/quill.js'></script>
+    <script defer src='https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js'></script>
     <script defer src='https://cdn.jsdelivr.net/npm/vue-quill-editor@3.0.6/dist/vue-quill-editor.js'></script>
     <script defer src='https://cdn.jsdelivr.net/npm/lodash@4.17.19/lodash.min.js'></script>
     {{currentProfile|json_script:"current-profile"}}

diff --git a/app/retail/emails.py b/app/retail/emails.py
@@ -1202,10 +1202,10 @@ def render_new_bounty_roundup(to_email):
     from marketing.models import RoundupEmail
     args = RoundupEmail.objects.order_by('created_on').last()
     hide_dynamic = args.hide_dynamic
+    new_kudos_size_px = '300'
 
     subject = args.subject
-    new_kudos_pks = args.kudos_ids.split(',')
-    new_kudos_size_px = 150
+    new_kudos_ids = args.kudos_ids[0:-1].split(',')
     if settings.DEBUG and False:
         # for debugging email styles
         email_style = 2
@@ -1239,12 +1239,18 @@ def render_new_bounty_roundup(to_email):
     }
 
 
-    from kudos.models import KudosTransfer
+    from kudos.models import KudosTransfer, Token
     if highlight_kudos_ids:
         kudos_highlights = KudosTransfer.objects.filter(id__in=highlight_kudos_ids)
     else:
         kudos_highlights = KudosTransfer.objects.exclude(network='mainnet', txid='').order_by('-created_on')[:num_kudos_to_show]
 
+    if new_kudos_ids:
+        new_kudos = Token.objects.filter(id__in=new_kudos_ids)
+    else:
+        new_kudos = None
+    print(new_kudos, new_kudos_ids)
+
     for key, __ in leaderboard.items():
         leaderboard[key]['items'] = LeaderboardRank.objects.active() \
             .filter(leaderboard=key, product='all').order_by('rank')[0:num_leadboard_items]
@@ -1280,7 +1286,7 @@ def render_new_bounty_roundup(to_email):
         'email_style': email_style,
         'hide_dynamic': hide_dynamic,
         'hide_bottom_logo': True,
-        'new_kudos_pks': new_kudos_pks,
+        'new_kudos': new_kudos,
         'new_kudos_size_px': new_kudos_size_px,
         'videos': args.videos,
         'news': args.news,

diff --git a/app/retail/templates/emails/bounty_roundup.html b/app/retail/templates/emails/bounty_roundup.html
@@ -234,9 +234,10 @@ <h2 style="font-weight:500; text-transform:capitalize; font-size:1.6rem; text-al
 
   <div style="text-align: center">
     <p>Congrats, you made it to the end of this issue! Grab your Kudos below.</p>
-    {% for pk in new_kudos_pks %}
-      <a href='https://gitcoin.co/kudos/{pk}/'>
-        <img src="https://p21.p4.n0.cdn.getcloudapp.com/items/o0u8XzlJ/image8.png?v=9411bc4cc4df4253753f1c4776b51b0e" width="300px" alt="Issue #1 Kudos" style="border-style:none; vertical-align:middle" valign="middle">
+    <!-- {{new_kudos}} -->
+    {% for kudos in new_kudos %}
+      <a href='https://gitcoin.co/kudos/{{kudos.pk}}/'>
+        <img style="max-width: 100%; border-style:none; vertical-align:middle" valign="middle" src="{{ kudos.img_url }}" width="300px" alt="{{kudos.name}}">
       </a>
     {% endfor %}
     </p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ $('#edit-btn').on('click', function() { @@
         return quill;
       };
-      loadDynamicScript(activateQuill, 'https://cdn.quilljs.com/1.3.6/quill.js', 'quill-js');
+      loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js');
     });
@@ Expand Down @@