From e73ed5185ace001bec8c5906b5ddd017330425ad Mon Sep 17 00:00:00 2001 From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com> Date: Thu, 16 Dec 2021 11:44:11 +0100 Subject: [PATCH 001/489] search button aligned with input and pointer cursor --- components/header/Header.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/header/Header.vue b/components/header/Header.vue index c24276bf..b56383bb 100644 --- a/components/header/Header.vue +++ b/components/header/Header.vue @@ -555,8 +555,8 @@ export default { height: 40px; border-radius: 4px; margin-left: 9px; - margin-top: 1px; border: none; + cursor: pointer; @media screen and (max-width: 1023px) { display: none; } From 53fb89c25a43c7cb48f1731f0c63154e2610c18a Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Wed, 7 Dec 2022 09:51:55 -0500 Subject: [PATCH 002/489] Added spinner to facet --- components/FacetMenu/RadioDateOption.vue | 26 ++++++++---------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/components/FacetMenu/RadioDateOption.vue b/components/FacetMenu/RadioDateOption.vue index f63d6e9e..6645023a 100644 --- a/components/FacetMenu/RadioDateOption.vue +++ b/components/FacetMenu/RadioDateOption.vue @@ -1,10 +1,10 @@ diff --git a/components/NewsListItem/NewsListItem.vue b/components/NewsListItem/NewsListItem.vue index 0c13bf59..9fc24e61 100644 --- a/components/NewsListItem/NewsListItem.vue +++ b/components/NewsListItem/NewsListItem.vue @@ -19,10 +19,10 @@ - +

@@ -39,7 +39,7 @@ import FormatDate from '@/mixins/format-date' import EventBannerImage from '@/components/EventBannerImage/EventBannerImage.vue' import SparcPill from '@/components/SparcPill/SparcPill.vue' -import { isInternalLink } from '@/mixins/marked/index' +import { isInternalLink, opensInNewTab } from '@/mixins/marked/index' import { highlightMatches } from '~/pages/data/utils' export default { @@ -75,6 +75,7 @@ export default { methods: { isInternalLink, + opensInNewTab, highlightMatches } } diff --git a/components/StayConnected/StayConnected.vue b/components/StayConnected/StayConnected.vue index 118094c2..f5b19810 100644 --- a/components/StayConnected/StayConnected.vue +++ b/components/StayConnected/StayConnected.vue @@ -11,7 +11,7 @@

Open Office Hours
Join one of our weekly office hours to ask questions and learn more from the SPARC Data Resource Center Team.
- + Find out more diff --git a/components/ToolAndResourcesPage/ToolsAndResourcesPage.vue b/components/ToolAndResourcesPage/ToolsAndResourcesPage.vue index 5450b49d..e9fc7aac 100644 --- a/components/ToolAndResourcesPage/ToolsAndResourcesPage.vue +++ b/components/ToolAndResourcesPage/ToolsAndResourcesPage.vue @@ -18,7 +18,7 @@
TUTORIALS & GUIDES
- + {{ tutorial.fields.title }} @@ -27,7 +27,7 @@
VIDEOS & WEBINARS
- + {{ webinar.fields.title }} @@ -46,7 +46,7 @@ import FormatDate from '@/mixins/format-date' import Breadcrumb from '@/components/Breadcrumb/Breadcrumb' import PageHero from '@/components/PageHero/PageHero' import { pathOr } from 'ramda' -import { isInternalLink } from '@/mixins/marked/index' +import { isInternalLink, opensInNewTab } from '@/mixins/marked/index' export default { name: 'ToolsAndResourcesPage', @@ -87,6 +87,7 @@ export default { methods: { isInternalLink, + opensInNewTab }, computed: { diff --git a/components/footer/FooterLink.vue b/components/footer/FooterLink.vue index 01a71f17..78e0ce27 100644 --- a/components/footer/FooterLink.vue +++ b/components/footer/FooterLink.vue @@ -1,18 +1,14 @@ diff --git a/mixins/marked/index.js b/mixins/marked/index.js index 44f6482d..cd3444a5 100644 --- a/mixins/marked/index.js +++ b/mixins/marked/index.js @@ -21,7 +21,12 @@ export const isAnchor = str => { export const isInternalLink = str => { return isAnchor(str) ? true - : str.includes(process.env.ROOT_URL) || str.startsWith('/') + : str.includes(process.env.ROOT_URL) || str.includes("docs.sparc.science") || str.startsWith('/') +} + +// docs.sparc.science is considered an internal link, but should always open in new tab +export const opensInNewTab = link => { + return !isInternalLink(link) || link.includes("docs.sparc.science") } renderer.link = function(href, title, text) { diff --git a/pages/projects/_projectId.vue b/pages/projects/_projectId.vue index 817dd23a..b4319b67 100644 --- a/pages/projects/_projectId.vue +++ b/pages/projects/_projectId.vue @@ -43,7 +43,7 @@ NIH AWARD
- + {{ awardId }} @@ -92,7 +92,7 @@ import Breadcrumb from '@/components/Breadcrumb/Breadcrumb.vue' import DatasetCard from '@/components/DatasetCard/DatasetCard.vue' import ShareLinks from '@/components/ShareLinks/ShareLinks.vue' -import { isInternalLink } from '@/mixins/marked/index' +import { isInternalLink, opensInNewTab } from '@/mixins/marked/index' import { propOr, isEmpty } from 'ramda' import createClient from '@/plugins/contentful.js' @@ -201,6 +201,7 @@ export default { methods: { isInternalLink, + opensInNewTab } } From 92244740b0cff355846c508d852b04efbe9c61c4 Mon Sep 17 00:00:00 2001 From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com> Date: Wed, 4 Jan 2023 11:56:08 +0100 Subject: [PATCH 019/489] fix for buttons click area --- pages/news-and-events/index.vue | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pages/news-and-events/index.vue b/pages/news-and-events/index.vue index ccfea462..c0a5d23c 100644 --- a/pages/news-and-events/index.vue +++ b/pages/news-and-events/index.vue @@ -115,24 +115,24 @@
Get Involved
Empower SPARC to promote your science and interests by submitting your science story, news, or event.
- - + + Share news or events - - - - + + + + Submit a community spotlight idea - - + +
+
+ +
@@ -110,6 +113,7 @@ import SortMenu from '@/components/SortMenu/SortMenu.vue' import ResourcesSearchResults from '@/components/Resources/ResourcesSearchResults.vue' import ToolsAndResourcesFacetMenu from '@/components/FacetMenu/ToolsAndResourcesFacetMenu.vue' import { fetchResources, searchTypes, sortOptions } from '../utils.ts' +import SubmitToolSection from '@/components/Resources/SubmitToolSection.vue' export default { name: 'BiologicalPage', @@ -119,7 +123,8 @@ export default { SearchControlsContentful, ResourcesSearchResults, ToolsAndResourcesFacetMenu, - SortMenu + SortMenu, + SubmitToolSection }, async asyncData({ route }) { diff --git a/pages/resources/databases/index.vue b/pages/resources/databases/index.vue index 814c3e1a..a7a0ed29 100644 --- a/pages/resources/databases/index.vue +++ b/pages/resources/databases/index.vue @@ -99,6 +99,9 @@ +
+ +
@@ -110,6 +113,7 @@ import SortMenu from '@/components/SortMenu/SortMenu.vue' import ResourcesSearchResults from '@/components/Resources/ResourcesSearchResults.vue' import ToolsAndResourcesFacetMenu from '@/components/FacetMenu/ToolsAndResourcesFacetMenu.vue' import { fetchResources, searchTypes, sortOptions } from '../utils.ts' +import SubmitToolSection from '@/components/Resources/SubmitToolSection.vue' export default { name: 'DatabasesPage', @@ -119,7 +123,8 @@ export default { SearchControlsContentful, ResourcesSearchResults, ToolsAndResourcesFacetMenu, - SortMenu + SortMenu, + SubmitToolSection }, async asyncData({ route }) { diff --git a/pages/resources/devices/index.vue b/pages/resources/devices/index.vue index f6278ce6..f09b1cb8 100644 --- a/pages/resources/devices/index.vue +++ b/pages/resources/devices/index.vue @@ -99,6 +99,9 @@ +
+ +
@@ -110,6 +113,7 @@ import SortMenu from '@/components/SortMenu/SortMenu.vue' import ResourcesSearchResults from '@/components/Resources/ResourcesSearchResults.vue' import ToolsAndResourcesFacetMenu from '@/components/FacetMenu/ToolsAndResourcesFacetMenu.vue' import { fetchResources, searchTypes, sortOptions } from '../utils.ts' +import SubmitToolSection from '@/components/Resources/SubmitToolSection.vue' export default { name: 'DevicesPage', @@ -119,7 +123,8 @@ export default { SearchControlsContentful, ResourcesSearchResults, ToolsAndResourcesFacetMenu, - SortMenu + SortMenu, + SubmitToolSection }, async asyncData({ route }) { diff --git a/pages/resources/information-services/index.vue b/pages/resources/information-services/index.vue index 7e2414f9..e8ec3c38 100644 --- a/pages/resources/information-services/index.vue +++ b/pages/resources/information-services/index.vue @@ -99,6 +99,9 @@ +
+ +
@@ -110,6 +113,7 @@ import SortMenu from '@/components/SortMenu/SortMenu.vue' import ResourcesSearchResults from '@/components/Resources/ResourcesSearchResults.vue' import ToolsAndResourcesFacetMenu from '@/components/FacetMenu/ToolsAndResourcesFacetMenu.vue' import { fetchResources, searchTypes, sortOptions } from '../utils.ts' +import SubmitToolSection from '@/components/Resources/SubmitToolSection.vue' export default { name: 'InformationServicesPage', @@ -119,7 +123,8 @@ export default { SearchControlsContentful, ResourcesSearchResults, ToolsAndResourcesFacetMenu, - SortMenu + SortMenu, + SubmitToolSection }, async asyncData({ route }) { diff --git a/pages/resources/software/index.vue b/pages/resources/software/index.vue index 5781d750..76b464ec 100644 --- a/pages/resources/software/index.vue +++ b/pages/resources/software/index.vue @@ -99,6 +99,9 @@ +
+ +
@@ -110,6 +113,7 @@ import SortMenu from '@/components/SortMenu/SortMenu.vue' import ResourcesSearchResults from '@/components/Resources/ResourcesSearchResults.vue' import ToolsAndResourcesFacetMenu from '@/components/FacetMenu/ToolsAndResourcesFacetMenu.vue' import { fetchResources, searchTypes, sortOptions } from '../utils.ts' +import SubmitToolSection from '@/components/Resources/SubmitToolSection.vue' export default { name: 'SoftwarePage', @@ -119,7 +123,8 @@ export default { SearchControlsContentful, ResourcesSearchResults, ToolsAndResourcesFacetMenu, - SortMenu + SortMenu, + SubmitToolSection }, async asyncData({ route }) { From e2500594d3187b03cc9134d7c7040da4097b00a8 Mon Sep 17 00:00:00 2001 From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com> Date: Fri, 6 Jan 2023 13:50:52 +0100 Subject: [PATCH 022/489] showing owner's name in search results --- components/Resources/ResourcesSearchResults.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/Resources/ResourcesSearchResults.vue b/components/Resources/ResourcesSearchResults.vue index 3a0b18a6..ff13e1c5 100644 --- a/components/Resources/ResourcesSearchResults.vue +++ b/components/Resources/ResourcesSearchResults.vue @@ -35,6 +35,8 @@ Support Contact

+ {{ data.fields.owner }} + · Date: Fri, 6 Jan 2023 14:23:06 +0100 Subject: [PATCH 023/489] highlighting owner --- components/Resources/ResourcesSearchResults.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Resources/ResourcesSearchResults.vue b/components/Resources/ResourcesSearchResults.vue index ff13e1c5..dacf6ed8 100644 --- a/components/Resources/ResourcesSearchResults.vue +++ b/components/Resources/ResourcesSearchResults.vue @@ -35,7 +35,7 @@ Support Contact

- {{ data.fields.owner }} + · Date: Fri, 6 Jan 2023 14:49:48 +0100 Subject: [PATCH 024/489] removed link out icon from button --- components/StayConnected/StayConnected.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/StayConnected/StayConnected.vue b/components/StayConnected/StayConnected.vue index 1564ecd7..9a0fcda2 100644 --- a/components/StayConnected/StayConnected.vue +++ b/components/StayConnected/StayConnected.vue @@ -13,7 +13,7 @@

Join one of our weekly office hours to ask questions and learn more from the SPARC Data Resource Center Team.
- Find out more + Find out more From 2ee8be979e01e3a95cc01245e74e0dc81bbf914d Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Sat, 7 Jan 2023 12:06:28 -0500 Subject: [PATCH 025/489] updated default values for news/events facet menus --- components/FacetMenu/EventsFacetMenu.vue | 4 ++-- components/FacetMenu/NewsFacetMenu.vue | 4 ++-- pages/index.vue | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/FacetMenu/EventsFacetMenu.vue b/components/FacetMenu/EventsFacetMenu.vue index cc0aa84c..6d36ca6d 100644 --- a/components/FacetMenu/EventsFacetMenu.vue +++ b/components/FacetMenu/EventsFacetMenu.vue @@ -91,8 +91,8 @@ export default { selectedEventTypeOptions: [], eventDateOption: 'show all', eventTypeOption: 'show all', - eventMonth: 'Mar', - eventYear: 2020, + eventMonth: new Date().toLocaleString('en-US', {month: 'short'}), + eventYear: new Date().getFullYear(), visibleCategories: visibleCategories, } }, diff --git a/components/FacetMenu/NewsFacetMenu.vue b/components/FacetMenu/NewsFacetMenu.vue index 9a03dc09..a3322275 100644 --- a/components/FacetMenu/NewsFacetMenu.vue +++ b/components/FacetMenu/NewsFacetMenu.vue @@ -65,8 +65,8 @@ export default { newsSubjects: SUBJECT_CATEGORY, selectedNewsSubjectIds: [], publicationDateOption: 'show all', - publicationMonth: 'Mar', - publicationYear: 2020, + publicationMonth: new Date().toLocaleString('en-US', {month: 'short'}), + publicationYear: new Date().getFullYear(), visibleCategories: visibleCategories, } }, diff --git a/pages/index.vue b/pages/index.vue index 3b08742f..dcd0c0be 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -150,6 +150,10 @@ export default { content: 'Stimulating Peripheral Activity to Relieve Conditions (SPARC)' }, + { + property: 'og:image', + content: 'https://drive.google.com/uc?id=1htDtD97Ys1Z7ng4otGu6denNXgUbURpV' + }, { name: 'og:site_name', content: 'SPARC Portal' From 6019c179c05dc217bd4a1f67d8c652a42b59dcd3 Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Mon, 9 Jan 2023 11:29:57 -0500 Subject: [PATCH 026/489] Updated seo headers --- nuxt.config.js | 12 ++++++------ pages/index.vue | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index dbeec588..6eaf9c84 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -24,13 +24,13 @@ export default { content: 'nih sparc, sparc program, stimulating peripheral activity to relieve conditions, common fund sparc, sparc, sparc initiative, sparc neuro, sparc science' }, // default social cards information for site sharing url's - { hid: 'og-type', property: 'og:type', content: 'website' }, - { hid: 'og-title', property: 'og:title', content: 'SPARC Portal' }, - { hid: 'og-desc', property: 'og:description', content: 'Advancing bioelectronic medicine through open science!' }, - { hid: 'og-image', property: 'og:image', - content: 'https://drive.google.com/uc?id=1htDtD97Ys1Z7ng4otGu6denNXgUbURpV' + { hid: 'og:type', property: 'og:type', content: 'website' }, + { hid: 'og:title', property: 'og:title', content: 'SPARC Portal' }, + { hid: 'og:desc', property: 'og:description', content: 'Advancing bioelectronic medicine through open science!' }, + { hid: 'og:image', property: 'og:image', + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' }, - { hid: 'og-url', property: 'og:url', content: process.env.ROOT_URL || 'sparc.science' }, + { hid: 'og:url', property: 'og:url', content: process.env.ROOT_URL || 'sparc.science' }, { hid: 't-type', name: 'twitter:card', content: 'summary_large_image' }, ], link: [ diff --git a/pages/index.vue b/pages/index.vue index dcd0c0be..78dc1288 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -151,8 +151,9 @@ export default { 'Stimulating Peripheral Activity to Relieve Conditions (SPARC)' }, { + hid: 'og:image', property: 'og:image', - content: 'https://drive.google.com/uc?id=1htDtD97Ys1Z7ng4otGu6denNXgUbURpV' + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' }, { name: 'og:site_name', From 6ba49b875ae4aab5153f677f24c1316f89b9b944 Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Mon, 9 Jan 2023 11:54:42 -0500 Subject: [PATCH 027/489] added secure url property --- nuxt.config.js | 3 +++ pages/index.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nuxt.config.js b/nuxt.config.js index 6eaf9c84..640197de 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -30,6 +30,9 @@ export default { { hid: 'og:image', property: 'og:image', content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' }, + { hid: 'og:image:secure_url', property: 'og:image:secure_url', + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' + }, { hid: 'og:url', property: 'og:url', content: process.env.ROOT_URL || 'sparc.science' }, { hid: 't-type', name: 'twitter:card', content: 'summary_large_image' }, ], diff --git a/pages/index.vue b/pages/index.vue index 78dc1288..e984a516 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -155,6 +155,9 @@ export default { property: 'og:image', content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' }, + { hid: 'og:image:secure_url', property: 'og:image:secure_url', + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' + }, { name: 'og:site_name', content: 'SPARC Portal' From 56d91f593ba404144091b1d0c820dce325005393 Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Mon, 9 Jan 2023 13:25:10 -0500 Subject: [PATCH 028/489] Updated social card image ratio --- nuxt.config.js | 4 ++-- pages/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index 640197de..bc2ddb2c 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -28,10 +28,10 @@ export default { { hid: 'og:title', property: 'og:title', content: 'SPARC Portal' }, { hid: 'og:desc', property: 'og:description', content: 'Advancing bioelectronic medicine through open science!' }, { hid: 'og:image', property: 'og:image', - content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/2ac134de2ddfd65eb6316421df7578f9/sparc-logo-primary.png' }, { hid: 'og:image:secure_url', property: 'og:image:secure_url', - content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/2ac134de2ddfd65eb6316421df7578f9/sparc-logo-primary.png' }, { hid: 'og:url', property: 'og:url', content: process.env.ROOT_URL || 'sparc.science' }, { hid: 't-type', name: 'twitter:card', content: 'summary_large_image' }, diff --git a/pages/index.vue b/pages/index.vue index e984a516..756fbe03 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -153,10 +153,10 @@ export default { { hid: 'og:image', property: 'og:image', - content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/2ac134de2ddfd65eb6316421df7578f9/sparc-logo-primary.png' }, { hid: 'og:image:secure_url', property: 'og:image:secure_url', - content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/63ffa09e191e3f4b9b2084f29b5de019/sparc-logo-primary.png' + content: 'https://images.ctfassets.net/6bya4tyw8399/7r5WTb92QnHkub8RsExuc1/2ac134de2ddfd65eb6316421df7578f9/sparc-logo-primary.png' }, { name: 'og:site_name', From 9c74ab5905d3e7c701b6cb615f23d2454d7c1b03 Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Mon, 9 Jan 2023 16:11:05 -0500 Subject: [PATCH 029/489] removed unnecessary code --- components/FacetMenu/FacetRadioButtonDateCategory.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/FacetMenu/FacetRadioButtonDateCategory.vue b/components/FacetMenu/FacetRadioButtonDateCategory.vue index f01361c5..0a4acebd 100644 --- a/components/FacetMenu/FacetRadioButtonDateCategory.vue +++ b/components/FacetMenu/FacetRadioButtonDateCategory.vue @@ -68,7 +68,7 @@ export default { computed: { monthNumber: function() { - return new Date(this.month + '/1/01').getMonth() + 1 + return new Date().getMonth() + 1 } }, watch: { From 05bc4937b97f2400850e288e80de15807860e26e Mon Sep 17 00:00:00 2001 From: Jesse Khorasanee Date: Tue, 10 Jan 2023 17:26:32 +1300 Subject: [PATCH 030/489] Add route to bug form on error pages --- components/Error/400.vue | 3 ++- components/Error/404.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/Error/400.vue b/components/Error/400.vue index fa939d67..ddeff0d4 100644 --- a/components/Error/400.vue +++ b/components/Error/400.vue @@ -29,7 +29,8 @@ :to="{ name: 'contact-us', query: { - type: 'bug' + type: 'bug', + source_url: this.$nuxt.$route.fullPath } }" > diff --git a/components/Error/404.vue b/components/Error/404.vue index a2665132..5ac81d56 100644 --- a/components/Error/404.vue +++ b/components/Error/404.vue @@ -29,7 +29,8 @@ :to="{ name: 'contact-us', query: { - type: 'bug' + type: 'bug', + source_url: this.$nuxt.$route.fullPath } }" > From 7576bede62e2ba4e4f3ba244b2ad0a47dda65716 Mon Sep 17 00:00:00 2001 From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:34:38 +0100 Subject: [PATCH 031/489] added section for news&events too --- .../SubmitCommunitySection.vue | 38 ++++++++++++++++++ .../SubmitNewsSection.vue | 39 +++++++++++++++++++ components/Resources/SubmitToolSection.vue | 2 +- .../community-spotlight/index.vue | 7 +++- pages/news-and-events/events/index.vue | 7 +++- pages/news-and-events/news/index.vue | 7 +++- 6 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 components/NewsEventsResourcesPage/SubmitCommunitySection.vue create mode 100644 components/NewsEventsResourcesPage/SubmitNewsSection.vue diff --git a/components/NewsEventsResourcesPage/SubmitCommunitySection.vue b/components/NewsEventsResourcesPage/SubmitCommunitySection.vue new file mode 100644 index 00000000..b823d37f --- /dev/null +++ b/components/NewsEventsResourcesPage/SubmitCommunitySection.vue @@ -0,0 +1,38 @@ + + + diff --git a/components/NewsEventsResourcesPage/SubmitNewsSection.vue b/components/NewsEventsResourcesPage/SubmitNewsSection.vue new file mode 100644 index 00000000..765ace81 --- /dev/null +++ b/components/NewsEventsResourcesPage/SubmitNewsSection.vue @@ -0,0 +1,39 @@ + + + diff --git a/components/Resources/SubmitToolSection.vue b/components/Resources/SubmitToolSection.vue index 27eecba5..3f9f14c0 100644 --- a/components/Resources/SubmitToolSection.vue +++ b/components/Resources/SubmitToolSection.vue @@ -31,7 +31,7 @@ export default { async fetch() { const response = await client.getEntry(process.env.ctf_tools_and_resources_page_id) - this.searchPaperButton = response.fields.searchPaperButton, + this.searchPaperButton = response.fields.searchPaperButton this.searchPaperText = response.fields.searchPaperText } } diff --git a/pages/news-and-events/community-spotlight/index.vue b/pages/news-and-events/community-spotlight/index.vue index 4e81eab8..366219e0 100644 --- a/pages/news-and-events/community-spotlight/index.vue +++ b/pages/news-and-events/community-spotlight/index.vue @@ -112,6 +112,9 @@ +
+ +
@@ -125,6 +128,7 @@ import CommunitySpotlightFacetMenu from '@/components/FacetMenu/CommunitySpotlig import Breadcrumb from '@/components/Breadcrumb/Breadcrumb.vue' import SearchControlsContentful from '@/components/SearchControlsContentful/SearchControlsContentful.vue' import SortMenu from '@/components/SortMenu/SortMenu.vue' +import SubmitCommunitySection from '~/components/NewsEventsResourcesPage/SubmitCommunitySection.vue' import { fetchCommunitySpotlightItems, CommunitySpotlightData, CommunitySpotlightComputed, CommunitySpotlightMethods } from '../model' @@ -182,7 +186,8 @@ export default Vue.extend +
+ +
@@ -116,6 +119,7 @@ import EventListItem from '@/components/EventListItem/EventListItem.vue' import SearchControlsContentful from '@/components/SearchControlsContentful/SearchControlsContentful.vue' import SortMenu from '@/components/SortMenu/SortMenu.vue' import createClient from '@/plugins/contentful.js' +import SubmitNewsSection from '~/components/NewsEventsResourcesPage/SubmitNewsSection.vue' import { fetchEvents, EventsData, EventsComputed, EventsMethods } from '../model' @@ -162,7 +166,8 @@ export default Vue.extend({ EventsFacetMenu, EventListItem, SearchControlsContentful, - SortMenu + SortMenu, + SubmitNewsSection }, async asyncData({ route }) { diff --git a/pages/news-and-events/news/index.vue b/pages/news-and-events/news/index.vue index 66ab70e5..8438b595 100644 --- a/pages/news-and-events/news/index.vue +++ b/pages/news-and-events/news/index.vue @@ -103,6 +103,9 @@ +
+ +
@@ -115,6 +118,7 @@ import NewsFacetMenu from '@/components/FacetMenu/NewsFacetMenu.vue' import NewsListItem from '@/components/NewsListItem/NewsListItem.vue' import SearchControlsContentful from '@/components/SearchControlsContentful/SearchControlsContentful.vue'; import SortMenu from '@/components/SortMenu/SortMenu.vue' +import SubmitNewsSection from '~/components/NewsEventsResourcesPage/SubmitNewsSection.vue' import createClient from '@/plugins/contentful.js' @@ -163,7 +167,8 @@ export default Vue.extend({ NewsFacetMenu, NewsListItem, SearchControlsContentful, - SortMenu + SortMenu, + SubmitNewsSection }, async asyncData({ route }) { From e914dce44e5733e3c26b3341bdb0720d242fd3d0 Mon Sep 17 00:00:00 2001 From: Eric Gauzens Date: Wed, 11 Jan 2023 10:47:28 -0500 Subject: [PATCH 032/489] Added metadata tag and recaptcha --- .../GeneralForm/GeneralForm.vue | 27 ++++++------------- nuxt.config.js | 7 ++++- pages/index.vue | 11 ++++++-- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/components/ContactUsForms/GeneralForm/GeneralForm.vue b/components/ContactUsForms/GeneralForm/GeneralForm.vue index 4958a94b..6d531b6e 100644 --- a/components/ContactUsForms/GeneralForm/GeneralForm.vue +++ b/components/ContactUsForms/GeneralForm/GeneralForm.vue @@ -1,6 +1,6 @@ - {{ title }} + @@ -16,10 +16,13 @@ import Vue from 'vue' import { Methods, Props } from './model' +import marked from '@/mixins/marked/index' export default Vue.extend({ name: 'Breadcrumb', + mixins: [marked], + props: { breadcrumb: { type: Array, @@ -29,7 +32,7 @@ export default Vue.extend({ type: String, default: '' } - }, + } }) @@ -43,5 +46,10 @@ export default Vue.extend({ text-decoration: none; color: $darkBlue; } + & sup { + vertical-align: baseline; + position: relative; + top: -0.4em; + } } diff --git a/components/NewsEventsResourcesPage/NewsEventsResourcesPage.vue b/components/NewsEventsResourcesPage/NewsEventsResourcesPage.vue index aab97197..de72608f 100644 --- a/components/NewsEventsResourcesPage/NewsEventsResourcesPage.vue +++ b/components/NewsEventsResourcesPage/NewsEventsResourcesPage.vue @@ -1,9 +1,9 @@ - From 2918d00fdd89e93d627f7cc14310ac53257ea7a7 Mon Sep 17 00:00:00 2001 From: Jesse Khorasanee Date: Thu, 9 Mar 2023 11:21:59 +1300 Subject: [PATCH 098/489] Fix text not matching current tab --- pages/data/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pages/data/index.vue b/pages/data/index.vue index 1924bc80..31cd7f7a 100644 --- a/pages/data/index.vue +++ b/pages/data/index.vue @@ -115,7 +115,7 @@
- No results were found for Datasets. The following results + No results were found for {{searchType.label}}. The following results were discovered for the other categories:

diff --git a/pages/metrics/index.vue b/pages/metrics/index.vue index 1b3bd6ce..57992474 100644 --- a/pages/metrics/index.vue +++ b/pages/metrics/index.vue @@ -91,56 +91,68 @@ const fetchMetrics = async () => { "source": { "S": "ga4" }, + "all_about_page_views_last_mo": { + "N": "229" + }, + "all_about_page_views_last_quarter": { + "N": "456" + }, "all_find_data_page_views_last_mo": { - "N": "6562" + "N": "7173" }, "all_find_data_page_views_last_quarter": { - "N": "13248" + "N": "12693" + }, + "all_help_page_views_last_mo": { + "N": "3" + }, + "all_help_page_views_last_quarter": { + "N": "9" }, "all_home_page_views_last_mo": { - "N": "10879" + "N": "12004" }, "all_home_page_views_last_quarter": { - "N": "23261" + "N": "22367" }, "all_maps_page_views_last_mo": { - "N": "442" + "N": "467" }, "all_maps_page_views_last_quarter": { - "N": "940" + "N": "890" }, "all_news_events_page_views_last_mo": { "N": "633" }, "all_news_events_page_views_last_quarter": { - "N": "1514" + "N": "1460" }, "all_screen_page_views_last_mo": { - "N": "9542" + "N": "10405" }, "all_screen_page_views_last_quarter": { - "N": "20224" + "N": "19369" }, "all_tools_resources_page_views_last_mo": { - "N": "458" + "N": "520" }, "all_tools_resources_page_views_last_quarter": { - "N": "1140" + "N": "1121" }, "month": { "N": "2" }, "new_users_in_last_month": { - "N": "729" + "N": "774" }, "new_users_in_last_quarter": { - "N": "1504" + "N": "1398" }, "returning_users_in_last_month": { - "N": "227" + "N": "230" }, "returning_users_in_last_quarter": { - "N": "283" + "N": "333" }, "year": { "N": "356" @@ -163,22 +175,22 @@ const fetchMetrics = async () => { "N": "0" }, "number_of_new_sparc_teams_last_3_mo": { - "N": "300" + "N": "0" }, "number_of_new_sparc_teams_last_mo": { - "N": "120" + "N": "0" }, "number_of_new_sparc_users_last_3_mo": { - "N": "6" + "N": "12" }, "number_of_new_sparc_users_last_mo": { "N": "3" }, "number_of_sparc_downloads_last_3_mo": { - "N": "142" + "N": "295" }, "number_of_sparc_downloads_last_mo": { - "N": "88" + "N": "90" }, "number_of_sparc_teams_overall": { "N": "62" @@ -204,7 +216,7 @@ const fetchMetrics = async () => { "N": "235" }, "all_sparc_categories_last_3_mo": { - "N": "16" + "N": "21" }, "all_sparc_categories_last_mo": { "N": "2" @@ -241,7 +253,7 @@ const fetchMetrics = async () => { "N": "2" }, "new_sparc_computational_models_last_3_mo": { - "N": "4" + "N": "5" }, "new_sparc_datasets_last_1_mo": { "N": "0" @@ -253,7 +265,7 @@ const fetchMetrics = async () => { "N": "0" }, "new_sparc_maps_last_3_mo": { - "N": "12" + "N": "16" }, "number_of_samples_cumulative": { "N": "8065" @@ -322,10 +334,10 @@ const fetchMetrics = async () => { })) return { userBehaviors: { - pageViewsLabels: ['All','Homepage', 'Find Data', 'Tools & Resources', 'Maps', 'News & Events'], + pageViewsLabels: ['Homepage', 'Find Data', 'Tools & Resources', 'Maps', 'News & Events'], pageViewsData: { - lastMonth: [parseInt(ga4MetricsData['all_screen_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_home_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_find_data_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_tools_resources_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_maps_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_news_events_page_views_last_mo']['N'])], - last3Months: [parseInt(ga4MetricsData['all_screen_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_home_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_find_data_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_tools_resources_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_maps_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_news_events_page_views_last_quarter']['N'])] + lastMonth: [parseInt(ga4MetricsData['all_home_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_find_data_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_tools_resources_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_maps_page_views_last_mo']['N']), parseInt(ga4MetricsData['all_news_events_page_views_last_mo']['N'])], + last3Months: [parseInt(ga4MetricsData['all_home_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_find_data_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_tools_resources_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_maps_page_views_last_quarter']['N']), parseInt(ga4MetricsData['all_news_events_page_views_last_quarter']['N'])] }, usersData: { lastMonth: [parseInt(ga4MetricsData['returning_users_in_last_month']['N']), parseInt(ga4MetricsData['new_users_in_last_month']['N'])], From 08b52b9c6a191b6ce7d4e6a47c5d82bd562e9168 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 10 Mar 2023 12:36:14 +1300 Subject: [PATCH 101/489] Add a separate button for launching NL360C. --- .../BiolucidaViewer/BiolucidaViewer.vue | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/components/BiolucidaViewer/BiolucidaViewer.vue b/components/BiolucidaViewer/BiolucidaViewer.vue index daacf5dd..f19c51af 100644 --- a/components/BiolucidaViewer/BiolucidaViewer.vue +++ b/components/BiolucidaViewer/BiolucidaViewer.vue @@ -2,9 +2,28 @@
@@ -53,6 +62,7 @@ export default { &__items { display: flex; flex-direction: row; + align-items: flex-start; border-bottom: solid 1px $light-grey; padding: 1.25em 0; @media screen and (max-width: 768px) { @@ -67,6 +77,7 @@ export default { } &--content { + flex: 1; a { text-decoration: none; } @@ -98,6 +109,18 @@ export default { line-height: 22px; font-weight: normal; color: $dark-sky; + margin-right: 1rem; + } + &--button { + align-self: center; + sup, sub { + vertical-align: baseline; + position: relative; + top: -0.4em; + } + sub { + top: 0.4em; + } } } } From ab906f6e1dbf75af8d98f478f8a3d05c94ab1bab Mon Sep 17 00:00:00 2001 From: Ignacio Pascual <4764217+ignapas@users.noreply.github.com> Date: Wed, 22 Mar 2023 17:08:21 +0100 Subject: [PATCH 116/489] added missing placement for tooltip --- components/Resources/ServicesSearchResults.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Resources/ServicesSearchResults.vue b/components/Resources/ServicesSearchResults.vue index 53c326bb..0800ea3d 100644 --- a/components/Resources/ServicesSearchResults.vue +++ b/components/Resources/ServicesSearchResults.vue @@ -22,7 +22,7 @@ />
- +
Open in o2S2PARC From 6782f97f1814155d9f654a774dcd3a6693269f66 Mon Sep 17 00:00:00 2001 From: alan-wu Date: Thu, 23 Mar 2023 16:22:20 +1300 Subject: [PATCH 117/489] Update packages. --- package.json | 4 ++-- yarn.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index dd562f7c..85ec29da 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ "test:debug": "node --inspect node_modules/.bin/jest --runInBand" }, "dependencies": { - "@abi-software/gallery": "0.3.1", - "@abi-software/mapintegratedvuer": "0.3.13-fixes-1", + "@abi-software/gallery": "0.3.2", + "@abi-software/mapintegratedvuer": "0.3.14", "@abi-software/plotvuer": "^0.3.0", "@abi-software/simulationvuer": "0.6.5", "@aws-amplify/auth": "^4.4.4", diff --git a/yarn.lock b/yarn.lock index 81216e9d..99f0ea70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -41,10 +41,10 @@ lodash "^4.17.21" vue "^2.6.10" -"@abi-software/gallery@0.3.1", "@abi-software/gallery@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@abi-software/gallery/-/gallery-0.3.1.tgz#cb8317e4271e95254c6e3242be824fd3ec4b9ad4" - integrity sha512-ED5ppMiXfHbobM073SnDiUhomviLH+dSQ6jgk6b9ULBkdTmF6r0cE6WbPHYJHdNgZVJDbYokBieO/URrff8QhQ== +"@abi-software/gallery@0.3.2", "@abi-software/gallery@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@abi-software/gallery/-/gallery-0.3.2.tgz#538ac360ab89692528d72a02cb5532e67b6f99d6" + integrity sha512-YvLlBQVQY7mKyytfsYKX838ulpzlHo8THYEiDwBOT4xSdBVzl+t1cNvFC4Fip+QcXw96LLDJLKCiZXtU+7JDTw== dependencies: "@babel/code-frame" "^7.12.11" axios "^0.26.1" @@ -54,12 +54,12 @@ element-ui "^2.15.0" vue "^2.6.11" -"@abi-software/map-side-bar@^1.3.34": - version "1.3.34" - resolved "https://registry.yarnpkg.com/@abi-software/map-side-bar/-/map-side-bar-1.3.34.tgz#774e5208bf76e43bfa8840ab4effd85954d59369" - integrity sha512-sOdMUZKUUS5joyQFTpLDJj0JB8Vrz0XMrBVgkkePJSB2j+tXLckxVXE4n7hnkhsAmbGIVf7SInXmOMyQ4Na6cQ== +"@abi-software/map-side-bar@^1.3.36": + version "1.3.36" + resolved "https://registry.yarnpkg.com/@abi-software/map-side-bar/-/map-side-bar-1.3.36.tgz#84188ac26e7e957283f0231d3eecdf330a5c59f9" + integrity sha512-pEBwFAEX2LFtPT3qXwoAqofOr9ib/L7Lvvi+n/cHXwI4NG461lm/mon6f5bczKtYKxopqnbLq1oQDfVW0a3Lkg== dependencies: - "@abi-software/gallery" "^0.3.1" + "@abi-software/gallery" "^0.3.2" "@abi-software/svg-sprite" "^0.1.14" algoliasearch "^4.10.5" element-ui "^2.13.0" @@ -67,15 +67,15 @@ vue "^2.6.10" xss "^1.0.14" -"@abi-software/mapintegratedvuer@0.3.13-fixes-1": - version "0.3.13-fixes-1" - resolved "https://registry.yarnpkg.com/@abi-software/mapintegratedvuer/-/mapintegratedvuer-0.3.13-fixes-1.tgz#84200997d944fe21a0c125a4c58010283727d7f3" - integrity sha512-wNKt7pnK9AdeexBmOpFQ2ESAlncEMQV+YTtkAQiCrU0j1/igwLRAdLYAwO3ImFXnZUxR6bNUPK2i6kZfnaXl5w== +"@abi-software/mapintegratedvuer@0.3.14": + version "0.3.14" + resolved "https://registry.yarnpkg.com/@abi-software/mapintegratedvuer/-/mapintegratedvuer-0.3.14.tgz#e051cff04d0d55e20a1594830b9feead1a6e293d" + integrity sha512-54O7AsoG5mUv8PcMatWPyBfMX6fRAgrqhDQr8TxxMA38+hvScqnZbuMIFG9Fd616WwquY5Y6ejJ/zhSSuoHy9w== dependencies: "@abi-software/flatmapvuer" "^0.3.15" - "@abi-software/map-side-bar" "^1.3.34" + "@abi-software/map-side-bar" "^1.3.36" "@abi-software/plotvuer" "^0.3.9" - "@abi-software/scaffoldvuer" "^0.1.57" + "@abi-software/scaffoldvuer" "^0.1.58" "@abi-software/simulationvuer" "^0.6.5" "@abi-software/svg-sprite" "^0.1.15" "@soda/get-current-script" "^1.0.2" @@ -146,10 +146,10 @@ vue-draggable-resizable "^2.2.0" vue-router "^3.2.0" -"@abi-software/scaffoldvuer@^0.1.57": - version "0.1.57" - resolved "https://registry.yarnpkg.com/@abi-software/scaffoldvuer/-/scaffoldvuer-0.1.57.tgz#420f11a4796f8e5bb19f28a6e7589e43886b079d" - integrity sha512-L/I5rAQsS3mNbd5aSJ1tHlmGs7qG9Ljr3M65HQMBp6H06+n6CgmO6lXRagt2HEmCzh6VyLX1AkH/uSfBreUS5A== +"@abi-software/scaffoldvuer@^0.1.58": + version "0.1.58" + resolved "https://registry.yarnpkg.com/@abi-software/scaffoldvuer/-/scaffoldvuer-0.1.58.tgz#98766a40bc21a4a0ca502eb49cdb429abe0876e2" + integrity sha512-r/zkckQi1Xzu4NtlqnNoE7gczm1jJucEQSb4eQVwbqvxvUO27k7dUBNLC9aTLy3rBjDQcN8PxbDLDVZLTUVfgQ== dependencies: "@abi-software/svg-sprite" "^0.1.15" axios "^0.21.2" @@ -163,7 +163,7 @@ vue-custom-element "^3.3.0" vue-drag-resize "^1.3.2" vue-router "^3.5.1" - zincjs "^1.0.11" + zincjs "^1.0.15" "@abi-software/simulationvuer@0.6.5", "@abi-software/simulationvuer@^0.6.5": version "0.6.5" @@ -16141,10 +16141,10 @@ zero-crossings@^1.0.0: dependencies: cwise-compiler "^1.0.0" -zincjs@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/zincjs/-/zincjs-1.0.11.tgz#b28ef3547acc8794bfe8c73afa10ef6b2b9346ce" - integrity sha512-SknkseprKt2kxnsniohhkPQ56WT+9b7Ju1kxynhs83yNE2lcuakphedTRIBHGUUNcRAzw8TCgtfjN52uKFtKzQ== +zincjs@^1.0.15: + version "1.0.15" + resolved "https://registry.yarnpkg.com/zincjs/-/zincjs-1.0.15.tgz#0865f8e05b0d8dc7586167fe496accbd8898535a" + integrity sha512-Csnbvrgin7Ebo9kfFr071KzKDFcoDX03MoBz41h1hq6lG8MHJXjTHLP/EhF5kwbNhThH21rgz718D8rBvwTALA== dependencies: css-element-queries "^1.2.2" lodash "^4.17.19" From ad049500c44667b5f9891dd49b588c5fe79d73ad Mon Sep 17 00:00:00 2001 From: Jesse Khorasanee Date: Fri, 24 Mar 2023 12:25:27 +1300 Subject: [PATCH 118/489] Implement working alt search results for resources page --- .../AlternativeSearchResults.vue | 93 ++++++++++++++++--- pages/resources/biological/index.vue | 13 ++- pages/resources/databases/index.vue | 9 +- pages/resources/devices/index.vue | 11 ++- .../resources/information-services/index.vue | 11 ++- pages/resources/software/index.vue | 11 ++- 6 files changed, 119 insertions(+), 29 deletions(-) diff --git a/components/AlternativeSearchResults/AlternativeSearchResults.vue b/components/AlternativeSearchResults/AlternativeSearchResults.vue index e3e65e84..f1e67c87 100644 --- a/components/AlternativeSearchResults/AlternativeSearchResults.vue +++ b/components/AlternativeSearchResults/AlternativeSearchResults.vue @@ -1,8 +1,9 @@