Skip to content

Commit bc21378

Browse files
cornflourbluecornflourblue
committed
Updated to Angular 1.6
Updated to Angular 1.6 and replaced deprecated $cookieStore service with $cookies
1 parent 7222a12 commit bc21378

File tree

7 files changed

+27
-21
lines changed

7 files changed

+27
-21
lines changed

‎app-content/app.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-

1+
a {
2+
cursor: pointer;
3+
}

‎app-services/authentication.service.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
.module('app')
66
.factory('AuthenticationService', AuthenticationService);
77

8-
AuthenticationService.$inject = ['$http', '$cookieStore', '$rootScope', '$timeout', 'UserService'];
9-
function AuthenticationService($http, $cookieStore, $rootScope, $timeout, UserService) {
8+
AuthenticationService.$inject = ['$http', '$cookies', '$rootScope', '$timeout', 'UserService'];
9+
function AuthenticationService($http, $cookies, $rootScope, $timeout, UserService) {
1010
var service = {};
1111

1212
service.Login = Login;
@@ -51,13 +51,18 @@
5151
}
5252
};
5353

54-
$http.defaults.headers.common['Authorization'] = 'Basic ' + authdata; // jshint ignore:line
55-
$cookieStore.put('globals', $rootScope.globals);
54+
// set default auth header for http requests
55+
$http.defaults.headers.common['Authorization'] = 'Basic ' + authdata;
56+
57+
// store user details in globals cookie that keeps user logged in for 1 week (or until they logout)
58+
var cookieExp = new Date();
59+
cookieExp.setDate(cookieExp.getDate() + 7);
60+
$cookies.putObject('globals', $rootScope.globals, { expires: cookieExp });
5661
}
5762

5863
function ClearCredentials() {
5964
$rootScope.globals = {};
60-
$cookieStore.remove('globals');
65+
$cookies.remove('globals');
6166
$http.defaults.headers.common.Authorization = 'Basic';
6267
}
6368
}

‎app.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
.otherwise({ redirectTo: '/login' });
3131
}
3232

