From cb8032b6c4969c8d96889301d0e96d4e0340225f Mon Sep 17 00:00:00 2001
From: Joshua Gleitze <git@joshuagleitze.de>
Date: Thu, 3 Dec 2015 22:34:33 +0100
Subject: [PATCH] login form in navbar

---
 index.html                             | 21 +++++++++++++++------
 js/controllers/LoginController.js      | 22 ++++++++++++++++++++++
 js/controllers/NavigationController.js | 10 ----------
 3 files changed, 37 insertions(+), 16 deletions(-)
 delete mode 100644 js/controllers/NavigationController.js
diff --git a/index.html b/index.html
index bab6ba8..a2985c3 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
 	<script src="js/routeProvider.js"></script>
 	<script src="js/translateProvider.js"></script>
 	<script src="js/controllers/RegisterController.js"></script>
-	<script src="js/controllers/NavigationController.js"></script>
+	<script src="js/controllers/LoginController.js"></script>
 	<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="bower_components/bootstrap-social/bootstrap-social.css" />
 	<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" />
@@ -32,15 +32,24 @@
 <body>
 
 	<div class="container">
-		<nav class="navbar navbar-default" ng-controller="NavigationController as ctrl">
+		<nav class="navbar navbar-default">
 			<div class="container-fluid">
 				<div class="navbar-header">
 					<a class="navbar-brand" href="http://come2.help/">come2.help</a>
 				</div>
-				<div class="collapse navbar-collapse">
-					<ul class="nav navbar-nav navbar-right" ng-show="ctrl.authenticated()">
-						<li><a href="" ng-click="ctrl.logout()">{{ 'Logout' | translate }}</a></li>
-					</ul>
+				<div class="navbar-right" ng-controller="LoginController as ctrl">
+					<form class="navbar-form" ng-hide="ctrl.authenticated()" ng-submit="ctrl.login()">
+						<div class="form-group">
+							<label class="sr-only" for="login-email">{{ 'Email' | translate}}</label>
+							<input type="email" class="form-control" id="login-email" ng-bind="ctrl.user.email" placeholder="{{ 'Email' | translate}}">
+						</div>
+						<div class="form-group">
+							<label class="sr-only" for="login-password">{{ 'Password' | translate}}</label>
+							<input type="password" class="form-control col-xs-4" id="login-password" ng-bind="ctrl.user.password" placeholder="{{ 'Password' | translate }}">
+						</div>
+						<button type="submit" class="btn btn-default btn-success">{{ 'Log in' | translate }}</button>
+					</form>
+					<button type="button" href="" ng-click="ctrl.logout()" class="btn navbar-btn btn-link" ng-show="ctrl.authenticated()">{{ 'Logout' | translate }}</button>
 				</div>
 			</div>
 		</nav>
diff --git a/js/controllers/LoginController.js b/js/controllers/LoginController.js
index e69de29..7170300 100644
--- a/js/controllers/LoginController.js
+++ b/js/controllers/LoginController.js
@@ -0,0 +1,22 @@
+angular.module('Come2HelpApp')
+.controller('LoginController', ['$auth', '$location', function($auth, $location) {
+	var vm = this;
+
+	vm.credentials = {};
+
+	vm.login = function() {
+		// User transport object
+		var transUser = {
+			email: vm.user.email || '',
+			password: vm.user.password || ''
+		};
+		$auth.login(transUser);
+	};
+
+	vm.authenticated = $auth.isAuthenticated.bind($auth);
+
+	vm.logout = function() {
+		$auth.removeToken();
+		$location.path('/');
+	};
+}]);
\ No newline at end of file
diff --git a/js/controllers/NavigationController.js b/js/controllers/NavigationController.js
deleted file mode 100644
index dbb4801..0000000
--- a/js/controllers/NavigationController.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module('Come2HelpApp')
-.controller('NavigationController', ['$auth', '$location', function($auth, $location) {
-	var vm = this;
-
-	vm.authenticated = $auth.isAuthenticated.bind($auth);
-	vm.logout = function() {
-		$auth.removeToken();
-		$location.path('/');
-	};
-}]);
\ No newline at end of file
