Skip to content

Commit dd38451

Browse files
thelostone-mcdanlipert
thelostone-mc
authored and
danlipert
committed
bug: profile fix (#5750)
* bug: profile fix * minor fixes
1 parent f123965 commit dd38451

9 files changed

Lines changed: 160 additions & 119 deletions

File tree

‎app/assets/v2/css/profile.css‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
background: #E8F0FA;
1919
padding: 4px;
2020
border-radius: 2px;
21-
font-size: 12px;
21+
font-size: 11px;
2222
color: #6487AE;
2323
display: inline-block;
2424
margin-bottom: 2px;
@@ -73,6 +73,10 @@
7373
font-size: 1.7rem;
7474
}
7575

76+
.profile-header__handle .quick-link {
77+
top: -3px;
78+
}
79+
7680
.profile-header__handle small {
7781
text-transform: none;
7882
}
@@ -215,8 +219,11 @@
215219
display: none;
216220
}
217221

218-
}
222+
.transaction-history.bounty_row .avatar {
223+
max-width: 100% !important;
224+
}
219225

226+
}
220227

221228
.profile-header__stats {
222229
border: none;
@@ -239,6 +246,19 @@
239246
padding: 0.7rem;
240247
}
241248

249+
250+
.bounty_row {
251+
border-bottom: 1px solid #EFEFEF;
252+
}
253+
254+
.bounty_row:hover {
255+
background: none;
256+
}
257+
258+
#earn_dataviz {
259+
max-width: 100%;
260+
}
261+
242262
@media (min-width: 992px) and (max-width: 1199.98px) {
243263

244264
.profile-header__stats .card-header {

‎app/dashboard/templates/profiles/header_details.html‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,37 @@
22

33
<h1 class="profile-header__handle">
44
{{ profile.name }}
5+
56
{% if is_staff and not profile.is_org %}
6-
<button class="btn btn-outline-gc-blue btn-sm flex-grow-1" data-openchat="{{profile}}"> <i class="fas fa-comment-dots" data-placement="bottom" data-toggle="tooltip" data-html="true" title="Chat @{{ profile.handle }}"></i></button>
7+
<button class="btn btn-outline-gc-blue btn-sm flex-grow-1 font-smaller-5 position-relative quick-link" data-openchat="{{profile}}">
8+
<i class="fas fa-comment-dots" data-placement="bottom" data-toggle="tooltip" data-html="true"
9+
title="Chat @{{ profile.handle }}">
10+
</i>
11+
</button>
712
{% endif %}
8-
<a class="btn btn-outline-gc-blue btn-sm flex-grow-1" href="{% url 'tip' %}?username={{ profile.handle }}" data-placement="bottom" data-toggle="tooltip" data-html="true" title="Tip @{{ profile.handle }}">
13+
14+
<a class="btn btn-outline-gc-blue btn-sm flex-grow-1 font-smaller-5 position-relative quick-link"
15+
href="{% url 'tip' %}?username={{ profile.handle }}" data-placement="bottom" data-toggle="tooltip" data-html="true" title="Tip @{{ profile.handle }}"
16+
>
917
<i class="fab fa-ethereum"></i>
1018
</a>
11-
<a class="btn btn-outline-gc-blue btn-sm flex-grow-1" href="/users?invite={{ profile.handle }}" data-placement="bottom" data-toggle="tooltip" data-html="true" title="Invite @{{ profile.handle }} to Bounty">
12-
<i class="fas fa-share-square"></i>
19+
20+
<a class="btn btn-outline-gc-blue btn-sm flex-grow-1 font-smaller-5 position-relative quick-link" href="/users?invite={{ profile.handle }}"
21+
data-placement="bottom" data-toggle="tooltip" data-html="true" title="Invite @{{ profile.handle }} to Bounty"
22+
>
23+
<i class="fas fa-user-plus"></i>
1324
</a>
25+
1426
{% if verification %}
1527
<button class="btn btn-sm animate-verify" data-container="body" data-toggle="popover" data-html="true" data-placement="bottom" data-trigger="hover click" data-content='
16-
<p class="h6 my-2 text-left">Gitcoin Verified <img width="18" src="{% static "v2/images/badge-verify.svg" %}"></p>
17-
<p>This contributor has completed the Gitcoin verification process, which means that the Gitcoin Core trusts their work.</p>
18-
<p>Please note - use your judgement on whether this is the right contributor for your task.</p>
19-
'><img src="{% static 'v2/images/badge-verify.svg' %}" alt=""></button>
28+
<p class="h6 my-2 text-left">Gitcoin Verified <img width="18" src="{% static "v2/images/badge-verify.svg" %}"></p>
29+
<p>This contributor has completed the Gitcoin verification process, which means that the Gitcoin Core trusts their work.</p>
30+
<p>Please note - use your judgement on whether this is the right contributor for your task.</p>'
31+
>
32+
<img src="{% static 'v2/images/badge-verify.svg' %}" alt="">
33+
</button>
2034
{% endif %}
35+
2136
</h1>
2237
<p class="mb-0">
2338
{{ profile.handle }}
@@ -49,16 +64,14 @@ <h1 class="profile-header__handle">
4964
<i class="fab fa-discord"></i>
5065
</a>
5166
{% endif %}
52-
{% if is_staff %}
53-
<button class="chat btn btn-outline-gc-black" data-openchat="{{profile.handle}}"><i class="fas fa-comment-dots" data-placement="bottom" data-toggle="tooltip" data-html="true" title="@{{ profile.handle }} on Gitcoin Chat"></i></button>
54-
{% endif %}
5567
</p>
5668

5769
{% if profile.data.bio %}
5870
<div class="profile-header__bio my-2">
5971
<small class="review-comment">{{ profile.data.bio }}</small>
6072
</div>
6173
{% endif %}
74+
6275
{% if user.is_authenticated and is_on_tribe and profile.is_org %}
6376
<button class="btn btn-gc-blue btn-sm" data-jointribe="{{profile.handle}}">Leave Tribe</button>
6477
{% elif user.is_authenticated and profile.is_org %}

‎app/dashboard/templates/profiles/profile.html‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@
4646
</div>
4747
{% endif %}
4848
</div>
49+
4950
<div class="container-fluid bg-light">
50-
<div class="container profile-card mt-md-n5 mh-150">
51+
<div class="container profile-card mh-150">
5152
<div class="row">
5253
{% if total_kudos_count %}
5354
<div id="kudos_header" class="d-md-block d-none">
@@ -57,33 +58,27 @@
5758
</div>
5859
{% endif %}
5960

60-
<div class="col-12 col-lg-6 profile-header__main-infos">
61-
{% if not hidden %}
61+
{% if not hidden %}
62+
<div class="col-12 col-lg-6 profile-header__main-infos">
6263
{% include 'profiles/header_avatar.html' %}
6364
{% include 'profiles/header_details.html' %}
65+
</div>
66+
{% if profile.is_org %}
67+
{% include 'profiles/organization.html' %}
6468

65-
{% if not hidden %}
66-
{% if profile.is_org %}
67-
{% include 'profiles/organization.html' %}
68-
{% else %}
69-
{% if profile.cascaded_persona == 'funder' %}
70-
{% include 'profiles/scorecard_funder.html' %}
71-
{% elif profile.cascaded_persona == 'hunter' %}
72-
{% include 'profiles/scorecard_hunter.html' %}
73-
{% else %}
74-
{% include 'profiles/scorecard_hunter.html' %}
75-
{% endif %}
76-
</div>
77-
</div>
69+
{% elif profile.cascaded_persona == 'funder' %}
70+
{% include 'profiles/scorecard_funder.html' %}
71+
72+
{% else %}
73+
{% include 'profiles/scorecard_hunter.html' %}
74+
{% endif %}
7875
{% endif %}
79-
{% endif %}
76+
</div>
8077
</div>
8178
</div>
82-
{% endif%}
8379

84-
{% include 'profiles/tabs.html' %}
80+
{% include 'profiles/tabs.html' %}
8581

86-
</div>
8782
<div class="container">
8883
{% if hidden %}
8984
{% include 'profiles/hidden.html' %}

‎app/dashboard/templates/profiles/status_box.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% load static %}
2-
<div class="container-fluid mt-1" id="status">
2+
<div class="container-fluid mt-4" id="status">
33
{% csrf_token %}
44
<textarea
55
id="textarea"

‎app/dashboard/templates/profiles/tab_active.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div class="tab-projects d-flex flex-column">
44
{% for bounty in active_bounties %}
5-
<div class="tab-projects__item d-flex mb-0 {% cycle 'odd' 'even' %} pt-1 pb-1 bounty_row">
5+
<div class="tab-projects__item d-flex mb-0 pt-1 pb-1 bounty_row">
66
<div class="avatar-container col-1 justify-content-center hide_min_viewport">
77
<img class="profile-header__avatar mr-3" src="{% avatar_url bounty.org_name %}" alt="">
88
</div>
@@ -13,12 +13,14 @@
1313
<div class="info font-caption">Bounty opened {{bounty.web3_created|naturaltime}} for {{bounty.org_name}}</div>
1414
<div class="tag-list">
1515
{% for keyword in bounty.keywords_list %}
16-
<small class="tag-list__item">{{keyword}}</small>
16+
<small class="tag-list__item px-2">{{keyword}}</small>
1717
{% endfor %}
1818
</div>
1919
</div>
2020
<div class="col-12 col-md-4 col-lg-3 font-caption my-auto text-right">
21-
<a class="btn btn-gc-blue btn-sm " href="{{bounty.url}}">View Bounty &gt;</a>
21+
<a class="btn btn-gc-blue btn-sm font-caption font-weight-semibold" href="{{bounty.url}}">
22+
View Bounty <i class="fas fa-chevron-right ml-1 font-smaller-5"></i>
23+
</a>
2224
</div>
2325
</div>
2426
{% endfor %}

‎app/dashboard/templates/profiles/tab_grant_contribs.html‎

Lines changed: 71 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -21,79 +21,86 @@ <h2 class="font-title my-3 pb-3 title">
2121
{% trans "Grant Contribution History" %}
2222
{% if total_grant_contributions %} ({{total_grant_contributions}}) {% endif %}
2323
</h2>
24-
<h3 class="font-body mt-1 mb-1">Monthly Summary</h3>
24+
<h3 class="font-body mt-1 mb-2 font-weight-semibold">Monthly Summary</h3>
25+
2526
{% include "profiles/earningsgraph.html" with graph_type="grants" %}
2627

27-
<h3 class="font-body mt-1 mb-1">Grants Created ({{profile.grant_admin.count}})</h3>
28+
<h2 class="font-body m-3 pb-3 title">Grants Created ({{profile.grant_admin.count}})</h3>
29+
2830
{% if not profile.grant_admin.count %}
29-
<p class="p-3">
30-
No Grants Created. <a href=grants/new>Create a Grant &gt;</a>
31-
</p>
31+
<h2 class="font-title m-3 pb-3 title">
32+
No Grants Created. <a href=grants/new>Create a Grant &gt;</a>
33+
</h2>
3234
{% endif %}
35+
3336
{% for transaction in profile.grant_admin.all %}
34-
<div class="py-3 mx-sm-0 row transaction-history">
35-
<div class="col-3 col-md-2 font-subheader text-center my-auto">
36-
{{ transaction.created_on|date:"Y-m-d" }}
37-
</div>
38-
<div class="col-2 col-md-2 justify-content-center special_tag">
39-
<img class="avatar" style="max-width: 70px;" src="{% if transaction.logo and transaction.logo.url %}{{ transaction.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=transaction.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
40-
</div>
41-
<div class="col-7 col-md-5 my-auto">
42-
<div class="title font-body">
43-
<a href="{{ transaction.url }}">{{ transaction.title }}</a>
44-
</div>
45-
<div class="info font-caption">
46-
</div>
47-
</div>
37+
<div class="py-3 mx-sm-0 px-lg-0 row transaction-history bounty_row">
38+
<div class="col-5 col-sm-4 col-md-2 font-body my-auto">
39+
{{ transaction.created_on|date:"Y-m-d" }}
40+
</div>
41+
<div class="col-2 col-md-2 px-0 justify-content-center special_tag">
42+
<img class="avatar" style="max-width: 70px;" src="{% if transaction.logo and transaction.logo.url %}{{ transaction.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=transaction.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
43+
</div>
44+
<div class="col-5 col-md-4 my-auto">
45+
<div class="title font-body">
46+
<a href="{{ transaction.url }}">{{ transaction.title }}</a>
47+
</div>
48+
</div>
49+
<div class="col-12 col-sm-6 col-md-2 my-auto">
50+
<div class="info font-caption mt-4 mt-md-0 text-center text-sm-left">
51+
<span class="font-weight-semibold">Goal: </span> {{ transaction.amount_goal}}<br>
52+
<span class="font-weight-semibold">Received:</span> {{ transaction.amount_received }}<br>
4853
</div>
54+
</div>
55+
<div class="col-12 col-sm-6 col-md-2 my-auto">
56+
<div class="info font-caption mt-sm-4 mt-md-0 text-center text-sm-left">
57+
<span class="font-weight-semibold">Contributons Count:</span> {{ transaction.contribution_count }} <br>
58+
<span class="font-weight-semibold">Contributors Count:</span> {{ transaction.contributor_count }}
59+
</div>
60+
</div>
61+
</div>
4962
{% endfor %}
50-
<h3 class="font-body mt-1 mb-1">Grant Contribution History ({{history|length}})</h3>
51-
{% for transaction in history %}
52-
<div class="py-3 mx-sm-0 row transaction-history">
53-
<div class="col-3 col-md-2 font-subheader text-center my-auto">
54-
{{ transaction.created_on }}
55-
</div>
56-
<div class="col-2 col-md-1 justify-content-center special_tag">
57-
<img class="avatar" style="max-width: 70px;" src="{% if transaction.logo %}{{ transaction.logo }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=transaction.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
58-
</div>
59-
<div class="col-7 col-md-4 my-auto">
60-
<div class="title font-body">
61-
<a href="{{ transaction.url }}">{{ transaction.title }}</a>
62-
</div>
63-
<div class="info font-caption">
6463

65-
{{ transaction.amount_per_period|floatformat:4|intcomma }} {{ transaction.token_symbol }}
66-
{% if transaction.num_tx_approved > 1 %}
67-
/ {{ transaction.frequency }} {{ transaction.frequency_unit }},
68-
{% endif %}
69-
{{transaction.num_tx_approved|floatformat}} time{{ transaction.num_tx_approved|pluralize }}
64+
<h2 class="font-body mx-3 pb-2 mt-5 title">Grant Contribution History ({{history|length}})</h2>
7065

71-
</div>
72-
</div>
73-
<div class="col-5 col-md-2 font-body my-auto txn-link">
74-
<a id="tx_link" href="https://etherscan.io/tx/{{transaction.cont.tx_id}}" target="_blank" rel="noopener noreferrer">
75-
{% if transaction.tx_id %}
76-
View Etherscan
77-
{% endif %}
78-
</a>
79-
<input type="hidden" id="tx_id" name="tx_id" value="{{ transaction.cont.tx_id }}"/>
80-
</div>
81-
<div class="offset-lg-1 col-7 col-md-2 my-auto tags font-caption">
82-
<div class="tag tag-lg token">
83-
<p>
84-
{{ transaction.amount_per_period|floatformat:4|intcomma }}
85-
<span>{{ transaction.token_symbol }}</span>
86-
</p>
87-
</div>
88-
{% if transaction.amount_per_period_usdt %}
89-
<div class="tag tag-lg usd">
90-
<p>
91-
{{ transaction.amount_per_period_usdt|floatformat:2 }}
92-
<span>USD</span>
93-
</p>
94-
</div>
95-
{% endif %}
96-
</div>
66+
{% for transaction in history %}
67+
<div class="py-3 mx-sm-0 px-lg-0 row transaction-history bounty_row">
68+
<div class="col-5 col-sm-4 col-md-2 font-body my-auto">
69+
{{ transaction.created_on }}
70+
</div>
71+
<div class="col-2 col-md-2 px-0 justify-content-center special_tag">
72+
<img class="avatar" style="max-width: 70px;" src="{% if transaction.logo %}{{ transaction.logo }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=transaction.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
73+
</div>
74+
<div class="col-5 col-md-4 my-auto">
75+
<div class="title font-body">
76+
<a href="{{ transaction.url }}">{{ transaction.title }}</a>
77+
</div>
78+
</div>
79+
<div class="col-5 col-md-2 font-caption my-auto txn-link pt-3 pt-md-0">
80+
{% if transaction.tx_id %}
81+
<a id="tx_link" href="https://etherscan.io/tx/{{transaction.cont.tx_id}}" target="_blank" rel="noopener noreferrer">
82+
View Etherscan
83+
</a>
84+
{% endif %}
85+
86+
<input type="hidden" id="tx_id" name="tx_id" value="{{ transaction.cont.tx_id }}"/>
87+
</div>
88+
<div class="col-7 col-md-2 my-auto tags font-caption pt-3 pt-md-0">
89+
<div class="tag tag-lg token">
90+
<p>
91+
{{ transaction.amount_per_period|floatformat:4|intcomma }}
92+
<span>{{ transaction.token_symbol }}</span>
93+
</p>
9794
</div>
95+
{% if transaction.amount_per_period_usdt %}
96+
<div class="tag tag-lg usd">
97+
<p>
98+
{{ transaction.amount_per_period_usdt|floatformat:2 }}
99+
<span>USD</span>
100+
</p>
101+
</div>
102+
{% endif %}
103+
</div>
104+
</div>
98105
{% endfor %}
99106
</div>

‎app/dashboard/templates/profiles/tab_portfolio.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="py-3 font-weight-bold">Specified Skillset</div>
33
<div class="tag-list">
44
{% for keyword in profile.keywords %}
5-
<small class="tag-list__item">{{keyword}}</small>
5+
<small class="tag-list__item px-2">{{keyword}}</small>
66
{% endfor %}
77
</div>
88

@@ -19,10 +19,10 @@
1919

2020

2121
{% if is_my_profile %}
22-
<div class="p-3 mt-3" style="background-color: #f5f5f5;">
23-
<div class="py-1 font-weight-bold">Add a project</div>
24-
<div style="font-size: 12px;">
25-
<i class="fas fa-eye"></i> <span>Only visible to you</span>
22+
<div class="py-3 mt-3">
23+
<div class="py-1">
24+
<span class="font-weight-bold">Add a project</span>
25+
<span class="font-caption">( Only visible to you <i class="fas fa-eye font-smaller-5"></i> )</span>
2626
</div>
2727
<div class="tab-projects-submit d-flex flex-column">
2828
<div class="tab-projects__item d-flex mb-0">
@@ -42,9 +42,8 @@
4242
<label class="form__label" for="tags">Tags (comma seperated)</label>
4343
<input name="tags" id="tags" class="form__input" type="text" placeholder="python, javascript" value="">
4444
</div>
45-
<div class="col-12 col-md-3 ">
46-
<div class="mt-6">&nbsp;</div>
47-
<input class="btn btn-gc-blue btn-sm mt-3" type="submit" name="submit" id="submit" value="Add Project">
45+
<div class="col-12 col-md-3 pt-3">
46+
<input class="mt-4 btn btn-gc-blue btn-sm font-caption font-weight-semibold" type="submit" name="submit" id="submit" value="Add Project">
4847
</div>
4948
</div>
5049
</div>

0 commit comments

Comments
 (0)