Thermostat

about.ABOUT

about.OVERVIEW

about.VERSION

diff -r baa2100c95bb -r b686b8d24638 src/app/components/auth/login/login.controller.js --- a/src/app/components/auth/login/login.controller.js Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/auth/login/login.controller.js Thu Sep 21 16:26:15 2017 -0400 @@ -34,7 +34,7 @@ this._authService = authService; if (authService.status()) { - $state.go('landing'); + $state.go('jvmList'); return; } @@ -46,7 +46,7 @@ login () { this._authService.rememberUser(this.rememberUser); - this._authService.login(this.username, this.password, () => this._state.go('landing')); + this._authService.login(this.username, this.password, () => this._state.go('jvmList')); } } diff -r baa2100c95bb -r b686b8d24638 src/app/components/auth/login/login.controller.spec.js --- a/src/app/components/auth/login/login.controller.spec.js Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/auth/login/login.controller.spec.js Thu Sep 21 16:26:15 2017 -0400 @@ -77,9 +77,9 @@ }); })); - it('should redirect to landing if already logged in', () => { + it('should redirect to jvm-list if already logged in', () => { authService.status.should.be.calledOnce(); - state.go.should.be.calledWith('landing'); + state.go.should.be.calledWith('jvmList'); }); }); diff -r baa2100c95bb -r b686b8d24638 src/app/components/auth/login/login.routing.js --- a/src/app/components/auth/login/login.routing.js Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/auth/login/login.routing.js Thu Sep 21 16:26:15 2017 -0400 @@ -27,7 +27,7 @@ function config ($urlRouterProvider, $stateProvider) { 'ngInject'; - $urlRouterProvider.when('', '/landing'); + $urlRouterProvider.when('', '/jvm-list'); $stateProvider.state('login', { url: '/login', diff -r baa2100c95bb -r b686b8d24638 src/app/components/auth/login/login.routing.spec.js --- a/src/app/components/auth/login/login.routing.spec.js Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/auth/login/login.routing.spec.js Thu Sep 21 16:26:15 2017 -0400 @@ -39,8 +39,8 @@ }); describe('urlRouterProvider', () => { - it('should redirect blank path to landing', () => { - urlRouterProvider.when.should.be.calledWith('', '/landing'); + it('should redirect blank path to jvm-list', () => { + urlRouterProvider.when.should.be.calledWith('', '/jvm-list'); }); }); diff -r baa2100c95bb -r b686b8d24638 src/app/components/jvm-info/jvm-info.html --- a/src/app/components/jvm-info/jvm-info.html Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/jvm-info/jvm-info.html Thu Sep 21 16:26:15 2017 -0400 @@ -1,6 +1,5 @@

Thermostat
jvmInfo.JVM_LIST_BREADCRUMB
{{$ctrl.systemHostname}}
{{$ctrl.jvmInfo.mainClass | extractClass}}

diff -r baa2100c95bb -r b686b8d24638 src/app/components/landing/en.locale.yaml --- a/src/app/components/landing/en.locale.yaml Wed Sep 20 13:29:27 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -landing: - WELCOME: Welcome - APP_TITLE: Thermostat.next() Web Client - NAVIGATION: Navigation - nav: - JVM_LISTING: JVM Listing - MULTICHARTS: Multicharts diff -r baa2100c95bb -r b686b8d24638 src/app/components/landing/landing.component.js --- a/src/app/components/landing/landing.component.js Wed Sep 20 13:29:27 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/** - * Copyright 2012-2017 Red Hat, Inc. - * - * Thermostat is distributed under the GNU General Public License, - * version 2 or any later version (with a special exception described - * below, commonly known as the "Classpath Exception"). - * - * A copy of GNU General Public License (GPL) is included in this - * distribution, in the file COPYING. - * - * Linking Thermostat code with other modules is making a combined work - * based on Thermostat. Thus, the terms and conditions of the GPL - * cover the whole combination. - * - * As a special exception, the copyright holders of Thermostat give you - * permission to link this code with independent modules to produce an - * executable, regardless of the license terms of these independent - * modules, and to copy and distribute the resulting executable under - * terms of your choice, provided that you also meet, for each linked - * independent module, the terms and conditions of the license of that - * module. An independent module is a module which is not derived from - * or based on Thermostat code. If you modify Thermostat, you may - * extend this exception to your version of the software, but you are - * not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - */ - -export default angular - .module('landingComponent', []) - .component('landing', { - template: require('./landing.html') - }) - .name; diff -r baa2100c95bb -r b686b8d24638 src/app/components/landing/landing.html --- a/src/app/components/landing/landing.html Wed Sep 20 13:29:27 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -

- - -

- -

landing.WELCOME

landing.APP_TITLE

diff -r baa2100c95bb -r b686b8d24638 src/app/components/landing/landing.routing.js --- a/src/app/components/landing/landing.routing.js Wed Sep 20 13:29:27 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/** - * Copyright 2012-2017 Red Hat, Inc. - * - * Thermostat is distributed under the GNU General Public License, - * version 2 or any later version (with a special exception described - * below, commonly known as the "Classpath Exception"). - * - * A copy of GNU General Public License (GPL) is included in this - * distribution, in the file COPYING. - * - * Linking Thermostat code with other modules is making a combined work - * based on Thermostat. Thus, the terms and conditions of the GPL - * cover the whole combination. - * - * As a special exception, the copyright holders of Thermostat give you - * permission to link this code with independent modules to produce an - * executable, regardless of the license terms of these independent - * modules, and to copy and distribute the resulting executable under - * terms of your choice, provided that you also meet, for each linked - * independent module, the terms and conditions of the license of that - * module. An independent module is a module which is not derived from - * or based on Thermostat code. If you modify Thermostat, you may - * extend this exception to your version of the software, but you are - * not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - */ - -function config ($stateProvider) { - 'ngInject'; - - $stateProvider.state('landing', { - url: '/landing', - component: 'landing', - resolve: { - lazyLoad: ($q, $ocLazyLoad) => { - 'ngInject'; - return $q(resolve => { - require.ensure(['./landing.component.js'], () => { - let module = require('./landing.component.js'); - $ocLazyLoad.load({ name: module.default }); - resolve(module); - }); - }); - } - } - }); -} - -export { config }; - -export default angular - .module('landing.routing', [ - 'ui.router', - 'ui.bootstrap' - ]) - .config(config) - .name; diff -r baa2100c95bb -r b686b8d24638 src/app/components/landing/landing.routing.spec.js --- a/src/app/components/landing/landing.routing.spec.js Wed Sep 20 13:29:27 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -/** - * Copyright 2012-2017 Red Hat, Inc. - * - * Thermostat is distributed under the GNU General Public License, - * version 2 or any later version (with a special exception described - * below, commonly known as the "Classpath Exception"). - * - * A copy of GNU General Public License (GPL) is included in this - * distribution, in the file COPYING. - * - * Linking Thermostat code with other modules is making a combined work - * based on Thermostat. Thus, the terms and conditions of the GPL - * cover the whole combination. - * - * As a special exception, the copyright holders of Thermostat give you - * permission to link this code with independent modules to produce an - * executable, regardless of the license terms of these independent - * modules, and to copy and distribute the resulting executable under - * terms of your choice, provided that you also meet, for each linked - * independent module, the terms and conditions of the license of that - * module. An independent module is a module which is not derived from - * or based on Thermostat code. If you modify Thermostat, you may - * extend this exception to your version of the software, but you are - * not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - */ - -describe('LandingModule', () => { - - let module = require('./landing.routing.js'); - - let stateProvider, args, q, ocLazyLoad; - beforeEach(() => { - stateProvider = { - state: sinon.spy() - }; - module.config(stateProvider); - args = stateProvider.state.args[0]; - q = sinon.spy(); - ocLazyLoad = { load: sinon.spy() }; - }); - - describe('stateProvider', () => { - it('should call $stateProvider.state', () => { - stateProvider.state.should.be.calledOnce(); - args[0].should.equal('landing'); - }); - - it('should define a \'landing\' state', () => { - args[0].should.equal('landing'); - }); - - it('should map to /landing', () => { - args[1].url.should.equal('/landing'); - }); - - it('resolve should load landing component', done => { - let resolveFn = stateProvider.state.args[0][1].resolve.lazyLoad[2]; - resolveFn.should.be.a.Function(); - resolveFn(q, ocLazyLoad); - q.should.be.calledOnce(); - - let deferred = q.args[0][0]; - deferred.should.be.a.Function(); - - let resolve = sinon.stub().callsFake(val => { - ocLazyLoad.load.should.be.calledWith({ name: require('./landing.component.js').default}); - val.should.equal(require('./landing.component.js')); - done(); - }); - deferred(resolve); - }); - }); -}); diff -r baa2100c95bb -r b686b8d24638 src/app/components/multichart/multichart.html --- a/src/app/components/multichart/multichart.html Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/multichart/multichart.html Thu Sep 21 16:26:15 2017 -0400 @@ -1,6 +1,5 @@

diff -r baa2100c95bb -r b686b8d24638 src/app/components/system-info/system-info.html --- a/src/app/components/system-info/system-info.html Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/components/system-info/system-info.html Thu Sep 21 16:26:15 2017 -0400 @@ -1,6 +1,5 @@

diff -r baa2100c95bb -r b686b8d24638 src/app/index.html --- a/src/app/index.html Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/index.html Thu Sep 21 16:26:15 2017 -0400 @@ -18,7 +18,7 @@

- @@ -59,7 +59,7 @@ update-active-items-on-click="true" >

404.MESSAGE

404.LANDING_LINK_MSG

404.ROOT_LINK_MSG

diff -r baa2100c95bb -r b686b8d24638 src/app/shared/templates/en.locale.yaml --- a/src/app/shared/templates/en.locale.yaml Wed Sep 20 13:29:27 2017 -0400 +++ b/src/app/shared/templates/en.locale.yaml Thu Sep 21 16:26:15 2017 -0400 @@ -1,4 +1,4 @@ 404: TITLE: 404 Not Found MESSAGE: Oops! The page you're looking for cannot be found. - LANDING_LINK_MSG: Click here to go to the landing page. + ROOT_LINK_MSG: Click here to go to the application root.