diff --git a/gatsby-node.js b/gatsby-node.js index 78c5aea..ff23f39 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -41,9 +41,6 @@ exports.createPages = ({ actions, graphql }) => { } } research_tags - software { - name - } submitter { name family_name diff --git a/src/components/Badges.js b/src/components/Badges.js index 5320884..b9535b5 100644 --- a/src/components/Badges.js +++ b/src/components/Badges.js @@ -34,6 +34,7 @@ const BadgeTag = ({ tag, style }) => { ) } + const TagsList = ({ tags, style }) => { const tags_sorted = [...tags].sort() return ( diff --git a/src/components/ModelList.js b/src/components/ModelList.js index f59b347..74011d5 100644 --- a/src/components/ModelList.js +++ b/src/components/ModelList.js @@ -18,6 +18,9 @@ const ModelList = ({ posts }) => { : post ) } + + // Custom style for compute_tags + // return (
{ @@ -27,7 +30,8 @@ const ModelList = ({ posts }) => { title={post.frontmatter.title} creator={post.frontmatter.submitter} date={post.frontmatter.date} - tags={post.frontmatter.research_tags.concat(post.frontmatter.compute_tags)} + tags={post.frontmatter.research_tags} + compute_tags={post.frontmatter.compute_tags} software={post.frontmatter.software} landing_image={post.frontmatter.images.landing_image} key={post.fields.slug} @@ -53,6 +57,7 @@ const ModelListItem = ({ creator, date, tags, + compute_tags, software, landing_image, }) => { @@ -94,7 +99,8 @@ const ModelListItem = ({

}

Tags:

-

+

+

@@ -152,7 +158,7 @@ const ModelCarouselItem = ({ - ); + ); } const personEqual = (person1, person2) => ( diff --git a/src/components/atlas.sass b/src/components/atlas.sass index a567a47..3c95532 100644 --- a/src/components/atlas.sass +++ b/src/components/atlas.sass @@ -126,7 +126,7 @@ $menu-label-color: $white-ter margin-bottom: 1em .blog-list-item .featured-thumbnail flex-basis: 35% - min-width: 100px + min-width: 100px margin: 0 1.5em 0 0 @@ -177,7 +177,7 @@ $menu-label-color: $white-ter &:hover filter: saturate(120%) contrast(120%) opacity(80%) -.mc-card-overlay +.mc-card-overlay position: absolute bottom: 100% left: 0 @@ -204,9 +204,9 @@ $menu-label-color: $white-ter transition: 1.5s ease -webkit-transition: 1.5s ease -ms-transition: 1.5s ease - - + + .pg-screenshot-box img:hover transform: scale(1.5) filter: saturate(1.7) @@ -228,7 +228,7 @@ $menu-label-color: $white-ter transition: 1.5s ease !important -webkit-transition: 1.5s ease !important -ms-transition: 1.5s ease !important - + // .people img:hover // -webkit-filter: grayscale(0%) @@ -380,6 +380,7 @@ $menu-label-color: $white-ter background-color: #007ec6 border-radius: 0px 5px 5px 0px + .badge-creator @extend .badge font-size: 16px @@ -405,7 +406,7 @@ $menu-label-color: $white-ter transform: translate(-50%, -50%) text-align: center -.mc-hr +.mc-hr height: 2px .content h1.gp-landing-page-title @@ -414,7 +415,7 @@ $menu-label-color: $white-ter .column padding: 0.5rem -.tint2 +.tint2 z-index: 2 height: 100% width: 100% @@ -424,7 +425,7 @@ $menu-label-color: $white-ter background: rgba(240,248,255, 0.35) -.tint +.tint z-index: 1 height: 100% width: 100% @@ -437,13 +438,13 @@ $menu-label-color: $white-ter -ms-transition: 5.5s ease -webkit-animation: glow linear 20s infinite animation: glow linear 20s infinite - @-webkit-keyframes glow + @-webkit-keyframes glow 0% background: rgba(240,248,255, 0.95) 50% background: rgba(240,248,255, 0.85) 100% - background: rgba(240,248,255, 0.95) + background: rgba(240,248,255, 0.95) @keyframes glow 0% background: rgba(240,248,255, 0.95) @@ -459,12 +460,12 @@ $menu-label-color: $white-ter //perspective: 1000px //cursor: wait - //@keyframes shake - // 30% + //@keyframes shake + // 30% // transform: translate3d(0, -20px, 0) - // 100% + // 100% // transform: translate3d(0, -1000px, 0) - + .gp-header:after display: block content: "" @@ -492,7 +493,7 @@ $menu-label-color: $white-ter .gp-hidden-ctl:hover ~ .gp-header-info opacity: 0 - + .gp-card display: flex flex-direction: column @@ -515,24 +516,24 @@ $menu-label-color: $white-ter //box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2) -.gp-card:hover .gp-card-container +.gp-card:hover .gp-card-container transform: rotateY(180deg) -.gp-card-front, .gp-card-back +.gp-card-front, .gp-card-back position: absolute - width: 100% + width: 100% height: 100% overflow: hidden -webkit-backface-visibility: hidden backface-visibility: hidden -.gp-card-front +.gp-card-front background-color: #bbb color: black -.gp-card-back +.gp-card-back display: flex flex-direction: column justify-content: center @@ -545,15 +546,15 @@ $menu-label-color: $white-ter @media screen and (min-width: 1600px) .full-width-image height: 100vh - -::-webkit-scrollbar + +::-webkit-scrollbar width: 0 height: 0 body - scrollbar-width: none + scrollbar-width: none font-family: Open Sans Bold, sans-serif - -ms-overflow-style: none + -ms-overflow-style: none overflow-y: scroll .gp-title @@ -574,7 +575,7 @@ body #main-screenshot.hide opacity: 0 - + .gp-box .gp-news-title text-decoration: none !important font-size: 1rem @@ -588,7 +589,7 @@ body border: black solid 1px .gp-front-news - max-width: 800px + max-width: 800px margin: auto .content li p @@ -602,20 +603,20 @@ body .more-pub margin-top: 0.5rem -.tip, +.tip, .important, .note, .warning width: auto !important -.tip .icon, +.tip .icon, .important .icon, -.note .icon, +.note .icon, .warning .icon - width: 5rem + width: 5rem display: inline-table -.tip .content, +.tip .content, .important .content, .note .content, .warning .content @@ -626,8 +627,8 @@ body display: table-cell vertical-align: middle border: none - width: 7rem - + width: 7rem + .doc-list .content border: none @@ -643,35 +644,35 @@ div.download-box font-size: 90% padding-left: 1.1em padding-right: 1.1em - padding-top: 0.1em + padding-top: 0.1em -div.download-box a +div.download-box a font-size: 150% line-height: 120% text-decoration: none color: #0c5e00 -div.download-box a:hover +div.download-box a:hover background: #90ff80 text-decoration: underline color: #0c5e00 -div.download-box img.download-icon +div.download-box img.download-icon background: #90ff80 float: left -div.download-box a:visited +div.download-box a:visited color: #0c5e00 div.download-box table .icon - width: 5rem + width: 5rem display: table-cell div.download-box table .content vertical-align: middle padding-left: 0 -.download-box .gatsby-resp-image-image +.download-box .gatsby-resp-image-image box-shadow: none !important .download-box table @@ -689,70 +690,70 @@ div.download-box table .content fill: blue transform-origin: center animation: kaboom 5s ease alternate infinite - - @keyframes kaboom + + @keyframes kaboom 0% fill: blue transform: scale(1.0) - 50% + 50% fill: red transform: scale(0.4) - 100% + 100% fill: yellow transform: scale(1.0) - @-webkit-keyframes kaboom + @-webkit-keyframes kaboom 0% fill: blue transform: scale(1.0) - 50% + 50% fill: red transform: scale(0.4) - 100% + 100% fill: yellow transform: scale(1.0) #hexagon-with-teeth transform-origin: center animation: rotate-teeth 5s ease alternate infinite - - @keyframes rotate-teeth + + @keyframes rotate-teeth 0% - transform: rotate(0deg) - 50% - transform: rotate(90deg) - 100% + transform: rotate(0deg) + 50% + transform: rotate(90deg) + 100% transform: rotate(180deg) - @-webkit-keyframes rotate-teeth + @-webkit-keyframes rotate-teeth 0% - transform: rotate(0deg) - 50% - transform: rotate(90deg) - 100% + transform: rotate(0deg) + 50% + transform: rotate(90deg) + 100% transform: rotate(180deg) #hexagon transform-origin: center fill: red animation: hexagon 5s ease alternate infinite - - @keyframes hexagon + + @keyframes hexagon 0% fill: red - transform: rotate(0deg) - 50% + transform: rotate(0deg) + 50% fill: yellow - transform: rotate(-180deg) - 100% + transform: rotate(-180deg) + 100% fill: blue transform: rotate(-360deg) - @-webkit-keyframes hexagon + @-webkit-keyframes hexagon 0% fill: red - transform: rotate(0deg) - 50% + transform: rotate(0deg) + 50% fill: yellow - transform: rotate(-180deg) - 100% + transform: rotate(-180deg) + 100% fill: blue transform: rotate(-360deg) diff --git a/src/pages/models/RodriguezCorcho-2022-ArcCollision/index.md b/src/pages/models/RodriguezCorcho-2022-ArcCollision/index.md index 5c293c6..0dcfc9d 100644 --- a/src/pages/models/RodriguezCorcho-2022-ArcCollision/index.md +++ b/src/pages/models/RodriguezCorcho-2022-ArcCollision/index.md @@ -16,9 +16,9 @@ creditText: Rodríguez Corcho, A., Polanco, S., Farrington, R., Beucher, R., Mon Style and Stress Evolution of Arc-Continent Collision [Data set]. AuScope, National Computational Infrastructure. https://doi.org/xy60-b940 software: - - name: Underworld2 - doi: https://zenodo.org/records/3996738 - url_source: https://github.com/underworldcode/UWGeodynamics + name: Underworld2 + doi: https://zenodo.org/records/3996738 + url_source: https://github.com/underworldcode/UWGeodynamics licence: licence_url: https://creativecommons.org/licenses/by/4.0/legalcode licence_image: ../../../img/licence/by.png @@ -220,7 +220,7 @@ model_files: and also the script used for post-processing. file_tree: '' existing_identifier: https://github.com/andresrcorcho/Dynamics-of-Arc-Continent-Collision - nci_file_path: + nci_file_path: https://thredds.nci.org.au/thredds/catalog/nm08/MATE/RodriguezCorcho-2022-ArcCollision/catalog.html include: true dataset: @@ -228,7 +228,7 @@ dataset: notes: The output consists of xdmf and h5 files. There is one xdmf file per time step (every 0.5 Myr) and a set of h5 files that contain the distinct model properties. existing_identifier: '' - nci_file_path: + nci_file_path: https://thredds.nci.org.au/thredds/catalog/nm08/MATE/RodriguezCorcho-2022-ArcCollision/catalog.html include: true metadataFile: ro-crate-metadata.json diff --git a/src/pages/models/index.js b/src/pages/models/index.js index 1160f4e..a111392 100644 --- a/src/pages/models/index.js +++ b/src/pages/models/index.js @@ -59,9 +59,6 @@ const fn = () => ( } } } - software { - name - } research_tags compute_tags templateKey diff --git a/src/pages/models/mather-2022-groundwater/index.md b/src/pages/models/mather-2022-groundwater/index.md index a43e2c1..55a3f3f 100644 --- a/src/pages/models/mather-2022-groundwater/index.md +++ b/src/pages/models/mather-2022-groundwater/index.md @@ -15,9 +15,9 @@ creditText: Mather, B., Müller, R. Dietmar., ['O’Neill', "O'Neill"], C., Beal groundwater flow to climate change [Data set]. AuScope, National Computational Infrastructure. https://doi.org/t2mn-bk81 software: - - name: 'Underworld2: Python Geodynamics Modelling for Desktop, HPC and Cloud' - doi: https://doi.org/10.5281/zenodo.7455999 - url_source: https://github.com/underworldcode/underworld2 + name: 'Underworld2: Python Geodynamics Modelling for Desktop, HPC and Cloud' + doi: https://doi.org/10.5281/zenodo.7455999 + url_source: https://github.com/underworldcode/underworld2 licence: licence_url: https://creativecommons.org/licenses/by/4.0/legalcode licence_image: ../../../img/licence/by.png @@ -166,7 +166,7 @@ model_files: HL06 was used to take the maximum a posteriori model and run it at high resolution. file_tree: '' existing_identifier: https://github.com/brmather/Sydney_Basin/tree/master - nci_file_path: + nci_file_path: https://dapds00.nci.org.au/thredds/catalog/nm08/MATE/mather-2022-groundwater/catalog.html include: true dataset: @@ -176,7 +176,7 @@ dataset: format\r\n.npz - data on numpy binary format\r\n.png - image files\r\n.pvsm - Paraview state files\r\n.txt - data in .txt format" existing_identifier: '' - nci_file_path: + nci_file_path: https://dapds00.nci.org.au/thredds/catalog/nm08/MATE/mather-2022-groundwater/catalog.html include: true metadataFile: ro-crate-metadata.json diff --git a/src/pages/models/polanco-2024-deltas/index.md b/src/pages/models/polanco-2024-deltas/index.md index e8bee63..10a4b3d 100644 --- a/src/pages/models/polanco-2024-deltas/index.md +++ b/src/pages/models/polanco-2024-deltas/index.md @@ -16,9 +16,9 @@ creditText: Polanco, S., Blum, M., Salles, T., Frederick, B., Farrington, R., Di continental-scale deltas to climatically driven sea level changes [Data set]. AuScope, National Computational Infrastructure. https://doi.org/4m82-y773 software: - - name: Badlands - doi: https://doi.org/10.5281/zenodo.1069573 - url_source: https://github.com/badlands-model/badlands + name: Badlands + doi: https://doi.org/10.5281/zenodo.1069573 + url_source: https://github.com/badlands-model/badlands licence: licence_url: https://creativecommons.org/licenses/by/4.0/legalcode licence_image: ../../../img/licence/by.png @@ -198,7 +198,7 @@ model_files: experiment and perform some pre or post-processing tasks." file_tree: '' existing_identifier: '' - nci_file_path: + nci_file_path: https://thredds.nci.org.au/thredds/catalog/nm08/MATE/polanco-2024-deltas/catalog.html include: true dataset: @@ -211,7 +211,7 @@ dataset: \n\r\n- two **.xdmf** files for the surface (**tin_series.xdmf**) and the flow network (**flow_series.xdmf**) that read the **xmf** files through time." existing_identifier: '' - nci_file_path: + nci_file_path: https://thredds.nci.org.au/thredds/catalog/nm08/MATE/polanco-2024-deltas/catalog.html include: true metadataFile: ro-crate-metadata.json diff --git a/src/pages/models/sandiford-2021-detachment/index.md b/src/pages/models/sandiford-2021-detachment/index.md index ac3c454..e13a216 100644 --- a/src/pages/models/sandiford-2021-detachment/index.md +++ b/src/pages/models/sandiford-2021-detachment/index.md @@ -15,9 +15,9 @@ creditText: 'Sandiford, D., Brune, S., Glerum, A., Naliboff, J., & Whittaker, J. and Apparent Unbending [Data set]. AuScope, National Computational Infrastructure. https://doi.org/r3ya-bg54' software: - - name: 'geodynamics/aspect: ASPECT 2.5.0' - doi: https://doi.org/10.5281/zenodo.8200213 - url_source: '' + name: 'geodynamics/aspect: ASPECT 2.5.0' + doi: https://doi.org/10.5281/zenodo.8200213 + url_source: '' licence: licence_url: https://creativecommons.org/licenses/by/4.0/legalcode licence_image: ../../../img/licence/by.png diff --git a/src/styles/customStyles.css b/src/styles/customStyles.css new file mode 100644 index 0000000..3c1ba3a --- /dev/null +++ b/src/styles/customStyles.css @@ -0,0 +1,23 @@ +.cool-caption { + font-size: 1.2em; + color: #333; + background-color: #f9f9f9; + padding: 10px; + border-left: 4px solid #007acc; + margin: 20px 0; + border-radius: 5px; + text-shadow: 1px 1px 2px #aaa; +} + +.animation-caption-container { + margin: 20px 0; +} + +button { + background-color: #007acc; + color: white; + border: none; + padding: 10px; + border-radius: 5px; + cursor: pointer; +} diff --git a/src/templates/creators.js b/src/templates/creators.js index 4c6fc83..63416fc 100644 --- a/src/templates/creators.js +++ b/src/templates/creators.js @@ -90,9 +90,6 @@ export const creatorPageQuery = graphql` } } research_tags - software { - name - } submitter { name family_name diff --git a/src/templates/index-page.js b/src/templates/index-page.js index 5579246..4db8862 100644 --- a/src/templates/index-page.js +++ b/src/templates/index-page.js @@ -215,7 +215,7 @@ const IndexPageTemplate = ({ /> - + ); }; @@ -292,9 +292,6 @@ query MyQuery { } } research_tags - software { - name - } submitter { name family_name diff --git a/src/templates/model.js b/src/templates/model.js index b8230d2..fbe55c0 100644 --- a/src/templates/model.js +++ b/src/templates/model.js @@ -3,10 +3,11 @@ import PropTypes from "prop-types" import React from "react" import { Tab, Tabs, TabList, TabPanel } from "react-tabs" import "react-tabs/style/react-tabs.css" - +import '../styles/customStyles.css'; // Adjust the path as needed import Animation from "../components/Animation" import { BadgeCreator, + BadgeOrcid, BadgeDoi, TagsList, } from "../components/Badges" @@ -104,18 +105,17 @@ const ModelTemplate = ({ Snapshot - Overview - Details - Setup - Code and outputs + Science overview + Metadata & license + Model setup + Model code & data
-

Model snapshot

-

- Model submitted by {submitter_full_name} on {date}. -

+ + +

Plain language summary

{description}

@@ -138,9 +138,44 @@ const ModelTemplate = ({ /> } + { + animation.caption && +

+ + {animation.caption} + +

+ } + +

+ Model submitted by {submitter_full_name} on {date}. +

+ + +

Tags

+

+ + { + publication.html && +
+

Associated publication

+ { + publication.doi && + + } + +
+ } +

Abstract

{abstract}

@@ -160,33 +195,30 @@ const ModelTemplate = ({ /> { graphic_abstract.caption && -

{graphic_abstract.caption}

+

+ + {graphic_abstract.caption} + +

} + +
} +

+ Model submitted by {submitter_full_name} on {date}. +

+ - { - publication.html && -
-

Model publication

- { - publication.doi && - - } - -
- }

Model metadata

-
-

Tags

-

-
+ + { metadataFile?.publicURL &&
@@ -249,6 +281,12 @@ const ModelTemplate = ({ }
+ + +

+ Model submitted by {submitter_full_name} on {date}. +

+ @@ -265,16 +303,28 @@ const ModelTemplate = ({ ), }} /> + + { - model_setup.caption && -

{model_setup.caption}

+ model_setup.caption && +

+ + {model_setup.caption} + +

} + + } { model_setup_info?.summary &&

+

Details:

+ + + +

Model code & inputs

@@ -306,27 +360,7 @@ const ModelTemplate = ({ here.

} - { - compute_info?.name && <> -

- This model was originally run on { - compute_info?.url ? - {compute_info.name} - : compute_info.name - } - { - compute_info?.organisation ? - ` (${compute_info.organisation}).` - : "." - } -

- { - compute_info?.doi &&

- -

- } - - } + { model_files?.notes && @@ -550,11 +584,6 @@ export const pageQuery = graphql` summary } research_tags - software { - name - doi - url_source - } submitter { name family_name diff --git a/src/templates/tags.js b/src/templates/tags.js index e1e4284..6b7dbf2 100644 --- a/src/templates/tags.js +++ b/src/templates/tags.js @@ -51,7 +51,6 @@ class TagRoute extends React.Component { date={post.node.frontmatter.date} tags={post_tags} landing_image={post.node.frontmatter.images.landing_image} - software={post.node.frontmatter.software} /> ) : ( @@ -132,9 +131,6 @@ export const tagPageQuery = graphql` } } research_tags - software { - name - } submitter { name family_name