Skip to content

Commit

Permalink
Merge branch 'main' into Setting-up-add-vehicle
Browse files Browse the repository at this point in the history 
Signed-off-by: BrandonJohnson97 <[email protected]>
  • Loading branch information
@BrandonJohnson97
BrandonJohnson97 authored Mar 31, 2024
2 parents d07bf2e + e07bd49 commit 3769925
Show file tree
Hide file tree
Showing 11 changed files with 444 additions and 102 deletions.
142 changes: 113 additions & 29 deletions backend/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ import 'dotenv/config';
import client from "./mongo.js";
import mongo from "./mongo.js"
import e from 'express';
import {parse} from "dotenv";

const userEmail = "";
const CLIENT_ID = process.env.GOOGLE_CLIENT_ID;
const CLIENT_SECRET = process.env.GOOGLE_CLIENT_SECRET;
const DATABASE = client.db("vehicleDB");
const EMAIL = process.env.EMAIL;


console.log("\n\nPROCESS APP PAGE"+CLIENT_ID)
console.log("PROCESS APP PAGE"+CLIENT_SECRET)
Expand Down Expand Up @@ -103,8 +107,8 @@ app.get('/api/user', async (req, res) => {

console.log("Decoded: "+decoded);

const database = client.db("vehicleDB");
const users = database.collection("users");
const DATABASE = client.db("vehicleDB");
const users = DATABASE.collection("users");

const user = await users.findOne({email: decoded.email});
console.log("AUTHORIZ USER: "+user);
Expand All @@ -129,9 +133,8 @@ const updateOrCreateUserFromOauth = async (oauthUserInfo) => {

console.log(name);
console.log(email);

const database = client.db("vehicleDB");
const users = database.collection("users");

const users = DATABASE.collection("users");

const existingUser = await users.findOne({email})

Expand All @@ -148,28 +151,112 @@ const updateOrCreateUserFromOauth = async (oauthUserInfo) => {
}
}

app.get('/api/get-vehicle-info', async (req, res) => {
const database = client.db("vehicleDB");
const vehicle = database.collection("configurations");
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

/***
* This route is used to get the vehicle information from the DATABASE
* @param configId - The config_id of the vehicle
*/
app.get('/api/get-vehicle-info', async (req, res) => {
const vehicle = DATABASE.collection("configurations");
const configId = req.query.configId;

const getConfiguration = await vehicle.findOne({config_id: parseInt(configId)});

res.json(getConfiguration);
res.json(getConfiguration);
});

/***
* This route is used to get the vehicle history from the DATABASE
* @param configId - The config_id of the vehicle
* @param email - The email of the user
*/

app.get('/api/get-vehicle-history', async (req, res) => {
const history = DATABASE.collection("user_vehicle_info");
const configId = req.query.configId;

const getHistory = await history.aggregate([
{
$match: {
config_id: parseInt(configId),
email: EMAIL
}
},
{
$project: {
_id: 0,
completed_maintenance: 1
}
}
]).toArray();
res.send(getHistory);
});

app.post('/api/update-maintenance-history', async (req, res) => {
try {
const garage = DATABASE.collection("user_vehicle_info");

const {
old_type, old_date, old_maintenance, old_cost,
new_type, new_date, new_maintenance, new_cost
} = req.body;
const update = await garage.updateOne(
{
email: EMAIL,
"completed_maintenance.type": old_type,
"completed_maintenance.date": old_date,
"completed_maintenance.maintenance": old_maintenance,
"completed_maintenance.cost": parseInt(old_cost)
},
{
$set: {
"completed_maintenance.$.type": new_type,
"completed_maintenance.$.date": new_date,
"completed_maintenance.$.maintenance": new_maintenance,
"completed_maintenance.$.cost": parseInt(new_cost)
}
}
);
return res.json(update.modifiedCount);
} catch (error) {
return res.status(500).json({message: error.message});
}

});

app.delete('/api/delete-maintenance-history', async (req, res) => {
const garage = DATABASE.collection("user_vehicle_info");

const { type, date, maintenance, cost } = req.body;
const deletion = await garage.updateOne(
{
email: EMAIL
},
{$pull:
{
completed_maintenance: {
type: type,
date: date,
maintenance: maintenance,
cost: cost
}
}
}
);
return res.json(deletion.modifiedCount);
});

/***
* This route is used to get the user's vehicles from the database
* This route is used to get the user's vehicles from the DATABASE
*/
app.get('/api/get-user-vehicles', async (req, res) => {
const database = client.db("vehicleDB");
const garage = database.collection("user_garage");
const garage = DATABASE.collection("user_garage");

const vehicles = await garage.aggregate([
{
$match: {
email: "[email protected]"
email: EMAIL
}
},
{
Expand All @@ -192,22 +279,23 @@ app.get('/api/get-user-vehicles', async (req, res) => {
]).toArray();
res.send(vehicles);
});

app.delete('/api/delete-user-vehicle', async (req, res) => {
const database = client.db("vehicleDB");
const garage = database.collection("user_garage");
const garage = DATABASE.collection("user_garage");

const { config_id } = req.body;
const deletion = await garage.updateOne(
{email: 'placeholder'},
{email: EMAIL},
{$pull: { vehicle_config_ids: config_id } }
);
return res.json(deletion.modifiedCount);
});


////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

app.get('/api/get-maintenance', async (req , res) => {
const database = client.db("vehicleDB");
const message = database.collection("maintenance");
const message = DATABASE.collection("maintenance");

// const docObject = await message.findOne({ config_id: { $eq: 401988727} });

Expand All @@ -217,7 +305,6 @@ app.get('/api/get-maintenance', async (req , res) => {
})


//TODO: Request to get a config_id given a vehicle's Year, Make, Model, Engine, and Transmission.
app.get('/api/get-config-id', async (req, res) => {
const year = req.query.year;
const make = req.query.make;
Expand All @@ -229,15 +316,15 @@ app.get('/api/get-config-id', async (req, res) => {
return res.status(400).json({message: "Missing required fields"});
}
const database = client.db("vehicleDB");
const message = database.collection("configurations");

const message = DATABASE.collection("configurations");

const config_id = await message.findOne({year: parseInt(year), make: make, model: model, engine: engine, transmission: transmission});
console.log("config_id: "+config_id.config_id);

res.send(config_id);
})

//TODO: Request to get a list of all years (Non-repeating).
app.get('/api/get-years', async (req, res) => {
const database = client.db("vehicleDB");
const configurations = database.collection("configurations");
Expand All @@ -248,10 +335,9 @@ app.get('/api/get-years', async (req, res) => {
res.send(years);
})

//TODO: Request to get a list of all makes given a year (Non-repeating).
app.get('/api/get-makes', async (req, res) => {
const carYear = req.query.year;

if(!carYear) {
return res.status(400).json({message: "Missing required fields"});
}
Expand All @@ -264,14 +350,12 @@ app.get('/api/get-makes', async (req, res) => {
{ $group: { _id: "$make", makes: { $addToSet: "$make" } }},
{ $sort: { _id: 1 }}
]).toArray();

const uniqueMakes = makes.map(make => make._id);

console.log("makes " +uniqueMakes)
res.send(uniqueMakes);
res.send(uniqueMakes);
})

//TODO: Request to get a list of all models given a year and make (Non-repeating).
app.get('/api/get-models', async (req, res) => {
const year = req.query.year;
const make = req.query.make;
Expand Down
34 changes: 16 additions & 18 deletions frontend/src/pages/garage/Garage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,23 @@ function Garage(props) {

{
props.info != null ?
props.info.map((vehicle, index) => {
//console.log(garageVehicles[0][0].configurations.year);
vehicle_count++;
if (vehicle_count === 1 || vehicle_count % 3 === 0) {
return (
<Row key={index} xs={1} md={3} className="g-4">
<Col key={vehicle.configurations.name}>
<Vehicle vehicle={vehicle} id={index}/>
</Col>
</Row>
)
}
return (
<Col key={vehicle.configurations.name}>
<Vehicle vehicle={vehicle} id={index}/>
</Col>
)
}) : null
props.info.reduce((rows, vehicle, index) => {
if (index % 3 === 0) {
rows.push([]);
}
rows[rows.length - 1].push(
<Col key={vehicle.configurations.name}>
<Vehicle vehicle={vehicle} id={index}/>
</Col>
);
return rows;
}, []).map((row, rowIndex) => (
<Row key={rowIndex} xs={1} md={3} className="g-4">
{row}
</Row>
)) : null
}

</div>
<div className="col-md-1 order-md-3"></div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/pages/garage/RemoveVehicle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ function RemoveVehicle(props) {
fetch("/api/delete-user-vehicle", reqOptions)
.then((response) => response.text())
.then((result) => {
console.log(result)
//props.setInfo(props.info.filter( (bike) => bike.name != evt.target.id));
setRefreshData(!refreshData);
})
.catch((error) => console.error(error));
Expand Down
12 changes: 10 additions & 2 deletions frontend/src/pages/maintenance-history/ManualVehicleHistory.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import Button from "react-bootstrap/Button";
import {Link} from "react-router-dom";
import { useNavigate} from "react-router-dom";

function ManualVehicleHistory() {
let navigate = useNavigate();

return (
<div>
<h1>Manual Vehicle History</h1>
<p>Enter vehicle history manually</p>
<p>Placeholder</p>
<p>Uh oh! This page isn't finished yet!</p>
<Button onClick={() => navigate(-1)}>
Go Back
</Button>
</div>
)
}
Expand Down
20 changes: 17 additions & 3 deletions frontend/src/pages/maintenance-history/UploadNavbar.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
import {Link} from "react-router-dom";
import Button from "react-bootstrap/Button";

function UploadNavbar() {
return (
<div>
<Link to="/garage/vehicle-history/upload">Upload</Link>
<Link to="/garage/vehicle-history/manual">Manual</Link>
<div className="container">
<div className="row">
<div className="col-md-1 order-md-1"/>
<div className="col-md-10 order-md-2">
<div className="d-flex justify-content-center">
<Link to={"/garage/vehicle-history/upload"} className="me-3">
<Button variant="primary">Upload</Button>
</Link>

<Link to={"/garage/vehicle-history/manual"} className="ml-3">
<Button variant="primary">Manual</Button>
</Link>
</div>
</div>
<div className="col-md-1 order-md-3"/>
</div>
</div>
);
}
Expand Down
11 changes: 9 additions & 2 deletions frontend/src/pages/maintenance-history/UploadVehicleHistory.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import {useNavigate} from "react-router-dom";
import Button from "react-bootstrap/Button";

function UploadVehicleHistory() {
let navigate = useNavigate();

return (
<div>
<h1>Upload Vehicle History</h1>
<p>Upload a file</p>
<p>Placeholder</p>
<p>Uh oh! This page isn't finished yet!</p>
<Button onClick={() => navigate(-1)}>
Go Back
</Button>
</div>
)
}
Expand Down
1 change: 0 additions & 1 deletion frontend/src/pages/vehicle/Vehicle.js
View file

This file was deleted.

Loading

0 comments on commit 3769925

Please sign in to comment.