Image upload / Cookies

This commit is contained in:
2020-07-18 20:19:57 +02:00
parent bcb0061c2a
commit a267dd1f37
91 changed files with 7124 additions and 139 deletions

View File

@@ -1,5 +1,6 @@
import express from "express";
import Restaurant from "../models/restaurant.js";
import mongoose from "mongoose";
var router = express.Router();

View File

@@ -1,55 +1,45 @@
import express from "express";
import Restaurant from "../models/restaurant.js";
import * as services from "../services/services.js";
import Dish from "../models/dish.js";
import sanitizer from "string-sanitizer";
import mongoose from "mongoose";
var router = express.Router();
// GET DISH BY ID
router.get("/", (req, res) => {
Dish.findById(req.body.dishId, (err, data) => {
if (err) {
res.sendStatus(404);
} else res.send(data);
} else
res
.cookie("img", encodeURI(data.imgUrl), { maxAge: 1000 * 600 })
.send(data);
});
});
// ADD NEW DISH
router.post("/", (req, res) => {
//validate restaurant
validators.validateRestaurant(req.body.restaurantId, (result) => {
if (!result) res.sendStatus(400);
else {
//validate user
validators.validateUser(req.body.userId, (result) => {
services.validateRestaurant(req.body.restaurantId, (result) => {
if (!result) {
res.sendStatus(400);
} else {
services.validateUser(req.body.userId, (result) => {
if (!result) {
res.sendStatus(401);
} else {
//construct dish
const dish = new Dish({
_id: new mongoose.Types.ObjectId(),
name: sanitizer.sanitize.keepUnicode(req.body.dish.name),
category: req.body.dish.category,
price: req.body.dish.price,
notes: sanitizer.sanitize.keepUnicode(req.body.dish.notes),
imgUrl: req.body.dish.imgUrl,
weight: req.body.dish.weight,
allergens: {
gluten: req.body.dish.allergens.gluten,
lactose: req.body.dish.allergens.lactose,
soy: req.body.dish.allergens.soy,
eggs: req.body.dish.allergens.eggs,
seaFood: req.body.dish.allergens.seaFood,
peanuts: req.body.dish.allergens.peanuts,
sesame: req.body.dish.allergens.sesame,
},
vegan: req.body.dish.vegan,
vegetarian: req.body.dish.vegetarian,
});
//add dish to DB
const dish = services.createDish(
req.body.dish,
req.cookies["img"],
true
);
dish.save((err) => {
if (err) {
res.sendStatus(400);
} else {
//add dish ID to restaurant
Restaurant.updateOne(
{ _id: req.body.restaurantId },
{ $push: { dishes: dish._id } },
@@ -57,7 +47,7 @@ router.post("/", (req, res) => {
if (err) {
res.sendStatus(400);
} else {
res.sendStatus(201);
res.clearCookie("img").status(201).send();
}
}
);
@@ -69,47 +59,29 @@ router.post("/", (req, res) => {
});
});
// UPDATE DISH
router.put("/", (req, res) => {
//validate dish ID
validators.validateDishId(req.body.dishId, (result) => {
services.validateDishId(req.body.dishId, (result) => {
if (!result) {
res.sendStatus(204);
} else {
//validate user
validators.validateUser(req.body.userId, (result) => {
services.validateUser(req.body.userId, (result) => {
if (!result) {
res.sendStatus(401);
} else {
//replace dish in DB
Dish.replaceOne(
{ _id: req.body.dishId },
{
name: sanitizer.sanitize.keepUnicode(req.body.dish.name),
category: req.body.dish.category,
price: req.body.dish.price,
notes: sanitizer.sanitize.keepUnicode(req.body.dish.notes),
imgUrl: req.body.dish.imgUrl,
weight: req.body.dish.weight,
allergens: {
gluten: req.body.dish.allergens.gluten,
lactose: req.body.dish.allergens.lactose,
soy: req.body.dish.allergens.soy,
eggs: req.body.dish.allergens.eggs,
seaFood: req.body.dish.allergens.seaFood,
peanuts: req.body.dish.allergens.peanuts,
sesame: req.body.dish.allergens.sesame,
},
vegan: req.body.dish.vegan,
vegetarian: req.body.dish.vegetarian,
},
(err) => {
if (err) {
res.sendStatus(304);
} else {
res.sendStatus(200);
}
}
const dish = services.createDish(
req.body.dish,
req.cookies["img"],
false
);
Dish.replaceOne({ _id: req.body.dishId }, dish, (err) => {
if (err) {
res.sendStatus(304);
} else {
res.clearCookie("img").status(200).send();
}
});
}
});
}

View File

@@ -1,5 +1,8 @@
import express from "express";
import multer from "multer";
import fs from "fs";
import * as services from "../services/services.js";
var router = express.Router();
var storage = multer.diskStorage({
destination: function (req, file, cb) {
@@ -8,19 +11,20 @@ var storage = multer.diskStorage({
filename: function (req, file, cb) {
cb(
null,
new Date() //Date.now().toString
.toISOString()
Date.now()
.toString()
.trim()
.replace(/[:_ -.]/g, "") +
Math.floor(Math.random() * 5000 + 1) +
file.mimetype.replace("/", ".")
file.mimetype.replace("/", ".") +
"_TEMP"
);
},
});
const upload = multer({
storage: storage,
fileFilter: function (req, file, cb) {
if (file.mimetype !== "image/jpg") {
if (file.mimetype !== "image/png" && file.mimetype !== "image/jpeg") {
return cb(null, false);
}
cb(null, true);
@@ -28,8 +32,29 @@ const upload = multer({
limits: { fileSize: 4000000 },
}); //max file size = 4Mb
router.post("/", upload.single("menuiImage"), (req, res) => {
res.sendStatus(201);
router.post("/", upload.single("menuiImage"), async (req, res) => {
try {
const image = req.file;
if (!image) {
res.sendStatus(204);
} else {
setTimeout(() => {
fs.unlink(image.path, (err) => {
if (err) {
console.log("No such file or directory");
}
});
}, 1000 * 600);
res
.status(200)
.cookie("img", encodeURI(image.path), {
maxAge: 1000 * 600,
})
.send();
}
} catch (err) {
res.sendStatus(500);
}
});
export default router;

View File

@@ -1,14 +1,16 @@
import express from "express";
import * as validators from "../services/validation.js";
import * as services from "../services/services.js";
import Restaurant from "../models/restaurant.js";
import Dish from "../models/dish.js";
import User from "../models/users.js";
import sanitizer from "string-sanitizer";
import mongoose from "mongoose";
var router = express.Router();
// GET RESTAURANT BY ID
router.get("/", (req, res) => {
validators.validateRestaurant(req.body.restaurantId, (result) => {
services.validateRestaurant(req.body.restaurantId, (result) => {
if (!result) {
res.sendStatus(400);
} else {
@@ -21,50 +23,53 @@ router.get("/", (req, res) => {
});
});
// ADD NEW RESTAURANT
router.post("/", (req, res) => {
//validate user
validators.validateUser(req.body.userId, (result) => {
if (!result) res.sendStatus(401);
//create restaurant
const restaurant = new Restaurant({
_id: new mongoose.Types.ObjectId(),
name: sanitizer.sanitize.keepUnicode(req.body.name),
city: sanitizer.sanitize.keepUnicode(req.body.city),
imgUrl: req.body.imgUrl,
workingHours: req.body.workingHours,
hidden: req.body.hidden,
});
//add restaurant to DB
restaurant.save((err) => {
if (err) {
res.sendStatus(400);
} else {
res.status(201);
}
});
services.validateUser(req.body.userId, (result) => {
if (!result) {
res.sendStatus(401);
} else {
const restaurant = new Restaurant({
_id: new mongoose.Types.ObjectId(),
name: sanitizer.sanitize.keepUnicode(req.body.name),
city: sanitizer.sanitize.keepUnicode(req.body.city),
imgUrl: services.saveImage(req.cookies["img"]),
workingHours: req.body.workingHours,
hidden: req.body.hidden,
});
restaurant.save((err) => {
if (err) {
res.sendStatus(400);
} else {
res.clearCookie("img").status(201).send();
}
});
}
});
});
// GET ALL DISHES FROM A RESTAURANT ID
router.get("/dishes", (req, res) => {
//validate restaurant
validators.validateRestaurant(req.body.restaurantId, (result) => {
services.validateRestaurant(req.body.restaurantId, (result) => {
if (!result) {
res.sendStatus(400);
} else {
//get restaurant
Restaurant.findById(req.body.restaurantId, (err, result) => {
if (err) {
res.sendStatus(404);
} else {
//prepare variables
const dishesCount = result.dishes.length;
let dishes = [];
//fetch all dishes
result.dishes.forEach((element) => {
Dish.findById(element, (err, result) => {
if (err) console.log("ERROR fetching dish");
dishes.push(result);
if (dishes.length == dishesCount) res.send(dishes);
if (err) {
console.log("ERROR fetching dish");
} else {
dishes.push(result);
if (dishes.length == dishesCount) res.send(dishes);
}
});
});
}

14
routes/routeUser.js Normal file
View File

@@ -0,0 +1,14 @@
import express from "express";
import mongoose from "mongoose";
import User from "../models/users.js";
import jwt from "jsonwebtoken";
import * as config from "../config/index.js";
const { API_KEY, jwtSecret } = config;
var router = express.Router();
router.post("/login", (req, res) => {
console.log("gds");
});
export default router;