ngReorg - move dashboard-app/login out
This change will facilitate the removal of dashboard-app. Change-Id: Iab0f0c8018bc9bd2f8df124690da2316acb6c404 Partial-Bug: #1458697
This commit is contained in:
parent
b388adce93
commit
cd50373ce0
|
@ -52,6 +52,8 @@ module.exports = function(config){
|
|||
'horizon/js/angular/hz.api.module.js',
|
||||
'dashboard-app/dashboard-app.module.js',
|
||||
'dashboard-app/**/*.js',
|
||||
'auth/auth.module.js',
|
||||
'auth/login/login.module.js',
|
||||
'framework/framework.module.js',
|
||||
'framework/util/util.module.js',
|
||||
'framework/util/tech-debt/tech-debt.module.js',
|
||||
|
@ -60,6 +62,7 @@ module.exports = function(config){
|
|||
'framework/widgets/table/table.js',
|
||||
|
||||
// Catch-all for stuff that isn't required explicitly by others.
|
||||
'auth/**/!(*spec).js',
|
||||
'framework/**/!(*spec).js',
|
||||
|
||||
// Templates.
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
/**
|
||||
* Copyright 2015 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License. You may obtain
|
||||
* a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
angular.module('horizon.auth', [
|
||||
'horizon.auth.login'
|
||||
]);
|
||||
|
||||
})();
|
|
@ -16,18 +16,7 @@
|
|||
(function() {
|
||||
'use strict';
|
||||
|
||||
angular.module('horizon.dashboard-app.login', [])
|
||||
|
||||
/**
|
||||
* @ngdoc hzLoginCtrl
|
||||
* @description
|
||||
* controller for determining which
|
||||
* authentication method user picked.
|
||||
*/
|
||||
.controller('hzLoginCtrl', function($scope) {
|
||||
$scope.auth_type = 'credentials';
|
||||
})
|
||||
|
||||
angular.module('horizon.auth.login')
|
||||
/**
|
||||
* @ngdoc hzLoginFinder
|
||||
* @description
|
|
@ -0,0 +1,31 @@
|
|||
/**
|
||||
* Copyright 2015 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License. You may obtain
|
||||
* a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
angular.module('horizon.auth.login')
|
||||
|
||||
/**
|
||||
* @ngdoc hzLoginCtrl
|
||||
* @description
|
||||
* controller for determining which
|
||||
* authentication method user picked.
|
||||
*/
|
||||
.controller('hzLoginCtrl', function($scope) {
|
||||
$scope.auth_type = 'credentials';
|
||||
});
|
||||
|
||||
})();
|
|
@ -0,0 +1,21 @@
|
|||
/**
|
||||
* Copyright 2015 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License. You may obtain
|
||||
* a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
angular.module('horizon.auth.login', []);
|
||||
|
||||
})();
|
|
@ -20,7 +20,7 @@
|
|||
describe('hzLoginCtrl', function(){
|
||||
|
||||
var $controller;
|
||||
beforeEach(module('horizon.dashboard-app.login'));
|
||||
beforeEach(module('horizon.auth.login'));
|
||||
beforeEach(inject(function(_$controller_){
|
||||
$controller = _$controller_;
|
||||
}));
|
||||
|
@ -63,7 +63,7 @@
|
|||
'</fieldset>' +
|
||||
'</form>';
|
||||
|
||||
beforeEach(module('horizon.dashboard-app.login'));
|
||||
beforeEach(module('horizon.auth.login'));
|
||||
beforeEach(inject(function(_$compile_, _$rootScope_, _$timeout_){
|
||||
$compile = _$compile_;
|
||||
$rootScope = _$rootScope_;
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
angular.module('horizon.dashboard-app', [
|
||||
'horizon.framework',
|
||||
'horizon.dashboard-app.login',
|
||||
'horizon.auth',
|
||||
'hz.api',
|
||||
'ngCookies'].concat(angularModuleExtension))
|
||||
|
||||
|
|
|
@ -14,7 +14,11 @@
|
|||
<script src="{{ STATIC_URL }}horizon/lib/angular/lrdragndrop.js"></script>
|
||||
<script src="{{ STATIC_URL }}horizon/lib/angular/smart-table.js"></script>
|
||||
|
||||
<script src="{{ STATIC_URL }}dashboard-app/login/login.js"></script>
|
||||
<script src="{{ STATIC_URL }}auth/auth.module.js"></script>
|
||||
<script src="{{ STATIC_URL }}auth/login/login.module.js"></script>
|
||||
<script src="{{ STATIC_URL }}auth/login/login.controller.js"></script>
|
||||
<script src="{{ STATIC_URL }}auth/login/login-finder.directive.js"></script>
|
||||
|
||||
<script src='{{ STATIC_URL }}dashboard-app/controllers/namespace-controller.js'></script>
|
||||
|
||||
<script src='{{ STATIC_URL }}horizon/js/angular/hz.api.module.js'></script>
|
||||
|
|
|
@ -29,8 +29,12 @@ class ServicesTests(test.JasmineTests):
|
|||
'horizon/js/angular/services/hz.api.policy.js',
|
||||
'horizon/js/angular/services/hz.api.security-group.js',
|
||||
|
||||
'auth/auth.module.js',
|
||||
'auth/login/login.module.js',
|
||||
'auth/login/login.controller.js',
|
||||
'auth/login/login-finder.directive.js',
|
||||
|
||||
'dashboard-app/dashboard-app.module.js',
|
||||
'dashboard-app/login/login.js',
|
||||
|
||||
'framework/framework.module.js',
|
||||
|
||||
|
@ -80,8 +84,7 @@ class ServicesTests(test.JasmineTests):
|
|||
'horizon/js/angular/services/hz.api.policy.spec.js',
|
||||
'horizon/js/angular/services/hz.api.security-group.spec.js',
|
||||
|
||||
'dashboard-app/login/login.spec.js',
|
||||
'dashboard-app/utils/helper-functions.spec.js',
|
||||
'auth/login/login.spec.js',
|
||||
|
||||
'framework/util/bind-scope/bind-scope.spec.js',
|
||||
'framework/util/filters/filters.spec.js',
|
||||
|
|
Loading…
Reference in New Issue