optimize kernel

basemkhirat · basemkhirat · commit 27fe4ee6e1e6 · 2017-11-11T21:47:28.000+02:00
diff --git a/app/controllers/HomeController.js b/app/controllers/HomeController.js
@@ -10,10 +10,12 @@ module.exports = {
 
         // Logging In
 
-        // req.login({id: "59f4856fd3b99e1d311ef94a"}, function (error) {
-        //     if (error) return next(error);
-        //     return res.redirect("/profile");
-        // });
+        /*
+        req.login({id: "59f4856fd3b99e1d311ef94a"}, function (error) {
+            if (error) return next(error);
+            return res.redirect("/profile");
+        });
+        */
 
         return res.render("hello");
     },
diff --git a/app/kernel.js b/app/kernel.js
@@ -21,7 +21,11 @@ app.use(require('cors')(_config("cors")));
 
 app.use(require("express-mvc-platform/lib/i18n"));
 
-app.use(require("morgan")("dev"))
+/* Logging in development only */
+
+if(_config("app.env") != "production") {
+    app.use(require("morgan")("dev"));
+}
 
 /* Loading express validator */
 
@@ -33,6 +37,13 @@ app.use(require("body-parser").urlencoded(_config("body")));
 
 app.use(require("body-parser").json());
 
+/* Defining the request.isAPI boolean flag */
+
+app.use(function (req, res, next) {
+    req.isAPI = req.url.startsWith("/" + _config("app.api_prefix"));
+    next();
+});
+
 /* Loading the response cookie parser */
 
 app.use(require("cookie-parser")());
@@ -41,13 +52,33 @@ app.use(require("cookie-parser")());
 
 app.use(require("express-session")(_config("session")));
 
+// Passport authentication
+
+require("./passport");
+
+/* Serving api routes */
+
+app.use("/" + _config("app.api_prefix"), require("./routes/api"));
+
+/* API 404 error handler */
+
+app.use("/" + _config("app.api_prefix"), function (req, res) {
+    return res.notFound();
+});
+
+/* API 500 error handler */
+
+app.use("/" + _config("app.api_prefix"), function (error, req, res, next) {
+    return res.serverError(error.message);
+});
+
 /* Redirect back reponse method res.back() */
 
 app.use(require('express-back')());
 
 /* Enable cross site request forgery */
 
-//app.use(require('csurf')(_config("csrf")));
+app.use(require('csurf')(_config("csrf")));
 
 /* Enable session flash messages */
 
@@ -56,7 +87,9 @@ app.use(require("express-flash")());
 /* Passing the request object to views */
 
 app.use(function (req, res, next) {
+
     var origRender = res.render;
+
     res.render = function (view, locals, callback) {
         if ('function' == typeof locals) {
             callback = locals;
@@ -69,18 +102,9 @@ app.use(function (req, res, next) {
         origRender.call(res, view, locals, callback);
     };
 
-    req.isAPI = req.url.startsWith("/"+_config("app.api_prefix"));
     next();
 });
 
-// Passport authentication
-
-require("./passport");
-
-/* Serving api routes */
-
-app.use("/" + _config("app.api_prefix"), require("./routes/api"));
-
 /* Serving web routes */
 
 app.use("/", require("./routes/web"));
diff --git a/app/models/User.js b/app/models/User.js
@@ -90,4 +90,3 @@ schema.methods.comparePassword = function (password, callback) {
 }
 
 module.exports = mongoose.model("user", schema, "user");
-
diff --git a/app/routes/web.js b/app/routes/web.js
@@ -2,6 +2,9 @@ var router = require("express").Router();
 
 router.get("/", HomeController.index);
 router.get("/logout", AuthController.logout);
+
+//router.post("/profile", HomeController.profile);
+
 router.get("/profile", SessionAuth, HomeController.profile);
 
 module.exports = router;
diff --git a/app/views/hello.ejs b/app/views/hello.ejs
@@ -1,7 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Express MVC</title>
+    <link rel="icon" type="image/png" href="<%= _url('favicon.png') %>"/>
+    <link href="<%= _url('css/style.css') %>" type="text/css" rel="stylesheet" />
+</head>
+<body>
+
 <h1>
     Hello world <%= _lang("name") %>!
 </h1>
 
-<a href="/profile">Profile</a>
-<br/>
-<a href="/logout">logout</a>
+</body>
+</html>
diff --git a/config/i18n.js b/config/i18n.js
@@ -92,7 +92,7 @@ module.exports = {
      */
 
     logDebugFn: function (msg) {
-        console.log('debug', msg);
+        // console.log('debug', msg);
     },
 
     /**
@@ -101,7 +101,7 @@ module.exports = {
      */
 
     logWarnFn: function (msg) {
-        console.log('warn', msg);
+        // console.log('warn', msg);
     },
 
     /**
@@ -110,7 +110,7 @@ module.exports = {
      */
 
     logErrorFn: function (msg) {
-        console.log('error', msg);
+        // console.log('error', msg);
     },
 
     /**
diff --git a/config/session.js b/config/session.js
@@ -99,7 +99,7 @@ module.exports = {
          * and will delete it on a condition like exiting a web browser application.
          */
 
-        // expires: Dat
+        // expires: Date
 
 
         /**
diff --git a/public/css/style.css b/public/css/style.css
@@ -0,0 +1,4 @@
+h1 {
+    font-family: monospace;
+    color: #7d7d7d;
+}
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/robots.txt b/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/server.js b/server.js
@@ -10,4 +10,6 @@ require("./app");
 
 require("./app/kernel");
 
-app.listen(_config("app.port"));
+app.listen(_config("app.port"), function () {
+    console.log("Server is listening at port " + _config("app.port"));
+});

Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,3 @@ schema.methods.comparePassword = function (password, callback) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`module.exports = mongoose.model("user", schema, "user");`
`93`		`-`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +h1 {
 +    font-family: monospace;
 +    color: #7d7d7d;
 +}