KevinMidboe/vinlottis
1
0
Fork 0
Code Issues 8 Pull Requests 14 Packages Projects Releases Wiki Activity

Require statements now use path.join correctly.

Browse Source
This commit is contained in:
Kevin
2020-11-24 23:37:14 +01:00
parent 236c07f3d0
commit ad27ba8b33
12 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/lottery.js
View File

@@ -1,7 +1,7 @@
const path = require('path'); const path = require('path');
const Highscore = require(path.join(__dirname + '/../schemas/Highscore')); const Highscore = require(path.join(__dirname, '/schemas/Highscore'));
const Wine = require(path.join(__dirname + '/../schemas/Wine')); const Wine = require(path.join(__dirname, '/schemas/Wine'));
// Utils // Utils
const epochToDateString = date => new Date(parseInt(date)).toDateString(); const epochToDateString = date => new Date(parseInt(date)).toDateString();

2
api/person.js
View File

@@ -1,5 +1,5 @@
const path = require("path"); 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) { async function findSavePerson(foundWinner, wonWine, date) {
let person = await Highscore.findOne({ let person = await Highscore.findOne({

4
api/request.js
View File

@@ -1,10 +1,10 @@
const express = require("express"); const express = require("express");
const path = require("path"); const path = require("path");
const RequestedWine = require(path.join( const RequestedWine = require(path.join(
__dirname + "/../schemas/RequestedWine" __dirname, "/schemas/RequestedWine"
)); ));
const Wine = require(path.join( const Wine = require(path.join(
__dirname + "/../schemas/Wine" __dirname, "/schemas/Wine"
)); ));
const deleteRequestedWineById = async (req, res) => { const deleteRequestedWineById = async (req, res) => {

8
api/retrieve.js
View File

@@ -1,10 +1,10 @@
const path = require("path"); const path = require("path");
const Purchase = require(path.join(__dirname + "/../schemas/Purchase")); const Purchase = require(path.join(__dirname, "/schemas/Purchase"));
const Wine = require(path.join(__dirname + "/../schemas/Wine")); const Wine = require(path.join(__dirname, "/schemas/Wine"));
const Highscore = require(path.join(__dirname + "/../schemas/Highscore")); const Highscore = require(path.join(__dirname, "/schemas/Highscore"));
const PreLotteryWine = require(path.join( const PreLotteryWine = require(path.join(
__dirname + "/../schemas/PreLotteryWine" __dirname, "/schemas/PreLotteryWine"
)); ));
const prelotteryWines = async (req, res) => { const prelotteryWines = async (req, res) => {

25
api/router.js
View File

@@ -1,22 +1,21 @@
const express = require("express"); const express = require("express");
const path = require("path"); const path = require("path");
// Middleware const mustBeAuthenticated = require(path.join(__dirname, "/middleware/mustBeAuthenticated"));
const mustBeAuthenticated = require(__dirname + "/../middleware/mustBeAuthenticated"); const setAdminHeaderIfAuthenticated = require(path.join(__dirname, "/middleware/setAdminHeaderIfAuthenticated"));
const setAdminHeaderIfAuthenticated = require(__dirname + "/../middleware/setAdminHeaderIfAuthenticated");
const update = require(path.join(__dirname + "/update")); const update = require(path.join(__dirname, "/update"));
const retrieve = require(path.join(__dirname + "/retrieve")); const retrieve = require(path.join(__dirname, "/retrieve"));
const request = require(path.join(__dirname + "/request")); const request = require(path.join(__dirname, "/request"));
const subscriptionApi = require(path.join(__dirname + "/subscriptions")); const subscriptionApi = require(path.join(__dirname, "/subscriptions"));
const userApi = require(path.join(__dirname + "/user")); const userApi = require(path.join(__dirname, "/user"));
const wineinfo = require(path.join(__dirname + "/wineinfo")); const wineinfo = require(path.join(__dirname, "/wineinfo"));
const virtualApi = require(path.join(__dirname + "/virtualLottery")); const virtualApi = require(path.join(__dirname, "/virtualLottery"));
const virtualRegistrationApi = require(path.join( const virtualRegistrationApi = require(path.join(
__dirname + "/virtualRegistration" __dirname, "/virtualRegistration"
)); ));
const lottery = require(path.join(__dirname + "/lottery")); const lottery = require(path.join(__dirname, "/lottery"));
const chatHistoryApi = require(path.join(__dirname + "/chatHistory")); const chatHistoryApi = require(path.join(__dirname, "/chatHistory"));
const router = express.Router(); const router = express.Router();

4
api/subscriptions.js
View File

@@ -5,11 +5,11 @@ const webpush = require("web-push"); //requiring the web-push module
const schedule = require("node-schedule"); const schedule = require("node-schedule");
const mustBeAuthenticated = require(path.join( const mustBeAuthenticated = require(path.join(
__dirname + "/../middleware/mustBeAuthenticated" __dirname, "/middleware/mustBeAuthenticated"
)); ));
const config = require(path.join(__dirname + "/../config/defaults/push")); 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( const lotteryConfig = require(path.join(
__dirname + "/../config/defaults/lottery" __dirname + "/../config/defaults/lottery"
)); ));

12
api/update.js
View File

@@ -1,14 +1,14 @@
const express = require("express"); const express = require("express");
const path = require("path"); 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 _wineFunctions = require(path.join(__dirname, "/wine"));
const _personFunctions = require(path.join(__dirname + "/../api/person")); const _personFunctions = require(path.join(__dirname, "/person"));
const Subscription = require(path.join(__dirname + "/../schemas/Subscription")); const Subscription = require(path.join(__dirname, "/schemas/Subscription"));
const Lottery = require(path.join(__dirname + "/../schemas/Purchase")); const Lottery = require(path.join(__dirname, "/schemas/Purchase"));
const PreLotteryWine = require(path.join( const PreLotteryWine = require(path.join(
__dirname + "/../schemas/PreLotteryWine" __dirname, "/schemas/PreLotteryWine"
)); ));
const submitWines = async (req, res) => { const submitWines = async (req, res) => {

2
api/user.js
View File

@@ -1,6 +1,6 @@
const passport = require("passport"); const passport = require("passport");
const path = require("path"); 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 router = require("express").Router();
const register = (req, res, next) => { const register = (req, res, next) => {

12
api/virtualLottery.js
View File

@@ -1,13 +1,13 @@
const path = require("path"); const path = require("path");
const crypto = require("crypto"); const crypto = require("crypto");
const config = require(path.join(__dirname + "/../config/defaults/lottery")); const config = require(path.join(__dirname, "/../config/defaults/lottery"));
const Message = require(path.join(__dirname + "/message")); const Message = require(path.join(__dirname, "/message"));
const { findAndNotifyNextWinner } = require(path.join(__dirname + "/virtualRegistration")); const { findAndNotifyNextWinner } = require(path.join(__dirname, "/virtualRegistration"));
const Attendee = require(path.join(__dirname + "/../schemas/Attendee")); const Attendee = require(path.join(__dirname, "/schemas/Attendee"));
const VirtualWinner = require(path.join(__dirname + "/../schemas/VirtualWinner")); const VirtualWinner = require(path.join(__dirname, "/schemas/VirtualWinner"));
const PreLotteryWine = require(path.join(__dirname + "/../schemas/PreLotteryWine")); const PreLotteryWine = require(path.join(__dirname, "/schemas/PreLotteryWine"));
const winners = async (req, res) => { const winners = async (req, res) => {

10
api/virtualRegistration.js
View File

@@ -1,13 +1,13 @@
const path = require("path"); const path = require("path");
const _wineFunctions = require(path.join(__dirname + "/../api/wine")); const _wineFunctions = require(path.join(__dirname, "/wine"));
const _personFunctions = require(path.join(__dirname + "/../api/person")); const _personFunctions = require(path.join(__dirname, "/person"));
const Message = require(path.join(__dirname + "/../api/message")); const Message = require(path.join(__dirname, "/message"));
const VirtualWinner = require(path.join( const VirtualWinner = require(path.join(
__dirname + "/../schemas/VirtualWinner" __dirname, "/schemas/VirtualWinner"
)); ));
const PreLotteryWine = require(path.join( const PreLotteryWine = require(path.join(
__dirname + "/../schemas/PreLotteryWine" __dirname, "/schemas/PreLotteryWine"
)); ));

2
api/wine.js
View File

@@ -1,5 +1,5 @@
const path = require("path"); const path = require("path");
const Wine = require(path.join(__dirname + "/../schemas/Wine")); const Wine = require(path.join(__dirname, "/schemas/Wine"));
async function findSaveWine(prelotteryWine) { async function findSaveWine(prelotteryWine) {
let wonWine = await Wine.findOne({ name: prelotteryWine.name }); let wonWine = await Wine.findOne({ name: prelotteryWine.name });

6
server.js
View File

@@ -4,7 +4,7 @@ const server = require("http").Server(app);
const io = require("socket.io")(server); const io = require("socket.io")(server);
const path = require("path"); const path = require("path");
const session = require("express-session"); 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 apiRouter = require(path.join(__dirname + "/api/router.js"));
const subscriptionApi = require(path.join(__dirname + "/api/subscriptions")); 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"); mongoose.set("debug", process.env.NODE_ENV === "development");
// middleware // middleware
const setupCORS = require(path.join(__dirname, "/middleware/setupCORS")); const setupCORS = require(path.join(__dirname, "/api/middleware/setupCORS"));
const setupHeaders = require(path.join(__dirname, "/middleware/setupHeaders")); const setupHeaders = require(path.join(__dirname, "/api/middleware/setupHeaders"));
app.use(setupCORS) app.use(setupCORS)
app.use(setupHeaders) app.use(setupHeaders)