Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #506] Remove NOFO content #507

Merged
merged 3 commits into from
Sep 13, 2023
Merged

[ISSUE #506] Remove NOFO content #507

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4e5bdb
remove NOFO content, tweak remaining text, refactor email reoutes
andycochran Sep 12, 2023
b2766b8
improve wtig CTAs
andycochran Sep 12, 2023
5f54ce5
clarify beta in site title
andycochran Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions frontend/public/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"Index": {
"page_title": "Home | Beta.grants.gov",
"meta_description": "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
"alert_title": "This website is a work in progress.",
"alert": "To search for funding opportunities and apply, visit <LinkToGrants>www.grants.gov</LinkToGrants>.",
"alert_title": "Beta.grants.gov is a work in progress.",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose to say "This website Beta.grants.gov is a work in progress." as it's more direct. And I'm now wondering if the "Grants.gov" in the site header should be changed to include "beta" too.

"alert": "To search for funding opportunities and apply, go to <LinkToGrants>www.grants.gov</LinkToGrants>.",
"goal_title": "What's the goal?",
"goal_paragraph_1": "We want Grants.gov to be the simplest, most inclusive, and most gratifying tool ever built for posting, finding, sharing, and applying for financial assistance. Our mission is to increase access to grants and improve the grants experience for everyone.",
"goal_title_2": "For applicants",
"goal_paragraph_2": "We’re building a one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
"goal_paragraph_2": "We’re building a one‑stop shop for all federal discretionary funding that makes it easy for you to discover, understand, and apply for opportunities.",
"goal_title_3": "For grantmakers",
"goal_paragraph_3": "If you work for a federal grantmaking agency, we’re making it easier for you to write, post, announce, and manage funding opportunities that reach your communities, including underserved communities.",
"goal_paragraph_3": "If you work for a federal grantmaking agency, we’re making it easier for your communities (including underserved communities) to find the funding they need.",
"fo_title": "Improvements to funding opportunity announcements",
"fo_paragraph_1": "Funding opportunities should not only be easy to find, share, and apply for. They should also be easy to read and understand. Our objective is to simplify and organize funding opportunities announcements. ",
"fo_paragraph_2": "We want to help grantmakers write clear, concise announcements that encourage strong submissions from qualified applicants and make opportunities more accessible to everyone.",
Expand All @@ -25,7 +25,7 @@
"fo_paragraph_5": "We're especially interested in hearing from first‑time applicants and organizations that have never applied for funding opportunities. We encourage you to review our announcements and share your feedback, regardless of your experience with federal grants.",
"wtgi_title": "Ways to get involved",
"wtgi_paragraph_1": "Follow our progress as we improve grant announcements and build a better API and opportunity search on beta.grants.gov.",
"wtgi_list": "<ul><li><LinkToGoals>Read our project goals and milestones</LinkToGoals></li><li>Join our open‑source community on <github>GitHub</github></li><li>Contact us at <email>[email protected]</email></li></ul>"
"wtgi_list": "<ul><li><LinkToGoals>Read our project goals and milestones</LinkToGoals></li><li>Join our open‑source community on <github>GitHub</github></li><li>Contact us at <email>{{email}}</email></li></ul>"
},
"Header": {
"nav_link_home": "Home",
Expand All @@ -36,14 +36,13 @@
"Hero": {
"title": "We're building a new Grants.gov!",
"beta": "BETA!",
"content": "This new website will be your go‑to resource to follow our progress on improving funding opportunity announcements and the application experience.",
"content": "This new website will be your go‑to resource to follow our progress as we improve the grants experience, making it easier to find, share, and apply.",
"github_link": "Follow on GitHub"
},
"Footer": {
"agency_name": "Grants.gov",
"agency_contact_center": "Grants.gov Program Management Office",
"telephone": "1-877-696-6775",
"email": "[email protected]",
"return_to_top": "Return to top",
"link_twitter": "Twitter",
"link_youtube": "YouTube",
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const Footer = () => {
data-testid="footer"
size="medium"
returnToTop={
<GridContainer className="usa-footer__return-to-top">
<GridContainer className="usa-footer__return-to-top margin-top-5">
<a href="#">{t("return_to_top")}</a>
</GridContainer>
}
Expand Down Expand Up @@ -105,8 +105,8 @@ const Footer = () => {
<a key="telephone" href={`tel:${t("telephone")}`}>
{t("telephone")}
</a>,
<a key="email" href={ExternalRoutes.CONTACT_EMAIL}>
{t("email")}
<a key="email" href={`mailto:${ExternalRoutes.EMAIL_SUPPORT}`}>
{ExternalRoutes.EMAIL_SUPPORT}
</a>,
]}
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/GoalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const GoalContent = () => {
const { t } = useTranslation("common", { keyPrefix: "Index" });

return (
<GridContainer className="padding-y-1 tablet:padding-y-3 desktop-lg:padding-y-6">
<GridContainer className="padding-y-1 tablet:padding-y-3 desktop-lg:padding-y-6 border-bottom-2px border-base-lightest">
<h2 className="margin-bottom-0 tablet-lg:font-sans-xl desktop-lg:font-sans-2xl">
{t("goal_title")}
</h2>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/WtGIContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Trans, useTranslation } from "next-i18next";
import { Grid, GridContainer } from "@trussworks/react-uswds";

const WtGIContent = () => {
const email = ExternalRoutes.EMAIL_EQUITYINGRANTS;
const { t } = useTranslation("common", { keyPrefix: "Index" });

return (
Expand All @@ -22,6 +23,7 @@ const WtGIContent = () => {
<Trans
t={t}
i18nKey="wtgi_list"
values={{ email }}
components={{
ul: (
<ul className="usa-list margin-top-0 tablet-lg:margin-top-3 font-sans-md line-height-sans-4" />
Expand All @@ -41,7 +43,7 @@ const WtGIContent = () => {
href={ExternalRoutes.GITHUB_REPO}
/>
),
email: <a href={ExternalRoutes.CONTACT_EMAIL} />,
email: <a href={`mailto:${email}`} />,
}}
/>
</Grid>
Expand Down
25 changes: 13 additions & 12 deletions frontend/src/constants/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@ export const ExternalRoutes = {
ABOUT_HHS: "https://www.hhs.gov/about/index.html",
ACCESSIBILITY_COMPLIANCE:
"https://www.grants.gov/web/grants/accessibility-compliance.html",
EMAIL_EQUITYINGRANTS: "[email protected]",
EMAIL_SUPPORT: "[email protected]",
FOIA: "https://www.hhs.gov/foia/index.html",
NO_FEAR: "https://www.hhs.gov/about/agencies/asa/eeo/no-fear-act/index.html",
INSPECTOR_GENERAL: "https://oig.hhs.gov/",
PERFORMANCE_REPORTS: "https://www.hhs.gov/about/budget/index.html",
PRIVACY_POLICY: "https://www.grants.gov/web/grants/privacy.html",
USA: "https://www.usa.gov",
HHS: "https://www.hhs.gov",
MILESTONES:
"https://github.com/HHS/grants-equity/blob/main/documentation/milestones/milestone_short_descriptions.md",
GITHUB_REPO: "https://github.com/HHS/grants-equity",
CONTACT_EMAIL: "mailto:[email protected]",
GRANTS_HOME: "https://www.grants.gov",
GRANTS_TWITTER: "https://twitter.com/grantsdotgov",
GRANTS_YOUTUBE: "https://www.youtube.com/user/GrantsGovUS",
GRANTS_RSS: "https://www.grants.gov/web/grants/rss.html",
GRANTS_NEWSLETTER:
"https://www.grants.gov/web/grants/connect/newsletter-archive.html",
GRANTS_RSS: "https://www.grants.gov/web/grants/rss.html",
GRANTS_TWITTER: "https://twitter.com/grantsdotgov",
GRANTS_YOUTUBE: "https://www.youtube.com/user/GrantsGovUS",
GRANTS_BLOG: "https://grantsgovprod.wordpress.com/",
HHS: "https://www.hhs.gov",
INSPECTOR_GENERAL: "https://oig.hhs.gov/",
MILESTONES:
"https://github.com/HHS/grants-equity/blob/main/documentation/milestones/milestone_short_descriptions.md",
NO_FEAR: "https://www.hhs.gov/about/agencies/asa/eeo/no-fear-act/index.html",
PERFORMANCE_REPORTS: "https://www.hhs.gov/about/budget/index.html",
PRIVACY_POLICY: "https://www.grants.gov/web/grants/privacy.html",
USA: "https://www.usa.gov",
};
2 changes: 0 additions & 2 deletions frontend/src/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import PageSEO from "src/components/PageSEO";
import WtGIContent from "src/components/WtGIContent";
import FullWidthAlert from "../components/FullWidthAlert";
import FundingContent from "../components/FundingContent";
import GoalContent from "../components/GoalContent";
import Hero from "../components/Hero";

Expand All @@ -34,7 +33,6 @@ const Home: NextPage = () => {
/>
</FullWidthAlert>
<GoalContent />
<FundingContent />
<WtGIContent />
</>
);
Expand Down