Skip to content

Commit 3f1032c

Browse files
giliomeejgroansong
andauthored
Remove Create new Grant nav and disable grant creation page (#10964)
* 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. Co-authored-by: Roan Song <[email protected]>
1 parent 23c71f9 commit 3f1032c

File tree

11 files changed

+119
-16
lines changed

11 files changed

+119
-16
lines changed
Loading

app/dashboard/templates/profiles/tab_grant_contribs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 class="font-body mt-3 mb-3 ml-0 pb-3 title">Grants Created ({{profile.grant_
3030

3131
{% if not profile.grant_admin.count %}
3232
<p>
33-
No Grants Funded. <a href=grants/new>Create a Grant &gt;</a>
33+
No Grants Funded. <!--<a href=grants/new>Create a Grant &gt;</a>-->
3434
</p>
3535
{% endif %}
3636

app/dashboard/templates/shared/menu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@
158158
<li>
159159
<a class="dropdown-item dropdown-item-small" href="{% url 'grants:grants_explorer' %}">{% trans "Explore Grants" %}</a>
160160
</li>
161-
<li>
161+
<!-- <li>
162162
<a class="dropdown-item dropdown-item-small" href="{% url 'grants:new' %}">{% trans "Create Grant" %}</a>
163-
</li>
163+
</li> -->
164164
<li>
165165
<a class="dropdown-item dropdown-item-small" href="https://support.gitcoin.co/gitcoin-grants/what-is-a-grant">{% trans "About Grants" %}</a>
166166
</li>

app/dashboard/templates/shared/nav_auth.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145
<li>
146146
<a class="dropdown-item dropdown-item-small" href="{% url 'grants:grants_explorer' %}?following=true&idle=true">{% trans "Favorites" %}</a>
147147
</li>
148-
<hr />
148+
<!-- <hr />
149149
<li>
150150
<a class="dropdown-item dropdown-item-small" href="{% url 'grants:new' %}">{% trans "Create a Grant" %}</a>
151-
</li>
151+
</li> -->
152152
</ul>
153153
</div>
154154

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
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 <http://www.gnu.org/licenses/>.
16+
17+
{% endcomment %}
18+
{% load i18n static email_obfuscator add_url_schema avatar_tags bundle %}
19+
<!DOCTYPE html>
20+
<html lang="en">
21+
22+
<head>
23+
{% include 'shared/head.html' with slim=1 %}
24+
{% include 'shared/cards.html' %}
25+
<script src="//cdn.quilljs.com/1.3.6/quill.core.js"></script>
26+
{% bundle css file new_grant %}
27+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/lib/quill.bubble.scss" %} />
28+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/lib/quill.snow.scss" %} />
29+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/grants/new.scss" %} />
30+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/grants/form_wrapper.scss" %} />
31+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/progress_bar.scss" %} />
32+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/tabs.scss" %} />
33+
{% endbundle %}
34+
</head>
35+
36+
<body class="interior {{ active }} grant g-font-muli">
37+
<div class="content__main min-vh-100 d-md-flex flex-column">
38+
{% include 'shared/tag_manager_2.html' %}
39+
<div class="container-fluid header dash px-0">
40+
{% include 'shared/top_nav.html' with class='d-md-flex' %}
41+
{% include 'grants/nav.html' %}
42+
</div>
43+
44+
<div class="container-fluid pb-5 pt-5">
45+
<div class="col-lg-9 mx-auto mb-5">
46+
<div class="hubspot_form_wrap simple">
47+
48+
<div class="row">
49+
<div class="col-12 col-sm-6">
50+
<h1>We're buidling..</h1>
51+
<p>
52+
It looks like you’ve landed on a page where you used to create a grant, but as we’re in the exciting process of transitioning to our new decentralized platform. This old centralized version is now retired.
53+
</p>
54+
<p>
55+
<a href="https://support.gitcoin.co/gitcoin-knowledge-base/gitcoin-grants/how-is-the-gitcoin-grants-program-changing" title="How is the Gitcoin Grants program changing?" target="_blank">Learn more about our transition</a>.
56+
</p>
57+
<p>
58+
To be notified when you can start participating in grants on our new platform when it's live, please enter your email address below:<br />
59+
<script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/embed/v2.js"></script>
60+
<script>
61+
hbspt.forms.create({
62+
region: "na1",
63+
portalId: "21870089",
64+
formId: "fe7f94cb-3892-4f43-945f-5328c27705c6"
65+
});
66+
</script>
67+
</p>
68+
</div>
69+
<div class="col-12 col-sm-6 pt-5">
70+
<a href="https://go.gitcoin.co/blog/introduction-to-grants-protocol" title="More about Gitcoin Grants Protocol"></a>
71+
<img src="{{ STATIC_URL }}v2/images/grants/protocol/grants-protocol-banner.png" alt="Grants Protocol Banner" style="width: 100%;" />
72+
</a>
73+
</div>
74+
75+
</div>
76+
</div>
77+
</div>
78+
</div>
79+
80+
{% include 'shared/footer.html' %}
81+
{% include 'shared/current_profile.html' %}
82+
{% include 'grants/shared/shared_scripts.html' %}
83+
{% include 'shared/footer_scripts.html' with slim=1 ignore_inject_web3=1 %}
84+
{% include 'grants/components/form_wrapper.html' %}
85+
<script>
86+
document.grant_tags = {{grant_tags|safe}};
87+
</script>
88+
<script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
89+
<script src='https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.min.js'></script>
90+
<script src='https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-quill-editor.js'></script>
91+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/compressor.min.js"></script>
92+
93+
<script src="{% static "v2/js/grants/form_wrapper.js" %}"></script>
94+
<script src="{% static "v2/js/grants/progress_bar.js" %}"></script>
95+
<script src="{% static "v2/js/pages/tabs.js" %}"></script>
96+
<script src="{% static "v2/js/tokens.js" %}"></script>
97+
<script src="{% static "v2/js/user-search.js" %}"></script>
98+
<script src="{% static "v2/js/grants/shared.js" %}"></script>
99+
<script src="{% static "v2/js/grants/_new.js" %}"></script>
100+
</div>
101+
</body>
102+
<html>

app/grants/templates/grants/explorer.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,10 @@ <h3 class="my-3">Explore grants curated by the community</h3>
625625
{% include 'grants/shared/landing_grants.html' with container_class='container p-0' %}
626626
</b-tab>
627627
<template v-slot:tabs-end v-if="tabIndex === 0">
628-
<li role="presentation" class="flex-fill nav-item text-right">
628+
<span></span>
629+
<!-- <li role="presentation" class="flex-fill nav-item text-right">
629630
<a href="{% url 'grants:new' %}" class="btn btn-primary">{% trans 'Create a Grant' %}</a>
630-
</li>
631+
</li> -->
631632
</template>
632633
</b-tabs>
633634
</template>

app/grants/templates/grants/landing/landing_qf_active.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h4 class="text-wrap gc-font-base font-weight-normal mb-md-5 mb-4 pt-md-4 pt-1 t
4141
</h3>
4242
<div class="my-3">
4343
<a class="btn btn-lg btn-primary d-block d-sm-inline" href="{% url 'grants:grants_explorer' %}">{% trans 'View All Grants' %}</a>
44-
<a class="btn btn-lg btn-outline-primary ml-sm-3 d-block d-sm-inline mt-2 mt-sm-0" href="/grants/new">{% trans 'Create a Grant' %}</a>
44+
<!-- <a class="btn btn-lg btn-outline-primary ml-sm-3 d-block d-sm-inline mt-2 mt-sm-0" href="/grants/new">{% trans 'Create a Grant' %}</a> -->
4545
</div>
4646
<p class="font-subheader mt-4 mb-2">
4747
<a target="_blank" href="https://gitcoin.notion.site/gitcoin/Gitcoin-Grantee-Onboarding-Document-bbfe106a32534fb5a011f09c121257c3">

app/grants/templates/grants/matching_funds.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <h2>Matching Funds</h2>
150150
</div>
151151
</div>
152152
<div v-else>
153-
<p class="font-subheader text-grey-400 mt-3 mb-lg-5 mb-5">It seems like you don’t have a grant yet. <a href="/grants/new">Create a Grant?</a></p>
153+
<p class="font-subheader text-grey-400 mt-3 mb-lg-5 mb-5">It seems like you don’t have a grant yet. <!--<a href="/grants/new">Create a Grant?</a>--></p>
154154

155155
<div class="text-center">
156156
<svg width="332" height="360" viewBox="0 0 332 360" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -360,7 +360,7 @@ <h2>Matching Funds</h2>
360360
</div>
361361

362362
<div v-else>
363-
<p class="font-subheader text-grey-400 mt-3 mb-lg-5 mb-5">It seems like you don’t have a grant yet. <a href="/grants/new">Create a Grant?</a></p>
363+
<p class="font-subheader text-grey-400 mt-3 mb-lg-5 mb-5">It seems like you don’t have a grant yet. <!--<a href="/grants/new">Create a Grant?</a>--></p>
364364

365365
<div class="text-center">
366366
<svg width="332" height="360" viewBox="0 0 332 360" fill="none" xmlns="http://www.w3.org/2000/svg">

app/grants/templates/grants/shared/landing_hero.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% load humanize static i18n %}
22

33
<div id='container_bar' class='pl-3 pr-3 mb-0 py-4 text-center font-bigger-1'>
4-
<a class="btn btn-lg btn-primary col-12 col-sm-auto mr-md-4 mb-2 mb-sm-0" href="{% url 'grants:new' %}">
4+
<!-- <a class="btn btn-lg btn-primary col-12 col-sm-auto mr-md-4 mb-2 mb-sm-0" href="{% url 'grants:new' %}">
55
{% trans 'Create a Grant' %}
6-
</a>
6+
</a> -->
77
<a class="btn btn-lg btn-outline-primary col-12 col-sm-auto" href="/grants/matching-partners/new">
88
Become a Matching Partner
99
</a>

app/grants/tests/views/test_grant_new_routes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def test_when_not_logged_in_redirects_to_github_for_auth(self):
1616
content = str(response.content)
1717

1818
assert response.status_code == 200
19-
assert 'Create a Grant' not in content
20-
assert 'Please log in before submitting a grant' in content
19+
assert 'Create new grant' not in content
20+
assert 'This old centralized version is now retired' in content
2121

2222
def test_when_logged_in_renders_grants_new_template(self, django_user_model):
2323
user = django_user_model.objects.create(username='gitcoin', password='password123')
@@ -28,7 +28,7 @@ def test_when_logged_in_renders_grants_new_template(self, django_user_model):
2828
response = client.get('/grants/new')
2929

3030
assert response.status_code == 200
31-
assert 'Create a Grant' in str(response.content)
31+
assert 'This old centralized version is now retired' in str(response.content)
3232

3333

3434
@pytest.mark.django_db

0 commit comments

Comments
 (0)