Skip to content

Commit b50cfbd

Browse files
authored
Show multiple nearest libraries on map when doing postcode search (#139)
* Showing multiple nearest libraries and adding distance slider * Updating to material ui 7 * Ensuring search runs when updating radius * Implementing abort signal in searches * Adding search results summary into mask * Fixing display of library lines * Fixing use of abort controller in library search * Adding debouncing to radius slider
1 parent 6d2e115 commit b50cfbd

23 files changed

+868
-1145
lines changed

package-lock.json

Lines changed: 520 additions & 814 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,29 @@
3434
"last 1 safari version"
3535
]
3636
},
37+
"devDependencies": {
38+
"@vitejs/plugin-react": "^4.5.2",
39+
"gh-pages": "^6.3.0",
40+
"sitemap": "^8.0.0",
41+
"standard": "^17.1.2",
42+
"vite": "^6.3.5"
43+
},
3744
"dependencies": {
3845
"@emotion/react": "^11.14.0",
3946
"@emotion/styled": "^11.14.0",
40-
"@fontsource/roboto": "^5.2.5",
41-
"@mui/icons-material": "^6.4.11",
42-
"@mui/material": "^6.4.11",
43-
"@mui/x-data-grid": "^7.29.1",
47+
"@fontsource/roboto": "^5.2.6",
48+
"@mui/icons-material": "^7.1.1",
49+
"@mui/material": "^7.1.1",
50+
"@mui/x-data-grid": "^8.5.1",
4451
"@turf/turf": "^7.2.0",
4552
"axios": "^1.9.0",
46-
"maplibre-gl": "^5.4.0",
53+
"maplibre-gl": "^5.6.0",
4754
"markdown-to-jsx": "^7.7.6",
4855
"moment": "^2.30.1",
4956
"react": "^19.1.0",
5057
"react-dom": "^19.1.0",
5158
"react-map-gl": "^8.0.4",
52-
"react-router-dom": "^7.5.2",
53-
"react-websitecarbon-badge": "^1.0.6",
59+
"react-router-dom": "^7.6.2",
5460
"rrule": "^2.8.1"
55-
},
56-
"devDependencies": {
57-
"@vitejs/plugin-react": "^4.4.1",
58-
"gh-pages": "^6.3.0",
59-
"sitemap": "^8.0.0",
60-
"standard": "^17.1.2",
61-
"vite": "^6.3.3"
6261
}
6362
}

src/BuiltUpAreaPopup.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import DialogTitle from '@mui/material/DialogTitle'
99
import useMediaQuery from '@mui/material/useMediaQuery'
1010
import { useTheme } from '@mui/material/styles'
1111

12-
import grey from '@mui/material/colors/grey'
12+
import { grey } from '@mui/material/colors'
1313

1414
import CancelIcon from '@mui/icons-material/CancelRounded'
1515

src/Footer.jsx

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import FavoriteIcon from '@mui/icons-material/FavoriteRounded'
1111

1212
import { grey } from '@mui/material/colors'
1313

14-
import { WebsiteCarbonBadge } from 'react-websitecarbon-badge'
15-
1614
function Footer () {
1715
const mapPage = useMatch('/map')
1816
return (
@@ -27,7 +25,7 @@ function Footer () {
2725
>
2826
<Container>
2927
<Grid container spacing={2}>
30-
<Grid item xs={12} sm={12} md={4} lg={4} xl={4}>
28+
<Grid xs={12} sm={12} md={4} lg={4} xl={4}>
3129
<Typography component='p' variant='h6'>
3230
<MaterialLink
3331
component={Link}
@@ -54,18 +52,7 @@ function Footer () {
5452
</MaterialLink>
5553
</Typography>
5654
</Grid>
57-
<Grid
58-
item
59-
xs={12}
60-
sm={12}
61-
md={4}
62-
lg={4}
63-
xl={4}
64-
sx={{ display: mapPage ? 'none' : 'block' }}
65-
>
66-
<WebsiteCarbonBadge url={window.location.href} />
67-
</Grid>
68-
<Grid item xs={12} sm={12} md={4} lg={4} xl={4}>
55+
<Grid xs={12} sm={12} md={4} lg={4} xl={4}>
6956
<Typography component='p' variant='body1'>
7057
In memory of Paul Rowe
7158
<FavoriteIcon

src/Header.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Link, useMatch } from 'react-router-dom'
44

55
import { alpha } from '@mui/material'
66

7-
import grey from '@mui/material/colors/grey'
7+
import { grey } from '@mui/material/colors'
88

99
import AppBar from '@mui/material/AppBar'
1010
import Box from '@mui/material/Box'

src/Home.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ function Home () {
3939
<Search />
4040
</Box>
4141
<Grid container spacing={2}>
42-
<Grid item xs={12} sm={6}>
42+
<Grid xs={12} sm={6}>
4343
<PostcodeInfo />
4444
</Grid>
45-
<Grid item xs={12} sm={6}>
45+
<Grid xs={12} sm={6}>
4646
<PostcodeServiceInfo />
4747
</Grid>
4848
</Grid>

src/Libraries.jsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ import usePrevious from './hooks/usePrevious'
1919

2020
function Libraries () {
2121
const [
22-
{
23-
displayClosedLibraries,
24-
librarySearchDistance,
25-
searchPosition,
26-
serviceFilter
27-
},
22+
{ displayClosedLibraries, searchDistance, searchPosition, serviceFilter },
2823
dispatchSearch
2924
] = useSearchStateValue() //eslint-disable-line
3025
const [{}, dispatchView] = useViewStateValue() //eslint-disable-line
@@ -89,7 +84,7 @@ function Libraries () {
8984
pageSize: paginationModel.pageSize,
9085
sortModel,
9186
searchPosition,
92-
searchDistance: librarySearchDistance,
87+
searchDistance,
9388
serviceFilter,
9489
displayClosedLibraries
9590
})
@@ -99,7 +94,7 @@ function Libraries () {
9994
paginationModel.pageSize,
10095
sortModel,
10196
searchPosition,
102-
librarySearchDistance,
97+
searchDistance,
10398
serviceFilter,
10499
displayClosedLibraries
105100
])

src/Library.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import LibraryDetails from './LibraryDetails'
1313
import LibraryMap from './LibraryMap'
1414
import SiteBreadcrumbs from './SiteBreadcrumbs'
1515

16-
import grey from '@mui/material/colors/grey'
16+
import { grey } from '@mui/material/colors'
1717

1818
import { useApplicationStateValue } from './context/applicationState'
1919
import { useViewStateValue } from './context/viewState'
@@ -64,10 +64,10 @@ function Library () {
6464
</Typography>
6565
</Box>
6666
<Grid container spacing={2}>
67-
<Grid item xs={6}>
67+
<Grid xs={6}>
6868
<LibraryDetails library={library} />
6969
</Grid>
70-
<Grid item xs={6}>
70+
<Grid xs={6}>
7171
<Box sx={{ border: '1px solid', borderColor: grey[200] }}>
7272
<LibraryMap
7373
containerStyle={{

0 commit comments

Comments
 (0)