From 16f1f471c6a1ecb05a864d426f9137aa18289acb Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Mon, 29 Apr 2013 12:51:38 +0200
Subject: fixed some models

---
 models/project.js | 41 +++++++++++++++++++++++++++++++++++++++++
 models/system.js  | 12 ++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 models/project.js
 create mode 100644 models/system.js

diff --git a/models/project.js b/models/project.js
new file mode 100644
index 0000000..52853d7
--- /dev/null
+++ b/models/project.js
@@ -0,0 +1,41 @@
+
+/**
+ * Module dependencies
+ */
+
+var mongoose = require('mongoose')
+  , Schema = mongoose.Schema;
+
+
+
+
+
+var ProjectSchema = new Schema({
+    user: { type: String, ref: 'User' },
+    name: { type: String, default: '', trim: true },
+    description: {type: String, default: '', trim: true },
+    currency: { type: String, default: 'kr', trim: true },
+    public: { type: String, default: 'invite-only' },
+    created: { type: Date, default: Date.now },
+    updated: { type: Date, default: Date.now }
+});
+
+console.log(Schema.ObjectId);
+
+
+// the four validations below only apply if you are signing up traditionally
+
+ProjectSchema.path('name').validate(function(name) {
+    // if you're authenticated by any of the oauth strategies (facebook, twitter), don't validate
+    return name.length;
+}, 'Project name cannot be blank');
+
+ProjectSchema.methods = {
+
+    log: function() {
+        console.log('wat. wat logged this');
+    }
+
+}
+
+mongoose.model('Project', ProjectSchema);
diff --git a/models/system.js b/models/system.js
new file mode 100644
index 0000000..78d1361
--- /dev/null
+++ b/models/system.js
@@ -0,0 +1,12 @@
+
+/**
+ * Module dependencies
+ */
+
+var mongoose = require('mongoose')
+  , Schema = mongoose.Schema;
+
+
+
+
+
-- 
cgit v1.2.3


From c492a410588cbab8590bf369ab5917f6a8ce4575 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Mon, 29 Apr 2013 12:51:58 +0200
Subject: removed file

---
 models/system.js | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 models/system.js

diff --git a/models/system.js b/models/system.js
deleted file mode 100644
index 78d1361..0000000
--- a/models/system.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/**
- * Module dependencies
- */
-
-var mongoose = require('mongoose')
-  , Schema = mongoose.Schema;
-
-
-
-
-
-- 
cgit v1.2.3


From af4934a97f7a57ae6288760fe8a4110bb1f8a556 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Mon, 29 Apr 2013 12:52:46 +0200
Subject: added a few comments

---
 app.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 414372b..f9aa1b9 100644
--- a/app.js
+++ b/app.js
@@ -3,17 +3,17 @@
  * Module dependencies.
  */
 var express = require('express')
-    , fs = require('fs')
-  , passport = require('passport');
+  , fs = require('fs')
+  , passport = require('passport')
+  , mongoose = require('mongoose');
 
 /**
  * App configuration
  */
-var port = process.env.PORT || 8001
+var port = process.env.PORT || 8000
   , env = process.env.NODE_ENV || 'development'
   , config = require('./config/config')[env]
-  , auth = require('./config/middlewares/authorization')
-  , mongoose = require('mongoose');
+  , auth = require('./config/middlewares/authorization');
 
 // Bootstrap db connection
 mongoose.connect(config.db);
@@ -24,6 +24,7 @@ db.once('open', function callback(){
 });
 
 // Bootstrap models
