Merge pull request #2 from cs673-team-silver-serpent/feature/login-page

Feature/login page
cs673-team-silver-serpent · Feb 24, 2018 · 48f346d · 48f346d
2 parents ace5fc7 + 02370e3
commit 48f346d
Show file tree

Hide file tree

Showing 33 changed files with 10,191 additions and 512 deletions.
diff --git a/app.js b/app.js
@@ -25,8 +25,8 @@ app.use(bodyParser.json());
 // declare public folder
 app.use(express.static(path.join(__dirname,'public')));
 
-// routes
 
+// routes
 // for testing purposes during setup
 app.get('/hello', (req,res) => {
    res.send("Hello, world!");

diff --git a/controllers/portal-controller.js b/controllers/portal-controller.js
@@ -2,17 +2,19 @@ const express = require('express');
 const router = express.Router();
 const project = require('../models/portal-model');
 
+
+
 // GET HTTP method to /
 router.get('/',(request,response) => {
-   // response.send("GET");
-   project.getAllProjects( (error,projects) => {
-      if (error) {
-        response.json({success:false,message:`Failed to load all projects. Error: ${error}`});
-     } else {
-        response.write(JSON.stringify({success:true, projects:projects},null,2));
-        response.end();
-     }
-   });
+  // response.send("GET");
+  project.getAllProjects( (error,projects) => {
+    if (error) {
+      response.json({success:false,message:`Failed to load all projects. Error: ${error}`});
+    } else {
+      response.write(JSON.stringify({success:true, projects:projects}, null, 2));
+      response.end();
+    }
+  });
 });
 
 // POST HTTP method to /