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

Revert "Add hackathon prizes view and projects" #6358

Merged
merged 1 commit into from
Apr 2, 2020
Merged

Revert "Add hackathon prizes view and projects" #6358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions app/assets/v2/css/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,6 @@ body {
font-weight: 600;
letter-spacing: 1.7px;
}
.hackathon-explorer {
background: rgb(242, 246, 249) !important;
}

.hackathon-explorer .hackathon-alt {
display: none;
Expand Down
9 changes: 0 additions & 9 deletions app/assets/v2/css/search_bar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,3 @@
padding-right: 15px;
}
}

.em-dash::before {
content: '\2014\2014';
width: 13px;
color: var(--gc-green-hover);
font-weight: bold;
font-size: large;
padding-right: 10px;
}
5 changes: 0 additions & 5 deletions app/assets/v2/css/sidebar_search.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,4 @@
margin-right: 10px;
padding: 20px 20px 10px;
}
}

.left-ribbon {
border-left: 3px solid var(--gc-blue);
padding-left: 6px !important;
}
359 changes: 133 additions & 226 deletions app/dashboard/templates/dashboard/hackathon/projects.html
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 23 additions & 43 deletions app/dashboard/templates/dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,7 @@
.hackathon-banner {
background: {% firstof hackathon.background_color or 'white' %};
color: {% firstof hackathon.text_color or 'black' %};
height: 225px;
background-image: url("/static/wallpapers/V3.png");
}

.hackathon-text {
color: white;
}
.hackathon-title {
font-size: 1.4rem;
}
.hackathon-countdown {
font-size: 1rem;
}
{% if hackathon %}
.bounty_row {
background-color: white;
margin-bottom: 15px;
border-radius: 4px;
}
{% endif %}
</style>

{% if is_staff %}
Expand All @@ -73,44 +54,43 @@
</div>
{% endif %}
<div id="{{ hackathon.identifier }}" class="d-flex justify-content-between flex-column flex-md-row align-items-center p-3 banner hackathon-banner">
<div class="offset-2 hackathon-text pl-4">

<div class="">
<div class="">
<p class="hackathon-title title font-weight-bold mb-0">GITCOIN VIRTUAL HACKATHON</p>
<p class="font-weight-bold mb-0 font-smaller-6">GITCOIN VIRTUAL HACKATHON</p>
<span class="gc-letter-spacing text-uppercase font-weight-bold">{{ hackathon.name }}</span>
</div>
<p class="mb-1">
<p class="mb-1 font-smaller-1">
{{ hackathon.start_date|date:"M j, Y" }} - {{ hackathon.end_date|date:"M j, Y" }}
{% if hackathon.end_date|timeuntil >= "1 min" %}
<small class="hackathon-countdown text-uppercase">Ends in {{hackathon.end_date|timeuntil}}</small>
<small class=" text-uppercase">(Ends in {{hackathon.end_date|timeuntil}})</small>
{% endif %}
</p>
</div>
</div>
<div class="offset-2 navigation">
{% if hackathon.town_square_link %}
<a href="/{{hackathon.town_square_link}}" class="btn ml-2 mr-4 active">
Prizes (98)
</a>
<div class="text-right">
{% if hackathon.end_date|timesince <= "1 min" %}
<a href="{% url 'hackathon_onboard' hackathon.slug %}" class="btn btn-gc-blue mr-3"><i class="far fa-lightbulb mr-1"></i> Hackathon Guide</a>
{% endif %}
{% if hackathon.town_square_link %}
<a href="/{{hackathon.town_square_link}}" class="btn mr-4">
SW3 Town Square
{% if hackathon.show_results %}
<a href="{% url 'hackathon_projects' hackathon.slug %}" class="btn btn-gc-blue mr-3">
<i class="fas fa-tasks"></i>
Projects
</a>
{% endif %}

{% if hackathon.quest_link %}
<a href="{{hackathon.quest_link}}" class="btn mr-4">
Participants (134)
<a href="{{hackathon.quest_link}}" class="btn btn-gc-blue mr-3">
<i class="fas fa-globe-europe"></i>
Quests
</a>
{% endif %}
{% if hackathon.show_results %}
<a href="{% url 'hackathon_projects' hackathon.slug %}" class="btn mr-4">
Projects (57)
{% if hackathon.town_square_link %}
<a href="/{{hackathon.town_square_link}}" class="btn btn-gc-blue mr-3">
<i class="fas fa-city"></i>
Town Square
</a>
{% endif %}
{% if hackathon.end_date|timesince <= "1 min" %}
<a href="{% url 'hackathon_onboard' hackathon.slug %}" class="btn mr-3">Guide</a>
{% endif %}
</div>

