Skip to content

Commit aac49d3

Browse files
movibemovibe
committed
Module User Refactor
1 parent 334f045 commit aac49d3

16 files changed

Lines changed: 141 additions & 103 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ npm-debug.log
1111
docs
1212
downloaded
1313
docular_generated
14+
client/coverage

‎Gruntfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module.exports = function (grunt) {
8282
// Environment targets
8383
development: {
8484
options: {
85-
dest: '<%= yeoman.app %>/scripts/config.js'
85+
dest: '<%= yeoman.app %>/js/config.js'
8686
},
8787
constants: {
8888
ENV: {
@@ -93,7 +93,7 @@ module.exports = function (grunt) {
9393
},
9494
production: {
9595
options: {
96-
dest: '<%= yeoman.app %>/scripts/config.js'
96+
dest: '<%= yeoman.app %>/js/config.js'
9797
},
9898
constants: {
9999
ENV: {

‎client/app/index.html‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,27 @@
9696
<!--CORE-->
9797
<script src="modules/core/core.module.js"></script>
9898
<script src="modules/core/config/core.routes.js"></script>
99-
<script src="modules/core/config/core.auth.js"></script>
10099
<script src="modules/core/controllers/home.ctrl.js"></script>
101100
<script src="modules/core/controllers/main.ctrl.js"></script>
102101
<script src="modules/core/controllers/layout.ctrl.js"></script>
103-
<script src="modules/core/controllers/login.ctrl.js"></script>
104102
<script src="modules/core/controllers/router.ctrl.js"></script>
105103
<script src="modules/core/directives/admin-box.js"></script>
106104
<script src="modules/core/directives/admin-form.js"></script>
107105
<script src="modules/core/directives/admin-header.js"></script>
108106
<script src="modules/core/directives/date.js"></script>
109107
<script src="modules/core/directives/home.js"></script>
110-
<script src="modules/core/directives/login.js"></script>
111-
<script src="modules/core/directives/register.js"></script>
112108
<script src="modules/core/directives/small-box.directive.js"></script>
113109
<script src="modules/core/directives/navbar.js"></script>
114-
<script src="modules/core/services/appauth.service.js"></script>
110+
<!--Users-->
111+
<script src="modules/users/user.module.js"></script>
112+
<script src="modules/users/config/users.auth.js"></script>
113+
<script src="modules/users/config/users.routes.js"></script>
114+
<script src="modules/users/directives/login.js"></script>
115+
<script src="modules/users/directives/register.js"></script>
116+
<script src="modules/users/controllers/login.ctrl.js"></script>
117+
<script src="modules/users/controllers/register.ctrl.js"></script>
118+
<script src="modules/users/controllers/users.ctrl.js"></script>
119+
<script src="modules/users/services/appauth.service.js"></script>
115120
<!--About-->
116121
<script src="modules/about/about.module.js"></script>
117122
<script src="modules/about/controllers/about.controller.js"></script>
@@ -156,10 +161,7 @@
156161
<script src="modules/settings/settings.module.js"></script>
157162
<script src="modules/settings/config/settings.routes.js"></script>
158163
<script src="modules/settings/controllers/settings.ctrl.js"></script>
159-
<!--Users-->
160-
<script src="modules/users/user.module.js"></script>
161-
<script src="modules/users/config/users.routes.js"></script>
162-
<script src="modules/users/controllers/users.ctrl.js"></script>
164+
163165
<!-- endbuild -->
164166

165167
</body>

‎client/app/js/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
angular.module('config', [])
44

5-
.constant('ENV', {name:'production',apiUrl:'/api'})
5+
.constant('ENV', {name:'production',apiUrl:'http://0.0.0.0:3000/api/'})
66

77
;

‎client/app/modules/core/config/core.routes.js‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
angular.module ('com.module.core')
33
.config (function ($stateProvider, $urlRouterProvider) {
44
$stateProvider
5-
.state ('login', {
6-
url: '/login',
7-
template: '<login></login>',
8-
controller: 'LoginCtrl'
9-
}).state ('register', {
10-
url: '/register',
11-
template: '<register></register>',
12-
controller: 'LoginCtrl'
13-
}).state ('router', {
5+
.state ('router', {
146
url: '/router',
157
template: '<div class="lockscreen" style="height: 100%"></div>',
168
controller: 'RouteCtrl'
@@ -22,9 +14,9 @@ angular.module ('com.module.core')
2214
controller: 'MainCtrl'
2315
})
2416
.state ('app.home', {
25-
url: '',
26-
templateUrl: 'modules/core/views/home.html',
27-
controller: 'HomeCtrl'
28-
});
17+
url: '',
18+
templateUrl: 'modules/core/views/home.html',
19+
controller: 'HomeCtrl'
20+
});
2921
$urlRouterProvider.otherwise ('/router');
3022
});

‎client/app/modules/core/services/appauth.service.js‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

client/app/modules/core/config/core.auth.js renamed to client/app/modules/users/config/users.auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
angular.module ('com.module.core')
2+
angular.module ('com.module.users')
33
.config (function ($routeProvider, $httpProvider) {
44

55
// Intercept 401 responses and redirect to login screen

‎client/app/modules/users/config/users.routes.js‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
'use strict';
22
angular.module ('com.module.users')
33
.config (function ($stateProvider) {
4-
$stateProvider.state ('app.users', {
5-
abstract: true,
6-
url: '/users',
7-
templateUrl: 'modules/users/views/main.html',
8-
controller: 'UsersCtrl'
9-
}).state ('app.users.profile', {
10-
url: '/profile',
11-
templateUrl: 'modules/users/views/profile.html',
12-
controller: 'UsersCtrl'
13-
});
4+
$stateProvider
5+
.state ('login', {
6+
url: '/login',
7+
template: '<login></login>',
8+
controller: 'LoginCtrl'
149
})
10+
.state ('register', {
11+
url: '/register',
12+
template: '<register></register>',
13+
controller: 'RegisterCtrl'
14+
})
15+
.state ('app.users', {
16+
abstract: true,
17+
url: '/users',
18+
templateUrl: 'modules/users/views/main.html',
19+
controller: 'UsersCtrl'
20+
})
21+
.state ('app.users.profile', {
22+
url: '/profile',
23+
templateUrl: 'modules/users/views/profile.html',
24+
controller: 'UsersCtrl'
25+
});
26+
});

‎client/app/modules/users/controllers/login.ctrl.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
'use strict';
2+
/**
3+
* @ngdoc function
4+
* @name com.module.users.controller:LoginCtrl
5+
* @description Login Controller
6+
* @requires $scope
7+
* @requires $routeParams
8+
* @requires $location
9+
* Contrller for Login Page
10+
**/
11+
angular.module ('com.module.users')
12+
.controller ('LoginCtrl', function ($scope, $routeParams, $location, toasty, User, AppAuth) {
13+
$scope.credentials = {
14+
email: 'admin@admin.com',
15+
password: 'admin',
16+
rememberMe: true
17+
};
18+
19+
$scope.login = function () {
20+
$scope.loginResult = User.login ({
21+
include: 'user',
22+
rememberMe: $scope.credentials.rememberMe
23+
}, $scope.credentials,
24+
function () {
25+
var next = $location.nextAfterLogin || '/';
26+
$location.nextAfterLogin = null;
27+
AppAuth.currentUser = $scope.loginResult.user;
28+
toasty.pop.success ({title: 'Logged in', msg: 'You are logged in!', sound: false});
29+
if (next === '/login') {
30+
next = '/';
31+
}
32+
$location.path (next);
33+
},
34+
function (res) {
35+
$scope.loginError = res.data.error;
36+
}
37+
);
38+
};
39+
40+
41+
});

client/app/modules/core/controllers/login.ctrl.js renamed to client/app/modules/users/controllers/register.ctrl.js

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,15 @@
11
'use strict';
2-
angular.module ('com.module.core')
32
/**
4-
* @ngdoc function
5-
* @name com.module.core.controller:LoginCtrl
6-
* @description Login Controller
7-
* @requires $scope
8-
* @requires $routeParams
9-
* @requires $location
10-
* Contrller for Login Page
11-
**/
12-
.controller ('LoginCtrl', function ($scope, $routeParams, $location, toasty, User, AppAuth) {
13-
$scope.credentials = {
14-
email: 'admin@admin.com',
15-
password: 'admin',
16-
rememberMe: true
17-
};
18-
19-
$scope.login = function () {
20-
$scope.loginResult = User.login ({
21-
include: 'user',
22-
rememberMe: $scope.credentials.rememberMe
23-
}, $scope.credentials,
24-
function () {
25-
var next = $location.nextAfterLogin || '/';
26-
$location.nextAfterLogin = null;
27-
AppAuth.currentUser = $scope.loginResult.user;
28-
toasty.pop.success ({title: 'Logged in', msg: 'You are logged in!', sound: false});
29-
if (next === '/login') {
30-
next = '/';
31-
}
32-
$location.path (next);
33-
},
34-
function (res) {
35-
$scope.loginError = res.data.error;
36-
}
37-
);
38-
};
3+
* @ngdoc function
4+
* @name com.module.users.controller:RegisterCtrl
5+
* @description Login Controller
6+
* @requires $scope
7+
* @requires $routeParams
8+
* @requires $location
9+
* Controller for Register Page
10+
**/
11+
angular.module ('com.module.users')
12+
.controller ('RegisterCtrl', function ($scope, $routeParams, $location, toasty, User, AppAuth) {
3913

4014
$scope.registration = {
4115
firstName: '',

0 commit comments

Comments
 (0)