merged conflicts

app.js

@@ -46,6 +46,8 @@ app.configure('development', function(){
 app.get('/', routes.index);
 app.get('/signup', routes.showSignup);
 app.post('/signup', routes.processSignup);
+app.get('/login', routes.login);
+app.post('/userpage', routes.userPage);
 
 http.createServer(app).listen(app.get('port'), function(){
   console.log("Express server listening on port " + app.get('port'));

public/javascripts/signup.js

@@ -0,0 +1,25 @@
+(function () {
+	var el = '#signup',
+		$el = $('#signup');
+
+	/**
+	 * Createa an md5 based on the email as the gvatar specifictaion says.
+	 */
+	function createImageHash(str) {
+	    var result = '';
+
+	    str = str.trim().toLowerCase();
+
+	    if (str) {
+	        result = $.MD5(str);
+	    }
+
+	    return result;
+	}
+
+	$(document).ready(function() {
+		$('#txtEmail', el).blur(function() {
+			$('#profilePicture').attr('src', 'http://www.gravatar.com/avatar/' + createImageHash($(this).val()));
+		});
+	});
+}());

routes/index.js

@@ -23,7 +23,7 @@ exports.processSignup = function(req, res) {
 		},
 		email: req.body.txtEmail,
 		phone: req.body.txtPhone,
-		biography: req.body.biography 
+		biography: req.body.txtBiography 
 	});
 
 	user.save(function(err, user) {
@@ -32,6 +32,45 @@ exports.processSignup = function(req, res) {
 			errors.push(err);
 		}
 
-		res.render('signup', { title: 'Signup Successful', errors: errors, scripts: ['javascripts/signup.js'] });
-	});	
+		res.render('userpage', {title: 'Signup Successful', errors: errors,
+				       userName: user.username,
+					firstName: user.name.first,
+					lastName: user.name.last,
+					biography: user.biography,
+					scripts: ['javascripts/signup.js'] });
+	});
+
+};
+
+exports.login = function(req, res) {
+
+  res.render('login', {title: 'Login', errors: []});  
+};
+
+exports.userPage = function(req, res) {
+
+    var reqUserName = req.body.txtUserName;
+    var reqPassword = req.body.txtPassword;
+
+    db.models.User.findOne({username: reqUserName,
+			   password: reqPassword}, function(err, user){ 
+
+					   if(err) {
+					       console.log(err);
+					       res.send(500, "error");					       
+					       return;
+					   }
+
+					   if(user) {
+					       res.render('userpage', {title: 'Title', errors: [],
+								      userName: user.username,
+								      firstName: user.name.first,
+								      lastName: user.name.last,
+								      biography: user.biography});
+					       return;
+					   } else {
+					       res.render('login', {title: 'Title', errors: ['Username/Password invalid']});
+					       return;
+					   }
+				});
 };

views/footer.ejs

@@ -2,7 +2,6 @@
 		</footer>
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 		<script src="/javascripts/jquery.md5.mini.js"></script>
-		<%= scripts %>
 		<% for(var i = 0; i < scripts.length; i++) { %>
 				<script src="<%= scripts[i] %>"></script>
 		<% } %>

views/login.ejs

@@ -0,0 +1,14 @@
+<%- include header %>
+<% if (errors.length > 0) { %>
+<p><%= errors %></p>
+<% } else { %>
+	
+<% } %>
+
+
+<form method="post" action="/userpage">
+	<label for="txtUserName">Username:</label><input id="txtUserName" name="txtUserName" type="text" />
+	<label for="txtPassword">Password:</label><input id="txtPassword" name="txtPassword" type="text" />
+	<button type="submit">Login</button>
+</form>
+<%- include footer %>

views/login.ejs~

@@ -0,0 +1,16 @@
+<%- include header %>
+<% if (errors.length > 0) { %>
+<p><%= errors %></p>
+<% } else { %>
+	<p>Thank you for signing up, you are awesome :).</p>
+<% } %>
+<form method="post" action="/signup">
+	<label for="txtFirstName">First name:</label><input id="txtFirstName" name="txtFirstName" type="text" />
+	<label for="txtLastName">Last name:</label><input id="txtLastName" name="txtLastName" type="text" />
+	<label for="txtEmail">Email:</label><input id="txtEmail" name="txtEmail" type="text" />
+	<label for="txtPhone">Phone:</label><input id="txtPhone" name="txtPhone" type="text" />
+	<label for="txtBiography">Biography</label><textarea></textarea>
+	<img width="50" height="50" />
+	<button type="submit">Signup</button>
+</form>
+<%- include footer %>

views/signup.ejs

@@ -9,8 +9,8 @@
 	<label for="txtLastName">Last name:</label><input id="txtLastName" name="txtLastName" type="text" />
 	<label for="txtEmail">Email:</label><input id="txtEmail" name="txtEmail" type="email" />
 	<label for="txtPhone">Phone:</label><input id="txtPhone" name="txtPhone" type="text" />
-	<label for="txtBiography">Biography</label><textarea></textarea>
-	<img id="profilePicture" src="" width="50" height="50" />
+	<label for="txtBiography">Biography</label><textarea id="txtBiography" name="txtBiography"></textarea>
+	<img width="50" height="50" src="http://www.gravatar.com/avatar/" />
 	<button type="submit">Signup</button>
 </form>
 <%- include footer %>

views/userpage.ejs

@@ -0,0 +1,51 @@
+<%- include header %>
+<% if (errors.length > 0) { %>
+<p><%= errors %></p>
+<% } else { %>
+	<p>You are Logged in</p>
+<% } %>
+
+<h1><%= firstName %> <%= lastName %></h1>
+
+<h3>Biography</h3>
+<div id="userBio">
+  <%= biography %>
+</div>
+
+<div>
+
+<form>
+
+<div>
+<label for="txtWhatAdd">Username:</label>
+<select id="whatAdd" type="select">
+  <option name="Photo">Photo</option>
+</select>
+</div>
+
+<div>
+  <label for="txtPhotoName">Name:</label><input id="txtPhotoName" name="txtPhotoName" type="text" />
+</div>
+
+<div>
+  <label for="txtUserName">Username:</label><input id="txtUserName" name="txtUserName" type="text" />
+</div>
+<div id="imgPhoto"> </div>
+
+<div>
+  <button type="submit">Upload Photo</button>
+</div>
+
+<div>
+  <label for="txtDescription">Description:</label><textarea id="txtDescription" name="txtDescription"></textarea>
+</div>
+
+<div>
+  <button type="submit">Submit</button>
+</div>
+
+</form>
+
+</div>
+
+<%- include footer %>

views/userpage.ejs~

@@ -0,0 +1,16 @@
+<%- include header %>
+<% if (errors.length > 0) { %>
+<p><%= errors %></p>
+<% } else { %>
+	<p>Thank you for signing up, you are awesome :).</p>
+<% } %>
+<form method="post" action="/signup">
+	<label for="txtFirstName">First name:</label><input id="txtFirstName" name="txtFirstName" type="text" />
+	<label for="txtLastName">Last name:</label><input id="txtLastName" name="txtLastName" type="text" />
+	<label for="txtEmail">Email:</label><input id="txtEmail" name="txtEmail" type="text" />
+	<label for="txtPhone">Phone:</label><input id="txtPhone" name="txtPhone" type="text" />
+	<label for="txtBiography">Biography</label><textarea></textarea>
+	<img width="50" height="50" />
+	<button type="submit">Signup</button>
+</form>
+<%- include footer %>