+// This gets all model files in ./models
 var models_path = __dirname + '/models';
 fs.readdirSync(models_path).forEach( function(file) {
     require(models_path + '/' + file);
-- 
cgit v1.2.3


From 45efc4766216ef3095bf916c1fad64ac1443fdc8 Mon Sep 17 00:00:00 2001
From: Erling Aaby <erlinaa@stud.hist.no>
Date: Mon, 29 Apr 2013 12:55:56 +0200
Subject: changes in text and composition

---
 views/home.ejs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/views/home.ejs b/views/home.ejs
index f2f7997..27f655f 100644
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -1,6 +1,5 @@
 <% include header %>
 <link rel="stylesheet" href="/css/devanim.css">
-<link rel="stylesheet" href="/css/use.css">
 </head>
 <body>
 
@@ -45,24 +44,24 @@
 			<div class="row">
 				<div class="span3 infobox" id="first">
 						<img class="infoimg" src="/img/laptop.png">
-						<h4>Bruk mobil eller nett</h4>
-						  <p>Uansett hva du benytter er Divid tilgjengelig. Divid er tilgjengelig på alle plattformer og gjør derfor deling av utgifter enklere mellom deg og andre.</p>
+						<h4>Bruk mobil eller nettleser</h4>
+						  <p>Divid er en webapplikasjon og kan brukes på pc, nettbrett og mobil. Uansett hva du bruker er Divid tilgjengelig.</p>
 				</div>
 				<div class="span3 infobox" id="second">
 						<img class="infoimg" src="/img/addpeople.png">
 						<h4>Inviter de du vil</h4>
-						  <p>Divid gjør deling av utgifter enklere. Alt du trenger for å delta i et prosjekt i er en epost-adresse!</p>
+						  <p>Inviter deltakere til prosjekt ved å legge til epost-adressen deres eller send dem en link!</p>
 				</div>
 				<div class="span3 infobox" id="third">
 						<img class="infoimg" src="/img/overwatch.png">
-						<h4>Ta kontroll</h4>
-						<p>I et prosjekt kan du ha mange deltagere som skal dele på den samme regningen. Send påminnelser til sene betalere og få varsel når deltakere betaler.</p>
+						<h4>Få oversikt</h4>
+						<p>Ikke la delte utgifter gå i glemmeboken. Send påminnelser og få varsel når deltakere betaler.</p>
 				</div>
 			</div>
 			<div id="hvem" class="span12 content">
 				<div class="container last">
 					<div class="span6 sectionright">
-						<h1>Hvem er denne tjenesten for?</h1>
+						<h1>Hvor kan Divid brukes?</h1>
 						<h5>Divid er for alle. Å dele er sosialt og derfor holder Divid det sosialt.</h5>
 						<ul>
 							<li>Studenter - i kollektiv</li>
@@ -115,15 +114,15 @@
 				</div>
 			</div>
 		</div>
-		<div id="register" class="span12 content">
+		
+    </div> 
+	<div id="register" class="span12 content">
 			<div class="container last">
 				<div class="span6 sectionright">
 					<h1>Registrering?</h1> <!--Stian mente du ville ha denne nederst? Jeg trodde den skulle være frittflytende over alt.--!>
 				</div>
 			</div>
 		</div>
-			<hr>
-    </div> 
     </div><!-- /div.row -->
 	</div><!-- /div#wrapper -->
 	<!--<div id="footer">
-- 
cgit v1.2.3


From 318110acae21063c0afb9f3ab67edf6dceba615f Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Mon, 29 Apr 2013 13:24:51 +0200
Subject: fixing routes

---
 controllers/system.js | 2 +-
 router.js             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/system.js b/controllers/system.js
index cf205b9..f04ec6d 100644
--- a/controllers/system.js
+++ b/controllers/system.js
@@ -65,7 +65,7 @@ exports.project = function(req, res) {
     res.render('project', { title: 'Harepus', loggedin: true });
 }
 
-exports.newproject = function(req, res) {
+exports.newProject = function(req, res) {
     res.render('newproject', { title: 'Nytt prosjekt', loggedin: true });
 }
 
diff --git a/router.js b/router.js
index 3ffc887..b67f03a 100644
--- a/router.js
+++ b/router.js
@@ -55,6 +55,7 @@ module.exports = function(app, passport, auth) {
 
     app.get('/project', auth.requiresLogin, system.project);
 
-    app.get('/project/new', auth.requiresLogin, system.newproject);
+    app.get('/project/new', auth.requiresLogin, system.newProject);
 
+    app.post('/project/new', auth.requiresLogin, system.postNewProject)
 };
-- 
cgit v1.2.3


From 20491bbe25f287c32eabae260aa7877aad7ea38d Mon Sep 17 00:00:00 2001
From: Erling Aaby <erlinaa@stud.hist.no>
Date: Mon, 29 Apr 2013 13:40:26 +0200
Subject: changes in composition

---
 app.js              |  2 +-
 public/css/use.less |  6 +++---
 views/home.ejs      | 24 +++++-------------------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/app.js b/app.js
index f9aa1b9..492f8fe 100644
--- a/app.js
+++ b/app.js
@@ -10,7 +10,7 @@ var express = require('express')
 /**
  * App configuration
  */
-var port = process.env.PORT || 8000
+var port = process.env.PORT || 8001
   , env = process.env.NODE_ENV || 'development'
   , config = require('./config/config')[env]
   , auth = require('./config/middlewares/authorization');
diff --git a/public/css/use.less b/public/css/use.less
index fb2cbf1..44e303c 100644
--- a/public/css/use.less
+++ b/public/css/use.less
@@ -169,7 +169,7 @@ margin:10px;
 	margin-top:25px;
 	/*border-top: 2px solid #9fd5df;*/
 	color: #FFFFFF;
-	background-color: #000000;
+	background-color: #ff9a00;
 	box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2);
 	-moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
 	-webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
@@ -179,8 +179,8 @@ margin:10px;
 	display: block;
 	}
 
-/*#footer {
+#footer {
 	background-color: #0D56A6; 
 	width:1170px;
 	height:100px;
-}*/
+}
diff --git a/views/home.ejs b/views/home.ejs
index 27f655f..aeb0cda 100644
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -80,13 +80,9 @@
 			<div id="hvor" class="span12 content">
 				<div class="container last">
 					<div class="span7 sectionleft">
