Skip to content

Commit 6fb1c8e

Browse files
giliomeejgroansong
andauthored
func(Bounties): Add redirect for creating new bounties to send users to Buidlbox. (#11041)
* Added logging for calls to mautic_proxy In the process of moving from Mautic/Acquia to Hubspot. Starting by adding a log to develop a deeper understanding of requests, in order to prepare for writing the Hubspot part, which would see requests temporarily be sent to both Acquia and Hubspot before turning the Acquia requests off. * Added MauticLog table * Added entry for every call to mautic_proxy * Wrapped DB call in try-except * fix(Home): GR15 Image should be loaded via CDN. * func(Bottom nav): Add Passport to the footer nav. * func(Passport): Redirect gitcoin.co/passport to new landing page * fix(Loading image): Loading image size can be reduced by 50% as it appears the frontend uses fairly small versions of the image. * func(GR15): Temporary (1-2 weeks). Thank you banner for participating in GR15. * fix(Styling): Use smaller padding for mobile devices. * func(Home): Change banner to highlight protocol & grants for desktop. * func(Banner): Add responsiveness for mobile. * fix(Nav): Main nav was sitting under the banner images. * func(Blog): Wordpress is becoming unreliable (rate limiting issues) in redirecting gitcoin.co/blog to go.gitcoin.co/blog so change the links at the source to point to the newer blog location of go.gitcoin.co/blog. * func(Blog): Wordpress is becoming unreliable (rate limiting issues) in redirecting gitcoin.co/blog to go.gitcoin.co/blog so change the links at the source to point to the newer blog location of go.gitcoin.co/blog. * fix(Home banner): Mobile nav sat under the protocol image, instead of over it. * undo * func(Text): Small text change requested by ceresstation. * func(Grants): Remove navigational items for grant creation, as we're sunsetting cGrants. * func(Grants): Replace grant creation page with notification of new protocol launch. * func(Grants): Small text change to sunsetting cGrants. * func(Grants): Change more info links. * func(Grants): Small text change. * fix(Grants): Amend tests for new content. * fix(Grants): Breaking test. * fix(New grant): Remove new.scss that's causing a bundling error. * fix(Grants sunset): Remove unused .css that's throwing a bundle error. * func(Hackathons): Add an alert to send users to buidlbox.com. * func(Hackathons): Small update to link / add utm_source. * func(Banner): Highlight beta round. * func(Redirects): Change blog redirects over to new site. * fix(Dependency): Breaking chnage in urllib3 prevented the booting up of a local dev environment. * func(Bounties): Add redirect for creating new bounties to send users to Buidlbox. * chore(Cleanup): Small bits of cleanup. --------- Co-authored-by: Roan Song <[email protected]>
1 parent f1ddf97 commit 6fb1c8e

File tree

8 files changed

+1076
-3
lines changed

8 files changed

+1076
-3
lines changed

app/app/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
r'^bounties/contributor/?(?P<tech_stack>.*)/?', retail.views.contributor_bounties, name='contributor_bounties'
420420
),
421421
re_path(r'^bounty/quickstart/?', dashboard.views.quickstart, name='quickstart'),
422-
url(r'^bounty/new/?', dashboard.views.new_bounty, name='new_bounty'),
422+
url(r'^bounty/new/?', dashboard.views.move_to_buidlbox, name='new_bounty'),
423423
re_path(r'^bounty/change/(?P<bounty_id>.*)?', dashboard.views.change_bounty, name='change_bounty'),
424424
# TODO: Rename below to bounty/
425425
path('issue/fulfill', dashboard.views.fulfill_bounty, name='fulfill_bounty'),

app/assets/v2/images/buidlbox/landing-bg.svg

