Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Revert "FS-4071: Add contact_us_banner_json to fund-store round model (…
Browse files Browse the repository at this point in the history 
…#290)" (#293)

This reverts commit ec4f936.
  • Loading branch information
@tferns
tferns authored Apr 15, 2024
1 parent 01a2058 commit 23672ed
Show file tree
Hide file tree
Showing 13 changed files with 7 additions and 393 deletions.
5 changes: 0 additions & 5 deletions api/routes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ def filter_fund(data):
def filter_round_by_lang(round_data, lang_key: str = "en"):
def filter_round(data):
data["title"] = data["title_json"].get(lang_key) or data["title_json"]["en"]
data["contact_us_banner"] = (
data["contact_us_banner_json"].get(lang_key) or data["contact_us_banner_json"].get("en")
if data["contact_us_banner_json"]
else ""
)
data["instructions"] = (
data["instructions_json"].get(lang_key) or data["instructions_json"].get("en")
if data["instructions_json"]
Expand Down
86 changes: 2 additions & 84 deletions config/fund_loader_config/cof/cof_r2.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# flake8: noqa
import textwrap
from datetime import datetime
from datetime import timezone

Expand Down Expand Up @@ -40,47 +38,7 @@
"community-ownership-fund-privacy-notice"
),
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down Expand Up @@ -142,47 +100,7 @@
"https://www.gov.uk/government/publications/community-ownership-fund-privacy-notice/"
"community-ownership-fund-privacy-notice"
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down
128 changes: 3 additions & 125 deletions config/fund_loader_config/cof/cof_r3.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# flake8: noqa
import textwrap
from datetime import datetime
from datetime import timezone

Expand Down Expand Up @@ -730,47 +728,7 @@
"https://www.gov.uk/government/publications/community-ownership-fund-"
"privacy-notice/community-ownership-fund-privacy-notice"
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down Expand Up @@ -832,47 +790,7 @@
"https://www.gov.uk/government/publications/community-ownership-fund-"
"privacy-notice/community-ownership-fund-privacy-notice"
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down Expand Up @@ -934,47 +852,7 @@
"https://www.gov.uk/government/publications/community-ownership-fund-"
"privacy-notice/community-ownership-fund-privacy-notice"
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down
44 changes: 1 addition & 43 deletions config/fund_loader_config/cof/cof_r4.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# flake8: noqa
import textwrap
from datetime import datetime
from datetime import timezone

Expand Down Expand Up @@ -250,47 +248,7 @@
"https://www.gov.uk/government/publications/community-ownership-fund-"
"privacy-notice/community-ownership-fund-privacy-notice"
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down
44 changes: 1 addition & 43 deletions config/fund_loader_config/cof/eoi.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# flake8: noqa
import textwrap
from datetime import datetime
from datetime import timezone

Expand Down Expand Up @@ -124,47 +122,7 @@
"https://www.gov.uk/government/publications/community-ownership-fund-"
"privacy-notice/community-ownership-fund-privacy-notice"
),
"contact_us_banner_json": {
"en": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
"cy": textwrap.dedent(
"""
<h2 class="govuk-heading-m">Get application support</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund">Visit the My Community website</a>
for information and guidance on applying to Community Ownership Fund.
<a class="govuk-link" href="https://mycommunity.org.uk/community-ownership-fund#enquiry-form">Fill out the enquiry form</a>
to request advice from My Community.
</p>
<p class="govuk-body">
We cannot provide direct support to applicants outside of this service.
</p>
<h2 class="govuk-heading-m">Get technical support</h2>
<p class="govuk-body">
Contact the Department of Levelling Up, Housing and Communities funding team if you need
help with accessing or submitting an application form.
</p>
"""
),
},
"contact_email": "[email protected]",
"contact_email": "[email protected]",
"contact_phone": None,
"contact_textphone": None,
"support_times": "9am to 5pm",
Expand Down
Loading

0 comments on commit 23672ed

Please sign in to comment.