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

fix: grants.gov url change #2549

Merged
merged 3 commits into from
Jan 31, 2024
+5 −5
Merged

fix: grants.gov url change #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0b08b8
fix: grants.gov url change
as1729 Jan 31, 2024
49b6a07
fix: ensure email links are fixed
as1729 Jan 31, 2024
0e83c74
Merge branch 'main' into as/fix-url-to-grnats
TylerHendrickson Jan 31, 2024
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
2 changes: 1 addition & 1 deletion packages/client/src/components/Modals/GrantDetailsLegacy.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<h1 class="mb-0 h2">{{ selectedGrant.title }}</h1>
</b-col>
<b-col cols="4" class="text-right">
<b-button :href="`https://www.grants.gov/web/grants/view-opportunity.html?oppId=${selectedGrant.grant_id}`"
<b-button :href="`https://www.grants.gov/search-results-detail/${selectedGrant.grant_id}`"
target="_blank" rel="noopener noreferrer" variant="primary" data-dd-action-name="view on grants.gov">
<b-icon icon="box-arrow-up-right" aria-hidden="true" class="mr-2"></b-icon>View on Grants.gov
</b-button>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/views/GrantDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</b-col>
<b-col class="mx-auto my-5 px-2 col-md-4 col-lg-3">
<b-row>
<b-button :href="`https://www.grants.gov/web/grants/view-opportunity.html?oppId=${selectedGrant.grant_id}`"
<b-button :href="`https://www.grants.gov/search-results-detail/${selectedGrant.grant_id}`"
target="_blank" rel="noopener noreferrer" variant="primary" class="btn-block mx-1 my-2" data-dd-action-name="view on grants.gov">
<b-icon icon="box-arrow-up-right" aria-hidden="true" class="mr-2"></b-icon>Apply on Grants.gov
</b-button>
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/lib/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function getGrantDetail(grant, emailNotificationType) {
award_ceiling: grant.award_ceiling || 'Not available',
// estimated_funding: grant.estimated_funding, TODO: add once field is available in the database.
cost_sharing: grant.cost_sharing,
link_url: `https://www.grants.gov/web/grants/view-opportunity.html?oppId=${grant.grant_id}`,
link_url: `https://www.grants.gov/search-results-detail/${grant.grant_id}`,
grants_url: grantsUrl.toString(),
view_grant_label: emailNotificationType === notificationType.grantDigest ? undefined : 'View My Grants',
},
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/routes/grants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ router.get('/exportCSVNew', requireUser, async (req, res) => {
.join(', '),
open_date: new Date(grant.open_date).toLocaleDateString('en-US', { timeZone: 'UTC' }),
close_date: new Date(grant.close_date).toLocaleDateString('en-US', { timeZone: 'UTC' }),
url: `https://www.grants.gov/web/grants/view-opportunity.html?oppId=${grant.grant_id}`,
url: `https://www.grants.gov/search-results-detail/${grant.grant_id}`,
}));

if (data.length === 0) {
Expand Down Expand Up @@ -223,7 +223,7 @@ router.get('/exportCSV', requireUser, async (req, res) => {
.join(', '),
open_date: new Date(grant.open_date).toLocaleDateString('en-US', { timeZone: 'UTC' }),
close_date: new Date(grant.close_date).toLocaleDateString('en-US', { timeZone: 'UTC' }),
url: `https://www.grants.gov/web/grants/view-opportunity.html?oppId=${grant.grant_id}`,
url: `https://www.grants.gov/search-results-detail/${grant.grant_id}`,
}));

if (data.length === 0) {
Expand Down
Loading