-						<h1>Når bruke Divid?</h1>
-						<p>Hvilke bruksområder kan jeg bruke Divid?</p>
-						<ul>
-							<li>Bruk appen fra din Iphone, Android eller windows mobile</li>
-							<li>Du kan legge til utgifter og utlegg underveis</li>
-							<li></li>
-						</ul>
+						<div class="span5 sectionleft tutorial">
+							<iframe src="http://player.vimeo.com/video/41974181" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+						</div>
 					</div>
 					<div class="span5 sectionright">	
 					<img src="/img/iph.png" class="infoimg">
@@ -98,7 +94,7 @@
 		<div id="hvordan" class="span12 content">
 			<div class="container last">
 				<div class="span6 sectionright">
-				<h1>Hvordan bruke divid</h1> <!-- Vi viser deg hvor enkelt det er å bruke Divid.--!>
+				<h1>Registrering</h1> <!-- Vi viser deg hvor enkelt det er å bruke Divid.--!>
 					<ul>
 						<h4><i class="icon-chevron-right icon-white"></i> Vi tar bryet og løser delingen rettferdig</h4>
 						</br>
@@ -109,20 +105,10 @@
 						<h4><i class="icon-chevron-right icon-white"></i> Ta bilde av kvitteringene eller en utlånt gjenstand med Divid bildebank for senere gjennomsyn</h4><!--Du slipper kvitteringer - ta bilde av de og kast de i søpla. Bildene lastes opp til Divids servere så har du de senere hvis det er bruk for de.--!> 
 					</ul>
 				</div>
-				<div class="span5 sectionleft tutorial">
-				<iframe src="http://player.vimeo.com/video/41974181" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
-				</div>
+				
 			</div>
 		</div>
