Merge pull request #6 from oSoc19/develop

Develop

Author: jodiDL

app.js

@@ -3,25 +3,35 @@ var express = require('express');
 var path = require('path');
 var cookieParser = require('cookie-parser');
 var logger = require('morgan');
-const db = require('./queries/queries');
 
 var indexRouter = require('./routes/index');
-var dataApiRouter = require('./routes/dataApi');
+var testapiRouter = require('./routes/test_api.js');
+var funfactsRouter = require('./routes/funfacts');
+var solarRouter = require('./routes/solar');
+var quizRouter = require('./routes/quiz');
 
 var app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
+app.use(function(req, res, next) {
+  res.header("Access-Control-Allow-Origin", "*"); 
+  next();
+ });
+
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
-app.use('/api', dataApiRouter);
+app.use('/api', testapiRouter);
+app.use('/api', funfactsRouter);
+app.use('/api', solarRouter);
+app.use('/api', quizRouter);
 
 
 // catch 404 and forward to error handler
@@ -38,7 +48,8 @@ app.use(function(err, req, res, next) {
   // render the error page
   res.status(err.status || 500);
   res.render('error');*/
-  console.log("EYYYYYYYYY U CRASHED");
+  
+  console.log("CRASHED");
 });
 
 module.exports = app;

bin/www

@@ -29,6 +29,10 @@ server.listen(port);
 server.on('error', onError);
 server.on('listening', onListening);
 
+process.on('uncaughtException', function (err) {
+  console.error(err);
+  console.log("Node NOT Exiting...");
+});
 /**
  * Normalize a port into a number, string, or false.
  */