ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Rename.
Date Sat, 20 Feb 2016 03:26:05 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 ea979d83a -> 473dd7017


IGNITE-843 Rename.


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

Branch: refs/heads/ignite-843-rc2
Commit: 473dd701713133ccb08ee969c8da4425dd72263f
Parents: ea979d8
Author: Andrey <anovikov@gridgain.com>
Authored: Sat Feb 20 10:26:40 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Sat Feb 20 10:26:40 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/app/index.js |  14 +-
 .../main/js/app/modules/states/admin.state.js   |  36 +++++
 .../main/js/app/modules/states/admin/index.js   |  36 -----
 .../app/modules/states/configuration.state.js   | 162 +++++++++++++++++++
 .../app/modules/states/configuration/index.js   | 162 -------------------
 .../main/js/app/modules/states/login/index.js   |  55 -------
 .../main/js/app/modules/states/logout.state.js  |  33 ++++
 .../main/js/app/modules/states/logout/index.js  |  33 ----
 .../js/app/modules/states/password.state.js     |  40 +++++
 .../js/app/modules/states/password/index.js     |  40 -----
 .../main/js/app/modules/states/profile.state.js |  36 +++++
 .../main/js/app/modules/states/profile/index.js |  36 -----
 .../main/js/app/modules/states/signin.state.js  |  55 +++++++
 .../src/main/js/app/modules/states/sql.state.js |  56 +++++++
 .../src/main/js/app/modules/states/sql/index.js |  56 -------
 15 files changed, 425 insertions(+), 425 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/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 efa2d7d..fca3027 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -62,13 +62,13 @@ import './modules/form/form.module';
 import './modules/JavaTypes/JavaTypes.provider';
 import './modules/QueryNotebooks/QueryNotebooks.provider';
 