33-
run.$inject = ['$rootScope', '$location', '$cookieStore', '$http'];
34-
function run($rootScope, $location, $cookieStore, $http) {
33+
run.$inject = ['$rootScope', '$location', '$cookies', '$http'];
34+
function run($rootScope, $location, $cookies, $http) {
3535
// keep user logged in after page refresh
36-
$rootScope.globals = $cookieStore.get('globals') || {};
36+
$rootScope.globals = $cookies.getObject('globals') || {};
3737
if ($rootScope.globals.currentUser) {
38-
$http.defaults.headers.common['Authorization'] = 'Basic ' + $rootScope.globals.currentUser.authdata; // jshint ignore:line
38+
$http.defaults.headers.common['Authorization'] = 'Basic ' + $rootScope.globals.currentUser.authdata;
3939
}
4040

4141
$rootScope.$on('$locationChangeStart', function (event, next, current) {

‎home/home.view.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ <h3>All registered users:</h3>
44
<ul>
55
<li ng-repeat="user in vm.allUsers">
66
{{user.username}} ({{user.firstName}} {{user.lastName}})
7-
- <a href="#" ng-click="vm.deleteUser(user.id)">Delete</a>
7+
- <a ng-click="vm.deleteUser(user.id)">Delete</a>
88
</li>
99
</ul>
1010
<p>&nbsp;</p>
11-
<p><a href="#/login" class="btn btn-primary">Logout</a></p>
11+
<p><a href="#!/login" class="btn btn-primary">Logout</a></p>

‎index.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html ng-app="app">
33
<head>
44
<meta charset="utf-8" />
@@ -7,7 +7,6 @@
77
<link href="app-content/app.css" rel="stylesheet" />
88
</head>
99
<body>
10-
1110
<div class="jumbotron">
1211
<div class="container">
1312
<div class="col-sm-8 col-sm-offset-2">
@@ -18,17 +17,17 @@
1817
</div>
1918
<div class="credits text-center">
2019
<p>
21-
<a href="http://jasonwatmore.com/post/2015/03/10/AngularJS-User-Registration-and-Login-Example.aspx">AngularJS User Registration and Login Example</a>
20+
<a href="http://jasonwatmore.com/post/2015/03/10/angularjs-user-registration-and-login-example-tutorial">AngularJS User Registration and Login Example</a>
2221
</p>
2322
<p>
2423
<a href="http://jasonwatmore.com">JasonWatmore.com</a>
2524
</p>
2625
</div>
2726

28-
<script src="//code.jquery.com/jquery-2.0.3.min.js"></script>
29-
<script src="//code.angularjs.org/1.2.20/angular.js"></script>
30-
<script src="//code.angularjs.org/1.2.20/angular-route.js"></script>
31-
<script src="//code.angularjs.org/1.2.13/angular-cookies.js"></script>
27+
<script src="//code.jquery.com/jquery-3.1.1.min.js"></script>
28+
<script src="//code.angularjs.org/1.6.0/angular.min.js"></script>
29+
<script src="//code.angularjs.org/1.6.0/angular-route.min.js"></script>
30+
<script src="//code.angularjs.org/1.6.0/angular-cookies.min.js"></script>
3231

3332
<script src="app.js"></script>
3433
<script src="app-services/authentication.service.js"></script>

‎login/login.view.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h2>Login</h2>
1414
<div class="form-actions">
1515
<button type="submit" ng-disabled="form.$invalid || vm.dataLoading" class="btn btn-primary">Login</button>
1616
<img ng-if="vm.dataLoading" src="data:image/gif;base64,R0lGODlhEAAQAPIAAP///wAAAMLCwkJCQgAAAGJiYoKCgpKSkiH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAEAAQAAADMwi63P4wyklrE2MIOggZnAdOmGYJRbExwroUmcG2LmDEwnHQLVsYOd2mBzkYDAdKa+dIAAAh+QQJCgAAACwAAAAAEAAQAAADNAi63P5OjCEgG4QMu7DmikRxQlFUYDEZIGBMRVsaqHwctXXf7WEYB4Ag1xjihkMZsiUkKhIAIfkECQoAAAAsAAAAABAAEAAAAzYIujIjK8pByJDMlFYvBoVjHA70GU7xSUJhmKtwHPAKzLO9HMaoKwJZ7Rf8AYPDDzKpZBqfvwQAIfkECQoAAAAsAAAAABAAEAAAAzMIumIlK8oyhpHsnFZfhYumCYUhDAQxRIdhHBGqRoKw0R8DYlJd8z0fMDgsGo/IpHI5TAAAIfkECQoAAAAsAAAAABAAEAAAAzIIunInK0rnZBTwGPNMgQwmdsNgXGJUlIWEuR5oWUIpz8pAEAMe6TwfwyYsGo/IpFKSAAAh+QQJCgAAACwAAAAAEAAQAAADMwi6IMKQORfjdOe82p4wGccc4CEuQradylesojEMBgsUc2G7sDX3lQGBMLAJibufbSlKAAAh+QQJCgAAACwAAAAAEAAQAAADMgi63P7wCRHZnFVdmgHu2nFwlWCI3WGc3TSWhUFGxTAUkGCbtgENBMJAEJsxgMLWzpEAACH5BAkKAAAALAAAAAAQABAAAAMyCLrc/jDKSatlQtScKdceCAjDII7HcQ4EMTCpyrCuUBjCYRgHVtqlAiB1YhiCnlsRkAAAOwAAAAAAAAAAAA==" />
17-
<a href="#/register" class="btn btn-link">Register</a>
17+
<a href="#!/register" class="btn btn-link">Register</a>
1818
</div>
1919
</form>
2020
</div>

‎register/register.view.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2>Register</h2>
2424
<div class="form-actions">
2525
<button type="submit" ng-disabled="form.$invalid || vm.dataLoading" class="btn btn-primary">Register</button>
2626
<img ng-if="vm.dataLoading" src="data:image/gif;base64,R0lGODlhEAAQAPIAAP///wAAAMLCwkJCQgAAAGJiYoKCgpKSkiH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAEAAQAAADMwi63P4wyklrE2MIOggZnAdOmGYJRbExwroUmcG2LmDEwnHQLVsYOd2mBzkYDAdKa+dIAAAh+QQJCgAAACwAAAAAEAAQAAADNAi63P5OjCEgG4QMu7DmikRxQlFUYDEZIGBMRVsaqHwctXXf7WEYB4Ag1xjihkMZsiUkKhIAIfkECQoAAAAsAAAAABAAEAAAAzYIujIjK8pByJDMlFYvBoVjHA70GU7xSUJhmKtwHPAKzLO9HMaoKwJZ7Rf8AYPDDzKpZBqfvwQAIfkECQoAAAAsAAAAABAAEAAAAzMIumIlK8oyhpHsnFZfhYumCYUhDAQxRIdhHBGqRoKw0R8DYlJd8z0fMDgsGo/IpHI5TAAAIfkECQoAAAAsAAAAABAAEAAAAzIIunInK0rnZBTwGPNMgQwmdsNgXGJUlIWEuR5oWUIpz8pAEAMe6TwfwyYsGo/IpFKSAAAh+QQJCgAAACwAAAAAEAAQAAADMwi6IMKQORfjdOe82p4wGccc4CEuQradylesojEMBgsUc2G7sDX3lQGBMLAJibufbSlKAAAh+QQJCgAAACwAAAAAEAAQAAADMgi63P7wCRHZnFVdmgHu2nFwlWCI3WGc3TSWhUFGxTAUkGCbtgENBMJAEJsxgMLWzpEAACH5BAkKAAAALAAAAAAQABAAAAMyCLrc/jDKSatlQtScKdceCAjDII7HcQ4EMTCpyrCuUBjCYRgHVtqlAiB1YhiCnlsRkAAAOwAAAAAAAAAAAA==" />
27-
<a href="#/login" class="btn btn-link">Cancel</a>
27+
<a href="#!/login" class="btn btn-link">Cancel</a>
2828
</div>
2929
</form>
3030
</div>

0 commit comments

Comments
 (0)