Merge branch 'dev'

Conflicts:
	app.js
	router.js

1 files changed, 62 insertions, 0 deletions

diff --git a/controllers/system.js b/controllers/system.js
new file mode 100644
index 0000000..e54fc1c
--- /dev/null
+++ b/controllers/system.js
@@ -0,0 +1,62 @@
+
+/**
+ * Module dependencies
+ */
+
+
+
+
+
+/**
+ * Before the user log in
+ * ===============================================================
+*/
+
+exports.index = function(req, res) {
+        res.render('index', { title: 'DERS' });
+    };
+
+
+
+exports.test = function(req, res) {
+        res.render('test', {
+            title: 'test',
+            loggedin: false
+        });
+    };
+
+
+exports.home = function(req, res) {
+        res.render('home', {
+            title: 'home',
+            loggedin: false
+        });
+    };
+
+
+
+
+
+
+
+/**
+ * After the user has logged in
+ * ===============================================================
+*/
+
+
+
+exports.dashboard = function(req, res) {
+        console.log('/dashboard - ' + req.user);
+        res.render('dashboard', {
+            title: 'kanin',
+            loggedin: true
+        });
+    };
+
+
+
+exports.project = function(req, res) {
+        res.render('project', { title: 'Harepus', loggedin: true });
+}
+