Refactor

.babelrc

@@ -0,0 +1 @@
+{ "presets": ["es2015"] }

.eslintrc

@@ -1,5 +1,5 @@
 {
-  "extends": "airbnb/base",
+  "extends": "",
   "globals": {},
   "env" : {
     "node" : true

.gitignore

@@ -1,3 +1,6 @@
+node_modules
+.env
+
 ### API Keys ###
 *.auth.js
 
@@ -179,3 +182,4 @@ node_modules
 
 # compiled files
 dist
+>>>>>>> 567fb62210242b715e97f93bf0d9fbfb4ea50dcb

app.js

@@ -0,0 +1,64 @@
+var express = require('express');
+var babel = require('babel-core');
+require('babel-register');
+require('dotenv').load();
+
+var path = require('path');
+var favicon = require('serve-favicon');
+var logger = require('morgan');
+var cookieParser = require('cookie-parser');
+var bodyParser = require('body-parser');
+
+var routes = require('./routes/index');
+var sites = require('./routes/sites');
+
+var app = express();
+
+// view engine setup
+app.set('views', path.join(__dirname, 'views'));
+app.set('view engine', 'jade');
+
+// uncomment after placing your favicon in /public
+//app.use(favicon(__dirname + '/public/favicon.ico'));
+app.use(logger('dev'));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(express.static(path.join(__dirname, 'public')));
+
+app.use('/', routes);
+app.use('/site', sites);
+
+// catch 404 and forward to error handler
+app.use(function(req, res, next) {
+  var err = new Error('Not Found');
+  err.status = 404;
+  next(err);
+});
+
+// error handlers
+
+// development error handler
+// will print stacktrace
+if (app.get('env') === 'development') {
+  app.use(function(err, req, res, next) {
+    res.status(err.status || 500);
+    res.render('error', {
+      message: err.message,
+      error: err
+    });
+  });
+}
+
+// production error handler
+// no stacktraces leaked to user
+app.use(function(err, req, res, next) {
+  res.status(err.status || 500);
+  res.render('error', {
+    message: err.message,
+    error: {}
+  });
+});
+
+
+module.exports = app;

bin/www

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+var app = require('../app');
+var debug = require('debug')('gstv:server');
+var http = require('http');
+
+/**
+ * Get port from environment and store in Express.
+ */
+
+var port = normalizePort(process.env.PORT || '3000');
+app.set('port', port);
+
+/**
+ * Create HTTP server.
+ */
+
+var server = http.createServer(app);
+
+/**
+ * Listen on provided port, on all network interfaces.
+ */
+
+server.listen(port);
+server.on('error', onError);
+server.on('listening', onListening);
+
+/**
+ * Normalize a port into a number, string, or false.
+ */
+
+function normalizePort(val) {
+  var port = parseInt(val, 10);
+
+  if (isNaN(port)) {
+    // named pipe
+    return val;
+  }
+
+  if (port >= 0) {
+    // port number
+    return port;
+  }
+
+  return false;
+}
+
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+function onError(error) {
+  if (error.syscall !== 'listen') {
+    throw error;
+  }
+
+  var bind = typeof port === 'string'
+    ? 'Pipe ' + port
+    : 'Port ' + port;
+
+  // handle specific listen errors with friendly messages
+  switch (error.code) {
+    case 'EACCES':
+      console.error(bind + ' requires elevated privileges');
+      process.exit(1);
+      break;
+    case 'EADDRINUSE':
+      console.error(bind + ' is already in use');
+      process.exit(1);
+      break;
+    default:
+      throw error;
+  }
+}
+
+/**
+ * Event listener for HTTP server "listening" event.
+ */
+
+function onListening() {
+  var addr = server.address();
+  var bind = typeof addr === 'string'
+    ? 'pipe ' + addr
+    : 'port ' + addr.port;
+  debug('Listening on ' + bind);
+}

lib/errors.js

@@ -0,0 +1,26 @@
+/*=== Custom error messages ===*/
+
+export const ERROR = {
+
+  // Unable to Create/Update: {itemName} is required.
+  ITEM_REQUIRED: function(item){ return `Unable to CREATE/UPDATE. ${item} value is Missing and Required`;},
+
+  // Unable to Create/Update: {itemName} {itemValue} already exists.
+  DUPLICATE_ENTRY: function(item){ return `Unable to CREATE/UPDATE, ${item} already exits.`;},
+
+  // Unable to Create/Update: The start time must be before the end time
+  END_BEFORE_START: function(day,item){ return `${day, item}: The end time must be earlier than the start.`;},
+
+  // Unable to Create/Update: The start time may not be the same date as the end time
+  TIMES_EQUAL: function(day, item){ return `${day, item}: The start and end times cannot be the same.`;},
+
+  // NULL TIMESLOT
+  NULL_TIME: function(day, item) {return `${day, item}: The times cannot be null.`;},
+
+  // TIME_OVERLAP
+  TIMES_OVERLAP: function(day) {return `${day}: Adjust Timeslots, HOURS OVERLAP.`;},
+
+  // INCORRECT FORMAT:
+  INCORRECT_FORMAT: function(item){ return `${item} is formatted incorrectly.`;}
+
+};