Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion controllers/api/bidRoutes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const router = require('express').Router();
const { Car, Bid, User } = require('../../models');
const { authenticated } = require('../../helpers/middleware')


router.get("/", async (req, res) => {
try {
Expand All @@ -25,8 +27,9 @@ router.get("/:id", async (req, res) => {
});


router.post('/', async (req, res) => {
router.post('/', authenticated, async (req, res) => {
try {
console.log(req.body)
const newBid = await Bid.create({
...req.body,
user_id: req.session.user_id,
Expand Down
10 changes: 6 additions & 4 deletions controllers/api/carRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { authenticated } = require('../../helpers/middleware')

const upload = multer({ dest: 'uploads/' })

router.post('/', upload.single('uploaded_file'), async (req, res) => {
router.post('/', [authenticated, upload.single('uploaded_file')], async (req, res) => {
try {

if (req.body.file) {
Expand Down Expand Up @@ -49,10 +49,11 @@ router.post('/', upload.single('uploaded_file'), async (req, res) => {
color: req.body.color,
ending_date: req.body.ending_date,
description: req.body.description,
file_path: fileURL.url
file_path: fileURL.url,
user_id: req.session.user.id
})
} else {
console.log("HEEEEEEEEEEEEEEEEY");
console.log(req.body);

const carData = await Car.create({
manufacturer: req.body.manufacturer,
Expand All @@ -61,7 +62,8 @@ router.post('/', upload.single('uploaded_file'), async (req, res) => {
mileage: req.body.mileage,
color: req.body.color,
ending_date: req.body.ending_date,
description: req.body.description
description: req.body.description,
user_id: req.session.user.id
})
console.log(carData);
res.status(200).json(carData);
Expand Down
23 changes: 23 additions & 0 deletions controllers/bids.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
const express = require('express')
const { Bid, Car, User } = require('../models')

const router = express.Router()

router.get('/', async (req, res) => {
try {
const user = req.session.user || null
const carData = await Car.findAll();
const cars = carData.map((car) => car.get({ plain: true }));

res.render('partials/bid_details', {
user: user,
cars
});

} catch (err) {
res.status(500).json(err);
}

})

module.exports = router
4 changes: 4 additions & 0 deletions controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const express = require('express')
const auth_routes = require('./auth_routes')
const apiRoutes = require('./api');
const cars = require('./cars')
const bids = require('./bids')
const Car = require('../models/Car')
const router = express.Router();

Expand All @@ -10,6 +11,7 @@ router.use('/api', apiRoutes);
router.use('/users', auth_routes);

router.use('/cars', cars)
router.use('/bids', bids)

router.get('/', async (req, res) => {

Expand Down Expand Up @@ -42,6 +44,8 @@ router.get('/create', (req, res) => {

})



// TODO: Create these authentication views
router.get('/login', (req, res) => res.render('auth/login'));
router.get('/signup', (req, res) => res.render('auth/signup'));
Expand Down
7 changes: 6 additions & 1 deletion views/cars/show.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@
{{#each car.bids as |bid|}}
<li>{{bid.price}} - {{bid.user.username}}</li>
{{/each}}
</ul>
</ul>


<form action="/bids/" method="GET" id="{{car.id}}">
<input type="submit" value="Input bid">
</form>
22 changes: 17 additions & 5 deletions views/partials/bid_details.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<section class="card">
<header>{{bid.price}}</header>
<h2>{{bid.user_id}}</h2>
<form action="api/bids" method="POST" enctype="multipart/form-data" class="flex-column p-2 col-6">
<div class="flex-column p-2 col-6">
<label for="price">Price</label>
<input type="number" name="price" id="price">
</div>
<div class="flex-column p-2 col-6">
<label for="car_id">Choose a car:</label>
<select name="car_id" id="car_id">
{{#each cars as |car|}}
<option value="{{car.id}}">{{car.year}} {{car.manufacturer}} {{car.model}}</option>
{{/each}}
</select>
</div>
<div>
<input type="submit" value="Submit">
</div>
</form>


</section>