Skip to content

Commit

Permalink
Merge branch 'dev' into readme_makefile_updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@NickPhura
NickPhura authored Nov 1, 2021
2 parents 7936082 + 7cf09bc commit e8bc43a
Show file tree
Hide file tree
Showing 15 changed files with 3,642 additions and 3,620 deletions.
18 changes: 12 additions & 6 deletions app/src/components/boundary/MapBoundary.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Alert from '@material-ui/lab/Alert';
import Box from '@material-ui/core/Box';
import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
Expand Down Expand Up @@ -109,7 +110,9 @@ const MapBoundary: React.FC<IMapBoundaryProps> = (props) => {
dialogTitle="Upload Boundary"
onClose={() => setOpenUploadBoundary(false)}>
<Box>
<Typography style={{ marginBottom: '1rem' }}>Accepted file types: .gpx, .klm, .zip (shapefiles)</Typography>
<Box mb={3}>
<Alert severity="info">If uploading a shapefile, it must be configured with a valid projection.</Alert>
</Box>
<FileUpload
uploadHandler={boundaryUploadHandler()}
dropZoneProps={{
Expand All @@ -121,12 +124,15 @@ const MapBoundary: React.FC<IMapBoundaryProps> = (props) => {
<Grid item xs={12}>
<Typography className={classes.bold}>{title}</Typography>
<Box mt={2}>
<Typography variant="body2">
You may select a boundary from an existing layer or upload a KML or Shapefile, KMZ files will not be
accepted. The Shapefile being uploaded must be configured with a valid projection. To select a boundary from
an existing layer, toggle the appropriate layer and select a boundary from the map, then press add boundary.
When done, press the hide layer button.
<Typography variant="body1">
Define your boundary by selecting a boundary from an existing layer or by uploading KML file or shapefile.
</Typography>
<Box mt={2}>
<Typography variant="body1">
To select a boundary from an existing layer, select a layer from the dropdown, click a boundary on the map
and click 'Add Boundary'.
</Typography>
</Box>
</Box>
<Box display="flex" mt={3}>
<Button
Expand Down
8 changes: 3 additions & 5 deletions app/src/components/fields/HorizontalSplitFormComponent.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ const HorizontalSplitFormComponent: React.FC<IHorizontalSplitFormComponentProps>
return (
<>
<Box width="100%" display="flex" flexWrap="nowrap">
<Box width="30%" p={3}>
<Box>
<Typography variant="h2">{title}</Typography>
</Box>
<Box width="30%" p={5}>
<Typography variant="h2">{title}</Typography>
<Box pt={3}>
<Typography variant="body2">{summary}</Typography>
</Box>
</Box>
<Box width="70%" p={3}>
<Box width="70%" p={5}>
{component}
</Box>
</Box>
Expand Down
18 changes: 7 additions & 11 deletions app/src/components/fields/__snapshots__/HorizontalSplitFormComponent.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,13 @@ exports[`HorizontalSplitFormComponent renders correctly 1`] = `
<div
class="MuiBox-root MuiBox-root-2"
>
<div
class="MuiBox-root MuiBox-root-3"
<h2
class="MuiTypography-root MuiTypography-h2"
>
<h2
class="MuiTypography-root MuiTypography-h2"
>
Section title
</h2>
</div>
Section title
</h2>
<div
class="MuiBox-root MuiBox-root-4"
class="MuiBox-root MuiBox-root-3"
>
<p
class="MuiTypography-root MuiTypography-body2"
Expand All @@ -28,10 +24,10 @@ exports[`HorizontalSplitFormComponent renders correctly 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-5"
class="MuiBox-root MuiBox-root-4"
>
<div
class="MuiBox-root MuiBox-root-6"
class="MuiBox-root MuiBox-root-5"
>
<p
class="MuiTypography-root MuiTypography-body1"
Expand Down
96 changes: 44 additions & 52 deletions app/src/features/permits/__snapshots__/CreatePermitPage.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,13 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
<div
class="MuiBox-root MuiBox-root-18"
>
<div
class="MuiBox-root MuiBox-root-19"
<h2
class="MuiTypography-root MuiTypography-h2"
>
<h2
class="MuiTypography-root MuiTypography-h2"
>
Coordinator Information
</h2>
</div>
Coordinator Information
</h2>
<div
class="MuiBox-root MuiBox-root-20"
class="MuiBox-root MuiBox-root-19"
>
<p
class="MuiTypography-root MuiTypography-body2"
Expand All @@ -55,7 +51,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-21"
class="MuiBox-root MuiBox-root-20"
>
<form>
<div
Expand Down Expand Up @@ -95,10 +91,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-23 MuiOutlinedInput-notchedOutline"
class="PrivateNotchedOutline-root-22 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-25"
class="PrivateNotchedOutline-legendLabelled-24"
>
<span>
First Name *
Expand Down Expand Up @@ -142,10 +138,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-23 MuiOutlinedInput-notchedOutline"
class="PrivateNotchedOutline-root-22 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-25"
class="PrivateNotchedOutline-legendLabelled-24"
>
<span>
Last Name *
Expand Down Expand Up @@ -189,10 +185,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-23 MuiOutlinedInput-notchedOutline"
class="PrivateNotchedOutline-root-22 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-25"
class="PrivateNotchedOutline-legendLabelled-24"
>
<span>
Business Email Address *
Expand Down Expand Up @@ -274,10 +270,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-23 MuiOutlinedInput-notchedOutline"
class="PrivateNotchedOutline-root-22 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-25"
class="PrivateNotchedOutline-legendLabelled-24"
>
<span>
Coordinator Agency *
Expand All @@ -290,13 +286,13 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-27"
class="MuiBox-root MuiBox-root-26"
>
<fieldset
class="MuiFormControl-root"
>
<legend
class="MuiBox-root MuiBox-root-28 makeStyles-legend-22"
class="MuiBox-root MuiBox-root-27 makeStyles-legend-21"
>
Share Contact Details
</legend>
Expand All @@ -306,7 +302,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
Do you want the project coordinator contact information visible to the public?
</p>
<div
class="MuiBox-root MuiBox-root-29"
class="MuiBox-root MuiBox-root-28"
>
<div
aria-label="Share Contact Details"
Expand All @@ -318,21 +314,21 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-30 MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-checked-31 Mui-checked MuiIconButton-colorPrimary"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-29 MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-checked-30 Mui-checked MuiIconButton-colorPrimary"
>
<span
class="MuiIconButton-label"
>
<input
checked=""
class="PrivateSwitchBase-input-33"
class="PrivateSwitchBase-input-32"
name="share_contact_details"
required=""
type="radio"
value="false"
/>
<div
class="PrivateRadioButtonIcon-root-34 PrivateRadioButtonIcon-checked-36"
class="PrivateRadioButtonIcon-root-33 PrivateRadioButtonIcon-checked-35"
>
<svg
aria-hidden="true"
Expand All @@ -346,7 +342,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</svg>
<svg
aria-hidden="true"
class="MuiSvgIcon-root PrivateRadioButtonIcon-layer-35 MuiSvgIcon-fontSizeSmall"
class="MuiSvgIcon-root PrivateRadioButtonIcon-layer-34 MuiSvgIcon-fontSizeSmall"
focusable="false"
viewBox="0 0 24 24"
>
Expand All @@ -371,20 +367,20 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-30 MuiRadio-root MuiRadio-colorPrimary MuiIconButton-colorPrimary"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-29 MuiRadio-root MuiRadio-colorPrimary MuiIconButton-colorPrimary"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-33"
class="PrivateSwitchBase-input-32"
name="share_contact_details"
required=""
type="radio"
value="true"
/>
<div
class="PrivateRadioButtonIcon-root-34"
class="PrivateRadioButtonIcon-root-33"
>
<svg
aria-hidden="true"
Expand All @@ -398,7 +394,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</svg>
<svg
aria-hidden="true"
class="MuiSvgIcon-root PrivateRadioButtonIcon-layer-35 MuiSvgIcon-fontSizeSmall"
class="MuiSvgIcon-root PrivateRadioButtonIcon-layer-34 MuiSvgIcon-fontSizeSmall"
focusable="false"
viewBox="0 0 24 24"
>
Expand Down Expand Up @@ -432,22 +428,18 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
class="MuiDivider-root makeStyles-sectionDivider-12"
/>
<div
class="MuiBox-root MuiBox-root-37"
class="MuiBox-root MuiBox-root-36"
>
<div
class="MuiBox-root MuiBox-root-38"
class="MuiBox-root MuiBox-root-37"
>
<div
class="MuiBox-root MuiBox-root-39"
<h2
class="MuiTypography-root MuiTypography-h2"
>
<h2
class="MuiTypography-root MuiTypography-h2"
>
Non-Sampling Permits
</h2>
</div>
Non-Sampling Permits
</h2>
<div
class="MuiBox-root MuiBox-root-40"
class="MuiBox-root MuiBox-root-38"
>
<p
class="MuiTypography-root MuiTypography-body2"
Expand All @@ -457,11 +449,11 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-41"
class="MuiBox-root MuiBox-root-39"
>
<form>
<div
class="MuiBox-root MuiBox-root-42"
class="MuiBox-root MuiBox-root-40"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-3"
Expand All @@ -470,10 +462,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12"
>
<div
class="MuiBox-root MuiBox-root-43"
class="MuiBox-root MuiBox-root-41"
>
<div
class="MuiBox-root MuiBox-root-44"
class="MuiBox-root MuiBox-root-42"
>
<div
class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
Expand Down Expand Up @@ -506,10 +498,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-23 MuiOutlinedInput-notchedOutline"
class="PrivateNotchedOutline-root-22 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-25"
class="PrivateNotchedOutline-legendLabelled-24"
>
<span>
Permit Number *
Expand All @@ -520,7 +512,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-45"
class="MuiBox-root MuiBox-root-43"
>
<div
class="MuiFormControl-root"
Expand Down Expand Up @@ -575,10 +567,10 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</svg>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-23 MuiOutlinedInput-notchedOutline"
class="PrivateNotchedOutline-root-22 MuiOutlinedInput-notchedOutline"
>
<legend
class="PrivateNotchedOutline-legendLabelled-25"
class="PrivateNotchedOutline-legendLabelled-24"
>
<span>
Permit Type
Expand All @@ -592,7 +584,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-46"
class="MuiBox-root MuiBox-root-44"
>
<button
aria-label="remove permit"
Expand Down Expand Up @@ -624,7 +616,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
</div>
</div>
<div
class="MuiBox-root MuiBox-root-47"
class="MuiBox-root MuiBox-root-45"
>
<button
aria-label="add permit"
Expand All @@ -650,7 +642,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = `
class="MuiDivider-root makeStyles-sectionDivider-12"
/>
<div
class="MuiBox-root MuiBox-root-48"
class="MuiBox-root MuiBox-root-46"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-actionButton-7 MuiButton-containedPrimary"
Expand Down
Loading

0 comments on commit e8bc43a

Please sign in to comment.