diff --git a/app/assets/v2/css/quickstart.css b/app/assets/v2/css/quickstart.css index 5853b7a0170..d1663cd98f8 100644 --- a/app/assets/v2/css/quickstart.css +++ b/app/assets/v2/css/quickstart.css @@ -1,27 +1,14 @@ -body.quickstart, -.quickstart { - background: #f6f6f6; -} - .quickstart .title { color: #0d0764; letter-spacing: 0; } -.quickstart .container-fluid.content { - margin-bottom: 13rem; - text-align: left; -} - .quickstart h4.title { font-size: 2.75rem; } .quickstart .dont-show { - text-align: right; - font-style: italic; color: #4a4a4a; - width: 100%; } .quickstart .dont-show .checkbox_container .filter-label { @@ -61,7 +48,6 @@ body.quickstart, } .steps-list p { - font-size: 1.1rem; color: #4a4a4a } @@ -69,7 +55,6 @@ body.quickstart, color: #3d3d46; list-style-type: none; line-height: 2.5rem; - font-size: 1.1rem; } .steps-list .action-footer { @@ -77,11 +62,11 @@ body.quickstart, } .action-footer .video-link { - width: 30%; + width: 40%; } .action-footer .btn { - border-radius: 2px; + border-radius: 3px; background-color: #0c0763; border-color: #0c0763; } @@ -92,12 +77,11 @@ body.quickstart, } .tips-list ul li { - font-size: 0.95rem !important; line-height: 2rem !important; } .issuetypes-container { - background-color: #efefef; + background-color: #fafafa; } .issuetypes-container .subheading { diff --git a/app/assets/v2/js/pages/new_bounty.js b/app/assets/v2/js/pages/new_bounty.js index fdae9c9853e..8a10b3038e8 100644 --- a/app/assets/v2/js/pages/new_bounty.js +++ b/app/assets/v2/js/pages/new_bounty.js @@ -5,8 +5,6 @@ load_tokens(); var localStorage = window.localStorage ? window.localStorage : {}; -const quickstartURL = document.location.origin + '/bounty/quickstart'; - const FEE_PERCENTAGE = document.FEE_PERCENTAGE / 100.0; var new_bounty = { @@ -16,22 +14,24 @@ var new_bounty = { if (localStorage['quickstart_dontshow'] !== 'true' && doShowQuickstart(document.referrer) && doShowQuickstart(document.URL)) { - window.location = quickstartURL; + window.location = document.location.origin + '/bounty/quickstart'; } -function doShowQuickstart(url) { - var fundingURL = document.location.origin + '/funding/new\\?'; - var bountyURL = document.location.origin + '/bounty/new\\?'; - var blacklist = [ fundingURL, bountyURL, quickstartURL ]; +const doShowQuickstart = url => { + let blacklist = []; + + blacklist.push(document.location.origin + '/bounty/quickstart'); + blacklist.push(document.location.origin + '/bounty/new\\?'); + blacklist.push(document.location.origin + '/funding/new\\?'); + blacklist.push(document.location.origin + '/new\\?'); - for (var i = 0; i < blacklist.length; i++) { - if (url.match(blacklist[i])) { + for (let i = 0; i < blacklist.length; i++) { + if (url.match(blacklist[i])) return false; - } } return true; -} +}; var processedData; diff --git a/app/dashboard/templates/quickstart.html b/app/dashboard/templates/quickstart.html index 580bd891df2..78f78487e75 100644 --- a/app/dashboard/templates/quickstart.html +++ b/app/dashboard/templates/quickstart.html @@ -31,14 +31,14 @@ {% include 'shared/top_nav.html' with class='d-md-flex' %} {% include 'shared/nav.html' %} -
+
-

{% trans "Developer Guide" %}

+

{% trans "Funder Guide" %}

-
+
@@ -53,7 +53,7 @@

{% trans "Developer Guide" %}

-
    +
    1. {% trans "1) Create a Github Issue, you'll need the issue URL" %}
    2. {% trans "2) Select the type of issue to fund" %}
    3. {% trans '3) Complete the form and press "Fund Issue"' %}
      4. @@ -63,18 +63,18 @@

      {% trans "Developer Guide" %}

      {% trans "Once confirmed on blockchain, your bounty is posted to Gitcoin! Wait for developers across the world to discover your bounty and start working on your issue." %}

      -
      +
      {% trans "Watch 90 second video" %}
      - +
      {% trans "Tips & Tricks" %}
      -
        +
        • {% trans "Know what you're looking for." %}
        • {% trans "Set clear acceptance criteria." %}
        • {% trans "Set a reasonable timeframe." %}
          • @@ -86,7 +86,7 @@
          {% trans "Tips & Tricks" %}
          {% trans "See Developer Guide" %}
-
+

{% trans "Other Repo Maintainers are funding these types of issues" %}

@@ -128,7 +128,7 @@
{% trans "DESIGN" %}
{% trans "OTHER" %}

{% trans "Ideas, discussions, contests, consulting" %}

-
+

{% blocktrans %}In our experience, the following are not good candidates for bounties:{% endblocktrans %}

  1. diff --git a/app/dashboard/views.py b/app/dashboard/views.py index 12e755432d5..495e08ab200 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -910,6 +910,7 @@ def dashboard(request): } return TemplateResponse(request, 'dashboard/index.html', params) + def ethhack(request): """Handle displaying ethhack landing page.""" @@ -923,6 +924,7 @@ def ethhack(request): } return TemplateResponse(request, 'dashboard/hackathon/ethhack_2019.html', params) + def accept_bounty(request): """Process the bounty. @@ -1074,6 +1076,7 @@ def social_contribution_modal(request): params['promo_text'] = promo_text return TemplateResponse(request, 'social_contribution_modal.html', params) + @csrf_exempt @require_POST def social_contribution_email(request): @@ -2368,6 +2371,7 @@ def redeem_coin(request, shortcode): raise Http404 +@login_required def new_bounty(request): """Create a new bounty.""" from .utils import clean_bounty_url diff --git a/app/retail/templates/home/index.html b/app/retail/templates/home/index.html index 02566572152..b0fa7687802 100644 --- a/app/retail/templates/home/index.html +++ b/app/retail/templates/home/index.html @@ -37,23 +37,30 @@

    {% trans "Crowdfunding and freelance developers for your software projects" %}

    {% blocktrans %} - Builders/Project Managers:
    - Leverage our global, on-demand workforce. Find expert freelance developers to design, test, code, and build your project teams today. Save time via direct Github integration. Crowdfund for your open source startup or project to increase your budget and bring in more developers. + Builders/Project Managers:
    + Leverage our global, on-demand workforce. Find expert freelance developers to design,\ + test, code, and build your project teams today. Save time via direct Github integration. + Crowdfund for your open source startup or project to increase your budget and bring in + more developers. + {% endblocktrans %} - Fund an Issue/Project - Grants + Fund an Issue/Project + Grants - {% endblocktrans %}

    {% blocktrans %} Coders/Software Developers:
    Get paid in crypto for freelance jobs, building features, and solving bug bounties! Work with top open source projects and get paid out fast. {% endblocktrans %}
    - {% trans "Bug Bounties" %} + {% trans "Bug Bounties" %}

    - {% trans "Fund an Issue" %} + {% if is_new_funder %} + {% trans "Become a Funder" %} + {% else %} + {% trans "Fund an Issue" %} + {% endif %} {% trans "See Our Products" %}
diff --git a/app/retail/templates/shared/top_nav.html b/app/retail/templates/shared/top_nav.html index 22ce3e53ece..aa6dfd04816 100644 --- a/app/retail/templates/shared/top_nav.html +++ b/app/retail/templates/shared/top_nav.html @@ -42,7 +42,7 @@ - + diff --git a/app/retail/views.py b/app/retail/views.py index 006a61105fc..a46c63690ba 100644 --- a/app/retail/views.py +++ b/app/retail/views.py @@ -36,7 +36,7 @@ from app.utils import get_default_network from cacheops import cached_as, cached_view, cached_view_as -from dashboard.models import Activity, Profile +from dashboard.models import Activity, Bounty, Profile from dashboard.notifications import amount_usdt_open_work, open_bounties from economy.models import Token from marketing.mails import new_funding_limit_increase_request, new_token_request @@ -64,7 +64,15 @@ def get_activities(tech_stack=None, num_activities=15): activities = activities[0:num_activities] return [a.view_props for a in activities] + def index(request): + + user = request.user.profile if request.user.is_authenticated else None + is_new_funder = True + + if user and Bounty.objects.filter(bounty_owner_github_username=user).count() > 0: + is_new_funder = False + products = [ { 'group' : 'grow_oss', @@ -198,6 +206,7 @@ def index(request): ] context = { + 'is_new_funder': is_new_funder, 'products': products, 'know_us': know_us, 'press': press, @@ -326,6 +335,7 @@ def subscribe(request): } return TemplateResponse(request, 'pricing/subscribe.html', context) + def funder_bounties_redirect(request): return redirect(funder_bounties) @@ -554,7 +564,7 @@ def contributor_bounties(request, tech_stack): { 'link': "/design", 'text': "Design"}, { 'link': "/html", 'text': "HTML"}, { 'link': "/ruby", 'text': "Ruby"}, - { 'link': "/css", 'text': "CSS"}, + { 'link': "/css", 'text': "CSS"}, ] } @@ -1343,6 +1353,7 @@ def help(request): } return TemplateResponse(request, 'help.html', context) + def verified(request): user = request.user if request.user.is_authenticated else None profile = request.user.profile if user and hasattr(request.user, 'profile') else None @@ -1354,6 +1365,7 @@ def verified(request): } return TemplateResponse(request, 'verified.html', context) + def presskit(request): brand_colors = [ @@ -1518,6 +1530,7 @@ def slack(request): return TemplateResponse(request, 'slack.html', context) + @csrf_exempt def newtoken(request): context = {