</div>
{% else %}
{% include 'dashboard/ftux.html' %}
{% endif %}
Expand All @@ -120,7 +100,7 @@
<div class="col-12 col-lg-3 col-xl-2 invisible" id="sidebar_container" style="background: #F2F6F9;">
{% include 'dashboard/sidebar_search_hackathon.html' %}
</div>
<div class="col-10 col-lg-8 col-xl-10 body px-4 px-lg-0 pr-lg-5 hackathon-explorer">
<div class="col-12 col-lg-9 col-xl-10 body px-4 px-lg-0 hackathon-explorer">
<div class="container-fluid p-2" id="bounties">
<div id="dashboard-title" class="hidden">
{% include 'shared/search_bar.html' %}
Expand Down
66 changes: 26 additions & 40 deletions app/dashboard/templates/dashboard/sidebar_search_hackathon.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,6 @@
form .col:first-child {
border-top: none;
}
.hackathon-logo {
margin-top: -245px;
height: 185px;
max-height: 185px;
width: 185px;
max-width: 185px;
background-color: #090E60;
border-radius: 10px;
color: white;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.hackathon-logo img {
height: 115px;
}
.register {
width: 100%;
}
</style>

<div class="sidebar_search font-body">
Expand All @@ -53,30 +33,17 @@
</p>
<form>
<div class="col">
<div class="hackathon-logo mb-1">
{% if hackathon.logo_svg %}
<img class="d-none d-md-block mx-auto mb-5 mw-100" src="{{ hackathon.logo_svg.url }}" alt="Hackathon logo"/>
{% elif hackathon.logo %}
<img class="d-none d-md-block mx-auto mb-1 mw-100" src="{{ hackathon.logo.url }}" alt="Hackathon logo"/>
{% endif %}
<small>{{ hackathon.start_date|date:"M j, Y" }} - {{ hackathon.end_date|date:"M j, Y" }}</small>
</div>
<a href="{% url 'hackathon_onboard' hackathon.slug %}" class="btn btn-gc-blue register col-xs-12 mt-4 mb-2">
Register
</a>
{% if hackathon.logo_svg %}
<img class="d-none d-md-block mx-auto mb-1 mw-100" src="{{ hackathon.logo_svg.url }}" alt="Hackathon logo"/>
{% elif hackathon.logo %}
<img class="d-none d-md-block mx-auto mb-1 mw-100" src="{{ hackathon.logo.url }}" alt="Hackathon logo"/>
{% endif %}

</div>
<div class="col">
{% if not no_filter %}
{% if hackathon %}
<div class="col-12 subheading left-ribbon">
{% trans "Hackathon Sponsors" %}
</div>
{% else %}
<div class="col-12 subheading">
{% trans "Sponsors" %}
</div>
{% endif %}


<div class="col-12 options" id="list-orgs">

Expand All @@ -93,7 +60,26 @@
</div>
{% endfor %}
</div>
{% endif %}
</div>

<div class="col" id="network-filter" style="display: hidden;">
<div class="col-12 subheading">{% trans "Network" %}</div>
<div class="col-12 options">
<div class="checkbox_container">
<input name="network" id="rinkeby" type="checkbox" value="rinkeby" val-ui='Rinkeby' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=rinkeby>{% trans "Rinkeby" %}</label>
</div>
</div>
<div class="checkbox_container">
<input name="network" id="mainnet" type="checkbox" value="mainnet" val-ui='Mainnet' checked />
<span class="checkbox"></span>
<div class="filter-label">
<label for=mainnet>{% trans "Mainnet" %}</label>
</div>
</div>
</div>
</div>
</form>
</div>
8 changes: 2 additions & 6 deletions app/dashboard/templates/shared/search_bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@
{% endcomment %}
{% load i18n static %}
<link rel="stylesheet" href="{% static "v2/css/search_bar.css" %}">
<div class="d-flex {% if not hackathon %}search_bar{% endif %} my-lg-3 mr-lg-4">
<div class="d-flex search_bar my-lg-3 mx-lg-4">
<div class="col-4 font-body">
{% if hackathon %}
<div class="ml-3 ml-lg-0 black em-dash">Open for submission</div>
{% else %}
<div id="results-count" class="ml-3 ml-lg-0"><span class='num'></span><span class='plus'></span> bounties</div>
{% endif %}
<div id="results-count" class="ml-3 ml-lg-0"><span class='num'></span><span class='plus'></span> bounties</div>
</div>
<div class="col-8 font-caption order_by">
<div class="heading">{% trans "Sort by" %} </div>
Expand Down