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

adds hackathons to nav/products page #5320

Merged
merged 6 commits into from
Oct 15, 2019
Merged

adds hackathons to nav/products page #5320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cf4029
adds hackathons to nav/products page
owocki Oct 14, 2019
752a6c6
fizz buzz (just kidding; updating the products page
owocki Oct 15, 2019
e75f68d
fizz buzz (just kidding; updating the products page
owocki Oct 15, 2019
fee1bc3
rezied logos in nav
thelostone-mc Oct 15, 2019
7e72213
compressing svgs
thelostone-mc Oct 15, 2019
fd651cc
remove humanize
thelostone-mc Oct 15, 2019
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
46 changes: 42 additions & 4 deletions app/assets/v2/css/products.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,54 @@
color: #ffffff;
}

.quests{
background-color: #55508e;
.hackathons{
background-color: #ff92be;
color: #ffffff;
}

.quests span img{
max-width: 50px;
.quests{
background-color: #55508e;
color: #ffffff;
}

.codefund{
background-color: #4c008f;
color: #ffffff;
}

.matching{
background-color: #444;
color: #ffffff;
}

.matching img,
.hackathons img{
max-width: 500px;
}
.quests span img{
max-width: 50px;
}

.labs{
background-color: #bf2781;
color: #ffffff;
}

.tag
{
background-color: #e7f0fa;
color: var(--gc-blue);
font-size: 10px;
display: block;
list-style: none;
padding: 5px;
width: 66px;
}

.codefund .tag
{
width: 140px;
}
@media(min-width: 1200px) {
.intro-header{
font-size:76px;
Expand Down Expand Up @@ -141,6 +169,16 @@
color: #000;
}

.button-hackathons{
background-color: #ffa2de;
color: white;
}

.button-matching{
background-color: #222;
color: white;
}

.button-labs{
background-color: #782456;
color: #fff;
Expand Down
Binary file added app/assets/v2/images/products/engine-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/products/engine.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/v2/images/products/graphics-hackathons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/products/hackathons-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/top-bar/hackathons-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/v2/images/top-bar/hackathons-symbol.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 15 additions & 6 deletions app/retail/templates/products.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@
</span>
<span class=" mb-2 product-heading">{{ product.heading }}</span>
<span class="mb-4 product-desc">{{ product.description }}</span>
<a href="{{ product.link }}" class="button button-{{ product.name }} text-center display-5">
{% trans "Get Started" %}
</a>
<span class="mb-4 tag">{{ product.service_level }}</span>
{% if product.link %}
<a href="{{ product.link }}" class="button button-{{ product.name }} text-center display-5">
{% trans "Get Started" %}
</a>
{% endif %}
</div>
<div class="col-md-6 py-md-5 py-2 align-self-center">
<img class="img-fluid float-right pl-3 pl-md-0" src="{{ product.img }}" alt="{{ product.name }}-image">
Expand All @@ -78,9 +81,12 @@
</span>
<span class="mb-2 product-heading">{{ product.heading }}</span>
<span class="mb-4 product-desc">{{ product.description }}</span>
<a href="{{ product.link }}" class="button button-{{ product.name }} text-center display-5 ">
{% trans "Get Started" %}
</a>
<span class="mb-4 tag">{{ product.service_level }}</span>
{% if product.link %}
<a href="{{ product.link }}" class="button button-{{ product.name }} text-center display-5">
{% trans "Get Started" %}
</a>
{% endif %}
</div>
{% endif %}
</div>
Expand Down Expand Up @@ -108,6 +114,9 @@ <h2 class="text-center pt-3 my-4">
<a href="{% url 'jobs' %}" class="btn btn-gc-blue py-3 shadow-none font-weight-bold text-center m-2">
{% trans "Check our Jobs Page" %}
</a>
<a href="mailto:[email protected]" class="btn btn-gc-blue py-3 shadow-none font-weight-bold text-center m-2">
{% trans "Contact Us" %}
</a>
<a href="{% url 'mission' %}" class="btn btn-gc-blue py-3 shadow-none font-weight-bold text-center m-2">
{% trans "About the mission" %}
</a>
Expand Down
8 changes: 5 additions & 3 deletions app/retail/templates/shared/top_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@

<div class="top-nav g-font-muli {{class}}">
<a class="link d-md-block d-none" href="{% url 'products' %}">Grow Open Source</a>
<a class="{% if request.path|matches:'^\/((hackathons.*))$' %}selected{% endif %}" href="https://hackathons.gitcoin.co">
<img src="{% static "v2/images/top-bar/hackathons-logo.svg" %}" height="23" width="125" alt="" class="d-md-block d-none" style="margin-top: 0px; margin-left: -10px;">
<img src="{% static "v2/images/top-bar/hackathons-symbol.svg" %}" height="22" alt="" class="d-md-none" style="height: 55px; width: 55px; margin-top: -7px; margin-left: -15px;">
</a>
<a class="{% if request.path == '/' %}selected{% endif %}" href="{% url 'funder_bounties' %}">
<img src="{% static "v2/images/top-bar/bounties_desktop.svg" %}" height="22" alt="" class="d-md-block d-none" style="margin-bottom: 5px;">
<img src="{% static "v2/images/top-bar/bounties_mobile.svg" %}" height="22" alt="" class="d-md-none">
Expand All @@ -46,10 +50,8 @@
<img src="{% static "v2/images/top-bar/grants-logo.svg" %}" height="22" alt="" class="d-md-block d-none">
<img src="{% static "v2/images/top-bar/grants-symbol.svg" %}" height="22" alt="" class="d-md-none">
</a>
{% if quests_live %}
<a class="{% if request.path|matches:'^\/((quests.*))$' %}selected{% endif %}" href="{% url "quests_index" %}">
<img src="{% static "v2/images/top-bar/quests-logo.svg" %}" height="20" width="110" alt="" class="d-md-block d-none" style="margin-top: -2px; margin-left: -10px;">
<img src="{% static "v2/images/top-bar/quests-logo.svg" %}" height="20" width="95" alt="" class="d-md-block d-none" style="margin-top: -2px; margin-left: -10px;">
<img src="{% static "v2/images/top-bar/quests-symbol.svg" %}" height="22" alt="" class="d-md-none" style="height: 55px; width: 55px; margin-top: -15px; margin-left: -15px;">
</a>
{% endif %}
</div>
36 changes: 30 additions & 6 deletions app/retail/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,14 +991,33 @@ def vision(request):
def products(request):
"""Render the Products response."""
products = [
{
'name': 'matching engine',
'heading': _("Find the Right Dev. Every Time."),
'description': _("It's not about finding *a* developer. It's about finding *the right developer for your needs*. Our matching engine powers each of our products, and can target the right community members for you."),
'link': '/users',
'img': static('v2/images/products/engine.svg'),
'logo': static('v2/images/products/engine-logo.png'),
'service_level': 'Integrated',
},
{
'name': 'hackathons',
'heading': _("Hack with the best companies in web3."),
'description': _("Gitcoin offers Virtual Hackathons about once a month; Earn Prizes by working with some of the best projects in the decentralization space."),
'link': 'https://hackathons.gitcoin.co',
'img': static('v2/images/products/graphics-hackathons.png'),
'logo': static('v2/images/products/hackathons-logo.svg'),
'service_level': 'Full Service',
},
{
'name': 'bounties',
'heading': _("Solve bounties. Get paid. Contribute to open source"),
'description': _("Collaborate and monetize your skills while working on Open Source projects \
through bounties."),
'link': '/explorer',
'img': static('v2/images/products/graphics-Bounties.png'),
'logo': static('v2/images/products/gitcoin-logo.svg')
'logo': static('v2/images/products/gitcoin-logo.svg'),
'service_level': 'Self Service',
},
{
'name': 'kudos',
Expand All @@ -1007,7 +1026,8 @@ def products(request):
It's also a way to showcase special skills that a member might have."),
'link': '/kudos',
'img': static('v2/images/products/graphics-Kudos.png'),
'logo': static('v2/images/products/kudos-logo.svg')
'logo': static('v2/images/products/kudos-logo.svg'),
'service_level': 'Self Service',
},
{
'name': 'grants',
Expand All @@ -1016,7 +1036,8 @@ def products(request):
contributions to your favorite OSS maintainers. Powered by EIP1337."),
'link': '/grants',
'img': static('v2/images/products/graphics-Grants.png'),
'logo': static('v2/images/products/grants-logo.svg')
'logo': static('v2/images/products/grants-logo.svg'),
'service_level': 'Self Service',
},
{
'name': 'codefund',
Expand All @@ -1025,7 +1046,8 @@ def products(request):
source ecosystem"),
'link': 'https://codefund.app/',
'img': static('v2/images/products/graphics-Codefund.svg'),
'logo': static('v2/images/products/codefund-logo.svg')
'logo': static('v2/images/products/codefund-logo.svg'),
'service_level': 'Self Service or Full Service',
},
{
'name': 'labs',
Expand All @@ -1034,7 +1056,8 @@ def products(request):
making Ethereum dapps fast, usable, and secure."),
'link': '/labs',
'img': static('v2/images/products/graphics-Labs.png'),
'logo': static('v2/images/products/labs-logo.svg')
'logo': static('v2/images/products/labs-logo.svg'),
'service_level': 'Self Service',
}
]

Expand All @@ -1045,7 +1068,8 @@ def products(request):
'description': _("Gitcoin Quests is a fun, gamified way to learn about the web3 ecosystem, earn rewards, and level up your decentralization-fu!"),
'link': '/quests',
'img': static('v2/images/products/graphics-Quests.png'),
'logo': static('v2/images/products/quests-symbol.svg')
'logo': static('v2/images/products/quests-symbol.svg'),
'service_level': 'Self Service',
})

context = {
Expand Down