Merge pull request #1 from blitz450/master

Dummy Routes

Author: shivaylamba

.gitignore

@@ -1,2 +1,4 @@
 /node_modules
-package-lock.json
+package-lock.json
+/config
+.env

config/dev.env

@@ -0,0 +1 @@
+PORT=5000

controllers/adminControllers.js

@@ -0,0 +1,4 @@
+// name the controllers in this format '<method of request><Name of the route>'
+exports.getTest = (req, res, next) => {
+  res.send("Admin Test");
+};

controllers/userControllers.js

@@ -1,4 +1,31 @@
 // name the controllers in this format '<method of request><Name of the route>'
-exports.getTest = (req, res, next) => {
-  res.send("Test");
+
+const postSubmit = async (req, res) => {
+  try {
+    res.status(201).send('Report added to DB');
+  } catch (e) {
+    res.status(400).send(e);
+  }
+};
+
+const getReports = async (req, res) => {
+  try {
+    res.status(200).send('Getting all reports!');
+  } catch (e) {
+    res.status(400).send(e);
+  }
+};
+
+const getReportsID = async (req, res) => {
+  try {
+    res.status(200).send(`Getting report with id ${req.params.id}`);
+  } catch (e) {
+    res.status(400).send(e);
+  }
+};
+
+module.exports = {
+  postSubmit,
+  getReports,
+  getReportsID
 };

package.json

@@ -4,7 +4,8 @@
   "description": "Web Project For MAIT-Interns",
   "main": "server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "env-cmd ./config/dev.env nodemon src/index.js"
   },
   "repository": {
     "type": "git",
@@ -21,5 +22,9 @@
     "express": "^4.16.4",
     "mongoose": "^5.5.1",
     "multer": "^1.4.1"
+  },
+  "devDependencies": {
+    "env-cmd": "^8.0.2",
+    "nodemon": "^1.18.11"
   }
 }

routes/adminRoutes.js

@@ -0,0 +1,8 @@
+const express = require("express");
+const router = express.Router();
+const adminControllers = require("../controllers/adminControllers");
+
+// final route is /admin/test
+router.get("/test", adminControllers.getTest);
+
+module.exports = router;

routes/userRoutes.js

@@ -1,8 +1,12 @@
-const express = require("express");
+const express = require('express');
 const router = express.Router();
-const userControllers = require("../controllers/userControllers");
+const userControllers = require('../controllers/userControllers');
 
 // final route is /user/test
-router.get("/test", userControllers.getTest);
+router.post('/submit', userControllers.postSubmit);
+
+router.get('/reports', userControllers.getReports);
+
+router.get('/reports/:id', userControllers.getReportsID);
 
 module.exports = router;

server.js

@@ -1,28 +1,40 @@
 // Main server file
-const express = require("express");
-const path = require("path");
-const bodyParser = require("body-parser");
+const express = require('express');
+const path = require('path');
+const bodyParser = require('body-parser');
+const userRoutes = require('./routes/userRoutes');
+const adminRoutes = require('./routes/adminRoutes');
 
 const app = express();
 
-const userRoutes = require("./routes/userRoutes");
-
 const PORT = process.env.PORT || 5000;
 
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(bodyParser.json());
 
-app.use(express.static(path.join(__dirname, "client")));
+app.use(express.static(path.join(__dirname, 'client')));
 
 // Routes
 
-// User route
-app.use("/user", userRoutes);
+// User routes
+app.use('/user', userRoutes);
+
+// Admin routes
+app.use('/admin', adminRoutes);
+
+//html routes
+app.get('/about', (req, res, next) => {
+  res.sendFile(__dirname + '/client/about.html');
+});
+
+app.get('/form', (req, res, next) => {
+  res.sendFile(__dirname + '/client/form.html');
+});
 
-app.get("/", (req, res, next) => {
-  res.sendFile(__dirname + "/client/index.html");
+app.get('/', (req, res, next) => {
+  res.sendFile(__dirname + '/client/index.html');
 });
 
 app.listen(PORT, () => {
-  console.log("Server has started");
+  console.log(`Server has started on port ${PORT}`);
 });