Skip to content

Commit 4c61621

Browse files
BlariBlari
committed
Comment out Google Maps-related code and update dependencies.
1 parent bb8fa33 commit 4c61621

File tree

5 files changed

+57
-69
lines changed

5 files changed

+57
-69
lines changed

‎package.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
"dependencies": {
1515
"@emotion/react": "^11.11.5",
1616
"@emotion/styled": "^11.11.5",
17-
"@fullcalendar/daygrid": "^5.11.5",
18-
"@fullcalendar/interaction": "^5.11.5",
19-
"@fullcalendar/list": "^5.11.5",
20-
"@fullcalendar/react": "^5.11.5",
21-
"@fullcalendar/timegrid": "^5.11.5",
17+
"@fullcalendar/daygrid": "^6.1.14",
18+
"@fullcalendar/core": "^6.1.14",
19+
"@fullcalendar/interaction": "^6.1.14",
20+
"@fullcalendar/list": "^6.1.14",
21+
"@fullcalendar/react": "^6.1.14",
22+
"@fullcalendar/timegrid": "^6.1.14",
2223
"@mdi/js": "^6.9.96",
2324
"@mdi/react": "^1.6.1",
2425
"@mui/icons-material": "^5.15.1",
@@ -53,10 +54,10 @@
5354
"process": "^0.11.10",
5455
"prop-types": "^15.8.1",
5556
"query-string": "7.1.3",
56-
"react": "^18.2.0",
57+
"react": "^19.0.0",
5758
"react-apexcharts": "^1.6.0",
5859
"react-app-rewired": "^2.2.1",
59-
"react-dom": "^18.2.0",
60+
"react-dom": "^19.0.0",
6061
"react-google-maps": "^9.4.5",
6162
"react-redux": "^7.2.9",
6263
"react-router-dom": "^5.3.4",
@@ -89,7 +90,7 @@
8990
"not op_mini all"
9091
],
9192
"engines": {
92-
"node": "^20.15"
93+
"node": ">=20.15"
9394
},
9495
"devDependencies": {
9596
"@babel/helper-call-delegate": "^7.12.13",
@@ -98,8 +99,8 @@
9899
"@testing-library/user-event": "^14.5.1",
99100
"@types/jest": "^29.5.14",
100101
"@types/node": "^20.10.5",
101-
"@types/react": "^18.3.12",
102-
"@types/react-dom": "^18.3.1",
102+
"@types/react": "^19.0.9",
103+
"@types/react-dom": "^19.0.3",
103104
"@types/sortablejs": "^1.15.7",
104105
"cross-env": "^7.0.3",
105106
"eslint-plugin-css-modules": "^2.12.0",

‎src/components/Layout/styles.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,4 @@ export default makeStyles((theme) => ({
9393
marginRight: 38,
9494
color: theme.palette.type === 'dark' ? '#D6D6D6' : '#4A494A',
9595
},
96-
link: {
97-
'&:not(:first-child)': {
98-
paddingLeft: 15
99-
}
100-
}
10196
}));

‎src/pages/calendar/Calendar.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ import interactionPlugin, { Draggable } from "@fullcalendar/interaction";
2121

2222
import s from "./Calendar.module.scss";
2323

24-
import "@fullcalendar/daygrid/main.css";
25-
import "@fullcalendar/timegrid/main.css";
26-
2724
import moment from "moment/moment";
2825
import cn from "classnames";
2926

