8000 jtbd feedbacks by octavioamu · Pull Request #8772 · gitcoinco/web · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

jtbd feedbacks #8772

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

Merged
merged 9 commits into from
Apr 22, 2021
Merged

jtbd feedbacks #8772

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
9757abf
jtbd feedbacks
octavioamu Apr 12, 2021
46b5cbc
add quests cta
octavioamu Apr 12, 2021
03357a2
copy fixes
octavioamu Apr 20, 2021
5254475
add redirect for cta
octavioamu Apr 20, 2021
cc22cca
Merge branch 'master' into gpg/jtbd-fixes
octavioamu Apr 20, 2021
1725acd
fix quests conflict
octavioamu Apr 20, 2021
ee27de9
lowercase
octavioamu Apr 21, 2021
c221b0a
more lower
octavioamu Apr 21, 2021
baabbba
Updates padding and unfurl copy
gdixon Apr 21, 2021
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
2 changes: 1 addition & 1 deletion app/perftools/management/commands/create_jtbd_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def create_jtbd_learn_cache():
'testimonial': {
'handle': 'Arya Soltanieh',
'role': 'Founder, Myco Ex-Coinbase',
'comment': "I’ve done a handful of these type of programs...but KERNEL has definitely felt the best. The community started at the top, has been so welcoming/ positive/ insightful/ AWESOME. Thank you to all the community members, and especially thank you to the team at the top, who’s personalities, content, and personal efforts helped create such a positive culture the last several weeks during KERNEL ❤️ I for one know that I will continue spreading the positive culture in everything I work on (myco)",
'comment': "I’ve done a handful of these type of programs... but KERNEL has definitely felt the best.\r\n The community started at the top, has been so welcoming/ positive/ insightful/ AWESOME. Thank you to all the community members, and especially thank you to the team at the top, who’s personalities, content, and personal efforts helped create such a positive culture the last several weeks during KERNEL ❤️ I for one know that I will continue spreading the positive culture in everything I work on (myco).",
'avatar_url': static('v2/images/jtbd/arya.png'),
'github_handle': 'lostcodingsomewhere',
'twitter_handle': '',
Expand Down
9 changes: 3 additions & 6 deletions app/retail/templates/jtbd/connect.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{% include 'home/nav.html' %}
</div>

<div class="container px-5">
<div class="container pt-5">

<div class="row mt-5">
<div class="col-12 col-md-8">
Expand Down Expand Up @@ -213,9 +213,6 @@ <h4 class="pl-3 w-100 mb-3">
{% endwith %}
{% endfor %}
</div>
<div class="my-4">
<a class="btn btn-primary btn-lg col-12 col-md-auto p-2 px-5" href="https://gitcoin.typeform.com/to/Sy0qlDwu" target="_blank">Apply to Kernel</a>
</div>
</div>
</section>

Expand Down Expand Up @@ -300,7 +297,7 @@ <h3 class="mt-4 mb-3 gc-font-base">More hackathons coming soon!</h3>
<div class="row">
<div class="col-12 col-md-9 py-5">
<h2>Have questions before you start with Gitcoin?</h2>
<p class="text-grey-400 font-bigger-2">Connect with the Gitcoin community in Discord</p>
<p class="text-grey-400 font-bigger-2">Meet the Gitcoin community in Discord.</p>
<div class="row mt-4 mx-0">
<a class="btn btn-primary btn-lg col-12 col-md-auto p-2 px-5" href="https://discord.com/invite/83BK5z55yB" target="_blank">Join Discord</a>
</div>
Expand Down Expand Up @@ -333,7 +330,7 @@ <h4 class="py-2 font-weight-normal">Connect through fellowship</h4>
<h4 class="py-2 font-weight-normal">Connect through building</h4>
<p class="py-2 font-bigger-1">Connect with your peers while working on top open source projects.</p>
</div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'get_hackathons' %}">Explore Hackathons</a>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'get_hackathons' %}">Explore Hackathons</a>
</div>
</div>
</section>
Expand Down
18 changes: 11 additions & 7 deletions app/retail/templates/jtbd/earn.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

{% endcomment %}

