last commit http

app/app.config.js

@@ -1,28 +1,31 @@
-app.run(function($rootScope, $location) {
-	$rootScope.$on('$routeChangeSuccess', function(){
-		$rootScope.currentMenuItem = $location.path() || '/home';
-	})
-})
-// check authorization
-app.config(['$httpProvider', function($httpProvider) {
-	$httpProvider.interceptors.push(['$q', '$location', function($q, $location) {
-		return {
-			request: function(config) {
-				config.headers = config.headers || {};
-
-				if (localStorage.getItem('authToken')) {
-					config.headers.Authorization = 'Bearer ' + localStorage.getItem('authToken');
-				}
-
-				return config;
-			},
-			responseError: function(response) {
-				if (response.status === 401) {
-					$location.path('/');
-				}
-
-				return $q.reject(response);
-			}
-		};
-	}]);
+app.run(function($rootScope, $location) {
+	$rootScope.$on('$routeChangeSuccess', function() {
+		$rootScope.currentMenuItem = $location.path() || '/home';
+	});
+
+});
+
+// check authorization
+app.config(['$httpProvider', function($httpProvider) {
+
+	$httpProvider.interceptors.push(['$q', '$location', function($q, $location) {
+		return {
+			request: function(config) {
+				config.headers = config.headers || {};
+	
+				if (localStorage.getItem('authToken')) {
+					config.headers.Authorization = 'Bearer ' + localStorage.getItem('authToken');
+				}
+
+				return config;
+			},
+			responseError: function(response) {
+				if (response.status === 401) {
+					$location.path('/');
+				}
+
+				return $q.reject(response);
+			}
+		};
+	}]);
 }]);

app/app.module.js

@@ -1 +1,3 @@
-var app = angular.module('MyApp', ['ngRoute']);
+var app = angular.module('fea5', [
+	'ngRoute'
+	]);

app/app.routes.js

@@ -1,22 +1,22 @@
-app.config(function($routeProvider,$locationProvider) {
-	$locationProvider.hashPrefix('')
-
-	$routeProvider
-		.when('/', {
-			templateUrl: 'app/views/home.template.html',
-			// controller: 'Home'
-		})
-		.when('/books',{
-			templateUrl: 'app/views/books-list.template.html',
-			controller: 'BooksList'
-		})
-		.when('/books/:id',{
-			templateUrl: 'app/views/books-details.template.html',
-			controller: 'BookDetails'
-		})
-		.when('/login',{
-			templateUrl: 'app/views/login.template.html',
-			controller: 'Login'
-		})
-		.otherwise('/')
+app.config(function($routeProvider, $locationProvider) {
+	$locationProvider.hashPrefix('');
+
+	$routeProvider
+	.when('/', {
+		templateUrl: 'app/views/home.template.html',
+		/*controller: 'Home'*/
+	})
+	.when('/login', {
+		templateUrl: 'app/views/login.template.html',
+		controller: 'Login'
+	})
+	.when('/books', {
+		templateUrl: 'app/views/books-list.template.html',
+		controller: 'BooksList'
+	})
+	.when('/books/:id', {
+		templateUrl: 'app/views/books-details.template.html',
+		controller: 'BookDetails'
+	})
+	.otherwise('/');
 })

app/constant/webApi.const.js

@@ -1,3 +0,0 @@
-app.constant('webApi',{
-    DOMAIN: 'http://helloworld.filonitta.fe4.a-level.com.ua'
-})

app/constants/webApi.com.js

@@ -0,0 +1,3 @@
+app.constant('webApi', {
+	DOMAIN: 'http://helloworld.filonitta.fe4.a-level.com.ua'
+});

app/controllers/bookDetails.js

@@ -1,8 +0,0 @@
-(function(){
-    'use strict';
-    app.controller('BookDetails', ['$scope','books.repository', '$routeParams',function ($scope, booksRepository, $routeParams) {
-       booksRepository.getBookById($routeParams.id).then(function(response){
-           
-       }) 
-    }])
-})()

app/controllers/bookdetails.controller.js

@@ -0,0 +1,16 @@
+(function ()
+{
+    'use strict';
+
+    app.controller('BookDetails', ['$scope', 'books.repository', '$routeParams', function ($scope, booksRepository, $routeParams)
+            {
+                booksRepository.getBookById($routeParams.id)
+                .then(function(response) {
+                    console.log(response.data);
+                }, function(error) {
+                    alert(error)}
+                    )
+            }
+        ]);
+}
+)();

app/controllers/books-list.controller.js

@@ -1,24 +0,0 @@
-(function() {
-	'use strict';
-	app.controller('BooksList', ['$scope','books.repository',function($scope, booksRepository){
-		$scope.sortFild = 'title';
-		$scope.sortBy = function(field){
-			$scope.sortFild = ($scope.sortFild === field)? '-'+ field : field;
-		};
-		$scope.deleteBook = function(index){
-			console.log(index)
-			console.log($scope.books[0])
-			for (var i = 0; i < $scope.books.length; i++) {
-				if (index === $scope.books[i].id) {
-					$scope.books.splice(i,1);
-				}
-			}
-		}
-		
-		booksRepository.getBooks().then(function(response){
-			$scope.books = response.data;
-		}, function(error){
-			
-		});
-	}])
-})()

app/controllers/bookslist.controller.js

@@ -0,0 +1,39 @@
+(function ()
+{
+    'use strict';
+
+    app.controller('BooksList', ['$scope', 'books.repository', function ($scope, booksRepository)
+            {
+                $scope.sortField = 'title';
+
+                $scope.sortBy = function (field)
+                {
+                    if ($scope.sortField == field)
+                    {
+                        $scope.sortField = '-' + field;
+                    }
+                    else
+                    {
+                        $scope.sortField = field;
+                    }
+                };
+
+                $scope.deleteBook = function (book)
+                {
+                    $scope.books.splice($scope.books.indexOf(book), 1);
+                };
+
+                booksRepository.getBooks()
+                .then(function (response)
+                {
+                    $scope.books = response.data;
+                }, function (error)
+                {
+                    alert(error);
+                }
+                );
+            }
+        ]);
+
+}
+)();

app/controllers/header.controller.js

@@ -1,8 +1,14 @@
-(function() {
-	'use strict';
-
-	app.controller('Header', function($scope){
-		
-
-	})
-})();
+(function ()
+{
+    'use strict';
+
+    app.controller('Header', function ($scope)
+    {
+        $scope.isLogged = function() {
+        	return localStorage.getItem('authToken') ? true : false;
+        };
+    }
+    );
+
+}
+)();

app/controllers/login.controller.js

@@ -1,9 +1,29 @@
-(function(){
-    app.controller('Login', ['$scope','account.repository', function($scope, accountRepository){
-        $scope.user = {
-            login: 'admin@gmail.com',
-            password: 'qQ1!1111'
-        }
-        $scope.login
-    }])
-})()
+(function ()
+{
+    'use strict';
+
+    app.controller('Login', ['$scope', 'account.repository', '$location', function ($scope, accountRepository, $location)
+            {
+                $scope.user =
+                {
+                    login: 'admin@gmail.com',
+                    password: 'qQ1!1111'
+                };
+
+                $scope.login = function ()
+                {
+                    accountRepository.login($scope.user)
+                    .then(function (response)  {
+                        $location.path('/');
+                        localStorage.setItem('authToken', response.data.authToken);
+                        //console.log(localStorage.authToken);
+                    }, function (error)
+                    {
+                        alert(error)
+                    }
+                    )
+                };
+            }
+        ]);
+}
+)();

app/controllers/main.controller.js

@@ -1,8 +1,13 @@
-(function() {
-	'use strict';
-
-	app.controller('Main', function($scope){
-		
-
-	})
-})();
+(function ()
+{
+    'use strict';
+
+    app.controller('Main', function ($scope)
+    {
+        
+
+    }
+    );
+
+}
+)();

app/services/account.factory.js

@@ -1,15 +1,16 @@
-(function(){
-    'use strict';
-    app.factory('account.repository', function(webApi, $http){
-        return {
-            getBooks: _getBooks,
-            getBookById: _getBookById
-        }
-        function _getBooks(){
-            return $http.get(webApi.DOMAIN + '/api/v2/books')
-        }
-        function _getBookById(id){
-            return $http.get(webApi.DOMAIN + '/api/v2/books/' + id)
-        }
-    })
-})()
+(function() {
+
+'use strict';
+
+app.factory('account.repository', ['webApi', '$http', function(webApi, $http) {
+	return {
+		login: _login,
+	};
+
+	function _login(data) {
+		return $http.post(webApi.DOMAIN + '/api/v2/login', data);
+	}
+
+}]);
+
+})();

app/services/books.factory.js

@@ -1,15 +1,22 @@
-(function(){
-    'use strict';
-    app.factory('books.repository', function(webApi, $http){
-        return {
-            getBooks: _getBooks,
-            getBookById: _getBookById
-        }
-        function _getBooks(){
-            return $http.get(webApi.DOMAIN + '/api/v2/books')
-        }
-        function _getBookById(id){
-            return $http.get(webApi.DOMAIN + '/api/v2/books/' + id)
-        }
-    })
-})()
+(function() {
+
+'use strict';
+
+app.factory('books.repository', ['webApi', '$http', function(webApi, $http) {
+	return {
+		getBooks: _getBooks,
+		getBookById: _getBookById,
+		//updateBookById: _updateBookById
+	};
+
+	function _getBooks() {
+		return $http.get(webApi.DOMAIN + '/api/v2/books');
+	}
+
+	function _getBookById(id) {
+		return $http.get(webApi.DOMAIN + '/api/v2/books/' + id);
+	}
+
+}]);
+
+})();

app/views/books-details.template.html

@@ -1 +1 @@
-<h1>Her</h1>
+<h2>Book Details</h2>

app/views/books-list.teamplate.html

@@ -1,31 +0,0 @@
-<div ng-controller='BooksList' class="container">
-		<div class="page-header">
-			<h1>Books</h1>
-		</div>
-		<div class="page-boody">
-			<input type="text" ng-model='searchString' placeholder="Filter" class="form-control">
-			<table class="table table-hover container">
-				<thead>
-					<td ng-click='sortBy("title")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "title", "glyphicon glyphicon-chevron-down": sortFild === "-title"}'></i>Title</td>
-					<td ng-click='sortBy("author")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "author", "glyphicon glyphicon-chevron-down": sortFild === "-author"}'></i>Author</td>
-					<td ng-click='sortBy("date")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "date", "glyphicon glyphicon-chevron-down": sortFild === "-date"}'></i>Date</td>
-					<td ng-click='sortBy("cost")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "cost", "glyphicon glyphicon-chevron-down": sortFild === "-cost"}'></i>Price</td>
-					<td ng-click='sortBy("rate")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "rate", "glyphicon glyphicon-chevron-down": sortFild === "-rate"}'></i>Rate</td>
-					<td></td>
-				</thead>
-				<tbody>
-					<tr ng-repeat='item in books | orderBy:sortFild  | filter: searchString'>
-						<td>{{item.title}}</td>
-						<td>{{item.author | uppercase}}</td>
-						<td>{{item.date | date: 'longDate'}}</td>
-						<td>{{item.cost}}</td>
-						<td>{{item.rate | number : 1}}</td>
-						<td>
-							<a href="#/books/{{book.id}}" class="btn btn-info btn-xs"><i class="glyphicon glyphicon-eye-open"></i></a>
-							<button class="btn btn-danger" ng-click='deleteBook(item.id)'></button>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</div>

app/views/books-list.template.html

@@ -1,30 +1,31 @@
-<div class="container">
-		<div class="page-header">
-			<h1>Books</h1>
-		</div>
-		<div class="page-boody">
-			<input type="text" ng-model='searchString' placeholder="Filter" class="form-control">
-			<table class="table table-hover container">
-				<thead>
-					<td ng-click='sortBy("title")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "title", "glyphicon glyphicon-chevron-down": sortFild === "-title"}'></i>Title</td>
-					<td ng-click='sortBy("author")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "author", "glyphicon glyphicon-chevron-down": sortFild === "-author"}'></i>Author</td>
-					<td ng-click='sortBy("date")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "date", "glyphicon glyphicon-chevron-down": sortFild === "-date"}'></i>Date</td>
-					<td ng-click='sortBy("cost")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "cost", "glyphicon glyphicon-chevron-down": sortFild === "-cost"}'></i>Price</td>
-					<td ng-click='sortBy("rate")'><i class="glyphicon" ng-class='{"glyphicon glyphicon-chevron-up": sortFild === "rate", "glyphicon glyphicon-chevron-down": sortFild === "-rate"}'></i>Rate</td>
-					<td></td>
-				</thead>
-				<tbody>
-					<tr ng-repeat='item in books | orderBy:sortFild  | filter: searchString'>
-						<td>{{item.title}}</td>
-						<td>{{item.author | uppercase}}</td>
-						<td>{{item.date | date: 'longDate'}}</td>
-						<td>{{item.cost}}</td>
-						<td>{{item.rate | number : 1}}</td>
-						<td>
-							<button class="btn btn-danger" ng-click='deleteBook(item.id)'></button>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</div>
+<div class="page-header">
+  <h1>Books list</h1>
+</div>
+<input type="text" placeholder="Filter" class="form-control" ng-model="searchString" /><br />
+<table class="table table-hover">
+  <thead>
+    <tr>
+      <th ng-click="sortBy('title')"><i class="glyphicon" ng-class="{'glyphicon-chevron-up' : sortField === 'title', 'glyphicon-chevron-down' : sortField === '-title'}"></i> Title</th>
+      <th ng-click="sortBy('author')"><i class="glyphicon" ng-class="{'glyphicon-chevron-up' : sortField === 'author', 'glyphicon-chevron-down' : sortField === '-author'}"></i>Author</th>
+      <th ng-click="sortBy('date')"><i class="glyphicon" ng-class="{'glyphicon-chevron-up' : sortField === 'date', 'glyphicon-chevron-down' : sortField === '-date'}"></i>Date</th>
+      <th ng-click="sortBy('cost')"><i class="glyphicon" ng-class="{'glyphicon-chevron-up' : sortField === 'cost', 'glyphicon-chevron-down' : sortField === '-cost'}"></i>Cost</th>
+      <th ng-click="sortBy('rate')"><i class="glyphicon" ng-class="{'glyphicon-chevron-up' : sortField === 'rate', 'glyphicon-chevron-down' : sortField === '-rate'}"></i>Rate</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr ng-repeat="book in books | orderBy:sortField | filter: searchString track by $index">
+      <td>{{book.title}}</td>
+      <td>{{book.author | uppercase}}</td>
+      <td>{{book.date | date: 'longDate'}}</td>
+      <td>{{book.cost | currency}}</td>
+      <td>{{book.rate | number : 1 }}</td>
+      <td>
+        <a href="#/books/{{book.id}}" class="btn btn-info btn-xs"><i class="glyphicon glyphicon-eye-open"></i></a>
+        <button class="btn-danger btn-xs" ng-click="deleteBook(book)"><i class="glyphicon glyphicon-trash"></i></button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<div class="text-center" ng-if="!books.length">
+  No Data
+</div>

app/views/footer.teamplate.html

@@ -1,5 +1,5 @@
-<footer class="navbar-default navbar-fixed-bottom p-t-5 p-b-40">
-    <div class="container">
-    	dasfgmlsd
-    </div>
+<footer class="navbar-default navbar-fixed-bottom p-t-5 p-b-40">
+    <div class="container">
+    	footer
+    </div>
 </footer>

app/views/header.template.html

@@ -1,16 +1,18 @@
-<nav class="navbar navbar-default" role="navigation" ng-controller="Header">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <a class="navbar-brand" href="#">AngularJS</a>
-        </div>
-        <div id="navbar" class="navbar-collapse collapse in" aria-expanded="true" aria-hidden="false">
-            <ul class="nav navbar-nav">
-               <li ng-class="{active: currentMenuItem === '/'}"><a href="#/">Home</a></li>
-               <li ng-class="{active: currentMenuItem === '/books'}"><a href="#/books">Books</a></li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-               <li></li>
-            </ul>
-        </div>
-    </div>
+<nav class="navbar navbar-default" role="navigation" ng-controller="Header">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="#">AngularJS</a>
+        </div>
+        <div id="navbar" class="navbar-collapse collapse in" aria-expanded="true" aria-hidden="false">
+            <ul class="nav navbar-nav">
+               <li ng-class="{active: currentMenuItem === '/'}"><a href="#/">Home</a></li>
+               <li ng-class="{active: currentMenuItem === '/books'}"><a href="#/books">Books</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+               <li ng-if="!isLogged()" ng-class="{active: currentMenuItem == '/login'}">
+                 <a href="#/login">Authorization</a>
+               </li>
+            </ul>
+        </div>
+    </div>
 </nav>

app/views/home.template.html

@@ -1,3 +1 @@
-<div class="container text-center">
-	<h1>Nu Tipo Knigi</h1>
-</div>
+<h2>Our home page</h2>

index.html

@@ -1,30 +1,31 @@
 <!DOCTYPE html>
-<html ng-app='MyApp'>
+<html lang="en" ng-app="fea5" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-	<meta charset="utf-8">
-	<title>My To Do Angular</title>
-	<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
-	<link rel="stylesheet" type="text/css" href="./css/style.css">
+  <meta charset="UTF-8" />
+  <title>Angular JS</title>
+  <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="css/style.css">
 </head>
-<body>
-	<div class="container" ng-controller='Main'>
-		<ng-include src='"app/views/header.template.html"'></ng-include>
-		<ng-view></ng-view>
-		<!-- <ng-include src='"app/views/books-list.teamplate.html"'></ng-include> -->
-		<ng-include src='"app/views/footer.teamplate.html"'></ng-include>
-	</div>
-	<script type="text/javascript" src="./node_modules/angular/angular.js"></script>
-	<script type="text/javascript" src="./node_modules/angular-route/angular-route.min.js"></script>
-	<script type="text/javascript" src="app/app.module.js"></script>
-	<script type="text/javascript" src="app/constant/webApi.const.js"></script>
-	<script type="text/javascript" src="app/services/books.factory.js"></script>
-	<script type="text/javascript" src="app/services/account.factory.js"></script>
-	<script type="text/javascript" src="app/app.routes.js"></script>
-	<script type="text/javascript" src="app/app.config.js"></script>
-	<script type="text/javascript" src="app/controllers/books-list.controller.js"></script>
-	<script type="text/javascript" src="app/controllers/main.controller.js"></script>
-	<script type="text/javascript" src="app/controllers/header.controller.js"></script>
-	<script type="text/javascript" src="app/controllers/bookDetails.js"></script>
-	<script type="text/javascript" src="app/controllers/login.controller.js"></script>
-</body>
+	<body ng-controller="Main">
+	  <div class="container">	  
+	    <ng-include src="'app/views/header.template.html'"></ng-include>
+	    <div ng-view></div>	
+	    <div ng-include src="'app/views/footer.template.html'"></div>
+	  </div>
+
+	  <script src="node_modules/angular/angular.js"></script> 
+	  <script src="node_modules/angular-route/angular-route.min.js"></script>
+	  <script src="app/app.module.js"></script> 
+	  <script src="app/constants/webApi.com.js"></script>
+	  <script src="app/app.config.js"></script> 
+	  <script src="app/app.routes.js"></app>.js"></script> 
+	  <script src="app/controllers/main.controller.js"></script>
+	  <script src="app/controllers/bookslist.controller.js"></script>
+	  <script src="app/controllers/header.controller.js"></script>
+	  <script src="app/services/books.factory.js"></script>
+	  <script src="app/controllers/bookdetails.controller.js"></script>
+	  <script src="app/controllers/login.controller.js"></script>
+	  <script src="app/services/account.factory.js"></script>
+
+	</body>
 </html>