Migrated to CommonJS

This commit is contained in:
2020-10-08 11:12:56 +02:00
parent 871919c838
commit 10a7680d90
16 changed files with 189 additions and 129 deletions

View File

@@ -1,19 +1,19 @@
import express from "express";
import { createDish } from "../services/dataPrepServices.js";
import {
const express = require("express");
const { createDish } = require("../services/dataPrepServices.js");
const {
removeDish,
fetchDish,
addDishToRestaurant,
setDishVisibility,
} from "../services/databaseServices.js";
import {
} = require("../services/databaseServices.js");
const {
validateRestaurant,
validateUserToken,
validateDishId,
handleError,
verifyDishAccess,
} from "../services/services.js";
import Dish from "../models/dish.js";
} = require("../services/services.js");
const Dish = require("../models/dish.js");
var router = express.Router();
@@ -89,4 +89,4 @@ router.put("/", async (req, res) => {
}
});
export default router;
module.exports = router;

View File

@@ -1,8 +1,8 @@
import express from "express";
import * as services from "../services/services.js";
import { uploadBlob } from "../services/azureServices.js";
const express = require("express");
const { validateUserToken, handleError } = require("../services/services.js");
const { uploadBlob } = require("../services/azureServices.js");
// Azure
import multer from "multer";
const multer = require("multer");
var router = express.Router();
var storage = multer.memoryStorage();
@@ -22,11 +22,11 @@ const uploadStrategy = multer({
router.post("/", uploadStrategy, async (req, res) => {
try {
const token = req.headers["x-auth-token"];
services.validateUserToken(token);
validateUserToken(token);
await uploadBlob(req, res);
} catch (error) {
services.handleError(error, res);
handleError(error, res);
}
});
export default router;
module.exports = router;

View File

@@ -1,5 +1,5 @@
import express from "express";
import { handleError } from "../services/services.js";
const express = require("express");
const { handleError } = require("../services/services.js");
var router = express.Router();
@@ -11,4 +11,4 @@ router.post("/", async (req, res) => {
}
});
export default router;
module.exports = router;

View File

@@ -1,6 +1,6 @@
import express from "express";
import { createRestaurant } from "../services/dataPrepServices.js";
import {
const express = require("express");
const { createRestaurant } = require("../services/dataPrepServices.js");
const {
addRestaurantToUser,
fetchRestaurant,
fetchAllDishesForRestaurant,
@@ -11,8 +11,8 @@ import {
fetchUser,
initializePayment,
renewSubscription,
} from "../services/databaseServices.js";
import {
} = require("../services/databaseServices.js");
const {
decodeAndSanitize,
validateRestaurant,
handleError,
@@ -20,8 +20,8 @@ import {
verifyRestaurantAccess,
newError,
checkPassword,
} from "../services/services.js";
import Restaurant from "../models/restaurant.js";
} = require("../services/services.js");
const Restaurant = require("../models/restaurant.js");
var router = express.Router();
@@ -180,4 +180,4 @@ router.post("/subscription", async (req, res) => {
}
});
export default router;
module.exports = router;

View File

@@ -1,7 +1,7 @@
import express from "express";
import Restaurant from "../models/restaurant.js";
import sanitizer from "string-sanitizer";
import { handleError } from "../services/services.js";
const express = require("express");
const Restaurant = require("../models/restaurant.js");
const sanitizer = require("string-sanitizer");
const { handleError } = require("../services/services.js");
var router = express.Router();
@@ -89,4 +89,4 @@ router.get("/autocomplete/", (req, res) => {
}
});
export default router;
module.exports = router;

View File

@@ -1,7 +1,13 @@
import express from "express";
import { changeUserPass, fetchUser } from "../services/databaseServices.js";
import { createUser, prepareSafeUser } from "../services/dataPrepServices.js";
import {
const express = require("express");
const {
changeUserPass,
fetchUser,
} = require("../services/databaseServices.js");
const {
createUser,
prepareSafeUser,
} = require("../services/dataPrepServices.js");
const {
newError,
handleError,
checkPassword,
@@ -9,8 +15,8 @@ import {
checkEmailTaken,
validateUserToken,
hashPass,
} from "../services/services.js";
import { resetPassword } from "../services/mailServices.js";
} = require("../services/services.js");
const { resetPassword } = require("../services/mailServices.js");
var router = express.Router();
@@ -101,4 +107,4 @@ router.post("/resetpass", async (req, res) => {
}
});
export default router;
module.exports = router;