+511
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{% comment %}
2+
Copyright (C) 2021 Gitcoin Core
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU Affero General Public License as published
6+
by the Free Software Foundation, either version 3 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU Affero General Public License for more details.
13+
14+
You should have received a copy of the GNU Affero General Public License
15+
along with this program. If not, see
16+
<http: //www.gnu.org/licenses />.
17+
18+
{% endcomment %}
19+
{% load i18n static email_obfuscator add_url_schema avatar_tags bundle %}
20+
<!DOCTYPE html>
21+
<html lang="en">
22+
23+
<head>
24+
{% include 'shared/head.html' %}
25+
{% include 'shared/cards.html' %}
26+
<meta name="title" content="Create Funded Issue/Bounty | Gitcoin moving to Buidlbox">
27+
<meta name="description"
28+
content="Gitcoin bounties are moving over to buidlbox.io">
29+
<style>
30+
.issue_description {
31+
height: 400px;
32+
padding: 1em;
33+
overflow: auto;
34+
resize: vertical;
35+
background-color: #f9f9f9;
36+
}
37+
38+
.issue_description img {
39+
max-width: 100%;
40+
}
41+
42+
/* Override some CSS attributes of ql-editor, so that placeholder does not overflow */
43+
.ql-container.ql-snow {
44+
overflow: hidden;
45+
}
46+
47+
.ql-editor.ql-blank {
48+
white-space: nowrap;
49+
}
50+
51+
.buidlbox-container {
52+
margin: 0 auto;
53+
width: 100%;
54+
max-width: 500px;
55+
background: #363232;
56+
background-image: url("{{ STATIC_URL }}v2/images/buidlbox/landing-bg.svg");
57+
color: #fff;
58+
59+
}
60+
</style>
61+
</head>
62+
63+
<body>
64+
<div class="content__main min-vh-100 d-md-flex flex-column">
65+
{% include 'shared/tag_manager_2.html' %}
66+
<div class="container-fluid header dash px-0">
67+
{% include 'shared/top_nav.html' with class='d-md-flex' %}
68+
{% include 'shared/nav.html' %}
69+
</div>
70+
<div class="mt-5 container-fluid pb-5 pt-5" id="gc-hackathon-new-bounty">
71+
72+
<div class="buidlbox-container row p-5">
73+
74+
<div class="mb-5">
75+
{% include 'shared/buidlbox_logo.svg' %}
76+
</div>
77+
78+
<div class="text-center">
79+
<h3 class="mb-5">
80+
Hackathons have moved and bounties are coming soon on <a href="https://buidlbox.io" title="Buidlbox" style="color: #fff; ">Buidlbox</a>
81+
</h3>
82+
<p>You'll be automatically redirected in <span id="countdown">5</span> seconds.</p>
83+
</div>
84+
85+
</div>
86+
87+
88+
</div>
89+
90+
<script>
91+
window.onload = function() {
92+
var countdown = 5;
93+
var countdownElement = document.getElementById('countdown');
94+
95+
var countdownTimer = setInterval(function() {
96+
countdown--;
97+
countdownElement.textContent = countdown;
98+
if (countdown <= 0) {
99+
clearInterval(countdownTimer);
100+
window.location.href = 'https://buidlbox.io?utm_source=bounties.gitcoin.co&utm_medium=referral&utm_campaign=gitcoin_buidlbox';
101+
}
102+
}, 1000);
103+
};
104+
</script>
105+
106+
{% include 'shared/footer.html' %}
107+
{% include 'shared/footer_scripts.html' with vue=True %}
108+
{% include 'shared/current_profile.html' %}
109+
{% include 'grants/components/form_wrapper.html' %}
110+
111+
</div>
112+
</body>
113+
114+
</html>

app/dashboard/templates/shared/buidlbox_logo.html

+220
Large diffs are not rendered by default.

app/dashboard/templates/shared/buidlbox_logo.svg

+220
Loading

app/dashboard/templates/shared/ribbon_banner.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div
1+
<!-- <div
22
style="
33
min-height: 30px;
44
background: #ffcc00;
@@ -14,4 +14,4 @@
1414
style="color: #000; text-decoration: underline"
1515
>Support here.</a
1616
>
17-
</div>
17+
</div> -->

app/dashboard/views.py

+7
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ def oauth_connect(request, *args, **kwargs):
173173
return JsonResponse(user_profile, status=200, safe=False)
174174

175175

176+
177+
178+
176179
def org_perms(request):
177180
if request.user.is_authenticated and getattr(request.user, 'profile', None):
178181
profile = request.user.profile
@@ -4457,6 +4460,10 @@ def labs(request):
44574460
}
44584461
return TemplateResponse(request, 'labs.html', context)
44594462

4463+
def move_to_buidlbox(request):
4464+
return TemplateResponse(request, 'bounty/move_to_buidlbox.html', {})
4465+
4466+
44604467

44614468
@login_required
44624469
def new_bounty(request):

requirements/base.txt

+1
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,4 @@ unidecode==1.2.0
121121
drf-flex-fields==0.9.1
122122
pandas==1.1.5
123123
django-svg-image-form-field==1.0.1
124+
urllib3<2

0 commit comments

Comments
 (0)