Skip to content

Commit

Permalink
Troubleshoot
Browse files Browse the repository at this point in the history
  • Loading branch information
VikramjeetD authored and AetherPrior committed Jun 13, 2020
1 parent f6ca2d6 commit 00fc2f2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
"nodemon": "^2.0.3"
},
"scripts": {
"server": "nodemon server/server --exec babel-node",
"start": "node server/server --exec babel-node",
"server": "nodemon server --exec babel-node",
"start": "node server --exec babel-node",
"client": "npm start --prefix client",
"dev": "concurrently \"npm run server\" \"npm run client\"",
"test": "NODE_ENV=test mocha --exit --recursive || true",
Expand Down
2 changes: 1 addition & 1 deletion server/passport.js → passport.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const configuration = require("./config/constants.js");
const configuration = require("./server/config/constants.js");

const dotenv = require("dotenv");
dotenv.config();
Expand Down
18 changes: 9 additions & 9 deletions server/server.js → server.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
const express = require("express");
const connectDB = require("./config/db.js");
const connectDB = require("./server/config/db.js");
const cors = require("cors");
const passport = require("passport");
const bodyParser = require("body-parser");
const cookieSession = require("cookie-session");
const path = require("path");

const auth = require("./routes/api/auth.js");
const helForm = require("./routes/api/helForm.js");
const helData = require("./routes/api/helData.js");
const timetable = require("./routes/api/timetable.js");
const staff = require("./routes/api/profAuth.js");
const auth = require("./server/routes/api/auth.js");
const helForm = require("./server/routes/api/helForm.js");
const helData = require("./server/routes/api/helData.js");
const timetable = require("./server/routes/api/timetable.js");
const staff = require("./server/routes/api/profAuth.js");

const configuration = require("./config/constants.js");
const configuration = require("./server/config/constants.js");

/* Express setup */
const app = express();
Expand All @@ -24,8 +24,8 @@ app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json());

/* Connect to database */
const Student = require("./models/Student.js");
const Login = require("./models/Login.js");
const Student = require("./server/models/Student.js");
const Login = require("./server/models/Login.js");
if (process.env.NODE_ENV !== "test") {
connectDB();
}
Expand Down

0 comments on commit 00fc2f2

Please sign in to comment.