Merge pull request #24 from CSSE6400/revert-23-postgis

Revert "Fixed issues with nearby algorithm"
CSSE6400 · May 27, 2024 · 175d3b8 · 175d3b8
2 parents a405387 + 9d0ab1a
commit 175d3b8
Show file tree

Hide file tree

Showing 31 changed files with 104 additions and 1,630 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
diff --git a/application/app/frontend/package.json b/application/app/frontend/package.json
@@ -4,10 +4,6 @@
   "private": true,
   "proxy": "http://localhost:8080",
   "dependencies": {
-    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.15.17",
-    "@mui/material": "^5.15.17",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",

diff --git a/application/app/frontend/src/App.js b/application/app/frontend/src/App.js
@@ -4,14 +4,11 @@ import TripRequest from './components/TripRequest';
 import LoginEmail from './components/loginEmail';
 import { UserProvider, UserContext } from './components/UserContext';
 import './App.css';
-import RideRequests from './components/RideRequests';
 import { useContext } from 'react';
 import  TripDetail  from './components/TripDetail'
 import  TripList  from './components/TripList'
 import SimpleMap from './components/Map';
 import RideRequest from './components/RideRequest';
-import TripsPage from './pages/TripsPage';
-import TripInformation from './pages/TripInformationPage';
 
 /**
  * App component - the main component of the application.
@@ -45,26 +42,11 @@ const App = () => {
               <TripDetail />
             </PrivateRoute>
           } />
-          <Route path="/trips/:tripId" element={
-            <PrivateRoute userType="driver">
-              <TripInformation />
-            </PrivateRoute>
-          } />
           <Route path="/ride-request" element={
             <PrivateRoute userType="passenger">
               <RideRequest />
             </PrivateRoute>
           } />
-          <Route path="/rides/:tripId" element={
-            <PrivateRoute userType="driver">
-              <RideRequests />
-              </PrivateRoute>
-          } />
-          <Route path="/trips" element={
-            <PrivateRoute userType="driver">
-              <TripsPage />
-            </PrivateRoute>
-          } />
         </Routes>
       </Router>
     </UserProvider>

diff --git a/application/app/frontend/src/api/api.js b/application/app/frontend/src/api/api.js
@@ -51,70 +51,4 @@ export const fetchCoordinates = async (address) => {
   } else {
       throw new Error("Failed to fetch coordinates.");
   }
-};
-
-
-export const getPendingTripRequests = async (username) => {
-  const url = "/trip_requests/get/pending";
-  try {
-      const response = await fetch(url, {
-          method: 'POST',  
-          headers: {
-              'Content-Type': 'application/json',
-              'Accept': 'application/json',
-          },
-          body: JSON.stringify({username}) 
-      });
-      if (response.ok) {
-          return response.json();
-      } else {
-          throw new Error('Failed to fetch pending trip requests');
-      }
-  } catch (error) {
-      throw error;
-  }
-};
-
-export const getNearbyTripRequests = async (tripId, username) => {
-    const url = "/trip/get/pending_nearby";
-    try {
-        const response = await fetch(url, {
-            method: 'POST',  
-            headers: {
-                'Content-Type': 'application/json',
-                'Accept': 'application/json',
-            },
-            body: JSON.stringify({ trip_id: tripId, username })
-        });
-        if (response.ok) {
-            return response.json();
-        } else {
-            throw new Error('Failed to fetch nearby trip requests');
-        }
-    } catch (error) {
-        throw error;
-    }
-  };
-
-  export const approveRequest = async (username, tripRequestId, tripId) => {
-    const url = "/trip/post/approved";
-    try {
-        const response = await fetch(url, {
-            method: 'POST',
-            headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ username, trip_request_id: tripRequestId, trip_id: tripId }),
-        });
-        if (response.ok) {
-            return await response.json();
-        } else {
-            const errorResponse = await response.json();
-            throw new Error(errorResponse.message);
-        }
-    } catch (error) {
-        console.error('Error approving trip request:', error);
-        throw error;
-    }
 };
diff --git a/application/app/frontend/src/components/ApprovedTripCard.js b/application/app/frontend/src/components/ApprovedTripCard.js
diff --git a/application/app/frontend/src/components/RideRequest.js b/application/app/frontend/src/components/RideRequest.js
@@ -97,29 +97,29 @@ function RideRequest() {
 
     return (
         <div>
-            <form onSubmit={handleSubmit} className={styles.formContainer}>
             <h1>Create Ride Request</h1>
+            <form onSubmit={handleSubmit} className={styles.formContainer}>
                 <div className={styles.gridContainer}>
                     <label className={styles.fullWidth}>
-                    <div className={styles.formText}>Pickup Window Start:</div>
+                        Pickup Window Start:
                         <input type="datetime-local" name="pickup_window_start" value={tripWindows.pickup_window_start.replace(':00', '')} onChange={handleTimeChange} className={errors.pickup_window_start ? styles.errorInput : styles.inputField} />
                     </label>
                     <label className={styles.fullWidth}>
-                    <div className={styles.formText}>Pickup Window End:</div>
+                        Pickup Window End:
                         <input type="datetime-local" name="pickup_window_end" value={tripWindows.pickup_window_end.replace(':00', '')} onChange={handleTimeChange} className={errors.pickup_window_end ? styles.errorInput : styles.inputField} />
                     </label>
                     <label className={styles.fullWidth}>
-                    <div className={styles.formText}>Pickup Address:</div>
+                        Pickup Address:
                         <input type="text" value={pickupAddress} onChange={(e) => handleAddressChange(e, "pickup")} className={errors.pickup ? styles.errorInput : styles.inputField} />
                     </label>
                     <label className={styles.fullWidth}>
-                    <div className={styles.formText}>Dropoff Address:</div>
+                        Dropoff Address:
                         <input type="text" value={dropoffAddress} onChange={(e) => handleAddressChange(e, "dropoff")} className={errors.dropoff ? styles.errorInput : styles.inputField} />
                     </label>
                 </div>
-                <center><button type="submit" className={styles.button}>Create Trip Request</button></center>
+                <button type="submit" className={styles.button}>Create Trip Request</button>
             </form>
-            <center><button onClick={handleLogout} className={styles.blueButton}>Logout</button></center>
+            <button onClick={handleLogout} className={styles.blueButton}>Logout</button>
         </div>
     );
 }

diff --git a/application/app/frontend/src/components/RideRequests.js b/application/app/frontend/src/components/RideRequests.js
diff --git a/application/app/frontend/src/components/RiderCard.js b/application/app/frontend/src/components/RiderCard.js
@@ -1,26 +1,16 @@
 import React from 'react';
-import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import '../styles/RiderCard.css';
 
-const RiderCard = ({ riderName, startingPoint, destination, onApprove }) => {
+const RiderCard = ({ riderName, startingPoint, destination }) => {
   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;
diff --git a/application/app/frontend/src/components/Routing.js b/application/app/frontend/src/components/Routing.js
@@ -2,15 +2,14 @@ import L from "leaflet";
 import { createControlComponent } from "@react-leaflet/core";
 import "leaflet-routing-machine";
 import markerIconPng from "leaflet/dist/images/marker-icon.png"
-
 const customIcon = new L.Icon({
     iconUrl: markerIconPng,
     iconSize: [25, 41],  
     iconAnchor: [12, 41],  
     popupAnchor: [1, -34],  
-});
+  });
 
-const createRoutineMachineLayer = ({ waypoints }) => {
+const createRoutineMachineLayer = ({waypoints}) => {
   const instance = L.Routing.control({
     waypoints: waypoints.map(wp => L.latLng(wp.lat, wp.lng)),
     lineOptions: {
@@ -27,19 +26,10 @@ const createRoutineMachineLayer = ({ waypoints }) => {
       fitSelectedRoutes: false,
       showAlternatives: false,
       show: false,
-      createMarker: function(i, wp, n) {
-        const marker = L.marker(wp.latLng, {
+      createMarker: function(i, wp) {
+        return L.marker(wp.latLng, {
           icon: customIcon
         });
-        // Adding a popup to display the name
-        // if (waypoints[i].name) {
-        //   marker.bindPopup(waypoints[i].name);
-        // }
-        // Alternatively, you can use a tooltip
-        if (waypoints[i].name) {
-          marker.bindTooltip(waypoints[i].name, {permanent: true});
-        }
-        return marker;
       }
   });
 
@@ -48,4 +38,4 @@ const createRoutineMachineLayer = ({ waypoints }) => {
 
 const RoutingMachine = createControlComponent(createRoutineMachineLayer);
 
-export default RoutingMachine;
+export default RoutingMachine;
diff --git a/application/app/frontend/src/components/TripCard.js b/application/app/frontend/src/components/TripCard.js
@@ -29,4 +29,4 @@ const TripCard = ({ trip }) => {
     );
   };
 
-  export default TripCard;
+  export default TripCard;