From ad27ba8b33de6354b4a34712866f4a5e76014e40 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Tue, 24 Nov 2020 23:37:14 +0100 Subject: [PATCH] Require statements now use path.join correctly. --- api/lottery.js | 4 ++-- api/person.js | 2 +- api/request.js | 4 ++-- api/retrieve.js | 8 ++++---- api/router.js | 25 ++++++++++++------------- api/subscriptions.js | 4 ++-- api/update.js | 12 ++++++------ api/user.js | 2 +- api/virtualLottery.js | 12 ++++++------ api/virtualRegistration.js | 10 +++++----- api/wine.js | 2 +- server.js | 6 +++--- 12 files changed, 45 insertions(+), 46 deletions(-) diff --git a/api/lottery.js b/api/lottery.js index 0f7d218..6783a8c 100644 --- a/api/lottery.js +++ b/api/lottery.js @@ -1,7 +1,7 @@ const path = require('path'); -const Highscore = require(path.join(__dirname + '/../schemas/Highscore')); -const Wine = require(path.join(__dirname + '/../schemas/Wine')); +const Highscore = require(path.join(__dirname, '/schemas/Highscore')); +const Wine = require(path.join(__dirname, '/schemas/Wine')); // Utils const epochToDateString = date => new Date(parseInt(date)).toDateString(); diff --git a/api/person.js b/api/person.js index 8a10879..03aee27 100644 --- a/api/person.js +++ b/api/person.js @@ -1,5 +1,5 @@ const path = require("path"); -const Highscore = require(path.join(__dirname + "/../schemas/Highscore")); +const Highscore = require(path.join(__dirname, "/schemas/Highscore")); async function findSavePerson(foundWinner, wonWine, date) { let person = await Highscore.findOne({ diff --git a/api/request.js b/api/request.js index 210c3e0..60388fa 100644 --- a/api/request.js +++ b/api/request.js @@ -1,10 +1,10 @@ const express = require("express"); const path = require("path"); const RequestedWine = require(path.join( - __dirname + "/../schemas/RequestedWine" + __dirname, "/schemas/RequestedWine" )); const Wine = require(path.join( - __dirname + "/../schemas/Wine" + __dirname, "/schemas/Wine" )); const deleteRequestedWineById = async (req, res) => { diff --git a/api/retrieve.js b/api/retrieve.js index a90b95f..c29133a 100644 --- a/api/retrieve.js +++ b/api/retrieve.js @@ -1,10 +1,10 @@ const path = require("path"); -const Purchase = require(path.join(__dirname + "/../schemas/Purchase")); -const Wine = require(path.join(__dirname + "/../schemas/Wine")); -const Highscore = require(path.join(__dirname + "/../schemas/Highscore")); +const Purchase = require(path.join(__dirname, "/schemas/Purchase")); +const Wine = require(path.join(__dirname, "/schemas/Wine")); +const Highscore = require(path.join(__dirname, "/schemas/Highscore")); const PreLotteryWine = require(path.join( - __dirname + "/../schemas/PreLotteryWine" + __dirname, "/schemas/PreLotteryWine" )); const prelotteryWines = async (req, res) => { diff --git a/api/router.js b/api/router.js index a4bd555..4d57057 100644 --- a/api/router.js +++ b/api/router.js @@ -1,22 +1,21 @@ const express = require("express"); const path = require("path"); -// Middleware -const mustBeAuthenticated = require(__dirname + "/../middleware/mustBeAuthenticated"); -const setAdminHeaderIfAuthenticated = require(__dirname + "/../middleware/setAdminHeaderIfAuthenticated"); +const mustBeAuthenticated = require(path.join(__dirname, "/middleware/mustBeAuthenticated")); +const setAdminHeaderIfAuthenticated = require(path.join(__dirname, "/middleware/setAdminHeaderIfAuthenticated")); -const update = require(path.join(__dirname + "/update")); -const retrieve = require(path.join(__dirname + "/retrieve")); -const request = require(path.join(__dirname + "/request")); -const subscriptionApi = require(path.join(__dirname + "/subscriptions")); -const userApi = require(path.join(__dirname + "/user")); -const wineinfo = require(path.join(__dirname + "/wineinfo")); -const virtualApi = require(path.join(__dirname + "/virtualLottery")); +const update = require(path.join(__dirname, "/update")); +const retrieve = require(path.join(__dirname, "/retrieve")); +const request = require(path.join(__dirname, "/request")); +const subscriptionApi = require(path.join(__dirname, "/subscriptions")); +const userApi = require(path.join(__dirname, "/user")); +const wineinfo = require(path.join(__dirname, "/wineinfo")); +const virtualApi = require(path.join(__dirname, "/virtualLottery")); const virtualRegistrationApi = require(path.join( - __dirname + "/virtualRegistration" + __dirname, "/virtualRegistration" )); -const lottery = require(path.join(__dirname + "/lottery")); -const chatHistoryApi = require(path.join(__dirname + "/chatHistory")); +const lottery = require(path.join(__dirname, "/lottery")); +const chatHistoryApi = require(path.join(__dirname, "/chatHistory")); const router = express.Router(); diff --git a/api/subscriptions.js b/api/subscriptions.js index 1d61a08..7fc7366 100644 --- a/api/subscriptions.js +++ b/api/subscriptions.js @@ -5,11 +5,11 @@ const webpush = require("web-push"); //requiring the web-push module const schedule = require("node-schedule"); const mustBeAuthenticated = require(path.join( - __dirname + "/../middleware/mustBeAuthenticated" + __dirname, "/middleware/mustBeAuthenticated" )); const config = require(path.join(__dirname + "/../config/defaults/push")); -const Subscription = require(path.join(__dirname + "/../schemas/Subscription")); +const Subscription = require(path.join(__dirname, "/schemas/Subscription")); const lotteryConfig = require(path.join( __dirname + "/../config/defaults/lottery" )); diff --git a/api/update.js b/api/update.js index c3fa4d1..88df56a 100644 --- a/api/update.js +++ b/api/update.js @@ -1,14 +1,14 @@ const express = require("express"); const path = require("path"); -const sub = require(path.join(__dirname + "/../api/subscriptions")); +const sub = require(path.join(__dirname, "/subscriptions")); -const _wineFunctions = require(path.join(__dirname + "/../api/wine")); -const _personFunctions = require(path.join(__dirname + "/../api/person")); -const Subscription = require(path.join(__dirname + "/../schemas/Subscription")); -const Lottery = require(path.join(__dirname + "/../schemas/Purchase")); +const _wineFunctions = require(path.join(__dirname, "/wine")); +const _personFunctions = require(path.join(__dirname, "/person")); +const Subscription = require(path.join(__dirname, "/schemas/Subscription")); +const Lottery = require(path.join(__dirname, "/schemas/Purchase")); const PreLotteryWine = require(path.join( - __dirname + "/../schemas/PreLotteryWine" + __dirname, "/schemas/PreLotteryWine" )); const submitWines = async (req, res) => { diff --git a/api/user.js b/api/user.js index 00c5cce..7a2ce9e 100644 --- a/api/user.js +++ b/api/user.js @@ -1,6 +1,6 @@ const passport = require("passport"); const path = require("path"); -const User = require(path.join(__dirname + "/../schemas/User")); +const User = require(path.join(__dirname, "/schemas/User")); const router = require("express").Router(); const register = (req, res, next) => { diff --git a/api/virtualLottery.js b/api/virtualLottery.js index 74224d6..cad4924 100644 --- a/api/virtualLottery.js +++ b/api/virtualLottery.js @@ -1,13 +1,13 @@ const path = require("path"); const crypto = require("crypto"); -const config = require(path.join(__dirname + "/../config/defaults/lottery")); -const Message = require(path.join(__dirname + "/message")); -const { findAndNotifyNextWinner } = require(path.join(__dirname + "/virtualRegistration")); +const config = require(path.join(__dirname, "/../config/defaults/lottery")); +const Message = require(path.join(__dirname, "/message")); +const { findAndNotifyNextWinner } = require(path.join(__dirname, "/virtualRegistration")); -const Attendee = require(path.join(__dirname + "/../schemas/Attendee")); -const VirtualWinner = require(path.join(__dirname + "/../schemas/VirtualWinner")); -const PreLotteryWine = require(path.join(__dirname + "/../schemas/PreLotteryWine")); +const Attendee = require(path.join(__dirname, "/schemas/Attendee")); +const VirtualWinner = require(path.join(__dirname, "/schemas/VirtualWinner")); +const PreLotteryWine = require(path.join(__dirname, "/schemas/PreLotteryWine")); const winners = async (req, res) => { diff --git a/api/virtualRegistration.js b/api/virtualRegistration.js index 4e5e895..ec869a3 100644 --- a/api/virtualRegistration.js +++ b/api/virtualRegistration.js @@ -1,13 +1,13 @@ const path = require("path"); -const _wineFunctions = require(path.join(__dirname + "/../api/wine")); -const _personFunctions = require(path.join(__dirname + "/../api/person")); -const Message = require(path.join(__dirname + "/../api/message")); +const _wineFunctions = require(path.join(__dirname, "/wine")); +const _personFunctions = require(path.join(__dirname, "/person")); +const Message = require(path.join(__dirname, "/message")); const VirtualWinner = require(path.join( - __dirname + "/../schemas/VirtualWinner" + __dirname, "/schemas/VirtualWinner" )); const PreLotteryWine = require(path.join( - __dirname + "/../schemas/PreLotteryWine" + __dirname, "/schemas/PreLotteryWine" )); diff --git a/api/wine.js b/api/wine.js index e844867..d953013 100644 --- a/api/wine.js +++ b/api/wine.js @@ -1,5 +1,5 @@ const path = require("path"); -const Wine = require(path.join(__dirname + "/../schemas/Wine")); +const Wine = require(path.join(__dirname, "/schemas/Wine")); async function findSaveWine(prelotteryWine) { let wonWine = await Wine.findOne({ name: prelotteryWine.name }); diff --git a/server.js b/server.js index 6ab4922..8741610 100644 --- a/server.js +++ b/server.js @@ -4,7 +4,7 @@ const server = require("http").Server(app); const io = require("socket.io")(server); const path = require("path"); const session = require("express-session"); -const User = require(path.join(__dirname + "/schemas/User")); +const User = require(path.join(__dirname + "/api/schemas/User")); const apiRouter = require(path.join(__dirname + "/api/router.js")); const subscriptionApi = require(path.join(__dirname + "/api/subscriptions")); @@ -31,8 +31,8 @@ mongoose.connect("mongodb://localhost/vinlottis", { mongoose.set("debug", process.env.NODE_ENV === "development"); // middleware -const setupCORS = require(path.join(__dirname, "/middleware/setupCORS")); -const setupHeaders = require(path.join(__dirname, "/middleware/setupHeaders")); +const setupCORS = require(path.join(__dirname, "/api/middleware/setupCORS")); +const setupHeaders = require(path.join(__dirname, "/api/middleware/setupHeaders")); app.use(setupCORS) app.use(setupHeaders)