-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge pull request #24 from CSSE6400/revert-23-postgis"
- Loading branch information
1 parent
688b578
commit dbd300a
Showing
31 changed files
with
1,630 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
name: CI | ||
|
||
on: | ||
push: | ||
branches: | ||
- '*' | ||
pull_request: | ||
branches: | ||
- '*' | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
|
||
services: | ||
postgres: | ||
image: postgis/postgis | ||
env: | ||
POSTGRES_DB: ride | ||
POSTGRES_USER: administrator | ||
POSTGRES_PASSWORD: verySecretPassword | ||
ports: | ||
- 5432:5432 | ||
# Options to keep the container running until the end of the job | ||
options: >- | ||
--health-cmd pg_isready | ||
--health-interval 10s | ||
--health-timeout 5s | ||
--health-retries 5 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Set up Python | ||
uses: actions/setup-python@v2 | ||
with: | ||
python-version: '3.10' | ||
|
||
- name: Install dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install -r application/requirements.txt | ||
- name: Run tests | ||
run: | | ||
export SQLALCHEMY_DATABASE_URI=postgresql+psycopg://administrator:verySecretPassword@localhost:5432/ride | ||
cd application/app/tests | ||
python -m unittest discover | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
application/app/frontend/src/components/ApprovedTripCard.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import React from 'react'; | ||
import '../styles/TripCard.css'; | ||
|
||
const ApprovedTripCard = ({ riderName, startingPoint, destination, onClickCard }) => { | ||
return ( | ||
<div className="trip-card" onClick={onClickCard}> | ||
<div className="trip-info"> | ||
<p>{riderName}</p> | ||
<h3>{startingPoint}</h3> | ||
<h3>{destination}</h3> | ||
</div> | ||
</div> | ||
|
||
); | ||
}; | ||
|
||
export default ApprovedTripCard; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
import React, { useState, useEffect, useContext } from 'react'; | ||
import RiderCard from './RiderCard'; | ||
import { getNearbyTripRequests, approveRequest } from '../api/api'; | ||
import { UserContext } from './UserContext'; | ||
import { useParams } from 'react-router-dom'; | ||
import Alert from '@mui/material/Alert'; | ||
|
||
function RideRequests() { | ||
const { user } = useContext(UserContext); | ||
const username = user.username; | ||
const { tripId } = useParams(); | ||
const [tripRequests, setTripRequests] = useState([]); | ||
const [errorMessage, setErrorMessage] = useState(''); | ||
const [successMessage, setSuccessMessage] = useState(''); | ||
|
||
useEffect(() => { | ||
const fetchTripRequests = async () => { | ||
try { | ||
const response = await getNearbyTripRequests(tripId, username); | ||
|
||
if (response && Array.isArray(response)) { | ||
setTripRequests(response); | ||
} else { | ||
setErrorMessage('Data received is not valid'); | ||
console.error('Data received is not an array:', response); | ||
} | ||
} catch (error) { | ||
setErrorMessage('Failed to fetch trip requests.'); | ||
console.error('Failed to fetch trip requests:', error); | ||
} | ||
}; | ||
fetchTripRequests(); | ||
}, [tripId, username]); | ||
|
||
const handleApprove = async (tripRequestId) => { | ||
try { | ||
setErrorMessage(''); | ||
setSuccessMessage(''); | ||
const response = await approveRequest(username, tripRequestId, tripId); | ||
setSuccessMessage(response.message); | ||
setTripRequests(tripRequests.filter(request => request.id !== tripRequestId)); | ||
} catch (error) { | ||
console.error('Failed to approve ride request:', error); | ||
setErrorMessage(error.message); | ||
} | ||
}; | ||
|
||
return ( | ||
<div> | ||
<center><h1>Available Ride Requests</h1></center> | ||
{errorMessage && <Alert severity="info">{errorMessage}</Alert>} | ||
{successMessage && <Alert severity="success">{successMessage}</Alert>} | ||
<center> | ||
<div> | ||
{tripRequests.length > 0 ? ( | ||
tripRequests.map(tripRequest => ( | ||
<RiderCard | ||
key={tripRequest.id} | ||
riderName={tripRequest.passenger_name} | ||
startingPoint={tripRequest.start_address} | ||
destination={tripRequest.end_address} | ||
onApprove={() => handleApprove(tripRequest.id)} | ||
/> | ||
)) | ||
) : ( | ||
<p>No ride requests available.</p> | ||
)} | ||
</div> | ||
</center> | ||
</div> | ||
); | ||
}; | ||
|
||
export default RideRequests; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,26 @@ | ||
import React from 'react'; | ||
import CheckCircleIcon from '@mui/icons-material/CheckCircle'; | ||
import '../styles/RiderCard.css'; | ||
|
||
const RiderCard = ({ riderName, startingPoint, destination }) => { | ||
const RiderCard = ({ riderName, startingPoint, destination, onApprove }) => { | ||
return ( | ||
<div className="rider-card"> | ||
<h3 style={{marginBottom:40}}>{riderName}</h3> | ||
<div className="rider-cards"> | ||
<div className="rider-info"> | ||
<h3>{riderName}</h3> | ||
<p>{startingPoint}</p> | ||
<p>{destination}</p> | ||
</div> | ||
<div className="actions"> | ||
<center> | ||
<button className="approve" onClick={onApprove}> | ||
<CheckCircleIcon style={{ color: 'green' }} /> | ||
</button> | ||
</center> | ||
</div> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default RiderCard; | ||
export default RiderCard; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,4 +29,4 @@ const TripCard = ({ trip }) => { | |
); | ||
}; | ||
|
||
export default TripCard; | ||
export default TripCard; |
Oops, something went wrong.