diff --git a/app/perftools/management/commands/create_jtbd_cache.py b/app/perftools/management/commands/create_jtbd_cache.py index 3c44dd71cea..b2053a1e2e7 100644 --- a/app/perftools/management/commands/create_jtbd_cache.py +++ b/app/perftools/management/commands/create_jtbd_cache.py @@ -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': '', diff --git a/app/retail/templates/jtbd/connect.html b/app/retail/templates/jtbd/connect.html index 57e635e8d06..77417135e76 100644 --- a/app/retail/templates/jtbd/connect.html +++ b/app/retail/templates/jtbd/connect.html @@ -39,7 +39,7 @@ {% include 'home/nav.html' %} -
+
@@ -213,9 +213,6 @@

{% endwith %} {% endfor %}

-
@@ -300,7 +297,7 @@

More hackathons coming soon!

Have questions before you start with Gitcoin?

-

Connect with the Gitcoin community in Discord

+

Meet the Gitcoin community in Discord.

@@ -333,7 +330,7 @@

Connect through fellowship

Connect through building

Connect with your peers while working on top open source projects.

- Explore Hackathons + Explore Hackathons
diff --git a/app/retail/templates/jtbd/earn.html b/app/retail/templates/jtbd/earn.html index 6fa8c357d2b..63b713295f6 100644 --- a/app/retail/templates/jtbd/earn.html +++ b/app/retail/templates/jtbd/earn.html @@ -17,7 +17,7 @@ {% endcomment %} -{% load i18n static compress date_fromisoformat grants_extra %} +{% load i18n static compress date_fromisoformat grants_extra split %} @@ -43,7 +43,7 @@ {% include 'home/nav.html' %}
-
+
@@ -214,7 +214,11 @@

Earn in bounties

{{ bounty.title }}

-

{{ bounty.metadata.issueKeywords.lower }}

+

+ {% for keyword in bounty.metadata.issueKeywords|split:',' %} + {{keyword.lower}} + {% endfor %} +

{{ bounty.value_true }} {{ bounty.token_name }}

{{ bounty.val_usd_db }} USD

@@ -296,7 +300,7 @@

Earn in bounties

Earn while building meaningful open source projects.

- {% trans "Explore Bounties" %} + {% trans "Explore Bounties" %}
@@ -304,10 +308,10 @@

Earn in bounties

Earn in hackathons

-

Earn while working on top open source projects with great leaders in crypto. Earn while working on top open source projects.

+

Earn while working on top open source projects with great leaders in crypto.

- {% trans "Explore Hackathons" %} + {% trans "Explore Hackathons" %}
@@ -318,7 +322,7 @@

Earn in grants

Get community support and matched funds for public goods projects.

- {% trans "Earn through Grants" %} + {% trans "Earn through Grants" %}
diff --git a/app/retail/templates/jtbd/fund.html b/app/retail/templates/jtbd/fund.html index 2f503c15655..cb966c3ef23 100644 --- a/app/retail/templates/jtbd/fund.html +++ b/app/retail/templates/jtbd/fund.html @@ -38,7 +38,7 @@ {% include 'home/nav.html' %} -
+
@@ -61,7 +61,7 @@

-

Why Quadratic Funding?

+

Why quadratic funding?

@@ -80,17 +80,17 @@

Why Quadratic Funding?

Traditional matching

    -
  • Grant 1 gets $100
  • -
  • Grant 2 gets $100
  • -
  • At the end of the round, both grants get $100 in matching
  • +
  • Grant 1 gets $100.
  • +
  • Grant 2 gets $100.
  • +
  • At the end of the round, both grants get $100 in matching.
-

Gitcoin Quadratic matching

+

Gitcoin quadratic matching

  • Grant 1 gets $100 from 1 funder.
  • Grant 2 gets $100 from 10 funders.
  • -
  • At the end of the round, Grant 1 gets $10 in matching, Grant 2 gets $190 in matching
  • +
  • At the end of the round, Grant 1 gets $10 in matching, Grant 2 gets $190 in matching.
@@ -231,7 +231,7 @@

Meet passionate builders

Have questions before you fund through Gitcoin?

-

Connect with the Gitcoin community in Discord

+

Meet with the Gitcoin community in Discord

@@ -251,11 +251,11 @@

Ready to fund?

-

Make an Impact

+

Make an impact

With Gitcoin Grants you can support the most impactful projects in web3.

@@ -266,7 +266,8 @@

Become a matching partner

Pledge your support to public goods development by contributing to the match pool.

diff --git a/app/retail/templates/jtbd/learn.html b/app/retail/templates/jtbd/learn.html index d28664d7ecb..9b93667b23f 100644 --- a/app/retail/templates/jtbd/learn.html +++ b/app/retail/templates/jtbd/learn.html @@ -38,7 +38,7 @@ {% include 'home/nav.html' %}

-
+
@@ -176,9 +176,6 @@

-
- -

@@ -201,12 +198,6 @@
- -
-

Gitcoin Quests are a fun, gamified, way to learn about web3 ecosystems and earn rewards..

-
@@ -316,7 +307,7 @@

-

{{ testimonial.comment }}

+

{{ testimonial.comment }}

{{ testimonial.handle }}
{{ testimonial.role }}

@@ -345,36 +336,38 @@

Ready to learn?

-
-
-
-

Learn in a hackathon

-

Learn and earn with your peers while working on top open source projects.

-
-
- Explore Hackathons +
+
+
+
+

Learn in a hackathon

+

Learn and earn with your peers while working on top open source projects.

+
+
-
-
-
-
-

Learn through fellowship

-

Join the Kernel fellowship program and receive mentorship and access to a lifelong community.

-
-
- Explore Kernel +
+
+
+

Learn through fellowship

+

Join the Kernel fellowship program and receive mentorship and access to a lifelong community.

+
+
-
-
-
-
-

Learn through Quests

-

Gitcoin Quests are a fun, gamified, way to learn about web3 ecosystems and earn rewards..

-
-
- Explore Quests +
+
+
+

Learn through Quests

+

Gitcoin Quests are a fun, gamified, way to learn about web3 ecosystems and earn rewards.

+
+
diff --git a/app/retail/templatetags/split.py b/app/retail/templatetags/split.py new file mode 100644 index 00000000000..7af8fe024f6 --- /dev/null +++ b/app/retail/templatetags/split.py @@ -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) diff --git a/app/retail/views.py b/app/retail/views.py index 74b4c348d5b..9cbca8e78c7 100644 --- a/app/retail/views.py +++ b/app/retail/views.py @@ -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.' ) @@ -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.' ) @@ -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.' ) @@ -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.' )