diff --git a/client/src/components/DataSubmission/MolecularDataForm.js b/client/src/components/DataSubmission/MolecularDataForm.js
index 358b37b5..4c2c63b5 100644
--- a/client/src/components/DataSubmission/MolecularDataForm.js
+++ b/client/src/components/DataSubmission/MolecularDataForm.js
@@ -7,7 +7,7 @@ import CustomSelect from '../Shared/CustomSelect';
const StyledMolecularDataForm = styled.div`
display: flex;
align-items: center;
- margin-bottom: 20px;
+ margin-bottom: 10px;
`;
const StyledFormContainer = styled.div`
@@ -23,13 +23,20 @@ const StyledFormContainer = styled.div`
width: 250px;
margin-right: 20px;
}
- .repo-url {
+ .tool-version {
+ width: 250px;
+ margin-left: 10px;
+ }
+ .first-repo-url {
width: 350px;
}
+ .second-repo-url {
+ width: 350px;
+ margin-left: 40px;
+ }
`;
const StyledButtonField = styled.div`
- margin-left: 20px;
.btn {
margin-left: 10px;
}
@@ -55,95 +62,99 @@ const MolecularDataForm = (props) => {
} = props;
return(
-
-
-
- {handleInputChange(e, index, 'name')}}
- selectOne={true}
- />
- {handleInputChange(e, index, 'filename')}}
- />
- {handleInputChange(e, index, 'repoURL')}}
- />
-
-
- {handleInputChange(e, index, 'toolname')}}
- />
- {handleInputChange(e, index, 'toolversion')}}
- />
-
-
- {handleInputChange(e, index, 'refname')}}
- />
- {handleInputChange(e, index, 'refURL')}}
- />
-
-
-
- {
- index > 0 &&
-
-
+
+
+
+
+ {handleInputChange(e, index, 'name')}}
+ selectOne={true}
+ />
+ {handleInputChange(e, index, 'filename')}}
+ />
+ {handleInputChange(e, index, 'repoURL')}}
+ />
+
+
+ {handleInputChange(e, index, 'toolname')}}
+ />
+ {handleInputChange(e, index, 'toolversion')}}
+ />
+
+
+ {handleInputChange(e, index, 'refname')}}
+ />
+ {handleInputChange(e, index, 'refURL')}}
+ />
+
+
+
+
+
+
+ {
+ index > 0 &&
+ {handleRemoveClick(e, index)}}
+ />
+ }
+ {
+ index === length - 1 &&
+
+ }
+ {handleReset(e, index)}}
+ />
+
+
);
}
diff --git a/client/src/components/Footer/Footer.js b/client/src/components/Footer/Footer.js
index 044169fd..207d8e21 100644
--- a/client/src/components/Footer/Footer.js
+++ b/client/src/components/Footer/Footer.js
@@ -10,7 +10,7 @@ const StyledFooter = styled.div`
bottom: 0%;
width: 100%;
background-color: rgb(255,255,255, 0.7);
- height: 150px;
+ height: 200px;
font-size: calc(0.7em + 0.2vw);
padding: 10px 0;
display: flex;
@@ -75,7 +75,8 @@ const Footer = () => {
{path.setDatatype(dataTypes.pharmacogenomics)}}>Pharmacogenomics Data
{path.setDatatype(dataTypes.toxicogenomics)}}>Toxicogenomics Data
{path.setDatatype(dataTypes.xenographic)}}>Xenographic Pharmacogenomics Data
- Clinical Genomics Data (Coming soon)
+ {path.setDatatype(dataTypes.clinicalgenomics)}}>Clinical Genomics Data
+ {path.setDatatype(dataTypes.icb)}}>Immune Checkpoint Blockade Data
Radiogenomics Data (Coming soon)
:
@@ -98,7 +99,7 @@ const Footer = () => {
}
GitHub
BHKLab
- support@orcestra.ca
+ support@orcestra.ca
BHKLab
diff --git a/package.json b/package.json
index 2af04b1b..0352894b 100755
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "myLocalProj",
+ "name": "localproj",
"version": "1.0.0",
"description": "",
"scripts": {