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

src/components/Pools.tsx

@@ -105,7 +105,7 @@ const Pools = () => {
 							</p>
 							<p className="text-left">Start Time: {pool.start_time}</p>
 							<p className="text-left">End Time: {pool.end_time}</p>
-							<p className="text-warning">
+							<p className="" style={{color: '#9E6105'}}>
 								{maybePluralize(pool.comments.length, 'comment')}
 							</p>
 						</div>

src/components/Profile.tsx

@@ -6,7 +6,7 @@ import CardContent from '@material-ui/core/CardContent';
 import { makeStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import { useContext, useEffect, useState } from 'react';
-import { makeAPIGetCall } from '../api/utils';
+import { API_ENDPOINT } from '../api/api';
 import AuthenticationContext from './AuthenticationContext';
 
 const useStyles = makeStyles({
@@ -21,8 +21,7 @@ const useStyles = makeStyles({
 const Profile = () => {
 	const { user, isLoggedIn } = useContext(AuthenticationContext);
 	const [groups, setGroups] = useState<Carpool.Group[]>([]);
-	const [pools, setPools] = useState<Carpool.Pool[]>([
-		/*
+	const [pools, setPools] = useState([
 		{
 			id: 1,
 			pool_title: 'TJ Carpool',
@@ -70,17 +69,19 @@ const Profile = () => {
 			comments: [
 				'What is the covid vaccination status of all the participants?',
 			],
-		},*/
+		},
 	]);
 	const classes = useStyles();
 
 	useEffect(() => {
 		console.log(process.env);
-		makeAPIGetCall('/my_pools').then((response) => {
-			if (response.data.data) {
-				setPools(response.data.data);
-			}
-		});
+		fetch(`${API_ENDPOINT}/my_pools`)
+			.then((response) => response.json())
+			.then((json) => {
+				if (json) {
+					setPools(json.data);
+				}
+			});
 	}, []);
 
 	if (!user) {
@@ -112,14 +113,14 @@ const Profile = () => {
 								<CardActionArea href={'/pool/' + pool.id}>
 									<CardContent>
 										<Typography gutterBottom variant="h5" component="h2">
-											{pool.title}
+											{pool.pool_title}
 										</Typography>
 										<Typography
 											variant="body2"
 											color="textSecondary"
 											component="p"
 										>
-											{pool.description}
+											{pool.pool_text}
 										</Typography>
 									</CardContent>
 								</CardActionArea>