diff --git a/app/assets/v2/js/pages/hackathon-onboard.js b/app/assets/v2/js/pages/hackathon-onboard.js index 04deb8c8e68..401894cdf09 100644 --- 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.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js'); + loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js', 'quill-js'); }); diff --git a/app/assets/v2/js/pages/tribe-edit.js b/app/assets/v2/js/pages/tribe-edit.js index 23ac9e29266..8dd8bd74f92 100644 --- a/app/assets/v2/js/pages/tribe-edit.js +++ b/app/assets/v2/js/pages/tribe-edit.js @@ -31,12 +31,12 @@ $('#edit-btn').on('click', function() { if (!document.getElementById('quill-js')) { const style = document.createElement('link'); - style.href = '//cdn.quilljs.com/1.3.6/quill.snow.css'; + style.href = '//cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css'; style.type = 'text/css'; style.rel = 'stylesheet'; document.getElementsByTagName('head')[0].appendChild(style); } - loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js'); + loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js', 'quill-js'); }); @@ -151,12 +151,12 @@ if ($('#edit-tribe_priority').length) { const style = document.createElement('link'); - style.href = '//cdn.quilljs.com/1.3.6/quill.snow.css'; + style.href = '//cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css'; style.type = 'text/css'; style.rel = 'stylesheet'; document.getElementsByTagName('head')[0].appendChild(style); - loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.js', 'quill-js'); + loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js', 'quill-js'); } tokens(document.web3network).forEach(function(ele) { diff --git a/app/dashboard/models.py b/app/dashboard/models.py index 7eef2a77257..e4e2c62e921 100644 --- a/app/dashboard/models.py +++ b/app/dashboard/models.py @@ -521,6 +521,8 @@ def get_canonical_url(self): return settings.BASE_URL.rstrip('/') + reverse('issue_details_new2', kwargs={'ghuser': _org_name, 'ghrepo': _repo_name, 'ghissue': _issue_num}) def get_natural_value(self): + if not self.value_in_token: + return 0 token = addr_to_token(self.token_address) if not token: return 0 @@ -1978,6 +1980,15 @@ def psave_bounty(sender, instance, **kwargs): instance.value_in_eth = instance.get_value_in_eth instance.value_true = instance.get_value_true + # https://gitcoincore.slack.com/archives/CAXQ7PT60/p1600019142065700 + if not instance.value_true: + instance.value_true = 0 + if not instance.value_in_token: + instance.value_in_token = 0 + if not instance.balance: + instance.balance = 0 + + if not instance.bounty_owner_profile: if instance.bounty_owner_github_username: profiles = Profile.objects.filter(handle=instance.bounty_owner_github_username.lower().replace('@','')) diff --git a/app/dashboard/templates/dashboard/hackathon/hackathons.html b/app/dashboard/templates/dashboard/hackathon/hackathons.html index 43cb734283d..d44c89e7785 100644 --- a/app/dashboard/templates/dashboard/hackathon/hackathons.html +++ b/app/dashboard/templates/dashboard/hackathon/hackathons.html @@ -131,6 +131,7 @@

Build with the coolest Web3 projects

+ {% if event.logo %} {% else %} @@ -138,11 +139,12 @@

Build with the coolest Web3 projects

{{ event.name }}
{% endif %} +
- + {{ event.name }}
diff --git a/app/dashboard/templates/profiles/tribes-vue.html b/app/dashboard/templates/profiles/tribes-vue.html index 1c2ca0c80f3..38a04e1c304 100644 --- a/app/dashboard/templates/profiles/tribes-vue.html +++ b/app/dashboard/templates/profiles/tribes-vue.html @@ -27,9 +27,9 @@ {% include 'shared/cards.html' %} {% endif %} - - - + + + @@ -1541,7 +1541,7 @@

{% trans "Top id - + {{currentProfile|json_script:"current-profile"}} diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html index 50df4f0b84b..922df61428f 100644 --- a/app/grants/templates/grants/cart-vue.html +++ b/app/grants/templates/grants/cart-vue.html @@ -27,9 +27,9 @@ - - - + + + diff --git a/app/grants/templates/grants/detail/index.html b/app/grants/templates/grants/detail/index.html index 825c13f9b77..2980e300b87 100644 --- a/app/grants/templates/grants/detail/index.html +++ b/app/grants/templates/grants/detail/index.html @@ -29,9 +29,9 @@ - - - + + + {% include 'shared/tag_manager_2.html' %} diff --git a/app/grants/templates/grants/new-whitelabel.html b/app/grants/templates/grants/new-whitelabel.html index e7d9decc44f..f059ee5bf0e 100644 --- a/app/grants/templates/grants/new-whitelabel.html +++ b/app/grants/templates/grants/new-whitelabel.html @@ -22,9 +22,9 @@ {% include 'shared/cards.html' %} - - - + + + {% include 'shared/tag_manager_2.html' %} diff --git a/app/grants/templates/grants/new.html b/app/grants/templates/grants/new.html index 1b3b74285ea..c45f5883a71 100644 --- a/app/grants/templates/grants/new.html +++ b/app/grants/templates/grants/new.html @@ -22,9 +22,9 @@ {% include 'shared/cards.html' %} - - - + + + {% include 'shared/tag_manager_2.html' %} @@ -108,7 +108,7 @@

Project Information
- +
diff --git a/app/grants/templates/grants/newmatch.html b/app/grants/templates/grants/newmatch.html index 0f9d3e29d28..f523a7aa696 100644 --- a/app/grants/templates/grants/newmatch.html +++ b/app/grants/templates/grants/newmatch.html @@ -22,9 +22,9 @@ {% include 'shared/cards_pic.html' %} - - - + + + {% include 'shared/tag_manager_2.html' %} @@ -112,7 +112,7 @@
Logos
-