Skip to content

Commit

Permalink
Merge branch 'Development' of github.com:biocompute-objects/portal_us…
Browse files Browse the repository at this point in the history 
…erdb into Development
  • Loading branch information
@HadleyKing
HadleyKing committed Sep 26, 2024
1 parent a0962b8 commit 99ca3d7
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 17 deletions.
1 change: 0 additions & 1 deletion client/src/App.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
/* ---------------------------------------------------------------------------------------------------- */
/* Page box components */
.About-half-width-box{
min-height: 650px; /* Ensure both boxes have a minimum height */
min-width: 350px;/* min-width: 275px; Ensure both boxes have a minimum width */
width: 90%; /* Half the width of the container minus spacing */
margin: 0 auto; /* Add spacing between the boxes */
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/descriptionDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const DescriptionDomain = ({onSave}) => {
<span className="bold-title">
Description Domain
<Tooltip title="Explanation of Description Domain">
<Button size="xs" href='https://wiki.biocomputeobject.org/index.php?title=Description-domain'>
<Button size="xs" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Description-domain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/errorDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const ErrorDomain = ({onSave}) => {
<span className="bold-title">
Error Domain
<Tooltip title="Explanation of Error Domain">
<Button size="small" href='https://github.com/biocompute-objects/BCO_Specification/blob/main/content/error-domain.md'>
<Button size="small" target="_blank" href='https://github.com/biocompute-objects/BCO_Specification/blob/main/content/error-domain.md'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/executionDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const ExecutionDomain = ({onSave}) => {
<span className="bold-title">
Execution Domain
<Tooltip title="Explanation of Execution Domain">
<Button size="xs" href='https://wiki.biocomputeobject.org/index.php?title=Execution-domain'>
<Button size="xs" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Execution-domain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/extensionDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const ExtensionDomain = ({onSave}) => {
<span className="bold-title">
Extension Domain
<Tooltip title="Explanation of Extension Domain">
<Button size="small" href='https://wiki.biocomputeobject.org/index.php?title=Extension-domain'>
<Button size="small" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Extension-domain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/ioDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const IODomain = ({onSave}) => {
<span className="bold-title">
I/O Domain
<Tooltip title="Explanation of IO Domain">
<Button size="xs" href='https://wiki.biocomputeobject.org/index.php?title=Iodomain'>
<Button size="xs" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Iodomain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/parametricDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const ParametricDomain = ({onSave}) => {
<span className="bold-title">
Parametric Domain
<Tooltip title="Explanation of Parametric Domain">
<Button size="xs" href='https://wiki.biocomputeobject.org/index.php?title=Parametric-domain'>
<Button size="xs" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Parametric-domain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/provenanceDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const ProvenanceDomain = ({onSave} ) => {
<span className="bold-title">
Provenance Domain
<Tooltip title="Explanation of Provenance Domain">
<Button size="small" href='https://wiki.biocomputeobject.org/index.php?title=Provenance-domain'>
<Button size="small" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Provenance-domain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/builder/usabilityDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const UsabilityDomain = ({onSave}) => {
<span className="bold-title">
Usability Domain
<Tooltip title="Explanation of Usability Domain">
<Button size="xs" href='https://wiki.biocomputeobject.org/index.php?title=Usability-domain'>
<Button size="xs" target="_blank" href='https://wiki.biocomputeobject.org/index.php?title=Usability-domain'>
<HelpOutlineIcon />
</Button>
</Tooltip>
Expand Down
Binary file added client/src/images/Builder_edit.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/images/nextflow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions client/src/pages/Home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ieee from "../images/ieee.jpg";
import workshoppic from "../images/workshop.jpg"
import mediaWiki from "../images/mediawikiwiki.svg";
import cloudlogo from "../images/cloud.png"
import builderlogo from "../images/Builder_edit.png"

const HomePage = () => {
return (
Expand Down Expand Up @@ -50,7 +51,7 @@ const HomePage = () => {
<ThirdBox
link="/builder"
title="BioCompute Builder"
image={logo}
image={builderlogo}
content="Use the BioCompute Builder or view objects in the database.
The BioCompute Builder is a platform-free, form-based editor."
/>
Expand All @@ -71,11 +72,11 @@ const HomePage = () => {
<Grid container justifyContent="center" spacing={3}>
<Grid item xs={12} sm={12} lg={12} xl={12} >
<FullWidthBox
link="https://wiki.biocomputeobject.org/index.php?title=BioCompute_Spring_Workshop_2024"
title="2024 BioCompute Conference & Workshop"
content="This workshop provides an opportunity to learn about interoperability between platforms that host BioCompute Objects (BCOs), the FDA’s 'Portal' for reading, writing and sharing BCOs, real world applications including intended use in regulatory submissions, and potential implementations, including the use of AI/ML. "
link="https://wiki.biocomputeobject.org/BCO_Pilot_Project"
title="BioCompute Pilot Project"
content="The purpose of the pilot is to bring both the sponsors and FDA to agreement around BCO usage to streamline and standardize computational workflow submissions and reviews. Expected to obtain first-hand knowledge of submitting computational analyses to the FDA and how to efficiently and effectively ease communication barrier between sponsors and government agency. "
cssClass=""
image={workshoppic}

/>
</Grid>
<Grid item xs={12} sm={6} lg={4} xl={4}>
Expand All @@ -92,7 +93,7 @@ const HomePage = () => {
<ThirdBox
link="https://hivelab.biochemistry.gwu.edu/publications#Multimedia"
title="Previous workshop material"
content="Collection of posters, presentation slides, and other materials from previous BioCompute workshops or conferences."
content="Collection of posters, presentation slides, recordings, and other materials from previous BioCompute workshops or conferences."
cssClass=""
image={workshoppic}
/>
Expand Down
14 changes: 12 additions & 2 deletions client/src/pages/Resources.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {

import ThirdBox from "../components/ThirdBox.js";
import FullWidthBox from "../components/FullWidthBox.js";
import HalfWidthBox from "../components/HalfWidthBox.js"
import logo from "../images/logo.png"
import hive from "../images/hive.png"
import gitLogo from "../images/Octocat.png";
Expand All @@ -17,6 +18,7 @@ import dnaNexus from "../images/dnanexus.png"
import galaxy from "../images/galaxy.png"
import cgc from "../images/cgc2.png"
import swagger from "../images/swagger.png"
import nextflow from "../images/nextflow.png"

export default function Resources() {
const bcodbUrl = process.env.REACT_APP_BCOAPI_URL
Expand All @@ -25,14 +27,22 @@ export default function Resources() {
<Paper>
<Container maxWidth={false}>
<Grid container justifyContent="center" spacing={3}>
<Grid item xs={12} sm={12} lg={12} xl={12}>
<FullWidthBox
<Grid item xs={4} sm={4} lg={6} xl={6}>
<HalfWidthBox
title="BCODB API"
image={swagger}
content="Explore the BioCompute data base RESTful APIs, generated by Swagger"
link={`${bcodbUrl}docs/`}
/>
</Grid>
<Grid item xs={4} sm={4} lg={6} xl={6}>
<HalfWidthBox
title="Nextflow"
image={nextflow}
content="Automatically generate BCO from Nextflow pipelines with provenance information "
link="https://github.com/nextflow-io/nf-prov"
/>
</Grid>
<Grid item xs={12} sm={6} lg={4} xl={4}>
<ThirdBox
link="https://hive.biochemistry.gwu.edu/dna.cgi?cmd=main"
Expand Down

0 comments on commit 99ca3d7

Please sign in to comment.