added sass, cleaned styling, cleaned views, revamped header, fixed dates

Author: Maxime Vaillancourt

app.js

@@ -1,6 +1,6 @@
-/*---------------------------------------------------------------------
+/**********************************************************************
   Dependencies
----------------------------------------------------------------------*/
+**********************************************************************/
 var express = require('express');
 var path = require('path');
 var favicon = require('serve-favicon');
@@ -9,13 +9,13 @@ var session = require('express-session');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
 var flash = require("express-flash");
-var Promise = require("bluebird");
 var compression = require('compression');
 var helmet = require('helmet')
+var sassMiddleware = require('node-sass-middleware')
 
-/*---------------------------------------------------------------------
+/**********************************************************************
   App Setup
----------------------------------------------------------------------*/
+**********************************************************************/
 var app = express();
 
 var sessionStore = new session.MemoryStore;
@@ -25,10 +25,9 @@ app.locals.moment = require('moment');
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'pug');
 
-/*---------------------------------------------------------------------
+/**********************************************************************
   Middleware
----------------------------------------------------------------------*/
-//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
+**********************************************************************/
 app.use(compression())
 app.use(helmet())
 app.use(cookieParser('secret'));
@@ -43,18 +42,25 @@ app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser('secret'));
-app.use(express.static(path.join(__dirname, 'public')));
 app.use(flash());
+app.use(sassMiddleware({
+    src: path.join(__dirname, 'sass'),
+    dest: path.join(__dirname, 'public/css'),
+    debug: true,
+    outputStyle: 'compressed',
+    prefix: '/css',
+}), express.static(path.join(__dirname, 'public')));
+//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
 
-/*---------------------------------------------------------------------
+/**********************************************************************
   Routes
----------------------------------------------------------------------*/
+**********************************************************************/
 app.use('/', require('./routes/index'));
 app.use('/feed', require('./routes/feed'));
 
-/*---------------------------------------------------------------------
-  Error handlers
----------------------------------------------------------------------*/
+/**********************************************************************
+  Error Handlers
+**********************************************************************/
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
   var err = new Error('Not Found');
@@ -73,7 +79,7 @@ app.use(function(err, req, res, next) {
   res.render('error');
 });
 
-/*---------------------------------------------------------------------
+/**********************************************************************
   Exports
----------------------------------------------------------------------*/
+**********************************************************************/
 module.exports = app;

package.json

@@ -18,6 +18,8 @@
     "helmet": "^3.6.1",
     "moment": "^2.18.1",
     "morgan": "~1.7.0",
+    "node-sass": "^4.5.3",
+    "node-sass-middleware": "^0.11.0",
     "pug": "~2.0.0-beta10",
     "redis": "^2.7.1",
     "request": "^2.81.0",

public/css/main.css

@@ -1,15 +1,15 @@
-/*---------------------------------------------------------------------
+/**********************************************************************
   Dependencies
----------------------------------------------------------------------*/
+**********************************************************************/
 var express = require('express');
 var router = express.Router();
 var request = require("request");
 var utils = require("../helpers/utils")
 var redisCache = require('redis').createClient(process.env.REDIS_URL);
 
-/*---------------------------------------------------------------------
-  Feed Display GET
----------------------------------------------------------------------*/
+/**********************************************************************
+  Feed Display (GET)
+**********************************************************************/
 router.get('/',
 
   function ajaxRequest(req, res, next) {
@@ -34,20 +34,19 @@ router.get('/',
             }
           })
 
-
           if(feedType == "json"){
 
             var parsedJson;
 
             res.locals.feedType = "json"
 
             try {
-                parsedJson = JSON.parse(rawData);
+              parsedJson = JSON.parse(rawData);
             } catch(e) {
               req.flash("error", "Error while parsing the JSON feed.")
               return res.redirect("/");
             }
-            var parsedJson = JSON.parse(rawData);
+
             if(parsedJson.hasOwnProperty('err')){
               req.flash("error", "There was an error while preparing the feed to be displayed.")
               return res.redirect("/");
@@ -90,7 +89,7 @@ router.get('/',
                   var parsedConvertedJson;
 
                   try {
-                      parsedConvertedJson = JSON.parse(converterRawData);
+                    parsedConvertedJson = JSON.parse(converterRawData);
                   } catch(e) {
                     req.flash("error", "Error while parsing the converted feed.")
                     return res.redirect("/");
@@ -107,7 +106,6 @@ router.get('/',
                       parsedConvertedJson.feed_url = req.query.url.toLowerCase().trim()
                     }
                     res.locals.data = parsedConvertedJson;
-                    console.log(parsedConvertedJson)
 
                     // push data to the redis cache (expires after 72 hours)
                     redisCache.setex(encodeURIComponent(req.query.url.toLowerCase().trim()), 60*60*72, JSON.stringify(parsedConvertedJson), function(){
@@ -129,7 +127,7 @@ router.get('/',
             });
           }
           else{
-            // not json, nor xml or atom
+            // not json, nor xml
             req.flash("error", "Unexpected MIME type. Please make sure you are entering a JSON, RSS, or Atom feed URL.")
             return res.redirect("/");
           }
@@ -155,7 +153,7 @@ router.get('/',
 
 );
 
-/*---------------------------------------------------------------------
+/**********************************************************************
   Exports
----------------------------------------------------------------------*/
+**********************************************************************/
 module.exports = router;