-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Feature/277 Other Reports (#278) * add OtherReportsPage; fix changelog link; * change wording; * hazard chart automcomplete expands horizontally; (#279) * Feature/280 Model Components (#282) * update model component page; add to menu and router; * remove text; * feature/238_PGA_boxplot (#281) * update toshi-nest; * update deploy-test env; * Fix/cypress tests (#284) * fix cypress tests; * removes changelog text from start of changelog page; adds new intro text; (#285) * v1.0.3 * update version; * update deploy env for prod;
- Loading branch information
1 parent
d69d134
commit b36b157
Showing
14 changed files
with
169 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
src/services/spectralAccel/testCases/calculateSpectralAccelCurveTestCase.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,43 @@ | ||
| import React from 'react'; | ||
| import { styled } from '@mui/material/styles'; | ||
| import Grid from '@mui/material/Grid'; | ||
| import { Link } from 'react-router-dom'; | ||
|
|
||
| import { Paper, Typography } from '@mui/material'; | ||
| import { Typography } from '@mui/material'; | ||
|
|
||
| const PageContainer = styled('div')({ | ||
| width: '100%', | ||
| // display: 'flex', | ||
| // flexDirection: 'column', | ||
| justifyContent: 'center', | ||
| alignItems: 'center', | ||
| padding: '4rem', | ||
| padding: '2rem', | ||
| marginBottom: '2rem', | ||
| }); | ||
|
|
||
| const InfoContainer = styled('div')({ | ||
| // display: 'flex', | ||
| // flexDirection: 'column', | ||
| const TitleContainer = styled('div')({ | ||
| justifyContent: 'left', | ||
| textAlign: 'left', | ||
| width: '100%', | ||
| // padding: '4rem', | ||
| paddingBottom: '1rem', | ||
| }); | ||
|
|
||
| interface InfoCardProps { | ||
| title: string; | ||
| text: string; | ||
| } | ||
|
|
||
| const ModelComponent: React.FC<InfoCardProps> = ({ title, text }: InfoCardProps) => { | ||
| return ( | ||
| <Grid item xs={12}> | ||
| <Paper> | ||
| <Grid container spacing={3}> | ||
| <Grid item xs={2}> | ||
| <Typography variant="h5">{title}</Typography> | ||
| </Grid> | ||
| <Grid item xs={4}> | ||
| <Typography>{text}</Typography> | ||
| </Grid> | ||
| </Grid> | ||
| </Paper> | ||
| </Grid> | ||
| ); | ||
| }; | ||
|
|
||
| const ModelComponentsPage: React.FC = () => { | ||
| return ( | ||
| <PageContainer> | ||
| <Grid container spacing={3} columns={{ sm: 6, md: 8, lg: 12 }}> | ||
| <Grid item xs={12}> | ||
| <InfoContainer> | ||
| <Typography variant="h2"> | ||
| <Link to="/Resources">Resources :: </Link> | ||
| Model Components | ||
| </Typography> | ||
| </InfoContainer> | ||
| </Grid> | ||
| <Grid item xs={12}> | ||
| <InfoContainer> | ||
| <Typography variant="h3">Source Models</Typography> | ||
| </InfoContainer> | ||
| <Grid container columns={{ sm: 6, md: 8, lg: 12 }}> | ||
| <Grid item xs={2} /> | ||
| <Grid item xs={8}> | ||
| <Grid container spacing={2} columns={{ sm: 6, md: 8, lg: 12 }}> | ||
| <Grid item xs={12}> | ||
| <TitleContainer> | ||
| <Typography variant="h2">Model Components</Typography> | ||
| </TitleContainer> | ||
| </Grid> | ||
| <Grid item xs={12}> | ||
| <Typography variant="body1"> | ||
| Please contact us at <a href="mailto:[email protected]">[email protected]</a> for OpenQuake input files and instructions on how to run the NSHM. | ||
| </Typography> | ||
| </Grid> | ||
| </Grid> | ||
| </Grid> | ||
| <ModelComponent title="Source 1" text="from json." /> | ||
| <ModelComponent title="Source 2 " text="from json." /> | ||
| {/*<InfoCard title="Model Information, Reports, and Input Files" text="More Information" />*/} | ||
| <Grid item xs={2} /> | ||
| </Grid> | ||
| </PageContainer> | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import React from 'react'; | ||
| import { styled } from '@mui/material/styles'; | ||
| import Grid from '@mui/material/Grid'; | ||
| import { Card, CardContent, Typography, Link, Button } from '@mui/material'; | ||
|
|
||
| const StyledCard = styled(Card)(() => ({ | ||
| justifyContent: 'center', | ||
| alignItems: 'center', | ||
| })); | ||
|
|
||
| const PageContainer = styled('div')({ | ||
| width: '100%', | ||
| justifyContent: 'center', | ||
| alignItems: 'center', | ||
| padding: '2rem', | ||
| }); | ||
|
|
||
| const SectionContainer = styled('div')({ | ||
| justifyContent: 'left', | ||
| textAlign: 'left', | ||
| width: '100%', | ||
| paddingTop: '2rem', | ||
| paddingBottom: '1rem', | ||
| }); | ||
|
|
||
| const OtherDocumentsPage: React.FC = () => { | ||
| return ( | ||
| <PageContainer> | ||
| <Grid container columns={{ sm: 6, md: 8, lg: 12 }}> | ||
| <Grid item xs={2} /> | ||
| <Grid spacing={3} item xs={8}> | ||
| <Typography variant="h2">Other Documents</Typography> | ||
| <SectionContainer> | ||
| <Grid container spacing={3} columns={{ sm: 6, md: 8, lg: 12 }}> | ||
| <Grid item xs={12}> | ||
| <StyledCard> | ||
| <CardContent> | ||
| <Grid container spacing={1} columns={{ sm: 6, md: 8, lg: 12 }}> | ||
| <Grid item xs={10}> | ||
| <Typography variant="h4">NSHM Project Assurance Review</Typography> | ||
| </Grid> | ||
| <Grid item xs={2}> | ||
| <Link | ||
| component={Button} | ||
| target="_blank" | ||
| rel="noopener" | ||
| color="primary" | ||
| href={'https://nshm-static-reports.gns.cri.nz/NSHM/ScienceReports/NSHM%20Project%20Assurance_FINAL%20DRAFT_28Jul22.pdf'} | ||
| > | ||
| View report | ||
| </Link> | ||
| </Grid> | ||
| </Grid> | ||
| <Typography> | ||
| Led by Hugh Cowan, the purpose of the Assurance and Lessons Review is to support the uptake of the new National Seismic Hazard Model into policy and practice, and to inform how | ||
| future iterations of the Model and its development may ensure best practice. It provides assurance to decision-makers that the processes followed for development of the revised | ||
| NSHM facilitated reasonable and legitimate scientific review, and led to best practice science and a rational consensus model. | ||
| </Typography> | ||
| </CardContent> | ||
| </StyledCard> | ||
| </Grid> | ||
| </Grid> | ||
| </SectionContainer> | ||
| </Grid> | ||
| <Grid item xs={2} /> | ||
| </Grid> | ||
| </PageContainer> | ||
| ); | ||
| }; | ||
|
|
||
| export default OtherDocumentsPage; |
Oops, something went wrong.