-		
     </div> 
-	<div id="register" class="span12 content">
-			<div class="container last">
-				<div class="span6 sectionright">
-					<h1>Registrering?</h1> <!--Stian mente du ville ha denne nederst? Jeg trodde den skulle være frittflytende over alt.--!>
-				</div>
-			</div>
-		</div>
     </div><!-- /div.row -->
 	</div><!-- /div#wrapper -->
 	<!--<div id="footer">
-- 
cgit v1.2.3


From 3bd5953d48e0984a0738ac33f671f8e9c556cc9e Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Mon, 29 Apr 2013 13:54:06 +0200
Subject: added button for new project

---
 views/navbar.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/navbar.ejs b/views/navbar.ejs
index 79cb55a..6bc2bbe 100644
--- a/views/navbar.ejs
+++ b/views/navbar.ejs
@@ -56,8 +56,8 @@
                     <div class="nav-collapse collapse">
                         <ul class="nav menu">
                             <li><a href="#faq">FAQ</a></li>
-                            <li><a href="#kontakt">Kontakt</a></li>
-                            <li><a href="#dashboard">Dashboard</a></li>
+                            <li><a href="/project/new">Nytt prosjekt</a></li>
+                            <li><a href="/dashboard">Dashboard</a></li>
                         </ul>
                     </div>
                 </div>
-- 
cgit v1.2.3


From 7ffbad817125e0767ff51ae7b3ddd9092328bafc Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Mon, 29 Apr 2013 14:24:43 +0200
Subject: been working on the project model and posting projects

---
 app.js                |  2 +-
 controllers/system.js | 11 ++++++++++-
 models/project.js     |  2 --
 views/newproject.ejs  |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 492f8fe..f9aa1b9 100644
--- a/app.js
+++ b/app.js
@@ -10,7 +10,7 @@ var express = require('express')
 /**
  * App configuration
  */
-var port = process.env.PORT || 8001
+var port = process.env.PORT || 8000
   , env = process.env.NODE_ENV || 'development'
   , config = require('./config/config')[env]
   , auth = require('./config/middlewares/authorization');
diff --git a/controllers/system.js b/controllers/system.js
index f04ec6d..e3a55bd 100644
--- a/controllers/system.js
+++ b/controllers/system.js
@@ -2,7 +2,8 @@
 /**
  * Module dependencies
  */
-
+var mongoose = require('mongoose')
+  , Project = mongoose.model('Project');
 
 
 
@@ -69,3 +70,11 @@ exports.newProject = function(req, res) {
     res.render('newproject', { title: 'Nytt prosjekt', loggedin: true });
 }
 
+exports.postNewProject = function(req, res) {
+    var project = new Project(req.body);
+    project.save(function(err) {
+        if (err) return res.render('newproject', { title: 'Nytt prosjekt - en feil oppstod', loggedin: true, errors: err.errors, project: project });
+        return res.redirect('/dashboard');
+    });
+}
+
diff --git a/models/project.js b/models/project.js
index 52853d7..2424694 100644
--- a/models/project.js
+++ b/models/project.js
@@ -20,8 +20,6 @@ var ProjectSchema = new Schema({
     updated: { type: Date, default: Date.now }
 });
 
-console.log(Schema.ObjectId);
-
 
 // the four validations below only apply if you are signing up traditionally
 
diff --git a/views/newproject.ejs b/views/newproject.ejs
index 3d0ff7c..e83673f 100644
--- a/views/newproject.ejs
+++ b/views/newproject.ejs
@@ -13,7 +13,7 @@
         <form class="form-horizontal" action="/project/new" method="post">
         <fieldset>
 
-        <legend>Lag nytt prosjekt</legend>
+            <h1><legend><%= title %></legend></h1>
 
         <div class="control-group">
             <label class="control-label">Prosjektnavn</label>
-- 
cgit v1.2.3