ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [08/50] ignite git commit: IGNITE-843 Rename login -> signin
Date Tue, 16 Feb 2016 15:14:25 GMT
IGNITE-843 Rename login -> signin


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/540acaa4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/540acaa4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/540acaa4

Branch: refs/heads/ignite-843-rc3
Commit: 540acaa4d736ac69926d3b4c06ac37cae91b782e
Parents: 8007e76
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Feb 15 15:37:04 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Feb 15 15:37:04 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/app/index.js |   2 +-
 .../main/js/app/modules/states/login/index.js   |  12 +-
 .../main/js/app/modules/user/Auth.service.js    |   2 +-
 .../src/main/js/controllers/common-module.js    |   2 +-
 .../src/main/js/serve/routes/profile.js         |   4 +-
 .../src/main/js/views/login.jade                | 157 -------------------
 .../src/main/js/views/signin.jade               | 157 +++++++++++++++++++
 7 files changed, 168 insertions(+), 168 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 6e1b172..efa2d7d 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -162,7 +162,7 @@ angular
             templateUrl: '/base.html'
         });
 
-    $urlRouterProvider.when('/', '/login');
+    $urlRouterProvider.when('/', '/signin');
 
     $locationProvider.html5Mode(true);
 }])

http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/app/modules/states/login/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/login/index.js b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
index e0632b4..feaf76a 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/login/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
@@ -26,9 +26,9 @@ angular
 .config(['$stateProvider', function($stateProvider) {
     // set up the states
     $stateProvider
-    .state('login', {
-        url: '/login',
-        templateUrl: '/login.html',
+    .state('signin', {
+        url: '/signin',
+        templateUrl: '/signin.html',
         resolve: {
             $title: () => {
                 return 'Sign In';
@@ -41,12 +41,12 @@ angular
         if (toState.name === IgniteTerms.termsState)
             return;
 
-        if (!Auth.authorized && (toState.name !== 'login' && !_.startsWith(toState.name,
'password.'))) {
+        if (!Auth.authorized && (toState.name !== 'signin' && !_.startsWith(toState.name,
'password.'))) {
             event.preventDefault();
 
-            $state.go('login');
+            $state.go('signin');
         }
-        else if (Auth.authorized && toState.name === 'login') {
+        else if (Auth.authorized && toState.name === 'signin') {
             event.preventDefault();
 
             $state.go('base.configuration.clusters');

http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
index 0690cfa..55bae1c 100644
--- a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
+++ b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
@@ -65,7 +65,7 @@ export default ['Auth', ['$http', '$rootScope', '$state', '$common', 'IgniteGett
 
                         _authorized(false);
 
-                        $state.go('login');
+                        $state.go('signin');
                     })
                     .catch((errMsg) => $common.showError(errMsg));
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 2686690..36b353d 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -2053,7 +2053,7 @@ consoleModule.controller('resetPassword', [
 consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries', function
($scope, $focus, Auth, countries) {
     $scope.auth = Auth.auth;
 
-    $scope.action = 'login';
+    $scope.action = 'signin';
     $scope.countries = countries;
 
     $focus('user_email');

http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/serve/routes/profile.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/profile.js b/modules/control-center-web/src/main/js/serve/routes/profile.js
index 7deff37..bf227a2 100644
--- a/modules/control-center-web/src/main/js/serve/routes/profile.js
+++ b/modules/control-center-web/src/main/js/serve/routes/profile.js
@@ -79,9 +79,9 @@ module.exports.factory = function(_, express, mongo) {
                     return user.save();
                 })
                 .then(() => res.sendStatus(200))
-                .catch((err) => {
+                .catch((errMsg) => {
                     // TODO IGNITE-843 Send error to admin
-                    res.status(500).send(err);
+                    res.status(500).send(errMsg);
                 });
         });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade
deleted file mode 100644
index 35767f4..0000000
--- a/modules/control-center-web/src/main/js/views/login.jade
+++ /dev/null
@@ -1,157 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
-
-mixin lbl(txt)
-    label.col-xs-3.col-md-3 #{txt}
-
-mixin lblRequired(txt)
-    label.col-xs-3.col-md-3.required #{txt}
-
-header#header.header
-    table.container
-        tr
-            td.col-xs-3.col-sm-3.col-md-2
-                ignite-logo
-            td
-                ignite-title
-
-.container.body-container
-    .main-content(ng-controller='auth')
-        .row.greedy.home
-            .col-xs-12.col-md-6
-                form(name='loginForm' novalidate)
-                    .modal-body.row(style='padding-bottom: 10px; margin: 0')
-                        .settings-row(ng-if='action == "signup"')
-                            h3.login-header Sign Up
-                        .settings-row(ng-if='action == "signin"')
-                            h3.login-header Sign In
-                        .settings-row(ng-if='action == "password/forgot"')
-                            h3.login-header Forgot password?
-                        .settings-row
-                            p.col-xs-12.col-md-11(ng-show='action == "password/forgot"')
-                                | That's ok! Simply enter your email below and a reset password
link will be sent to you via email. You can then follow that link and select a new password.
-                        .settings-row(ng-show='action == "signup"')
-                            +lblRequired('Full Name:')
-                            .col-xs-9.col-md-8
-                                input#user_name.form-control(enter-focus-next='user_email'
type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="signup"')
-                        .settings-row
-                            +lblRequired('Email:')
-                            .col-xs-9.col-md-8
-                                input#user_email.form-control(enter-focus-next='company'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required)
-                        .settings-row(ng-show='action == "signup"')
-                            +lbl('Company:')
-                            .col-xs-9.col-md-8
-                                input#company.form-control(enter-focus-next='country' type='text'
ng-model='user_info.company' placeholder='Your company name')
-                        .settings-row(ng-show='action == "signup"')
-                            +lbl('Country:')
-                            .col-xs-9.col-md-8
-                                button#country.select-toggle.form-control(bs-select bs-options='item
for item in countries' enter-focus-next='user_password' type='text' ng-model='user_info.country'
placeholder='Choose your country')
-                        .settings-row(ng-show='action != "password/forgot"')
-                            +lblRequired('Password:')
-                            .col-xs-9.col-md-8
-                                input#user_password.form-control(enter-focus-next='user_confirm'
type='password' ng-model='user_info.password' placeholder='Password' ng-required='action !=
"password/forgot"' on-enter='action == "login" && loginForm.$valid && auth(action,
user_info)')
-                        .settings-row(ng-if='action == "signup"')
-                            +lblRequired('Confirm:')
-                            .col-xs-9.col-md-8
-                                input#user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' ng-required='action == "signup"'
on-enter='loginForm.$valid && auth(action, user_info)')
-                        .settings-row(ignite-terms)
-                            .col-md-offset-3(ng-if='action == "signup" && terms.termsState')
-                                label
-                                    input(type='checkbox' ng-model='user_info.agree', ng-required='true')
-                                    | I agree to the #[a(ui-sref='{{::terms.termsState}}'
target='_blank') terms and conditions]
-                    .col-xs-12.col-md-11
-                        .login-footer(ng-show='action == "signup"')
-                            a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
-                            a.labelLogin(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
-                            button#signup.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='loginForm.$invalid') Sign Up
-                    .col-xs-12.col-md-11
-                        .login-footer(ng-show='action == "password/forgot"')
-                            a.labelField(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
-                            button#forgot.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='loginForm.$invalid') Send it to me
-                    .col-xs-12.col-md-11
-                        .login-footer(ng-show='action == "signin"')
-                            a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
-                            a.labelLogin(ng-click='action = "signup"' on-click-focus='user_name')
Sign Up
-                            button#login.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='loginForm.$invalid') Sign In
-
-                .col-xs-12.col-md-11.home-panel
-                    p Web Console is an interactive management tool which allows to:
-                    ul
-                        li Create and download cluster configurations
-                        li Automatically import domain model from any RDBMS
-                        li Connect to cluster and run SQL analytics on it
-            .col-xs-12.col-md-6
-                #carousel.carousel.slide
-                    // Indicators
-                    ol.carousel-indicators
-                        li.active(data-target='#carousel', data-slide-to='0')
-                        li(data-target='#carousel', data-slide-to='1')
-                        li(data-target='#carousel', data-slide-to='2')
-                        li(data-target='#carousel', data-slide-to='3')
-                        li(data-target='#carousel', data-slide-to='4')
-                        li(data-target='#carousel', data-slide-to='5')
-                        li(data-target='#carousel', data-slide-to='6')
-                    // Wrapper for slides
-                    .carousel-inner(role='listbox')
-                        .item.active
-                            img(src='/images/cluster.png', alt='Clusters screen')
-                            .carousel-caption
-                                h3 Clusters screen
-                                p Configure clusters, link clusters to caches
-                        .item
-                            img(src='/images/cache.png', alt='Caches screen')
-                            .carousel-caption
-                                h3 Caches screen
-                                p Configure caches, link domain models to caches, link caches
to clusters
-                        .item
-                            img(src='/images/domains.png', alt='Domain model screen')
-                            .carousel-caption
-                                h3 Domain model screen
-                                p Manually enter domain model or import from database
-                        .item
-                            img(src='/images/summary.png', alt='Summary screen')
-                            .carousel-caption
-                                h3 Summary screen
-                                p Preview XML config, JAVA code,Docker file and download
project
-                        .item
-                            img(src='/images/query-table.png', alt='Query')
-                            .carousel-caption
-                                h3 Query
-                                p Explain SQL, execute, scan queries
-                        .item
-                            img(src='/images/query-metadata.png', alt='Cache metadata')
-                            .carousel-caption
-                                h3 Cache metadata
-                                p View cache type metadata
-                        .item
-                            img(src='/images/query-chart.png', alt='Query chart')
-                            .carousel-caption
-                                h3 Query chart
-                                p View data in tabular form and as charts
-                    // Controls
-                    a.left.carousel-control(href='#carousel', role='button', data-slide='prev')
-                        span.fa.fa-chevron-left(aria-hidden='true')
-                        span.sr-only Previous
-                    a.right.carousel-control(href='#carousel', role='button', data-slide='next')
-                        span.fa.fa-chevron-right(aria-hidden='true')
-                        span.sr-only Next
-
-include includes/footer
-
-script.
-    $('.carousel').carousel()
-
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/540acaa4/modules/control-center-web/src/main/js/views/signin.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/signin.jade b/modules/control-center-web/src/main/js/views/signin.jade
new file mode 100644
index 0000000..b0f7ebe
--- /dev/null
+++ b/modules/control-center-web/src/main/js/views/signin.jade
@@ -0,0 +1,157 @@
+//-
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+mixin lbl(txt)
+    label.col-xs-3.col-md-3 #{txt}
+
+mixin lblRequired(txt)
+    label.col-xs-3.col-md-3.required #{txt}
+
+header#header.header
+    table.container
+        tr
+            td.col-xs-3.col-sm-3.col-md-2
+                ignite-logo
+            td
+                ignite-title
+
+.container.body-container
+    .main-content(ng-controller='auth')
+        .row.greedy.home
+            .col-xs-12.col-md-6
+                form(name='form' novalidate)
+                    .modal-body.row(style='padding-bottom: 10px; margin: 0')
+                        .settings-row(ng-if='action == "signup"')
+                            h3.login-header Sign Up
+                        .settings-row(ng-if='action == "signin"')
+                            h3.login-header Sign In
+                        .settings-row(ng-if='action == "password/forgot"')
+                            h3.login-header Forgot password?
+                        .settings-row
+                            p.col-xs-12.col-md-11(ng-show='action == "password/forgot"')
+                                | That's ok! Simply enter your email below and a reset password
link will be sent to you via email. You can then follow that link and select a new password.
+                        .settings-row(ng-show='action == "signup"')
+                            +lblRequired('Full Name:')
+                            .col-xs-9.col-md-8
+                                input#user_name.form-control(enter-focus-next='user_email'
type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="signup"')
+                        .settings-row
+                            +lblRequired('Email:')
+                            .col-xs-9.col-md-8
+                                input#user_email.form-control(enter-focus-next='company'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required)
+                        .settings-row(ng-show='action == "signup"')
+                            +lbl('Company:')
+                            .col-xs-9.col-md-8
+                                input#company.form-control(enter-focus-next='country' type='text'
ng-model='user_info.company' placeholder='Your company name')
+                        .settings-row(ng-show='action == "signup"')
+                            +lbl('Country:')
+                            .col-xs-9.col-md-8
+                                button#country.select-toggle.form-control(bs-select bs-options='item
for item in countries' enter-focus-next='user_password' type='text' ng-model='user_info.country'
placeholder='Choose your country')
+                        .settings-row(ng-show='action != "password/forgot"')
+                            +lblRequired('Password:')
+                            .col-xs-9.col-md-8
+                                input#user_password.form-control(enter-focus-next='user_confirm'
type='password' ng-model='user_info.password' placeholder='Password' ng-required='action !=
"password/forgot"' on-enter='action == "login" && form.$valid && auth(action,
user_info)')
+                        .settings-row(ng-if='action == "signup"')
+                            +lblRequired('Confirm:')
+                            .col-xs-9.col-md-8
+                                input#user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' ng-required='action == "signup"'
on-enter='form.$valid && auth(action, user_info)')
+                        .settings-row(ignite-terms)
+                            .col-md-offset-3(ng-if='action == "signup" && terms.termsState')
+                                label
+                                    input(type='checkbox' ng-model='user_info.agree', ng-required='true')
+                                    | I agree to the #[a(ui-sref='{{::terms.termsState}}'
target='_blank') terms and conditions]
+                    .col-xs-12.col-md-11
+                        .login-footer(ng-show='action == "signup"')
+                            a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
+                            a.labelLogin(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
+                            button#signup.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Sign Up
+                    .col-xs-12.col-md-11
+                        .login-footer(ng-show='action == "password/forgot"')
+                            a.labelField(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
+                            button#forgot.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Send it to me
+                    .col-xs-12.col-md-11
+                        .login-footer(ng-show='action == "signin"')
+                            a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
+                            a.labelLogin(ng-click='action = "signup"' on-click-focus='user_name')
Sign Up
+                            button#login.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Sign In
+
+                .col-xs-12.col-md-11.home-panel
+                    p Web Console is an interactive management tool which allows to:
+                    ul
+                        li Create and download cluster configurations
+                        li Automatically import domain model from any RDBMS
+                        li Connect to cluster and run SQL analytics on it
+            .col-xs-12.col-md-6
+                #carousel.carousel.slide
+                    // Indicators
+                    ol.carousel-indicators
+                        li.active(data-target='#carousel', data-slide-to='0')
+                        li(data-target='#carousel', data-slide-to='1')
+                        li(data-target='#carousel', data-slide-to='2')
+                        li(data-target='#carousel', data-slide-to='3')
+                        li(data-target='#carousel', data-slide-to='4')
+                        li(data-target='#carousel', data-slide-to='5')
+                        li(data-target='#carousel', data-slide-to='6')
+                    // Wrapper for slides
+                    .carousel-inner(role='listbox')
+                        .item.active
+                            img(src='/images/cluster.png', alt='Clusters screen')
+                            .carousel-caption
+                                h3 Clusters screen
+                                p Configure clusters, link clusters to caches
+                        .item
+                            img(src='/images/cache.png', alt='Caches screen')
+                            .carousel-caption
+                                h3 Caches screen
+                                p Configure caches, link domain models to caches, link caches
to clusters
+                        .item
+                            img(src='/images/domains.png', alt='Domain model screen')
+                            .carousel-caption
+                                h3 Domain model screen
+                                p Manually enter domain model or import from database
+                        .item
+                            img(src='/images/summary.png', alt='Summary screen')
+                            .carousel-caption
+                                h3 Summary screen
+                                p Preview XML config, JAVA code,Docker file and download
project
+                        .item
+                            img(src='/images/query-table.png', alt='Query')
+                            .carousel-caption
+                                h3 Query
+                                p Explain SQL, execute, scan queries
+                        .item
+                            img(src='/images/query-metadata.png', alt='Cache metadata')
+                            .carousel-caption
+                                h3 Cache metadata
+                                p View cache type metadata
+                        .item
+                            img(src='/images/query-chart.png', alt='Query chart')
+                            .carousel-caption
+                                h3 Query chart
+                                p View data in tabular form and as charts
+                    // Controls
+                    a.left.carousel-control(href='#carousel', role='button', data-slide='prev')
+                        span.fa.fa-chevron-left(aria-hidden='true')
+                        span.sr-only Previous
+                    a.right.carousel-control(href='#carousel', role='button', data-slide='next')
+                        span.fa.fa-chevron-right(aria-hidden='true')
+                        span.sr-only Next
+
+include includes/footer
+
+script.
+    $('.carousel').carousel()
+
+


Mime
View raw message