Skip to content

Commit 0ad9e70

Browse files
committed
Refactor amp.tsx and index.tsx: standardize string quotes and remove unused Links component
1 parent f5d2e86 commit 0ad9e70

3 files changed

Lines changed: 76 additions & 178 deletions

File tree

src/components/layout/sider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ export const ThemedSiderV2: React.FC<RefineThemedLayoutSiderProps> = ({
381381
>
382382
{[
383383
{ to: '/about', label: 'About' },
384-
{ to: '/ocotillo/help', label: 'Desktop GIS Help' },
384+
{ to: '/ocotillo/help', label: 'Connect Desktop GIS' },
385385
{ to: '/report-a-bug', label: 'Report a Bug' },
386386
].map(({ to, label }) => (
387387
<RouterLink key={to} to={to} style={{ textDecoration: 'none' }}>

src/pages/home/index.tsx

Lines changed: 17 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
11
import { useState } from 'react'
2+
import { MapOutlined } from '@mui/icons-material'
23
import {
3-
AutoAwesome,
4-
ElectricBolt,
5-
Plumbing,
6-
StorageOutlined,
7-
} from '@mui/icons-material'
8-
import {
9-
Avatar,
104
Card,
115
CardContent,
12-
List,
13-
ListItem,
14-
ListItemAvatar,
15-
ListItemButton,
16-
ListItemText,
17-
ListSubheader,
186
Stack,
197
Typography,
20-
useTheme,
218
Box,
229
Drawer,
2310
Alert,
2411
Divider,
2512
Container,
13+
Link,
2614
} from '@mui/material'
2715
import Grid from '@mui/material/Grid2'
2816
import ocotilloImage from '@/img/ocotillo.jpeg'
@@ -39,7 +27,6 @@ export const Home = () => {
3927
<Stack spacing={3}>
4028
<Hero />
4129
<About />
42-
<Links />
4330
</Stack>
4431
</CardContent>
4532
</Card>
@@ -102,8 +89,6 @@ const HomeNotification = ({ noPermissions }) => {
10289
}
10390

10491
const Hero = () => {
105-
const theme = useTheme()
106-
10792
return (
10893
<Box
10994
sx={{
@@ -128,7 +113,7 @@ const Hero = () => {
128113
backgroundRepeat: 'no-repeat, no-repeat',
129114
backgroundSize: 'cover, auto 100%', // overlay covers, image is auto x 100%
130115
backgroundPosition: 'center, center',
131-
backgroundColor: theme.palette.grey[900],
116+
backgroundColor: '#212121',
132117
}}
133118
/>
134119
{/* Overlay for readability + polish */}
@@ -162,11 +147,11 @@ const About = () => (
162147
<Stack spacing={3}>
163148
<Box>
164149
<Typography variant="deck" sx={{ color: 'text.secondary' }}>
165-
Ocotillo is an application for accessing and working with New
166-
Mexico Bureau of Geology water data. It provides access to
167-
groundwater well information from the Aquifer Mapping Program
168-
(AMP), with additional datasets from Geothermal, Oil &amp; Gas, and
169-
Argon Geochronology planned for the future.
150+
Ocotillo is an application for accessing and working with New Mexico
151+
Bureau of Geology water data. It provides access to groundwater well
152+
information from the Aquifer Mapping Program (AMP), with additional
153+
datasets from Geothermal, Oil &amp; Gas, and Argon Geochronology
154+
planned for the future.
170155
</Typography>
171156
</Box>
172157

@@ -179,7 +164,7 @@ const About = () => (
179164
</Typography>
180165
<Stack component="ul" spacing={1} sx={{ pl: 2, m: 0 }}>
181166
<Typography component="li" variant="body1">
182-
Browse wells on the Map
167+
<Link href="/ocotillo/map">Browse wells on the Map</Link>
183168
</Typography>
184169
<Typography component="li" variant="body1">
185170
Search by well ID, site name, or contact/owner
@@ -189,7 +174,14 @@ const About = () => (
189174
contacts/owners)
190175
</Typography>
191176
<Typography component="li" variant="body1">
192-
Export a Field Compilation sheet for a single well
177+
<Link href="/ocotillo/well/batch-export">
178+
Batch export Field Compilation sheets
179+
</Link>
180+
</Typography>
181+
<Typography component="li" variant="body1">
182+
<Link href="/ocotillo/help">
183+
Connect Ocotillo to ArcGIS Pro or QGIS
184+
</Link>
193185
</Typography>
194186
</Stack>
195187
</Grid>
@@ -217,83 +209,3 @@ const About = () => (
217209
</Container>
218210
</Box>
219211
)
220-
221-
const Links = () => {
222-
const theme = useTheme()
223-
224-
return (
225-
<Box sx={{ width: '100%' }}>
226-
<Container maxWidth="lg">
227-
<List
228-
sx={{ width: '100%', maxWidth: 300 }}
229-
subheader={
230-
<ListSubheader component="span">
231-
Use this tool to efficiently manage data from:
232-
</ListSubheader>
233-
}
234-
>
235-
<ListItem sx={{ pointerEvents: 'none' }}>
236-
<ListItemAvatar>
237-
<Avatar sx={{ bgcolor: theme.palette.secondary.main }}>
238-
<StorageOutlined />
239-
</Avatar>
240-
</ListItemAvatar>
241-
<ListItemText
242-
primary="Aquifer Mapping Program"
243-
sx={{
244-
color: theme.palette.secondary.main,
245-
}}
246-
/>
247-
</ListItem>
248-
<ListItemButton
249-
component="a"
250-
target="_blank"
251-
rel="noopener noreferrer"
252-
href="https://github.com/NMGRL/pychron"
253-
>
254-
<ListItemAvatar>
255-
<Avatar sx={{ bgcolor: theme.palette.secondary.main }}>
256-
<AutoAwesome />
257-
</Avatar>
258-
</ListItemAvatar>
259-
<ListItemText
260-
primary="Pychron"
261-
sx={{
262-
color: theme.palette.secondary.main,
263-
}}
264-
/>
265-
</ListItemButton>
266-
<ListItem sx={{ pointerEvents: 'none' }}>
267-
<ListItemAvatar>
268-
<Avatar sx={{ bgcolor: theme.palette.secondary.main }}>
269-
<Plumbing />
270-
</Avatar>
271-
</ListItemAvatar>
272-
<ListItemText
273-
primary="Geothermal Program"
274-
sx={{ color: theme.palette.secondary.main }}
275-
/>
276-
</ListItem>
277-
<ListItemButton
278-
component="a"
279-
target="_blank"
280-
rel="noopener noreferrer"
281-
href="https://st2.newmexicowaterdata.org/FROST-Server"
282-
>
283-
<ListItemAvatar>
284-
<Avatar sx={{ bgcolor: theme.palette.secondary.main }}>
285-
<ElectricBolt />
286-
</Avatar>
287-
</ListItemAvatar>
288-
<ListItemText
289-
primary="ST2"
290-
sx={{
291-
color: theme.palette.secondary.main,
292-
}}
293-
/>
294-
</ListItemButton>
295-
</List>
296-
</Container>
297-
</Box>
298-
)
299-
}

0 commit comments

Comments
 (0)