moved and renamed files to match the filesetup we want.

havebeen using a dev-setup till now.

2 files changed, 0 insertions, 639 deletions

diff --git a/controllers/system.js b/controllers/system.js
deleted file mode 100644
index c29e06f..0000000
--- a/controllers/system.js
+++ /dev/null
@@ -1,346 +0,0 @@
-
-/**
- * Module dependencies
- */
-var mongoose = require('mongoose')
-  , env = process.env.NODE_ENV || 'development'
-  , config = require('../config/config.js')[env]
-  , Project = mongoose.model('Project')
-  , Access = mongoose.model('Access')
-  , User = mongoose.model('User')
-  , pPost = mongoose.model('pPost')
-  , Validator = require('validator').Validator
-  , v = new Validator()
-  , sanitize = require('validator').sanitize;
-
-
-// validation error handling. This collects all errors before pushing them out in getErrors()
-Validator.prototype.error = function(msg) {
-    this._errors.push(msg);
-    return this;
-}
-Validator.prototype.getErrors = function() {
-    var returnThis = this._errors;
-    this._errors = ''; // need to reset errors between sessions because of object model
-    return returnThis;
-}
-
-/**
- * Before the user log in
- * ===============================================================
-*/
-
-exports.index = function(req, res) {
-    if (req.user !== undefined) { return res.redirect('/dashboard'); }
-    res.render('index', { title: 'DERS', user: req.user });
-    };
-
-
-
-exports.test = function(req, res) {
-    res.render('test', {
-        title: 'test',
-        user: req.user
-    });
-};
-
-
-exports.home = function(req, res) {
-    res.render('home', {
-        title: 'home',
-        user: req.user
-    });
-};
-
-
-exports.faq = function(req, res) {
-    res.render('faq', {
-        title: 'faq',
-        user: req.user
-    });
-}
-
-
-exports.contact = function(req, res) {
-    res.render('contact', {
-        title: 'contact',
-        user: req.user
-    });
-}
-
-
-/**
- * After the user has logged in
- * ===============================================================
-*/
-
-
-
-exports.dashboard = function(req, res) {
-
-/*
-    Access.find({ user: req.user._id }, function(err, accesses) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        console.log('accesses ' + accesses);
-        accesses.forEach(function(access) {
-            Project.load(access.project, function(err, project) {
-                    if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-                    projectList.push(project);
-                    console.log(project.user.username);
-                });
-        });
-    });
-*/
-    if (req.user.status < 3) {
-        if (req.header('Referer') === undefined) { return res.status(403).render('error', { title: 403, text: 'Du har ikke tilgang til denne siden. Du må registrere deg først. Sjekk mailen din for å se invitekode.' }); }
-        else { return res.redirect('back'); }
-    }
-
-    Access.loadUser(req.user._id, function(err, projects) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        var projectIDs = [];
-        var pro = { project: [] };
-        projects.forEach(function(project) {
-            projectIDs.push(project.project._id);
-            pro.project[project.project._id] = {
-                total:  0  // total for project
-              , user:   0  // what req-user has spent on project
-              , users:  0  // number of users on project
-            };
-        });
-        Access.loadProjects(projectIDs, function(err, participants) {
-            if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-            participants.forEach(function(p) {
-                pro.project[p.project].users++;
-            });
-            pPost.loadByProjects(projectIDs, function(err, posts) {
-                if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-                Access.loadProjects(projectIDs, function(err, participants) {
-                    if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-
-                    // FUN FUN FUN CALCULATIONS
-
-                    posts.forEach(function(p) {
-                        if (String(p.user._id) === String(req.user._id)) pro.project[p.project._id].user += p.value;
-                        pro.project[p.project._id].total += p.value;
-                    });
-
-                    res.render('dashboard', {
-                        title: 'Dashboard'
-                      , user: req.user
-                      , projects: projects
-                      , posts: posts
-                      , participants: participants
-                      , pro: pro
-                    });
-                });
-            });
-            /*            res.render('dashboard', {
-                title: 'Dashboard',
-                user: req.user,
-                projects: projects
-            });
-*/
-        });
-    });
-
-/*
-    Project.find(function(err, projects) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        res.render('dashboard', {
-            title: 'Dashboad',
-            user: req.user,
-            projects: projects
-        });
-    });*/
-}
-
-
-
-exports.project = function(req, res) {
-    Project.loadShort(req.params.short, function(err, project) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        Access.loadProject(project._id, function(err, access) {
-            if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-            pPost.loadProject(project._id, function(err, posts) {
-                if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-
-                // ALRIGHT! This is where the FUN starts!
-
-               // first we create an object that will hold all the calculational data
-                var pro = {
-                        users:  0   // number of users
-                      , user:   []  // this array will contain every user. Every user will then have it's own object inside this.
-                      , total:  0   // the overall total.
-                      , each:   0   // what each person has to pay
-                      , otot:   0   // how much is owned in total!
-                    };
-
-                // then we calculate how many users we have, and initiate objects foreach user
-                access.forEach(function(a) {
-                    if (String(a.user._id) === String(req.user._id)) req.user.permissions = a.permissions; //sets YOUR permissions in this project
-
-                    pro.users++;
-                    pro.user[a.user._id] = {
-                            total:  0
-                          , diff:   0
-                          , coeff:  0   // the coefficient of hom much you are owned
-                          , name:   a.user.name
-                        };
-                });
-
-                // now we must collect all the money!
-                posts.forEach(function(p) {
-                    pro.total += parseFloat(p.value);
-                    pro.user[p.user._id].total += parseFloat(p.value);
-                });
-
-                // then calculate how much each user must pay in total
-                pro.each = pro.total / pro.users;
-
-                // then calculate how much each person owe and is owned
-                for(var i in pro.user) {
-                    pro.user[i].diff = parseFloat(pro.user[i].total - pro.each).toFixed(2);
-                    if (pro.user[i].diff > 0) pro.otot += parseFloat(pro.user[i].diff);
-                }
-                for (var i in pro.user) {
-                    if (pro.user[i].diff > 0) pro.user[i].coeff = pro.user[i].diff / pro.otot;
-                }
-                console.log(pro);
-                res.render('project', {
-                    title: project.name
-                  , user: req.user
-                  , req: req
-                  , project: project
-                  , access: access
-                  , posts: posts
-                  , pro: pro
-                });
-            });
-        });
-
-    });
-}
-
-
-exports.projectParticipants = function(req, res) {
-    if (req.user.status < 3) {
-        if (req.header('Referer') === undefined) { return res.status(403).render('error', { title: 403, text: 'Du har ikke tilgang til denne siden. Du må registrere deg først. Sjekk mailen din for å se invitekode.' }); }
-        else { return res.redirect('back'); }
-    }
-    res.render('projectParticipants', { title: 'Prosjektdeltakere', user: req.user });
-
-}
-
-
-exports.projectPost = function(req, res) {
-
-   /** ###################################
-    * Need to check if user has access to this project!!
-    */
-    Project.loadShort(req.params.short, function(err, project) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        req.project = project;
-        res.render('projectPost', { title: 'Legg til utgift', user: req.user, req: req, project: project });
-    });
-
-
-
-}
-
-exports.postProjectPost = function(req, res) {
-
-    // Validation
-    v.check(req.body.project, 'The project was lost').notEmpty();
-    v.check(req.body.what, 'You need to fill in the what-field').notEmpty();
-    v.check(req.body.value, 'The value must be a positive number').notEmpty().isInt().min(0);
-
-    // error when validation fails
-    var errors = v.getErrors();
-    if (errors.length !== 0) return res.status(500).render('error', { title: '500', text: 'Det oppstod en valideringsfeil ' + errors, error: errors });
-
-    Project.loadShort(req.params.short, function(err, project) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-
-        // check if access
-        Access.checkAccess(req.user._id, project._id, 0, function(err, access) {
-            if (err || !access) return res.status(403).render('error', { title: '403', text: 'no sir.' });
-
-            // Time to fill in the model!
-            var ppost = new pPost();
-
-            ppost.user         = req.user._id;
-            ppost.for          = req.user._id;
-            ppost.project      = project._id;
-            ppost.what         = sanitize(req.body.what).escape();
-            ppost.comment      = sanitize(req.body.comment).xss(); // xss will remove cross-site-scripting in the textfield.
-            ppost.participants = sanitize(req.body.participants).escape();
-            ppost.value        = sanitize(req.body.value).toInt(); // this will remove leading zeroes. '0123' => '123'
-            ppost.when         = new Date(sanitize(req.body.date).escape() + ' ' + sanitize(req.body.time).escape() + ':00');
-            ppost.save(function(err) {
-                if (err) return res.render('projectPost', { title: 'Legg til utgift - en feil oppstod', user: req.user, req: req, project: project });
-                return res.redirect('/project/' + project.shortURL);
-            });
-        });
-    });
-}
-exports.newProject = function(req, res) {
-    if (req.user.status < 3) {
-        if (req.header('Referer') === undefined) { return res.status(403).render('error', { title: 403, text: 'Du har ikke tilgang til denne siden. Du må registrere deg først. Sjekk mailen din for å se invitekode.' }); }
-        else { return res.redirect('back'); }
-    }
-
-    res.render('newProject', { title: 'Nytt prosjekt', user: req.user });
-}
-
-exports.postNewProject = function(req, res) {
-    if (req.user.status < 3) {
-        if (req.header('Referer') === undefined) { return res.status(403).render('error', { title: 403, text: 'Du har ikke tilgang til denne siden. Du må registrere deg først. Sjekk mailen din for å se invitekode.' }); }
-        else { return res.redirect('back'); }
-    }
-
-    var project = new Project(req.body);
-    project.user = req.user._id;
-    project.save(function(err) {
-        if (err) {
-            console.log(err.errors);
-            return res.render('newproject', { title: 'Nytt prosjekt - en feil oppstod', user: req.user, errors: err.errors, project: project });
-        }
-        var access = new Access();
-        access.user = req.user._id;
-        access.creator = req.user._id;
-        access.project = project._id;
-        access.permissions = 9;
-        access.save(function(err) {
-            if (err) {
-                console.log(err.errors);
-                return res.render('newproject', { title: 'Nytt prosjekt - en feil oppstod', user: req.user });
-            }
-            return res.redirect('/dashboard');
-        });
-    });
-
-}
-
-
-exports.deleteProjectPost = function(req, res) {
-    Project.findOne({ shortURL: req.params.short }).select('_id').exec(function(err, project) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        Access.findOne({project: project._id, user: req.user._id}, function(err, access) {
-            if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-            if (!access) return res.status(403).render('error', { title: '403', text: 'Du har ikke tilgang til å gjøre dette' });
-            pPost.load(req.params.post, function(err, post) {
-                if (err || !post) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err });
-                if (post.user._id === req.user._id || access.permissions >= 6) {
-                    pPost.remove({ _id: post._id }, function(err) {
-                        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-                        console.log('deleted post ' + post._id);
-                        return res.redirect('back');
-                    })
-                } else { return res.status(403).render('error', { title: '403', text: 'Du har ikke tilgang til å gjøre dette' }); }
-            })
-        })
-    });
-}
-
-
diff --git a/controllers/users.js b/controllers/users.js
deleted file mode 100644
index 86cbd35..0000000
--- a/controllers/users.js
+++ /dev/null
@@ -1,293 +0,0 @@
-
-/**
- * Module dependencies
- */
-
-var mongoose = require('mongoose')
-  , User = mongoose.model('User')
-  , Project = mongoose.model('Project')
-  , Access = mongoose.model('Access')
-  , env = process.env.NODE_ENV || 'development'
-  , config = require('../config/config')[env]
-  , Validator = require('validator').Validator
-  , v = new Validator()
-  , sanitize = require('validator').sanitize;
-
-// validation error handling. This collects all errors before pushing them out in getErrors()
-Validator.prototype.error = function(msg) {
-    this._errors.push(msg);
-    return this;
-}
-Validator.prototype.getErrors = function() {
-    var returnThis = this._errors;
-    this._errors = ''; // need to reset errors between sessions because of object model
-    return returnThis;
-}
-
-
-/**
- * Login
- */
-exports.login = function(req, res) {
-    res.render('login', {
-        title: 'Login'
-    });
-
-}
-
-
-/**
- * Logout
- */
-exports.logout = function(req, res) {
-    req.logout();
-    res.redirect('/');
-}
-
-
-/**
- * Signin
- * This is triggered when the user post to /login
- */
-exports.signin = function(req, res) {
-    res.redirect('/dashboard');
-}
-
-exports.randomLogin = function(req, res) {
-    Access.findOne({ randomToken: req.params.hash }).populate('project', 'shortURL').exec(function(err, access) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        return res.redirect('/project/' + access.project.shortURL);
-
-    });
-}
-
-
-/**
- * Signup
- */
-exports.signup = function(req, res) {
-        res.render('signup', { title: 'Registrer deg', invite: false });
-}
-
-/**
- * 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) {
-    // if the user hasn't registered an email, we need to do so
-    if (!req.user.email || req.user.email === undefined) return res.redirect('/registerEmail');
-
-    res.redirect('/dashboard');
-}
-
-
-/**
- * registerEmail
- * Will register the users email if they don't have already
- */
-
-exports.registerEmail = function(req, res) {
-    // in case some user who has alreadu registered an email gets on this page
-    if (req.user.email !== undefined) return res.redirect('/dashboard');
-    res.render('registerEmail', { title: 'Registrer din e-post' });
-}
-
-
-/**
- * postRegisterEmail
- */
-
-exports.postRegisterEmail = function(req, res) {
-
-    v.check(req.body.email, 'You need to supply a proper email').isEmail();
-    var errors = v.getErrors();
-    if (errors.length !== 0) return res.status(500).render('error', { title: '500', text: 'Det oppstod en valideringsfeil<br>' + errors, error: errors });
-
-    // first we need to check if the email is already in use
-    User.findOne({ email: req.body.email }, function(err, user) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-
-        // if mail is in use..
-        if (user) return res.render('registerEmail', { title: 'Den e-posten er allerede i bruk. Vennligs registrer en annen.' });
-
-        User.update({ _id: req.user._id }, { email: req.body.email, status: 3 }, function(err) {
-            if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-            return res.redirect('/dashboard');
-        });
-    });
-}
-
-
-/**
- * postProjectParticipants
- * This callback is in this file because it treats users.
- */
-exports.postProjectParticipants = function(req, res) {
-    Project.loadShort(req.params.short, function(err, project) {
-        if (err || !project) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-
-        Access.checkAccess(req.user._id, project._id, 3, function(err, access) {
-            if (err || !access) return res.status(403).render('error', { title: '403', text: 'No sir! NO ACCESS FOR YOU', error: err });
-
-            // validate
-            var emails = sanitize(req.body.emails).xss();
-            v.check(emails, 'You need to enter some emails to invite someone').notEmpty();
-            //var emails = sanitize(req.body.emails).xss();
-            emails = emails.split('\r\n');
-            emails.forEach(function(m) { // m = each mailaddress
-                if (m) {
-                    v.check(m, m + ' is not a valid email').isEmail();
-                }
-            });
-
-            // error when validation fails
-            var errors = v.getErrors();
-            if (errors.length !== 0) return res.status(500).render('error', { title: '500', text: 'Det oppstod en valideringsfeil<br>' + errors, error: errors });
-
-            // EMAIL
-            // Require dependencies. We require them here so that they're not fetched until they're actually needed.
-            var email = require('emailjs')
-              , server = email.server.connect(config.email)
-              , message = {
-                subject:    'You were invited to use Divid',
-                text:       'VIL DU BRUK DIVID?',
-                from:       'Divid <divid@divid.no>',
-            }
-            emails.forEach(function(mailAddress) { // loops through all the emails and sets up each user
-                User.loadUser(mailAddress, function(err, user) {
-                    if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-                    if (!user) { //if the user doesn't exist, create one
-                        console.log('fant ingen brukere med den eposten. må invitere og stasj');
-                        var newUser = new User();
-                        newUser.email = mailAddress;
-                        newUser.username = mailAddress;
-                        newUser.name = mailAddress + ' <span class="muted">(ikke registrert)</span>';
-                        newUser.status = 1;
-                        newUser.password = newUser.generateRandomToken(32);
-                        newUser.randomToken = newUser.generateRandomToken(10, true);
-                        newUser.save(function(err) {
-                            if (err) return res.render('projectParticipants', { title: 'Nytt prosjekt - en feil oppstod', loggedin: true });
-                            console.log('made new user ' + newUser._id);
-                            var access = new Access();
-                            access.user = newUser._id;
-                            access.creator = req.user._id;
-                            access.project = project._id;
-                            access.randomToken = access.generateRandomToken(15);
-                            access.save(function(err) {
-                                if (err) {
-                                    console.log(err.errors);
-                                    return res.render('projectParticipants', { title: 'Nytt prosjekt - en feil oppstod', loggedin: true });
-                                }
-                                console.log('made new access for user ' + newUser._id);
-                                message.to = newUser.email;
-                                message.text = 'Hei! Du har blitt invitert til å delta i et Divid-prosjekt! https://divid.no/invite/' + newUser.randomToken + '\n Du kan også gå direkte til prosjektet her: https://divid.no/login/' + access.randomToken;
-                                server.send(message, function(err, message) { console.log(err || message);});
-                            });
-                        });
-
-                    } else { // if the user exists, add him to the project
-                        Access.checkAccess(user._id, project._id, 0, function(err, acc) {
-                            if (err) return res.render('projectParticipants', { title: 'Nytt prosjekt - en feil oppstod', loggedin: true });
-                            if (acc) { // if the user already has access to the project.. do nothing
-                                console.log('user ' + user.email + ' already has access to project ' + project.name);
-                            } else {
-                                console.log('fant en bruker. må lage ny access til han og si i fra.');
-                                var access = new Access();
-                                access.user = user._id;
-                                access.creator = req.user._id;
-                                access.project = project._id;
-                                message.text = 'Du ble lagt til projektet "' + project.name + '"';
-                                if (Number(user.status) < 3) {
-                                    access.randomToken = access.generateRandomToken(15);
-                                    message.text += '.\nDu kan få direkte tilgang til dette prosjektet her: https://divid.no/login/' + access.randomToken + ' \nDu kan bruke denne linken for å registrere deg, for å få tilgang til flere funksjoner: https://divid.no/invite/' + user.randomToken;
-                                }
-                                access.save(function(err) {
-                                    if (err) {
-                                        console.log(err.errors);
-                                        return res.render('projectParticipants', { title: 'Nytt prosjekt - en feil oppstod', loggedin: true });
-                                    }
-                                    console.log('made new access for user ' + user.username);
-                                    message.to = user.email;
-                                    server.send(message, function(err, message) { console.log(err || message);});
-                                });
-                            }
-                        });
-                    }
-                });
-           });
-
-            res.redirect('back');
-        });
-    });
-}
-
-
-/**
- * claimInvite
- * So users can use their inviteEmail
- */
-
-exports.claimInvite = function(req, res) {
-
-    // first we need to check if the invite is valid!
-    User.findOne({ randomToken: sanitize(req.params.randomToken).escape(), status: 1 }, function(err, user) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        if (!user) return res.render('error', { title: 'This invite does not exist', text: 'Invitasjonen din er ugyldig' });
-
-        res.render('signup', {
-            invite: true,
-            title: 'Registrer deg!',
-            email: user.email }
-        );
-    });
-
-
-}
-
-
-exports.postClaimInvite = function(req, res) {
-
-    User.findOne({ randomToken: sanitize(req.params.randomToken).escape(), status: 1 }, function(err, user) {
-        if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
-        if (!user) return res.render('error', { title: 'This invite does not exist', text: 'Invitasjonen din er ugyldig' });
-
-        v.check(req.body.password).notEmpty();
-        v.check(req.body.name).notEmpty();
-        v.check(req.body.username).notEmpty();
-
-        errors = v.getErrors();
-        if (errors.length !== 0) return res.status(500).render('error', { title: '500', text: 'Det oppstod en valideringsfeil<br>' + errors, error: errors });
-
-        user.name = sanitize(req.body.name).escape();
-        user.username = sanitize(req.body.username).escape();
-        user.password = req.body.password;
-        user.provider = 'local';
-        user.status = 3;
-        user.randomToken = '';
-        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');
-            });
-        });
-    });
-}
-