‎src/pages/maps/Maps.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,26 @@ import {
99
// styles
1010
import useStyles from "./styles";
1111

12-
const BasicMap = withScriptjs(
13-
withGoogleMap(() => (
14-
<GoogleMap
15-
defaultZoom={12}
16-
defaultCenter={{
17-
lat: parseFloat(-37.813179),
18-
lng: parseFloat(144.950259),
19-
}}
20-
>
21-
<Marker position={{ lat: -37.813179, lng: 144.950259 }} />
22-
</GoogleMap>
23-
)),
24-
);
12+
// const BasicMap = withScriptjs(
13+
// withGoogleMap(() => (
14+
// <GoogleMap
15+
// defaultZoom={12}
16+
// defaultCenter={{
17+
// lat: parseFloat(-37.813179),
18+
// lng: parseFloat(144.950259),
19+
// }}
20+
// >
21+
// <Marker position={{ lat: -37.813179, lng: 144.950259 }} />
22+
// </GoogleMap>
23+
// )),
24+
// );
2525

2626
export default function Maps() {
2727
var classes = useStyles();
2828

2929
return (
3030
<div className={classes.mapContainer}>
31-
<BasicMap
32-
googleMapURL="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=AIzaSyB7OXmzfQYua_1LEhRdqsoYzyJOPh9hGLg"
33-
loadingElement={<div style={{ height: "inherit", width: "inherit" }} />}
34-
containerElement={<div style={{ height: "100%" }} />}
35-
mapElement={<div style={{ height: "100%" }} />}
36-
/>
31+
3732
</div>
3833
);
3934
}

‎src/pages/timeline/Timeline.js‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ import { Typography, Avatar, Link, Button } from "../../components/Wrappers";
3636
import { Annotation, Timestep, Circle } from "../../components/Timeline";
3737
import Widget from "../../components/Widget";
3838

39-
const BasicMap = withScriptjs(
40-
withGoogleMap(() => (
41-
<GoogleMap
42-
defaultZoom={12}
43-
defaultCenter={{
44-
lat: parseFloat(-37.813179),
45-
lng: parseFloat(144.950259)
46-
}}
47-
>
48-
<Marker position={{ lat: -37.813179, lng: 144.950259 }} />
49-
</GoogleMap>
50-
))
51-
);
39+
// const BasicMap = withScriptjs(
40+
// withGoogleMap(() => (
41+
// <GoogleMap
42+
// defaultZoom={12}
43+
// defaultCenter={{
44+
// lat: parseFloat(-37.813179),
45+
// lng: parseFloat(144.950259)
46+
// }}
47+
// >
48+
// <Marker position={{ lat: -37.813179, lng: 144.950259 }} />
49+
// </GoogleMap>
50+
// ))
51+
// );
5252

5353
export default function TimelineComp() {
5454
const classes = useStyles();
@@ -82,25 +82,25 @@ export default function TimelineComp() {
8282
</Box>
8383
</Typography>
8484
</Box>
85-
<Box height={200} width={"100%"} mx={"-24px"} mt={2}>
86-
<BasicMap
87-
googleMapURL="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=AIzaSyB7OXmzfQYua_1LEhRdqsoYzyJOPh9hGLg"
88-
loadingElement={
89-
<div
90-
style={{ height: "inherit", width: "inherit" }}
91-
/>
92-
}
93-
containerElement={
94-
<div
95-
style={{
96-
height: "100%",
97-
width: "calc(100% + 48px)"
98-
}}
99-
/>
100-
}
101-
mapElement={<div style={{ height: "100%" }} />}
102-
/>
103-
</Box>
85+
{/*<Box height={200} width={"100%"} mx={"-24px"} mt={2}>*/}
86+
{/* <BasicMap*/}
87+
{/* googleMapURL="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=AIzaSyB7OXmzfQYua_1LEhRdqsoYzyJOPh9hGLg"*/}
88+
{/* loadingElement={*/}
89+
{/* <div*/}
90+
{/* style={{ height: "inherit", width: "inherit" }}*/}
91+
{/* />*/}
92+
{/* }*/}
93+
{/* containerElement={*/}
94+
{/* <div*/}
95+
{/* style={{*/}
96+
{/* height: "100%",*/}
97+
{/* width: "calc(100% + 48px)"*/}
98+
{/* }}*/}
99+
{/* />*/}
100+
{/* }*/}
101+
{/* mapElement={<div style={{ height: "100%" }} />}*/}
102+
{/* />*/}
103+
{/*</Box>*/}
104104
<Box display="flex" ml={"-12px"} my={1}>
105105
<IconButton aria-label="like">
106106
<LikeIcon />

0 commit comments

Comments
 (0)