-import './modules/states/login/index';
-import './modules/states/logout/index';
-import './modules/states/password/index';
-import './modules/states/configuration/index';
-import './modules/states/sql/index';
-import './modules/states/profile/index';
-import './modules/states/admin/index';
+import './modules/states/signin.state';
+import './modules/states/logout.state';
+import './modules/states/password.state';
+import './modules/states/configuration.state';
+import './modules/states/sql.state';
+import './modules/states/profile.state';
+import './modules/states/admin.state';
 
 // ignite:modules
 import './modules/user/user.module';

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
new file mode 100644
index 0000000..c183807
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+.module('ignite-console.states.admin', [
+    'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+    // set up the states
+    $stateProvider
+    .state('settings.admin', {
+        url: '/admin',
+        templateUrl: '/settings/admin.html',
+        resolve: {
+            $title: () => {
+                return 'List of registered users';
+            }
+        }
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin/index.js b/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
deleted file mode 100644
index c183807..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
+++ /dev/null
@@ -1,36 +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.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.states.admin', [
-    'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
-    // set up the states
-    $stateProvider
-    .state('settings.admin', {
-        url: '/admin',
-        templateUrl: '/settings/admin.html',
-        resolve: {
-            $title: () => {
-                return 'List of registered users';
-            }
-        }
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
new file mode 100644
index 0000000..57eb361
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
@@ -0,0 +1,162 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+import ConfigurationSummaryCtrl from './configuration/summary/summary.controller';
+import ConfigurationSummaryResource from './configuration/summary/summary.resource';
+import summaryTabs from './configuration/summary/summary-tabs.directive';
+import previewPanel from './configuration/clusters/preview-panel.directive';
+
+import clustersTransactions from './configuration/clusters/transactions.directive';
+import clustersThread from './configuration/clusters/thread.directive';
+import clustersTime from './configuration/clusters/time.directive';
+import clustersSwap from './configuration/clusters/swap.directive';
+import clustersSsl from './configuration/clusters/ssl.directive';
+import clustersMetrics from './configuration/clusters/metrics.directive';
+import clustersMarshaller from './configuration/clusters/marshaller.directive';
+import clustersIgfs from './configuration/clusters/igfs.directive';
+import clustersEvents from './configuration/clusters/events.directive';
+import clustersDiscovery from './configuration/clusters/discovery.directive';
+import clustersDeployment from './configuration/clusters/deployment.directive';
+import clustersConnector from './configuration/clusters/connector.directive';
+import clustersCommunication from './configuration/clusters/communication.directive';
+import clustersBinary from './configuration/clusters/binary.directive';
+import clustersAtomic from './configuration/clusters/atomic.directive';
+
+import clustersGeneral from './configuration/clusters/general.directive';
+import generalDiscoveryCloud from './configuration/clusters/general/discovery/cloud.directive';
+import generalDiscoveryGoogle from './configuration/clusters/general/discovery/google.directive';
+import generalDiscoveryJdbc from './configuration/clusters/general/discovery/jdbc.directive';
+import generalDiscoveryMulticast from './configuration/clusters/general/discovery/multicast.directive';
+import generalDiscoveryS3 from './configuration/clusters/general/discovery/s3.directive';
+import generalDiscoveryShared from './configuration/clusters/general/discovery/shared.directive';
+import generalDiscoveryVm from './configuration/clusters/general/discovery/vm.directive';
+
+angular
+.module('ignite-console.states.configuration', [
+    'ui.router'
+])
+.directive(...summaryTabs)
+.directive(...previewPanel)
+.directive(...clustersTransactions)
+.directive(...clustersThread)
+.directive(...clustersTime)
+.directive(...clustersSwap)
+.directive(...clustersSsl)
+.directive(...clustersMetrics)
+.directive(...clustersMarshaller)
+.directive(...clustersIgfs)
+.directive(...clustersEvents)
+.directive(...clustersDiscovery)
+.directive(...clustersDeployment)
+.directive(...clustersConnector)
+.directive(...clustersCommunication)
+.directive(...clustersBinary)
+.directive(...clustersAtomic)
+.directive(...clustersGeneral)
+.directive(...generalDiscoveryCloud)
+.directive(...generalDiscoveryGoogle)
+.directive(...generalDiscoveryJdbc)
+.directive(...generalDiscoveryMulticast)
+.directive(...generalDiscoveryS3)
+.directive(...generalDiscoveryShared)
+.directive(...generalDiscoveryVm)
+// Services.
+.service(...ConfigurationSummaryResource)
+.config(['$stateProvider', function($stateProvider) {
+    // Setup the states.
+    $stateProvider
+    .state('base.configuration', {
+        url: '/configuration',
+        templateUrl: '/configuration/sidebar.html'
+    })
+    .state('base.configuration.clusters', {
+        url: '/clusters',
+        templateUrl: '/configuration/clusters.html',
+        params: {
+            id: null
+        },
+        data: {
+            loading: 'Loading clusters screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Configure Clusters';
+            }
+        }
+    })
+    .state('base.configuration.caches', {
+        url: '/caches',
+        templateUrl: '/configuration/caches.html',
+        params: {
+            id: null
+        },
+        data: {
+            loading: 'Loading caches screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Configure Caches';
+            }
+        }
+    })
+    .state('base.configuration.domains', {
+        url: '/domains',
+        templateUrl: '/configuration/domains.html',
+        params: {
+            id: null
+        },
+        data: {
+            loading: 'Loading domain models screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Configure Domain Model';
+            }
+        }
+    })
+    .state('base.configuration.igfs', {
+        url: '/igfs',
+        templateUrl: '/configuration/igfs.html',
+        params: {
+            id: null
+        },
+        data: {
+            loading: 'Loading IGFS screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Configure IGFS';
+            }
+        }
+    })
+    .state('base.configuration.summary', {
+        url: '/summary',
+        templateUrl: '/configuration/summary.html',
+        controller: ConfigurationSummaryCtrl,
+        controllerAs: 'ctrl',
+        data: {
+            loading: 'Loading summary screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Configurations Summary';
+            }
+        }
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
deleted file mode 100644
index e8f32c0..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
+++ /dev/null
@@ -1,162 +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.
- */
-
-import angular from 'angular';
-
-import ConfigurationSummaryCtrl from './summary/summary.controller';
-import ConfigurationSummaryResource from './summary/summary.resource';
-import summaryTabs from './summary/summary-tabs.directive';
-import previewPanel from './clusters/preview-panel.directive';
-
-import clustersTransactions from './clusters/transactions.directive';
-import clustersThread from './clusters/thread.directive';
-import clustersTime from './clusters/time.directive';
-import clustersSwap from './clusters/swap.directive';
-import clustersSsl from './clusters/ssl.directive';
-import clustersMetrics from './clusters/metrics.directive';
-import clustersMarshaller from './clusters/marshaller.directive';
-import clustersIgfs from './clusters/igfs.directive';
-import clustersEvents from './clusters/events.directive';
-import clustersDiscovery from './clusters/discovery.directive';
-import clustersDeployment from './clusters/deployment.directive';
-import clustersConnector from './clusters/connector.directive';
-import clustersCommunication from './clusters/communication.directive';
-import clustersBinary from './clusters/binary.directive';
-import clustersAtomic from './clusters/atomic.directive';
-
-import clustersGeneral from './clusters/general.directive';
-import generalDiscoveryCloud from './clusters/general/discovery/cloud.directive';
-import generalDiscoveryGoogle from './clusters/general/discovery/google.directive';
-import generalDiscoveryJdbc from './clusters/general/discovery/jdbc.directive';
-import generalDiscoveryMulticast from './clusters/general/discovery/multicast.directive';
-import generalDiscoveryS3 from './clusters/general/discovery/s3.directive';
-import generalDiscoveryShared from './clusters/general/discovery/shared.directive';
-import generalDiscoveryVm from './clusters/general/discovery/vm.directive';
-
-angular
-.module('ignite-console.states.configuration', [
-    'ui.router'
-])
-.directive(...summaryTabs)
-.directive(...previewPanel)
-.directive(...clustersTransactions)
-.directive(...clustersThread)
-.directive(...clustersTime)
-.directive(...clustersSwap)
-.directive(...clustersSsl)
-.directive(...clustersMetrics)
-.directive(...clustersMarshaller)
-.directive(...clustersIgfs)
-.directive(...clustersEvents)
-.directive(...clustersDiscovery)
-.directive(...clustersDeployment)
-.directive(...clustersConnector)
-.directive(...clustersCommunication)
-.directive(...clustersBinary)
-.directive(...clustersAtomic)
-.directive(...clustersGeneral)
-.directive(...generalDiscoveryCloud)
-.directive(...generalDiscoveryGoogle)
-.directive(...generalDiscoveryJdbc)
-.directive(...generalDiscoveryMulticast)
-.directive(...generalDiscoveryS3)
-.directive(...generalDiscoveryShared)
-.directive(...generalDiscoveryVm)
-// Services.
-.service(...ConfigurationSummaryResource)
-.config(['$stateProvider', function($stateProvider) {
-    // Setup the states.
-    $stateProvider
-    .state('base.configuration', {
-        url: '/configuration',
-        templateUrl: '/configuration/sidebar.html'
-    })
-    .state('base.configuration.clusters', {
-        url: '/clusters',
-        templateUrl: '/configuration/clusters.html',
-        params: {
-            id: null
-        },
-        data: {
-            loading: 'Loading clusters screen...'
-        },
-        resolve: {
-            $title: () => {
-                return 'Configure Clusters';
-            }
-        }
-    })
-    .state('base.configuration.caches', {
-        url: '/caches',
-        templateUrl: '/configuration/caches.html',
-        params: {
-            id: null
-        },
-        data: {
-            loading: 'Loading caches screen...'
-        },
-        resolve: {
-            $title: () => {
-                return 'Configure Caches';
-            }
-        }
-    })
-    .state('base.configuration.domains', {
-        url: '/domains',
-        templateUrl: '/configuration/domains.html',
-        params: {
-            id: null
-        },
-        data: {
-            loading: 'Loading domain models screen...'
-        },
-        resolve: {
-            $title: () => {
-                return 'Configure Domain Model';
-            }
-        }
-    })
-    .state('base.configuration.igfs', {
-        url: '/igfs',
-        templateUrl: '/configuration/igfs.html',
-        params: {
-            id: null
-        },
-        data: {
-            loading: 'Loading IGFS screen...'
-        },
-        resolve: {
-            $title: () => {
-                return 'Configure IGFS';
-            }
-        }
-    })
-    .state('base.configuration.summary', {
-        url: '/summary',
-        templateUrl: '/configuration/summary.html',
-        controller: ConfigurationSummaryCtrl,
-        controllerAs: 'ctrl',
-        data: {
-            loading: 'Loading summary screen...'
-        },
-        resolve: {
-            $title: () => {
-                return 'Configurations Summary';
-            }
-        }
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/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
deleted file mode 100644
index feaf76a..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/login/index.js
+++ /dev/null
@@ -1,55 +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.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.states.login', [
-    'ui.router',
-    // services
-    'ignite-console.user'
-])
-.config(['$stateProvider', function($stateProvider) {
-    // set up the states
-    $stateProvider
-    .state('signin', {
-        url: '/signin',
-        templateUrl: '/signin.html',
-        resolve: {
-            $title: () => {
-                return 'Sign In';
-            }
-        }
-    });
-}])
-.run(['$rootScope', '$state', 'Auth', 'IgniteTerms', function($root, $state, Auth, IgniteTerms)
{
-    $root.$on('$stateChangeStart', function(event, toState) {
-        if (toState.name === IgniteTerms.termsState)
-            return;
-
-        if (!Auth.authorized && (toState.name !== 'signin' && !_.startsWith(toState.name,
'password.'))) {
-            event.preventDefault();
-
-            $state.go('signin');
-        }
-        else if (Auth.authorized && toState.name === 'signin') {
-            event.preventDefault();
-
-            $state.go('base.configuration.clusters');
-        }
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/logout.state.js b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
new file mode 100644
index 0000000..7609f24
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+.module('ignite-console.states.logout', [
+    'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+    // set up the states
+    $stateProvider
+    .state('logout', {
+        url: '/logout',
+        controller: ['Auth', function(Auth) {
+            Auth.logout();
+        }]
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/logout/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/logout/index.js b/modules/control-center-web/src/main/js/app/modules/states/logout/index.js
deleted file mode 100644
index 7609f24..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/logout/index.js
+++ /dev/null
@@ -1,33 +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.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.states.logout', [
-    'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
-    // set up the states
-    $stateProvider
-    .state('logout', {
-        url: '/logout',
-        controller: ['Auth', function(Auth) {
-            Auth.logout();
-        }]
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/password.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password.state.js b/modules/control-center-web/src/main/js/app/modules/states/password.state.js
new file mode 100644
index 0000000..6014cd2
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/password.state.js
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+.module('ignite-console.states.password', [
+    'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+    // set up the states
+    $stateProvider
+    .state('password', {
+        url: '/password',
+        abstract: true,
+        template: '<ui-view></ui-view>'
+    })
+    .state('password.reset', {
+        url: '/reset?{token}',
+        templateUrl: '/reset.html'
+    })
+    .state('password.send', {
+        url: '/send',
+        templateUrl: '/reset.html'
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/password/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password/index.js b/modules/control-center-web/src/main/js/app/modules/states/password/index.js
deleted file mode 100644
index 6014cd2..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/password/index.js
+++ /dev/null
@@ -1,40 +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.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.states.password', [
-    'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
-    // set up the states
-    $stateProvider
-    .state('password', {
-        url: '/password',
-        abstract: true,
-        template: '<ui-view></ui-view>'
-    })
-    .state('password.reset', {
-        url: '/reset?{token}',
-        templateUrl: '/reset.html'
-    })
-    .state('password.send', {
-        url: '/send',
-        templateUrl: '/reset.html'
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
new file mode 100644
index 0000000..23d1bec
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+.module('ignite-console.states.profile', [
+    'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+    // set up the states
+    $stateProvider
+    .state('settings.profile', {
+        url: '/profile',
+        templateUrl: '/settings/profile.html',
+        resolve: {
+            $title: () => {
+                return 'User profile';
+            }
+        }
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile/index.js b/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
deleted file mode 100644
index 23d1bec..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
+++ /dev/null
@@ -1,36 +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.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.states.profile', [
-    'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
-    // set up the states
-    $stateProvider
-    .state('settings.profile', {
-        url: '/profile',
-        templateUrl: '/settings/profile.html',
-        resolve: {
-            $title: () => {
-                return 'User profile';
-            }
-        }
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
new file mode 100644
index 0000000..feaf76a
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+.module('ignite-console.states.login', [
+    'ui.router',
+    // services
+    'ignite-console.user'
+])
+.config(['$stateProvider', function($stateProvider) {
+    // set up the states
+    $stateProvider
+    .state('signin', {
+        url: '/signin',
+        templateUrl: '/signin.html',
+        resolve: {
+            $title: () => {
+                return 'Sign In';
+            }
+        }
+    });
+}])
+.run(['$rootScope', '$state', 'Auth', 'IgniteTerms', function($root, $state, Auth, IgniteTerms)
{
+    $root.$on('$stateChangeStart', function(event, toState) {
+        if (toState.name === IgniteTerms.termsState)
+            return;
+
+        if (!Auth.authorized && (toState.name !== 'signin' && !_.startsWith(toState.name,
'password.'))) {
+            event.preventDefault();
+
+            $state.go('signin');
+        }
+        else if (Auth.authorized && toState.name === 'signin') {
+            event.preventDefault();
+
+            $state.go('base.configuration.clusters');
+        }
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
new file mode 100644
index 0000000..672d829
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+.module('ignite-console.states.sql', [
+    'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+    // set up the states
+    $stateProvider
+    .state('base.sql', {
+        url: '/sql',
+        abstract: true,
+        template: '<ui-view></ui-view>'
+    })
+    .state('base.sql.notebook', {
+        url: '/notebook/{noteId}',
+        templateUrl: '/sql/sql.html',
+        data: {
+            loading: 'Loading notebook screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Query notebook';
+            }
+        }
+    })
+    .state('base.sql.demo', {
+        url: '/demo',
+        templateUrl: '/sql/sql.html',
+        data: {
+            loading: 'Enable SQL demo...'
+        },
+        resolve: {
+            $title: () => {
+                return 'SQL demo';
+            }
+        }
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js b/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
deleted file mode 100644
index 672d829..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
+++ /dev/null
@@ -1,56 +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.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.states.sql', [
-    'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
-    // set up the states
-    $stateProvider
-    .state('base.sql', {
-        url: '/sql',
-        abstract: true,
-        template: '<ui-view></ui-view>'
-    })
-    .state('base.sql.notebook', {
-        url: '/notebook/{noteId}',
-        templateUrl: '/sql/sql.html',
-        data: {
-            loading: 'Loading notebook screen...'
-        },
-        resolve: {
-            $title: () => {
-                return 'Query notebook';
-            }
-        }
-    })
-    .state('base.sql.demo', {
-        url: '/demo',
-        templateUrl: '/sql/sql.html',
-        data: {
-            loading: 'Enable SQL demo...'
-        },
-        resolve: {
-            $title: () => {
-                return 'SQL demo';
-            }
-        }
-    });
-}]);


Mime
View raw message