Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history 
Signed-off-by: Aditya Anand M C <[email protected]>
  • Loading branch information
@thelostone-mc
thelostone-mc committed Sep 14, 2020
2 parents 0b5db3b + 5d7680d commit 2202790
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 27 deletions.
2 changes: 1 addition & 1 deletion app/assets/v2/js/pages/hackathon-onboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $('#edit-btn').on('click', function() {
return quill;
};

loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.js', 'quill-js');
loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.min.js', 'quill-js');

});

Expand Down
8 changes: 4 additions & 4 deletions app/assets/v2/js/pages/tribe-edit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]/dist/quill.js', 'quill-js');
loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.min.js', 'quill-js');

});

Expand Down Expand Up @@ -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/[email protected]/dist/quill.js', 'quill-js');
loadDynamicScript(activateQuill, 'https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.min.js', 'quill-js');
}

tokens(document.web3network).forEach(function(ele) {
Expand Down
11 changes: 11 additions & 0 deletions app/dashboard/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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('@',''))
Expand Down
4 changes: 3 additions & 1 deletion app/dashboard/templates/dashboard/hackathon/hackathons.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,20 @@ <h2 class="mt-4">Build with the coolest Web3 projects </h2>
<div class="card flex-row flex-wrap mb-5" id="{{ event.slug }}">

<div class="card-header text-center col-12 col-sm-4 px-0">
<a href="{% url 'hackathon' event.slug %}">
{% if event.logo %}
<img class="hackathon-card-logo" src="{{ MEDIA_URL }}{{ event.logo }}" alt="Hackathon logo" />
{% else %}
<div class="hackathon-card-logo text-center px-3 font-caption">
{{ event.name }}
</div>
{% endif %}
</a>
</div>

<div class="card-body col-12 col-sm-8">
<h5 class="font-subheader font-weight-semibold">
<a href="{% url 'hackathon' event.slug %}" class="text-black" target="_blank" rel="noopener noreferrer">
<a href="{% url 'hackathon' event.slug %}" class="text-black" rel="noopener noreferrer">
{{ event.name }}
</a>
</h5>
Expand Down
8 changes: 4 additions & 4 deletions app/dashboard/templates/profiles/tribes-vue.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
{% include 'shared/cards.html' %}
{% endif %}
<!-- Include stylesheet -->
<link href="https://cdn.quilljs.com/1.3.4/quill.core.css" rel="stylesheet">
<link href="https://cdn.quilljs.com/1.3.4/quill.snow.css" rel="stylesheet">
<link href="https://cdn.quilljs.com/1.3.4/quill.bubble.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/1.3.6/quill.core.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/1.3.6/quill.snow.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/1.3.6/quill.bubble.css" rel="stylesheet">
<link rel="stylesheet" href='{% static "v2/css/dashboard-hackathon.css" %}'/>
<link rel="stylesheet" href='{% static "v2/css/profile.css" %}' />
<link rel="stylesheet" href='{% static "v2/css/sidebar_search.css" %}' />
Expand Down Expand Up @@ -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.jsdelivr.net/npm/[email protected]/dist/quill.js'></script>
<script defer src='https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.min.js'></script>
<script defer src='https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-quill-editor.js'></script>
<script defer src='https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js'></script>
{{currentProfile|json_script:"current-profile"}}
Expand Down
6 changes: 3 additions & 3 deletions app/grants/templates/grants/cart-vue.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<link rel="stylesheet" href={% static "v2/css/tag.css" %}>
<link rel="stylesheet" href="{% static "v2/css/grants/profile.css" %}">
<link rel="stylesheet" href="{% static "v2/css/town_square.css" %}">
<script src="//cdn.quilljs.com/1.3.6/quill.min.js"></script>
<link href="//cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="//cdn.quilljs.com/1.3.6/quill.bubble.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js"></script>
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.bubble.css" rel="stylesheet">
<link rel="stylesheet" href="{% static "v2/css/grants/cart.css" %}">
</head>

Expand Down
6 changes: 3 additions & 3 deletions app/grants/templates/grants/detail/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<link rel="stylesheet" href="{% static "v2/css/grants/profile.css" %}">
<link rel="stylesheet" href="{% static "v2/css/town_square.css" %}">
<link rel="stylesheet" href="{% static "v2/css/grants/cart.css" %}">
<script src="//cdn.quilljs.com/1.3.6/quill.min.js"></script>
<link href="//cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="//cdn.quilljs.com/1.3.6/quill.bubble.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js"></script>
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.bubble.css" rel="stylesheet">
</head>
<body class="interior {{ active }} grant grant-detail g-font-muli">
{% include 'shared/tag_manager_2.html' %}
Expand Down
6 changes: 3 additions & 3 deletions app/grants/templates/grants/new-whitelabel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
{% include 'shared/cards.html' %}
<link rel="stylesheet" href="{% static "v2/css/grants/new.css" %}">
<link rel="stylesheet" href="{% static "v2/css/bounty.css" %}">
<script src="//cdn.quilljs.com/1.3.6/quill.min.js"></script>
<link href="//cdn.quilljs.com/1.3.6/quill.bubble.css" rel="stylesheet">
<link href="//cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js"></script>
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.bubble.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css" rel="stylesheet">
</head>
<body class="interior {{ active }} grant g-font-muli">
{% include 'shared/tag_manager_2.html' %}
Expand Down
8 changes: 4 additions & 4 deletions app/grants/templates/grants/new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
{% include 'shared/cards.html' %}
<link rel="stylesheet" href="{% static "v2/css/grants/new.css" %}">
<link rel="stylesheet" href="{% static "v2/css/bounty.css" %}">
<script src="//cdn.quilljs.com/1.3.6/quill.min.js"></script>
<link href="//cdn.quilljs.com/1.3.6/quill.bubble.css" rel="stylesheet">
<link href="//cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js"></script>
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.bubble.css" rel="stylesheet">
</head>
<body class="interior {{ active }} grant g-font-muli">
{% include 'shared/tag_manager_2.html' %}
Expand Down Expand Up @@ -108,7 +108,7 @@ <h5 class="mt-4">Project Information</h5>
<label class="font-body" for="input-handle2">{% trans "Your Twitter Handle" %}</label>
<input type="text" class="form__input form__input-lg " id="input-handle2" name="handle2" placeholder="@georgecostanza"/>
</div>

<div class="form__group-horizontal pb-3">
<label class="font-body" for="github_project_url">{% trans "Github Project URL" %}</label>
<input type="url" class="form__input form__input-lg " id="github_project_url" name="github_project_url" placeholder="https://github.com/human-fund"/>
Expand Down
8 changes: 4 additions & 4 deletions app/grants/templates/grants/newmatch.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
{% include 'shared/cards_pic.html' %}
<link rel="stylesheet" href="{% static "v2/css/grants/new.css" %}">
<link rel="stylesheet" href="{% static "v2/css/bounty.css" %}">
<script src="//cdn.quilljs.com/1.3.6/quill.min.js"></script>
<link href="//cdn.quilljs.com/1.3.6/quill.bubble.css" rel="stylesheet">
<link href="//cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js"></script>
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.snow.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.bubble.css" rel="stylesheet">
</head>
<body class="interior {{ active }} grant g-font-muli">
{% include 'shared/tag_manager_2.html' %}
Expand Down Expand Up @@ -112,7 +112,7 @@ <h5 class="mt-4">Logos</h5>
</div>
</div>
<div class="form__group-horizontal pt-3 pb-3">
<label class="font-body" for="input-amount">{% trans "What is your budget?" %}
<label class="font-body" for="input-amount">{% trans "What is your budget?" %}
<span class="badge badge-greylight text-capitalize">Required</span></label>
<input type="text" class="form__input form__input-lg " id="input-amount" value="{{data.amount}}" name="amount" required placeholder="100 ETH"/>
</div>
Expand Down

0 comments on commit 2202790

Please sign in to comment.