{% load i18n static compress date_fromisoformat grants_extra %}
{% load i18n static compress date_fromisoformat grants_extra split %}
<!DOCTYPE html>
<html lang="en">

Expand All @@ -43,7 +43,7 @@
{% include 'home/nav.html' %}
</div>

<div class="container px-5">
<div class="container pt-5">

<!-- Header section -->
<div class="row justify-content-between my-5">
Expand Down Expand Up @@ -214,7 +214,11 @@ <h2 class="mb-5 pt-4">Earn in bounties</h2>
</div>
<div class="col-9 col-lg-10 pl-0 pl-lg-2">
<p class="text-wrap font-bigger-1 text-grey-500">{{ bounty.title }}</p>
<p class="text-grey-400 font-subheader">{{ bounty.metadata.issueKeywords.lower }}</p>
<p class="text-grey-400 font-subheader">
{% for keyword in bounty.metadata.issueKeywords|split:',' %}
<small class="badge badge--bluelight">{{keyword.lower}}</small>
{% endfor %}
</p>
<div class="d-flex">
<p class="tag token font-bigger-1 ml-0">{{ bounty.value_true }} {{ bounty.token_name }}</p>
<p class="tag usd font-bigger-1">{{ bounty.val_usd_db }} USD</p>
Expand Down Expand Up @@ -296,18 +300,18 @@ <h4 class="py-2 font-weight-normal">Earn in bounties</h4>
<p class="font-bigger-1">Earn while building meaningful open source projects.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'explorer' %}">{% trans "Explore Bounties" %}</a>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'explorer' %}">{% trans "Explore Bounties" %}</a>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 mb-3">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 flex-basis-lg-33 p-5 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Earn in hackathons</h4>
<p class="font-bigger-1">Earn while working on top open source projects with great leaders in crypto. Earn while working on top open source projects.</p>
<p class="font-bigger-1">Earn while working on top open source projects with great leaders in crypto.</p>
</div>
<div>
<a class="col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'get_hackathons4' %}">{% trans "Explore Hackathons" %}</a>
<a class="col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'get_hackathons4' %}">{% trans "Explore Hackathons" %}</a>
</div>
</div>
</div>
Expand All @@ -318,7 +322,7 @@ <h4 class="py-2 font-weight-normal">Earn in grants</h4>
<p class="font-bigger-1">Get community support and matched funds for public goods projects.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'grants:grants' %}">{% trans "Earn through Grants" %}</a>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'grants:grants' %}">{% trans "Earn through Grants" %}</a>
</div>
</div>
</div>
Expand Down
23 changes: 12 additions & 11 deletions app/retail/templates/jtbd/fund.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{% include 'home/nav.html' %}
</div>

<div class="container px-5">
<div class="container pt-5">

<div class="row mt-5">
<div class="col-12 col-md-8">
Expand All @@ -61,7 +61,7 @@ <h1 class="mb-4 line-height-2">

