Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: New Box Hackathon Feature on Townsquare #6898

Merged
merged 9 commits into from
Jun 25, 2020
Merged

feat: New Box Hackathon Feature on Townsquare #6898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
57fa75c
add: Feature Hackathon on townsquare #6870
developerfred Jun 16, 2020
f3f0a46
feat: add Feature Hackathon's on Townsquare Experiment #6870
developerfred Jun 16, 2020
6e9bc55
Merge branch 'master' of https://github.com/gitcoinco/web into issue/…
developerfred Jun 17, 2020
cc8a2c1
add: click on name hackathon #6870
developerfred Jun 17, 2020
e159c38
Merge branch 'master' of https://github.com/gitcoinco/web into issue/…
developerfred Jun 22, 2020
ad10737
Merge branch 'master' of https://github.com/gitcoinco/web into issue/…
developerfred Jun 22, 2020
5e3ac58
fixed: design features on hackthon box #6870
developerfred Jun 22, 2020
6e6535d
Merge branch 'master' into issue/6870
developerfred Jun 24, 2020
af8a103
re-indent
thelostone-mc Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/v2/css/town_square.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,7 @@ body.green.offer_view .announce {
.townsquare_block-header.closed::after {
content: "^"
}

#status .btn-group-toggle .btn-radio {
background-color: var(--badge-blue-bg);
color: var(--badge-blue-text);
Expand Down
3 changes: 2 additions & 1 deletion app/retail/templates/emails/assets/css/activity_stream.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
cursor: pointer;
font-size: 12px;
padding: 3px;
background-color: #ecf0f4;
background-color: #fff;
border: 0px solid;
color: #3d23fc;
}

.dark-mode #reflink {
Expand Down
66 changes: 66 additions & 0 deletions app/townsquare/templates/townsquare/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,63 @@
<link rel="stylesheet" href="{% static "v2/css/activity_stream.css" %}">
<link rel="stylesheet" href="{% static "v2/css/tag.css" %}">
<link rel="stylesheet" href="{% static "v2/css/theme_switcher.css" %}">
<style>
img.hackathon-card-logo{
max-height: 5rem;
max-width: 5rem;
border-radius: .3rem;
background: rgb(25, 0, 63);
}

.hackathon-card-logo a {
color: #000000;
}

.townsquare_block-header.box-collapse {
background: #fff;
padding: 10px;
border-bottom: 1px solid #ddd;
text-transform: none;
border-radius: 5px 5px 0 0;
}

.box-hackathons {
background: #ffff;
border-bottom: 1px solid #ddd;
border-radius: 0 0 5px 5px;
}

.box-hackathons .card {
border: none;
}

.box-hackathons .card-header {
border-bottom: none;
background-color: transparent;
}

.box-hackathons-townsquare .hackathon-actions {
font-weight: 700;
margin: 0;
}

.box-hackathons-townsquare .card-body {
padding: 11px 0;
}

.box-hackathons-townsquare .card-body .font-smaller-2 {
color: #666666;
}

.box-hackathons-townsquare .card-body .font-weight-semibold {
margin: 0;
}

.box-hackathons .view-all {
padding: 0px 0px 0px 20px;
font-weight: 700;
}
</style>
<script src="{% static "v2/js/theme_switcher.js" %}"></script> <!-- needs to be in the head section -->
</head>

Expand Down Expand Up @@ -140,6 +197,15 @@
{% if SHOW_DRESSING %}

{% include 'townsquare/shared/tribe.html' %}


{% if hackathon_tabs|length %}
<div class="townsquare_block-header box-collapse mt-1" data-target="hackathons">
Gitcoin Hackathons
</div>
{% include 'townsquare/shared/hackathons.html' %}
{% endif %}

{% include 'townsquare/shared/reflink.html' %}

<div class="townsquare_block-header text-left my-4 mt-sm-0 mb-sm-2" data-target="actions">
Expand Down
44 changes: 44 additions & 0 deletions app/townsquare/templates/townsquare/shared/hackathons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<div id="hackathons" class="mb-4 box-hackathons">
{% for hackathon in hackathon_tabs|slice:":5" %}
<div class="box-hackathons-townsquare">
<div class="card flex-row" id="{{hackathon.slug}}">
<div class="card-header">
{% firstof hackathon.logo_svg or hackathon.logo as logo %}
{% if logo %}
<img class="hackathon-card-logo" src="{{MEDIA_URL}}{{logo}}" alt="Hackathon logo" />
{% else %}
<div class="hackathon-card-logo text-center px-3 font-caption">
<a href="{% url 'hackathon_onboard' hackathon.slug %}"> {{ hackathon.title }} </a>
</div>
{% endif %}
</div>

<div class="card-body">
<h5 class="font-subheader font-weight-semibold">
<a href="{% url 'hackathon' hackathon.slug %}" class="text-black" target="_blank" rel="noopener noreferrer">
{{ hackathon.title }}
</a>
</h5>
<div class="font-smaller-2">
<span class>From</span>
<time class="font-weight-bold" datetime="{{ hackathon.start_date|date:'c' }}">
{{ hackathon.start|date:"m/d/Y" }}
</time>
<span>To</span>
<time class="font-weight-bold" datetime="{{ hackathon.end_date|date:'c' }}">
{{ hackathon.end|date:"m/d/Y" }}
</time>
</div>
<div class="mt-1 hackathon-actions">
{% if hackathon.end|timesince <= "1 min" %}
<a href="{% url 'hackathon_onboard' hackathon.slug %}">
Join Hackathon >
</a>
{% endif %}
</div>
</div>
</div>
</div>
{% endfor %}
<a href="https://gitcoin.co/hackathon-list/" class="view-all">View all ></a>
</div>
4 changes: 2 additions & 2 deletions app/townsquare/templates/townsquare/shared/reflink.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if REFER_LINK %}
<div class="townsquare_block-header text-left mb-1 mt-0" data-target="reflink_container">
Ref Link <i data-toggle="tooltip" data-html="true" class="fas fa-info-circle mr-3" title="
<div class="townsquare_block-header box-collapse text-left mb-1 mt-0" data-target="reflink_container">
Ref A Friend! <i data-toggle="tooltip" data-html="true" class="fas fa-info-circle mr-3" title="
<strong>
Gitcoin is better with friends!
</strong> -
Expand Down
3 changes: 3 additions & 0 deletions app/townsquare/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ def get_sidebar_tabs(request):
for hackathon in hackathons:
connect = {
'title': hackathon.name,
'logo': hackathon.logo,
'start': hackathon.start_date,
'end': hackathon.end_date,
'slug': f'hackathon:{hackathon.pk}',
'url_slug': hackathon.slug,
'helper_text': f'Go to {hackathon.name} Townsquare.',
Expand Down