Merge branch 'main' of https://github.com/myfatemi04/Carpool-Frontend into main

package-lock.json

@@ -15,6 +15,7 @@
 				"@testing-library/react": "^11.1.0",
 				"@testing-library/user-event": "^12.1.10",
 				"@types/bootstrap": "^5.0.12",
+				"@types/google-map-react": "^2.1.0",
 				"@types/leaflet": "^1.7.0",
 				"@types/node": "^14.14.37",
 				"@types/react": "^17.0.3",
@@ -22,8 +23,9 @@
 				"axios": "^0.21.1",
 				"bootstrap": "^4.6.0",
 				"dotenv": "^8.2.0",
-				"google-maps-react": "^2.0.6",
+				"google-map-react": "^2.1.9",
 				"jquery": "^3.6.0",
+				"leaflet": "^1.7.1",
 				"popper.js": "^1.16.1",
 				"react": "^17.0.2",
 				"react-bootstrap": "^1.5.2",
@@ -1704,6 +1706,11 @@
 				"node": ">= 10.14.2"
 			}
 		},
+		"node_modules/@mapbox/point-geometry": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
+			"integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI="
+		},
 		"node_modules/@material-ui/core": {
 			"version": "4.11.3",
 			"resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.11.3.tgz",
@@ -2339,6 +2346,14 @@
 				"@types/node": "*"
 			}
 		},
+		"node_modules/@types/google-map-react": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/google-map-react/-/google-map-react-2.1.0.tgz",
+			"integrity": "sha512-HQF008Q8UKBBZu2T2++P5vx71IE52R2bHgmaKV8n6V5gyZIcrjsAe1OjIbgIN68aqjeo99N0/f10rYRyf2gTAA==",
+			"dependencies": {
+				"@types/react": "*"
+			}
+		},
 		"node_modules/@types/googlemaps": {
 			"version": "3.43.3",
 			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz",
@@ -8028,13 +8043,22 @@
 				"node": ">= 4"
 			}
 		},
-		"node_modules/google-maps-react": {
+		"node_modules/google-map-react": {
-			"version": "2.0.6",
+			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/google-maps-react/-/google-maps-react-2.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/google-map-react/-/google-map-react-2.1.9.tgz",
-			"integrity": "sha512-M8Eo9WndfQEfxcmm6yRq03qdJgw1x6rQmJ9DN+a+xPQ3K7yNDGkVDbinrf4/8vcox7nELbeopbm4bpefKewWfQ==",
+			"integrity": "sha512-//Pa0o6sdspU2H0ehVztSDQSnYYeV6TY4Z6ftty34yiCJYLliOzeq17dA9uFkyUFdL+XwbTU6e9mfs+bjBMIzw==",
+			"dependencies": {
+				"@googlemaps/js-api-loader": "^1.7.0",
+				"@mapbox/point-geometry": "^0.1.0",
+				"eventemitter3": "^4.0.4",
+				"prop-types": "^15.7.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
 			"peerDependencies": {
-				"react": "~0.14.8 || ^15.0.0 || ^16.0.0",
+				"react": "^16.0.0",
-				"react-dom": "~0.14.8 || ^15.0.0 || ^16.0.0"
+				"react-dom": "^16.0.0"
 			}
 		},
 		"node_modules/graceful-fs": {
@@ -10463,8 +10487,7 @@
 		"node_modules/leaflet": {
 			"version": "1.7.1",
 			"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz",
-			"integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==",
+			"integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
-			"peer": true
 		},
 		"node_modules/leven": {
 			"version": "3.1.0",
@@ -20852,6 +20875,11 @@
 				"chalk": "^4.0.0"
 			}
 		},
+		"@mapbox/point-geometry": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
+			"integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI="
+		},
 		"@material-ui/core": {
 			"version": "4.11.3",
 			"resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.11.3.tgz",
@@ -21381,6 +21409,14 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/google-map-react": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/google-map-react/-/google-map-react-2.1.0.tgz",
+			"integrity": "sha512-HQF008Q8UKBBZu2T2++P5vx71IE52R2bHgmaKV8n6V5gyZIcrjsAe1OjIbgIN68aqjeo99N0/f10rYRyf2gTAA==",
+			"requires": {
+				"@types/react": "*"
+			}
+		},
 		"@types/googlemaps": {
 			"version": "3.43.3",
 			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz",
@@ -26231,11 +26267,16 @@
 				}
 			}
 		},
-		"google-maps-react": {
+		"google-map-react": {
-			"version": "2.0.6",
+			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/google-maps-react/-/google-maps-react-2.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/google-map-react/-/google-map-react-2.1.9.tgz",
-			"integrity": "sha512-M8Eo9WndfQEfxcmm6yRq03qdJgw1x6rQmJ9DN+a+xPQ3K7yNDGkVDbinrf4/8vcox7nELbeopbm4bpefKewWfQ==",
+			"integrity": "sha512-//Pa0o6sdspU2H0ehVztSDQSnYYeV6TY4Z6ftty34yiCJYLliOzeq17dA9uFkyUFdL+XwbTU6e9mfs+bjBMIzw==",
-			"requires": {}
+			"requires": {
+				"@googlemaps/js-api-loader": "^1.7.0",
+				"@mapbox/point-geometry": "^0.1.0",
+				"eventemitter3": "^4.0.4",
+				"prop-types": "^15.7.2"
+			}
 		},
 		"graceful-fs": {
 			"version": "4.2.6",
@@ -28225,8 +28266,7 @@
 		"leaflet": {
 			"version": "1.7.1",
 			"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz",
-			"integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==",
+			"integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
-			"peer": true
 		},
 		"leven": {
 			"version": "3.1.0",

src/components/Pool.tsx

@@ -48,6 +48,7 @@ export default function Pool({
 }) {
 	const { user } = useContext(AuthenticationContext);
 	const [address, setAddress] = useState('');
+	const [comment, setComment] = useState('');
 	const handleChange = (address: string) => {
 		setAddress(address);
 	};
@@ -75,13 +76,13 @@ export default function Pool({
 			}
 
 			setCommentStatus('pending');
-
+			makeAPIPostCall(`/pools/${pool._id}/comment`, {
-			makeAPIPostCall('/comment', {
 				body: commentTextareaRef.current!.value,
 			})
 				.then(() => {
 					setCommentStatus(null);
 					commentTextareaRef.current!.value = '';
+					triggerUpdate();
 				})
 				.catch(() => {
 					setCommentStatus('errored');