Merge branch 'dev'

Conflicts:
	app.js
	router.js

2 files changed, 129 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 });
+}
+
diff --git a/controllers/users.js b/controllers/users.js
new file mode 100644
index 0000000..d465468
--- /dev/null
+++ b/controllers/users.js
@@ -0,0 +1,67 @@
+
+/**
+ * Module dependencies
+ */
+
+var mongoose = require('mongoose')
+  , User = mongoose.model('User');
+
+/**
+ * Login
+ */
+exports.login = function(req, res) {
+    res.render('login', {
+        title: 'Login'
+    });
+
+}
+
+
+/**
+ * Logout
+ */
+exports.logout = function(req, res) {
+    req.logout();
+    res.resirect('/test');
+}
+
+
+/**
+ * Signin
+ * This is triggered when the user post to /login
+ */
+exports.signin = function(req, res) {}
+
+
+/**
+ * Signup
+ */
+exports.signup = function(req, res) {
+        res.render('signup', { title: 'Registrer deg' });
+}
+
+/**
+ * Create users
+ */
+exports.create = function(req, res) {
+    var user = new User(req.body);
+    user.provider = 'local';
+    user.save(function(err) {
+        if (err) return res.render('/signup', { errors: err.errors, user: user });
+        req.logIn(user, function(err) {
+            if (err) return next(err);
+            return res.redirect('/dashboard');
+        });
+    });
+}
+
+
+/**
+ * AuthCallback
+ * This is what happends when a user has signed in using facebook/twitter
+ */
+
+exports.authCallback = function(req, res, next) {
+    res.redirect('/dashboard');
+}
+