<section class="row my-5 pt-5">
<header class="col-12 mb-4 pt-4">
<h2>Why Quadratic Funding?</h2>
<h2>Why quadratic funding?</h2>
</header>
<div class="col-12">
<div class="row">
Expand All @@ -80,17 +80,17 @@ <h2>Why Quadratic Funding?</h2>
<div class="col-12 col-lg-6">
<h2 class="mt-5">Traditional matching</h2>
<ul class="list-unstyled font-bigger-2 line-height-3 text-grey-400">
<li>Grant 1 gets $100</li>
<li>Grant 2 gets $100</li>
<li>At the end of the round, both grants get $100 in matching</li>
<li>Grant 1 gets $100.</li>
<li>Grant 2 gets $100.</li>
<li>At the end of the round, both grants get $100 in matching.</li>
</ul>
</div>
<div class="col-12 col-lg-6">
<h2 class="mt-5">Gitcoin Quadratic matching</h2>
<h2 class="mt-5">Gitcoin quadratic matching</h2>
<ul class="list-unstyled font-bigger-2 line-height-3 text-grey-400">
<li>Grant 1 gets $100 from 1 funder.</li>
<li>Grant 2 gets $100 from 10 funders.</li>
<li>At the end of the round, Grant 1 gets $10 in matching, Grant 2 gets $190 in matching</li>
<li>At the end of the round, Grant 1 gets $10 in matching, Grant 2 gets $190 in matching.</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -231,7 +231,7 @@ <h2 class="">Meet passionate builders</h2>
<div class="row">
<div class="col-12 col-md-9 py-5 ">
<h2>Have questions before you fund through Gitcoin?</h2>
<p class="text-grey-400 font-bigger-2">Connect with the Gitcoin community in Discord</p>
<p class="text-grey-400 font-bigger-2">Meet with the Gitcoin community in Discord</p>
<div class="row mt-4 mx-0">
<a class="btn btn-primary btn-lg col-12 col-md-auto p-2 px-5" href="https://discord.com/invite/83BK5z55yB" target="_blank">Join Discord</a>
</div>
Expand All @@ -251,11 +251,11 @@ <h2 class="pb-4 pt-5 w-100">Ready to fund?</h2>
<div class="col-12 col-md-6 mb-3">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 flex-basis-lg-33 p-5 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Make an Impact</h4>
<h4 class="py-2 font-weight-normal">Make an impact</h4>
<p class="font-bigger-1">With Gitcoin Grants you can support the most impactful projects in web3.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'grants:grants' %}">Explore Grants</a>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'grants:grants' %}">Explore Grants</a>
</div>
</div>
</div>
Expand All @@ -266,7 +266,8 @@ <h4 class="py-2 font-weight-normal">Become a matching partner</h4>
<p class="font-bigger-1">Pledge your support to public goods development by contributing to the match pool.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'grants:new_matching_partner' %}">Pledge Support</a>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'grants:new_matching_partner' %}">Pledge support</a>

</div>
</div>
</div>
Expand Down
67 changes: 30 additions & 37 deletions app/retail/templates/jtbd/learn.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{% include 'home/nav.html' %}
</div>

<div class="container px-5">
<div class="container pt-5">

