diff --git a/backend/src/routes/auth.ts b/backend/src/routes/auth.ts index d6ef970..7090af3 100644 --- a/backend/src/routes/auth.ts +++ b/backend/src/routes/auth.ts @@ -59,7 +59,6 @@ router.post("/login", validateAuth, async (req: Request, res: Response) => { ); const user = (await users[0]) as User; - // console.log(user); if (!user) { res.status(401).json({ @@ -79,8 +78,7 @@ router.post("/login", validateAuth, async (req: Request, res: Response) => { }); return; } - // console.log(user.password); - // console.log(hashedPassword); + const refreshToken = generateRefreshToken(user.id!); const accessToken = generateAccessToken(user.id!); @@ -92,7 +90,6 @@ router.post("/login", validateAuth, async (req: Request, res: Response) => { httpOnly: true, maxAge: 24 * 60 * 60 * 1000, }); - // console.log(req.cookies.jwt); res.status(200).json({ accessToken, isAdmin: user.is_admin, id: user.id }); } catch (error) { const errorMessage = (error as Error).message; @@ -112,7 +109,6 @@ router.get("/refresh", async (req: Request, res: Response) => { } const refreshToken = cookies.jwt; - // console.log(refreshToken); const foundUser = ( await pool.query("SELECT * FROM users WHERE refresh_token = $1", [ @@ -120,7 +116,6 @@ router.get("/refresh", async (req: Request, res: Response) => { ]) ).rows[0]; - // console.log(foundUser); if (!foundUser) { res.status(403).json({ @@ -137,13 +132,11 @@ router.get("/refresh", async (req: Request, res: Response) => { process.env.REFRESH_TOKEN_SECRET! ) as JwtPayload; - console.log(payload.userId); const accessToken = generateAccessToken(payload.userId); res .status(200) .json({ accessToken, isAdmin: foundUser.is_admin, id: foundUser.id }); - } catch (error) { - console.log(error); + } catch { res.status(403).json({ title: "No Access Rights", message: "You do not have access to these features.", diff --git a/backend/src/routes/cars.ts b/backend/src/routes/cars.ts index 27a8431..82fe6a2 100644 --- a/backend/src/routes/cars.ts +++ b/backend/src/routes/cars.ts @@ -14,7 +14,6 @@ router.post("/check-license", async (req: Request, res: Response) => { ); const driverFound = drivers[0]; - console.log(drivers); if (!driverFound) { res.status(401).json({ @@ -42,14 +41,6 @@ router.post("/add", async (req: Request, res: Response) => { license_number, }: Cars = req.body; - console.log( - car_model, - license_plate, - license_number, - color, - driver_id, - brand - ); const { rows: drivers } = await pool.query( `SELECT id @@ -67,7 +58,7 @@ router.post("/add", async (req: Request, res: Response) => { return; } - const car = await pool.query( + await pool.query( `INSERT INTO cars ( driver_id, car_model, @@ -79,7 +70,6 @@ router.post("/add", async (req: Request, res: Response) => { [driver_id, car_model, license_plate, brand, color, license_number] ); - console.log(car.rows); res.status(200).json({ title: "Car Added!", message: `Car ${brand} ${car_model} ${color} with a license plate of ${license_plate} has been added!`, @@ -94,7 +84,6 @@ router.get("/get", async (req: Request, res: Response) => { try { const { driverId } = req.query; - console.log("Received driverId:", driverId); if (!driverId) { res.status(400).json({ @@ -162,7 +151,6 @@ router.patch("/update", async (req: Request, res: Response) => { } const updateCar = result.rows[0]; - console.log("Car updated successfully:", updateCar); res.status(200).json({ title: "Car Updated!", @@ -177,9 +165,8 @@ router.patch("/update", async (req: Request, res: Response) => { router.delete("/delete", async (req: Request, res: Response) => { try { - console.log("Fetching. . ."); - const car = await pool.query( + await pool.query( `DELETE FROM cars WHERE @@ -189,7 +176,6 @@ router.delete("/delete", async (req: Request, res: Response) => { ); res.status(200).json({ message: "Car Added Successfully" }); - console.log("Driver deleted successfully:", car); } catch (error) { const errorMessage = (error as Error).message; res.status(500).json({ title: "Unknown Error", message: errorMessage }); diff --git a/backend/src/routes/driver.ts b/backend/src/routes/driver.ts index afbe519..21a1629 100644 --- a/backend/src/routes/driver.ts +++ b/backend/src/routes/driver.ts @@ -18,7 +18,7 @@ router.post("/add", validateDriver, async (req: Request, res: Response) => { license_expiration_date, } = req.body as Driver; - const driver = await pool.query( + await pool.query( `INSERT INTO drivers ( email, first_name, @@ -44,7 +44,6 @@ router.post("/add", validateDriver, async (req: Request, res: Response) => { ] ); - console.log(driver.rows); res.status(200).json({ title: "Driver Added!", message: `Driver ${last_name}, ${first_name} ${middle_name} has been added`, @@ -59,13 +58,11 @@ router.post("/add", validateDriver, async (req: Request, res: Response) => { router.get("/get", async (req: Request, res: Response) => { try { - console.log("Fetching drivers from the database..."); const { rows: drivers } = await pool.query( `SELECT * FROM drivers` ); - console.log("Drivers fetched successfully:", drivers); // Send the drivers list as a response res.json(drivers); @@ -101,7 +98,6 @@ router.get("/get/:driverId", async (req: Request, res: Response) => { ); const foundDriver = await drivers[0]; - console.log(foundDriver); if (!foundDriver) { res.status(404).json({ message: "Driver not found" }); @@ -193,7 +189,6 @@ router.patch("/update", async (req: Request, res: Response) => { }); router.delete("/delete", async (req: Request, res: Response) => { - console.log("Request body:", req.body); // Log the incoming request body try { const { id } = req.body; @@ -225,7 +220,6 @@ router.delete("/delete", async (req: Request, res: Response) => { } const deletedDriver = resultDriver.rows[0]; - console.log("Driver deleted successfully:", deletedDriver); res.status(200).json({ title: "Driver Deleted", diff --git a/backend/src/routes/notification.ts b/backend/src/routes/notification.ts index afa8dee..0a70454 100644 --- a/backend/src/routes/notification.ts +++ b/backend/src/routes/notification.ts @@ -25,8 +25,7 @@ router.get("/get-by-user", async (req: Req, res: Response) => { } else { res.json(notifications); } - } catch (err) { - console.log(err); + } catch { res.status(500).json({ title: "Server Error", message: "An unexpected error occurred while retrieving notifications", diff --git a/backend/src/routes/profile.ts b/backend/src/routes/profile.ts index 0861b73..7a3651b 100644 --- a/backend/src/routes/profile.ts +++ b/backend/src/routes/profile.ts @@ -30,8 +30,7 @@ router.get("/get/:id", async (req: Request, res: Response) => { ); res.status(200).json({ ...foundDriver, violations, cars }); - } catch (error) { - console.log(error); + } catch { res.sendStatus(500); } }); diff --git a/backend/src/routes/registration.ts b/backend/src/routes/registration.ts index 9f23c5d..cd31dad 100644 --- a/backend/src/routes/registration.ts +++ b/backend/src/routes/registration.ts @@ -16,11 +16,9 @@ const fetchRegistrationByLicense = async (license_number: string) => { // GET route to fetch all registrations router.get("/get", async (_req: Request, res: Response) => { try { - console.log("Fetching registration from the database..."); const { rows: registrations } = await pool.query( "SELECT user_id, license_number, school_email, first_name, last_name, middle_name, date_of_birth, driver_type, sex FROM registrations" ); - console.log("Registrations fetched successfully:", registrations); res.json(registrations); // Send the registration list as a response } catch (error) { @@ -46,7 +44,6 @@ router.post("/add", async (req: Request, res: Response) => { driver_type, } = req.body as Registration; - console.log(req.body); if ( ![ license_number, @@ -105,11 +102,6 @@ router.delete("/delete", async (req: Request, res: Response): Promise => { try { const { license_number } = req.body as Registration; // Extract license_number from request body - console.log( - "Attempting to delete registration with license number:", - license_number - ); - // Attempt to delete the registration await pool.query( `DELETE FROM registrations WHERE license_number = $1 RETURNING *`, diff --git a/backend/src/routes/user.ts b/backend/src/routes/user.ts index f020a9a..957818d 100644 --- a/backend/src/routes/user.ts +++ b/backend/src/routes/user.ts @@ -9,13 +9,10 @@ router.get("/get", async (req: Request, res: Response) => { try { const userId = req.user; - console.log(req.user); - console.log("Fetching user from the database..."); const { rows: users } = await pool.query( "SELECT id, first_name, last_name FROM users WHERE id = $1", [userId] ); - console.log("User fetched successfully:", users); const { rows: registrations } = await pool.query( "SELECT * FROM registrations WHERE user_id = $1", @@ -102,9 +99,8 @@ router.patch("/change-password", async (req: Request, res: Response) => { title: "Password Changed", message: "Password has been successfully changed.", }); - } catch (error) { + } catch { res.status(500).json({ message: "An Unknown Error Occured" }); - console.log(error); } }); diff --git a/backend/src/routes/violation.ts b/backend/src/routes/violation.ts index c289fe7..6fdee65 100644 --- a/backend/src/routes/violation.ts +++ b/backend/src/routes/violation.ts @@ -29,10 +29,8 @@ router.post("/add", async (req: Request, res: Response) => { return; } - console.log("THIS IS THE DRIVER FROM VIOLATION"); - console.log(driverFound); - const violations = await pool.query( + await pool.query( `INSERT INTO violations ( driver_id, violation_type, @@ -43,7 +41,6 @@ router.post("/add", async (req: Request, res: Response) => { [driver_id, violation_type, violation_date, description] ); - console.log(violations.rows[0]); res.status(200).json({ title: "Violation Added!", @@ -88,9 +85,6 @@ router.patch("/update", async (req: Request, res: Response) => { return; } - const updateViolation = result.rows[0]; - console.log("Violations updated successfully:", updateViolation); - res.status(200).json({ title: "Violation Updated!", message: `Violation has been updated successfully.`, @@ -99,7 +93,6 @@ router.patch("/update", async (req: Request, res: Response) => { router.delete("/delete", async (req: Request, res: Response) => { try { - console.log("Fetching. . ."); const { violationId } = req.body; @@ -124,7 +117,8 @@ router.delete("/delete", async (req: Request, res: Response) => { message: "Violation Deleted Successfully.", }); } catch (error) { - console.log(error); + const errorMessage = (error as Error).message; + res.status(500).json({ title: "Unknown Error", message: errorMessage }); } }); diff --git a/backend/src/routes/violators.ts b/backend/src/routes/violators.ts index 2e3dc0f..c998589 100644 --- a/backend/src/routes/violators.ts +++ b/backend/src/routes/violators.ts @@ -33,8 +33,7 @@ router.get("/get", async (_req: Request, res: Response) => { } res.status(200).json(violators); - } catch (error) { - console.log(error); + } catch { res.sendStatus(500); } }); diff --git a/frontend/src/hooks/car-hooks/useCheckLicenseNumber.ts b/frontend/src/hooks/car-hooks/useCheckLicenseNumber.ts index 02c14b5..233892c 100644 --- a/frontend/src/hooks/car-hooks/useCheckLicenseNumber.ts +++ b/frontend/src/hooks/car-hooks/useCheckLicenseNumber.ts @@ -16,7 +16,6 @@ const useCheckLicenseNumber = () => { try { // Make sure license_number is URL-safe - console.log(license_number); const response = await fetchWithAuth( navigate, refresh, diff --git a/frontend/src/hooks/car-hooks/useDeleteCar.ts b/frontend/src/hooks/car-hooks/useDeleteCar.ts index f47c3a3..a82a7d7 100644 --- a/frontend/src/hooks/car-hooks/useDeleteCar.ts +++ b/frontend/src/hooks/car-hooks/useDeleteCar.ts @@ -11,7 +11,6 @@ export const useDeleteCar = () => { const deleteCar = async (carId: string) => { setAppLoading!(true) try { - console.log("Sending delete request for car ID:", carId); // Log driverId const response = await fetchWithAuth( navigate, @@ -34,7 +33,6 @@ export const useDeleteCar = () => { const notificationAPI = await response.json() toast.success(notificationAPI.message) - console.log("Car deleted successfully"); return ; } catch (err: unknown) { console.error("Network error:", err); diff --git a/frontend/src/hooks/driver-hooks/useAddDriver.ts b/frontend/src/hooks/driver-hooks/useAddDriver.ts index 827fb5c..af89a00 100644 --- a/frontend/src/hooks/driver-hooks/useAddDriver.ts +++ b/frontend/src/hooks/driver-hooks/useAddDriver.ts @@ -14,7 +14,6 @@ export const useAddDriver = () => { setLoading(true); try { - console.log(`FORM DATA: ${JSON.stringify(formData)}`); const response = await fetchWithAuth( navigate, refresh, @@ -27,7 +26,6 @@ export const useAddDriver = () => { if (!response.ok) { const error: BackendMessage = await response.json(); setError(error); - console.log("What are you doing?!"); } } catch (error) { console.error("Unexpected error:", error); diff --git a/frontend/src/hooks/driver-hooks/useDeleteDriver.ts b/frontend/src/hooks/driver-hooks/useDeleteDriver.ts index 5c95d34..86b5f04 100644 --- a/frontend/src/hooks/driver-hooks/useDeleteDriver.ts +++ b/frontend/src/hooks/driver-hooks/useDeleteDriver.ts @@ -11,7 +11,6 @@ export const useDeleteDriver = () => { const deleteDriver = async (driverId: string) => { setAppLoading!(true) try { - console.log("Sending delete request for driver ID:", driverId); // Log driverId const response = await fetchWithAuth( navigate, diff --git a/frontend/src/hooks/driver-hooks/useGetDriver.ts b/frontend/src/hooks/driver-hooks/useGetDriver.ts index 8e123d1..20f8013 100644 --- a/frontend/src/hooks/driver-hooks/useGetDriver.ts +++ b/frontend/src/hooks/driver-hooks/useGetDriver.ts @@ -37,8 +37,7 @@ const useGetDriver = (id: string) => { const fetchedDriver = await response.json(); setDriver(fetchedDriver); - } catch (error) { - console.log(error); + } catch { return {}; } finally { setLoading(false); diff --git a/frontend/src/hooks/registration-hooks/useDeleteRegistration.ts b/frontend/src/hooks/registration-hooks/useDeleteRegistration.ts index 482f281..a74823e 100644 --- a/frontend/src/hooks/registration-hooks/useDeleteRegistration.ts +++ b/frontend/src/hooks/registration-hooks/useDeleteRegistration.ts @@ -12,8 +12,6 @@ export const useDeleteRegistration = () => { setdeleteLoading(true); try { - console.log(`Sending DELETE request to: /registration/delete`); - console.log("License Number to Delete:", licenseNumber); // Send license_number in the request body as JSON const response = await fetchWithAuth( @@ -28,12 +26,10 @@ export const useDeleteRegistration = () => { ); // Log the response status - console.log("Response Status:", response.status); let responseBody; try { responseBody = await response.json(); - console.log("Response Body:", responseBody); } catch (error) { console.error("Failed to parse JSON response:", error); throw new Error("Invalid JSON response from server."); diff --git a/frontend/src/hooks/useSignUp.ts b/frontend/src/hooks/useSignUp.ts index ab0500f..fd5b1ae 100644 --- a/frontend/src/hooks/useSignUp.ts +++ b/frontend/src/hooks/useSignUp.ts @@ -14,7 +14,6 @@ const useSignUp = () => { if (!response.ok) { const backendError: BackendMessage = await response.json(); - console.log(backendError); toast.error(`${backendError.message}`); return false; } diff --git a/frontend/src/hooks/useUser.ts b/frontend/src/hooks/useUser.ts index d396522..0138a18 100644 --- a/frontend/src/hooks/useUser.ts +++ b/frontend/src/hooks/useUser.ts @@ -27,7 +27,6 @@ const useUser = () => { return; } const user: UserType = await response.json(); - console.log(user); setData(user); } catch (err) { console.error("Error fetching user:", err); diff --git a/frontend/src/hooks/violation-hooks/useDeleteViolation.ts b/frontend/src/hooks/violation-hooks/useDeleteViolation.ts index 50aa679..c85fb6c 100644 --- a/frontend/src/hooks/violation-hooks/useDeleteViolation.ts +++ b/frontend/src/hooks/violation-hooks/useDeleteViolation.ts @@ -11,7 +11,6 @@ export const useDeleteViolation = () => { const deleteViolation = async (violationId: string) => { setAppLoading!(true); try { - console.log("Sending delete request for violation ID:", violationId); // Log driverId const response = await fetchWithAuth( navigate, @@ -34,7 +33,6 @@ export const useDeleteViolation = () => { const notificationAPI = await response.json(); toast.success(notificationAPI.message); - console.log("Violation deleted successfully"); return; } catch (err: unknown) { console.error("Network error:", err); diff --git a/frontend/src/pages/AdminHomePage.tsx b/frontend/src/pages/AdminHomePage.tsx index 8ce5f22..12af2c1 100644 --- a/frontend/src/pages/AdminHomePage.tsx +++ b/frontend/src/pages/AdminHomePage.tsx @@ -4,7 +4,6 @@ import useUser from "../hooks/useUser"; const AdminLandingPage = () => { const { data: user } = useUser(); - console.log(user); const navigate = useNavigate(); diff --git a/frontend/src/pages/DriverList.tsx b/frontend/src/pages/DriverList.tsx index 6b9b6d1..30d11f6 100644 --- a/frontend/src/pages/DriverList.tsx +++ b/frontend/src/pages/DriverList.tsx @@ -18,7 +18,6 @@ const DriversList = () => { // Handle driver click to show more details const handleDriverClick = (driver: DriverWithVandC) => { setSelectedDriver(driver); - console.log(driver.id); }; // Toggle sorting between alphabetical and default diff --git a/frontend/src/pages/RegisterDriver.tsx b/frontend/src/pages/RegisterDriver.tsx index 4cfb21e..87b995f 100644 --- a/frontend/src/pages/RegisterDriver.tsx +++ b/frontend/src/pages/RegisterDriver.tsx @@ -99,7 +99,6 @@ const RegisterDriver = () => { try { await postRegistration(formData); // Send the form data to the backend - console.log(formData); const isValid = validateForm(); // Validate the form if (isValid) navigate("/homepage"); // Redirect to the homepage } catch (error) { diff --git a/frontend/src/pages/ViolatorList.tsx b/frontend/src/pages/ViolatorList.tsx index 07bd36e..ede988a 100644 --- a/frontend/src/pages/ViolatorList.tsx +++ b/frontend/src/pages/ViolatorList.tsx @@ -17,11 +17,9 @@ const ViolatorList = () => { const [originalViolators, setOriginalViolators] = useState( [] ); // Stores the original list - console.log(sortedViolators); const handleViolatorsClick = (violator: Violators) => { setSelectedViolator(violator); - console.log(violator.id); }; // Toggle sorting between alphabetical and default diff --git a/frontend/src/utils/fetch.tsx b/frontend/src/utils/fetch.tsx index dee1b58..7d6aa3c 100644 --- a/frontend/src/utils/fetch.tsx +++ b/frontend/src/utils/fetch.tsx @@ -37,13 +37,11 @@ export const fetchWithAuth = async ( body: body ? JSON.stringify(body) : null, }); - console.log(response.status); if (response.status === 403) { - console.log(await response.json()); - console.log(auth?.accessToken); + const newAccessToken = await refresh(); - console.log("New Access Token: " + newAccessToken); + const newResponse = await fetch( `${import.meta.env.VITE_SERVER_URL}${route}`, { @@ -63,10 +61,8 @@ export const fetchWithAuth = async ( throw new Error(backendError.title + ": " + backendError.message); } - console.log("NEW RESPONSE"); // SHOULD BE REMOVED return newResponse; } - console.log("OLD RESPONSE"); // SHOULD BE REMOVED return response; };