Skip to content

Commit

Permalink
fix a couple more warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@hpratt
hpratt committed Aug 28, 2022
1 parent adf9c7f commit 465a83c
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 115 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "psychscreen",
"version": "0.4.1",
"version": "0.4.2",
"private": true,
"homepage": "https://weng-lab.github.io/psychscreen",
"dependencies": {
Expand Down
32 changes: 16 additions & 16 deletions src/tablet/Portals/DiseaseTraitPortal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
* DiseaseTraitPortal.tsx: the disease/trait portal page.
*/

import React from 'react';
import { AppBar } from '@zscreen/psychscreen-ui-components';
import { useNavigate } from 'react-router-dom';
const DiseaseTraitPortal: React.FC = () => {
const navigate = useNavigate();
return (
<>
<AppBar
onDownloadsClicked={() => navigate("/downloads")}
onHomepageClicked={() => navigate("/")}
/>
</>
);
};
export default DiseaseTraitPortal;
import React from 'react';
import { AppBar } from '@zscreen/psychscreen-ui-components';
import { useNavigate } from 'react-router-dom';

const DiseaseTraitPortal: React.FC = () => {
const navigate = useNavigate();
return (
<>
<AppBar
onDownloadsClicked={() => navigate("/downloads")}
onHomepageClicked={() => navigate("/")}
/>
</>
);
};
export default DiseaseTraitPortal;
2 changes: 1 addition & 1 deletion src/web/HomePage/MainPanel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const MainPanel: React.FC<GridProps> = props => (
</Grid>
<Grid item sm={6}>
<Container style={{ marginTop: "63px" }}>
<img src={BRAIN} style={{ width: "75%" }} />
<img alt="PsychSCREEN" src={BRAIN} style={{ width: "75%" }} />
</Container>
</Grid>
</Grid>
Expand Down
192 changes: 95 additions & 97 deletions src/web/Portals/DiseaseTraitPortal/DiseaseTraitPortal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,102 +2,100 @@
* DiseaseTraitPortal.tsx: the disease/trait portal page.
*/

import React, { useState } from 'react';
import { AppBar } from '@zscreen/psychscreen-ui-components';
import { useNavigate } from 'react-router-dom';
import { Grid, Container, GridProps, Slide } from '@mui/material';
import DiseaseTrait from '../../../assets/disease-trait.png';
import { Typography } from '@zscreen/psychscreen-ui-components';
import CheckIcon from '@mui/icons-material/Check';
import { SearchBox } from '@zscreen/psychscreen-ui-components';
import HorizontalCard from './HorizontalCard';
import React, { useState } from 'react';
import { AppBar } from '@zscreen/psychscreen-ui-components';
import { useNavigate } from 'react-router-dom';
import { Grid, Container, GridProps, Slide } from '@mui/material';
import DiseaseTrait from '../../../assets/disease-trait.png';
import { Typography } from '@zscreen/psychscreen-ui-components';
import CheckIcon from '@mui/icons-material/Check';
import { SearchBox } from '@zscreen/psychscreen-ui-components';
import HorizontalCard from './HorizontalCard';

const DiseaseTraitPortal: React.FC<GridProps> = (props) => {
const navigate = useNavigate();
const [searchVal, setSearchVal] = useState<string>('')
const [diseaseCards, setdiseaseCards] = useState<{cardLabel: string, val: string, cardDesc: string}[] | undefined>(undefined)

return (
<>
<AppBar
onDownloadsClicked={() => navigate("/downloads")}
onHomepageClicked={() => navigate("/")}
/>
<Grid container {...props}>
<Grid item sm={6}>
<Container style={{ marginTop: "147px", marginLeft: "100px", width: "741px" }}>
<Typography
type="display"
size="medium"
style={{ fontWeight: 700, fontSize: "48px", lineHeight: "57.6px", letterSpacing: "0.5px", marginBottom: "16px" }}
>
Disease/Trait Portal
</Typography>
<br/>
<Typography
type="body"
size="large"
style={{ fontSize: "16px", lineHeight: "24px", fontWeight: 400, letterSpacing: "0.3%", marginBottom: "16px", width: "414px" }}
>
Explore heritability enrichment for 40 distinct psychiatric, behavioral, and neuronal traits within gene regulatory features,
such as bCREs and quantitative trait loci (QTLs). Search genes associated with complex traits based on PsychENCODE TWAS.
</Typography>
<Typography
type="body"
size="large"
style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap', fontSize: "16px", fontWeight: 400, lineHeight: "19px" }}
>
<CheckIcon style={{ marginRight: "9px" }} /> 40 total traits cataloged
</Typography>
<Typography
type="body"
size="large"
style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap', fontSize: "16px", fontWeight: 400, lineHeight: "19px", marginBottom: "40px" }}
>
<CheckIcon style={{ marginRight: "9px" }} /> 1,103 bCRE/trait associations
</Typography>
<SearchBox
onChange={e => {
if(e.target.value===''){
setdiseaseCards(undefined)
}
setSearchVal(e.target.value)
}}
onClick={e => {
if(searchVal!==''){
setdiseaseCards([{cardLabel: "Schizophrenia", val: "Schizophrenia", cardDesc: "Description"},
{cardLabel: "Schizoaffective disorder", val: "Schizoaffective disorder", cardDesc: "Description"},
{cardLabel: "Schizoid Personality disorder", val: "Schizoid Personality disorder", cardDesc: "Description"},
{cardLabel: "Schizophreniform disorder", val: "Schizophreniform disorder", cardDesc: "Description"},
{cardLabel: "Schizoid Personality disorder", val: "Schizoid Personality disorder", cardDesc: "Description"}])
}

}}
helperText={"e.g. schizophrenia, years of education"}
/>
</Container>
</Grid>
<Grid item xs={6}>
{!diseaseCards ?
(<Container style={{ marginTop: "130px" }}>
<img src={DiseaseTrait} style={{ width: "60%" ,height: "100%" }} />
</Container>)
: (
<Slide direction="up" in={true} timeout={1000}>
<Container style={{ marginLeft: "12px", marginTop: "170px" }}>
<HorizontalCard width={600}
onCardClick={(val?: string)=>{
navigate("/psychscreen/traits/"+val)
}}
cardContentText={diseaseCards}
/>
</Container>
</Slide>
)}
</Grid>
const DiseaseTraitPortal: React.FC<GridProps> = (props) => {
const navigate = useNavigate();
const [searchVal, setSearchVal] = useState<string>('')
const [diseaseCards, setdiseaseCards] = useState<{cardLabel: string, val: string, cardDesc: string}[] | undefined>(undefined)

return (
<>
<AppBar
onDownloadsClicked={() => navigate("/downloads")}
onHomepageClicked={() => navigate("/")}
/>
<Grid container {...props}>
<Grid item sm={6}>
<Container style={{ marginTop: "147px", marginLeft: "100px", width: "741px" }}>
<Typography
type="display"
size="medium"
style={{ fontWeight: 700, fontSize: "48px", lineHeight: "57.6px", letterSpacing: "0.5px", marginBottom: "16px" }}
>
Disease/Trait Portal
</Typography>
<br/>
<Typography
type="body"
size="large"
style={{ fontSize: "16px", lineHeight: "24px", fontWeight: 400, letterSpacing: "0.3%", marginBottom: "16px", width: "414px" }}
>
Explore heritability enrichment for 40 distinct psychiatric, behavioral, and neuronal traits within gene regulatory features,
such as bCREs and quantitative trait loci (QTLs). Search genes associated with complex traits based on PsychENCODE TWAS.
</Typography>
<Typography
type="body"
size="large"
style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap', fontSize: "16px", fontWeight: 400, lineHeight: "19px" }}
>
<CheckIcon style={{ marginRight: "9px" }} /> 40 total traits cataloged
</Typography>
<Typography
type="body"
size="large"
style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap', fontSize: "16px", fontWeight: 400, lineHeight: "19px", marginBottom: "40px" }}
>
<CheckIcon style={{ marginRight: "9px" }} /> 1,103 bCRE/trait associations
</Typography>
<SearchBox
onChange={e => {
if(e.target.value===''){
setdiseaseCards(undefined)
}
setSearchVal(e.target.value)
}}
onClick={() => {
if(searchVal !== ''){
setdiseaseCards([{cardLabel: "Schizophrenia", val: "Schizophrenia", cardDesc: "Description"},
{cardLabel: "Schizoaffective disorder", val: "Schizoaffective disorder", cardDesc: "Description"},
{cardLabel: "Schizoid Personality disorder", val: "Schizoid Personality disorder", cardDesc: "Description"},
{cardLabel: "Schizophreniform disorder", val: "Schizophreniform disorder", cardDesc: "Description"},
{cardLabel: "Schizoid Personality disorder", val: "Schizoid Personality disorder", cardDesc: "Description"}])
}
}}
helperText={"e.g. schizophrenia, years of education"}
/>
</Container>
</Grid>
<Grid item xs={6}>
{!diseaseCards ?
(<Container style={{ marginTop: "130px" }}>
<img alt="disease/trait portal" src={DiseaseTrait} style={{ width: "60%" ,height: "100%" }} />
</Container>)
: (
<Slide direction="up" in timeout={1000}>
<Container style={{ marginLeft: "12px", marginTop: "170px" }}>
<HorizontalCard width={600}
onCardClick={(val?: string) => {
navigate(`/psychscreen/traits/${val}`)
}}
cardContentText={diseaseCards}
/>
</Container>
</Slide>
)}
</Grid>
</>
);
};
export default DiseaseTraitPortal;
</Grid>
</>
);
};
export default DiseaseTraitPortal;

0 comments on commit 465a83c

Please sign in to comment.