<div class="row mt-5">
<div class="col-12 col-md-8">
Expand Down Expand Up @@ -176,9 +176,6 @@ <h2>
<div class="collapseThree w-100 collapse bg-white" data-parent="#accordion-group">
<img class="d-block m-auto ml-lg-0" src="{% static "v2/images/jtbd/jtbd-6.svg" %}" style="max-width: 20rem;"/>
</div>
<div class="collapseFour w-100 collapse bg-white" data-parent="#accordion-group">
<img class="d-block m-auto ml-lg-0" src="{% static "v2/images/jtbd/earn-hackathons.svg" %}" style="max-width: 20rem;"/>
</div>
</div>
</div>
<div class="col-12 col-lg-6 pt-5">
Expand All @@ -201,12 +198,6 @@ <h5 class="accordion gc-font-base collapsed" id="headingThree" data-parent="#acc
<div class="accordion-panel collapse font-subheader text-grey-400 collapseThree" aria-labelledby="headingThree" data-parent="#accordion-group">
<p class="font-header font-bigger-1">Learn with your peers in social settings. Gitcoin is at the center of collaborative learning. Participate in presentations, workshops, and roundtable discussions hosted by influential Web3 experts.</p>
</div>
<h5 class="accordion gc-font-base collapsed" id="headingFour" data-parent="#accordion-group" data-toggle="collapse" data-target=".collapseFour">
<span class="accordion-title">Learn in Quests</span>
</h5>
<div class="accordion-panel collapse font-subheader text-grey-400 collapseFour" aria-labelledby="headingFour" data-parent="#accordion-group">
<p class="font-header font-bigger-1">Gitcoin Quests are a fun, gamified, way to learn about web3 ecosystems and earn rewards..</p>
</div>
</div>
</div>
</section>
Expand Down Expand Up @@ -316,7 +307,7 @@ <h4 class="col-10 font-weight-300 text-grey-400 line-height-md-3 gc-font-base mb
<div class="col-auto m-0 px-2 mt-n3"><span class="font-bigger-4">“</span></div>
<div class="col text-grey-400 pr-5 pb-4">
<div class="row">
<p class="font-bigger-1 line-height-2">{{ testimonial.comment }}</p>
<p class="font-bigger-1 line-height-2" style="white-space: pre-line;">{{ testimonial.comment }}</p>
</div>
<div class="row">
<p class="font-bigger-1">{{ testimonial.handle }}<br/>{{ testimonial.role }}</p>
Expand Down Expand Up @@ -345,36 +336,38 @@ <h2>
Ready to learn?
</h2>
</header>
<div class="col-12 col-md-6 mt-4 pr-md-1">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 p-5 mr-0 mr-md-2 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Learn in a hackathon</h4>
<p class="py-2 font-bigger-1">Learn and earn with your peers while working on top open source projects.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'get_hackathons' %}">Explore Hackathons</a>
<div class="row">
<div class="col-12 col-md-6 col-lg-4 mb-3">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 flex-basis-lg-33 p-5 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Learn in a hackathon</h4>
<p class="font-bigger-1">Learn and earn with your peers while working on top open source projects.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'get_hackathons' %}">{% trans "Explore Hackathons" %}</a>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 mt-4 pl-md-1">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 p-5 ml-0 ml-md-2 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Learn through fellowship</h4>
<p class="py-2 font-bigger-1">Join the Kernel fellowship program and receive mentorship and access to a lifelong community.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="https://kernel.community/">Explore Kernel</a>
<div class="col-12 col-md-6 col-lg-4 mb-3">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 flex-basis-lg-33 p-5 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Learn through fellowship</h4>
<p class="font-bigger-1">Join the Kernel fellowship program and receive mentorship and access to a lifelong community.</p>
</div>
<div>
<a class="col-md-auto btn btn-primary btn-lg btn-cta py-2" href="https://kernel.community/">{% trans "Explore Kernel" %}</a>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 mt-4 pl-md-1">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-md-50 p-5 ml-0 ml-md-2 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Learn through Quests</h4>
<p class="py-2 font-bigger-1">Gitcoin Quests are a fun, gamified, way to learn about web3 ecosystems and earn rewards..</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="/quests">Explore Quests</a>
<div class="col-12 col-md-12 col-lg-4 mb-3 mt-0 mt-md-3 mt-lg-0">
<div class="bg-lighter d-flex justify-content-between flex-column flex-basis-auto flex-basis-lg-33 flex-basis-md-100 p-5 h-100">
<div class="mb-4">
<h4 class="py-2 font-weight-normal">Learn through Quests</h4>
<p class="font-bigger-1">Gitcoin Quests are a fun, gamified, way to learn about web3 ecosystems and earn rewards.</p>
</div>
<div>
<a class="col-12 col-md-auto btn btn-primary btn-lg btn-cta py-2" href="{% url 'social:begin' 'github' %}?next={% url 'quests_index' %}">{% trans "Explore Quests" %}</a>
</div>
</div>
</div>
</div>
Expand Down
11 changes: 11 additions & 0 deletions app/retail/templatetags/split.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from django import template

register = template.Library()


@register.filter(name='split')
def split(value, key):
"""
Returns the value turned into a list.
"""
return value.split(key)
16 changes: 8 additions & 8 deletions app/retail/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@ def jtbd_earn(request):
request,
'earn',
'Earn',
'Gitcoin - Support digital public goods, support open source',
'Earn a living working on open source projects that matter'
'Gitcoin - Build the open internet.',
'Earn a living building open source projects that matter.'
)


Expand All @@ -1609,8 +1609,8 @@ def jtbd_learn(request):
request,
'learn',
'Learn',
'Gitcoin - Support digital public goods, support open source',
'Learn how to build the decentralized web'
'Gitcoin - Learn open source development.',
'Learn how to build open source projects that matter.'
)


Expand All @@ -1620,8 +1620,8 @@ def jtbd_connect(request):
request,
'connect',
'Connect',
'Gitcoin - Support digital public goods, support open source',
'Connect and build with top open source developers'
'Gitcoin - A community of open web builders.',
'Connect and build with top open source developers.'
)


Expand All @@ -1631,6 +1631,6 @@ def jtbd_fund(request):
request,
'fund',
'Fund',
'Gitcoin - Support digital public goods, support open source',
'Fund open source projects that make a difference'
'Gitcoin - Support open web development.',
'Fund open source projects that make the most difference.'
)
0