You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/03 11:07:55 UTC
ignite git commit: IGNITE-843 Getting started.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 94fea9fdd -> 77430e5ef
IGNITE-843 Getting started.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77430e5e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77430e5e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77430e5e
Branch: refs/heads/ignite-843-rc2
Commit: 77430e5ef3d83489dc025c3444384adcfdc66732
Parents: 94fea9f
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 3 17:08:00 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 3 17:08:00 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/data/getting-started.json | 91 ++++++++++++++++---
.../main/js/app/modules/getting-started/main.js | 9 +-
.../clusters/general/discovery/multicast.jade | 2 +-
.../src/main/js/gulpfile.js/tasks/bundle.js | 5 +-
.../src/main/js/public/images/igfs.png | Bin 0 -> 48721 bytes
.../src/main/js/public/stylesheets/style.scss | 4 +
.../js/views/templates/getting-started.jade | 2 +-
7 files changed, 93 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/app/data/getting-started.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/data/getting-started.json b/modules/control-center-web/src/main/js/app/data/getting-started.json
index 7b31bab..d0c4520 100644
--- a/modules/control-center-web/src/main/js/app/data/getting-started.json
+++ b/modules/control-center-web/src/main/js/app/data/getting-started.json
@@ -3,7 +3,7 @@
"title": "What is Apache Ignite",
"message": [
"<p><b>Apache Ignite</b> is a high-performance, integrated and distributed in-memory platform for computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with traditional disk-based or flash technologies.</p>",
- "<img src=\"/images/ignite-puzzle.png\" width=\"100%\" />",
+ "<img src='/images/ignite-puzzle.png' width='100%' />",
"<p><b>Apache Ignite</b> is designed to deliver uncompromised performance for a wide set of in-memory computing use cases from high performance computing, to the industry most advanced data grid, highly available service grid, and streaming.</p>"
]
},
@@ -19,22 +19,22 @@
"<li>Configure IGFS in-memory file systems</li>",
"<li>Preview generated XML and Java code in browser</li>",
"<li>Download fully functional Maven project with generated XML and Java code</li>",
+ "<li>Execute SQL queries on real clusters</li>",
"</ul>"
]
},
{
"title": "Cluster screen",
"message": [
- "<div class=\"col-xs-6 col-sm-6 col-md-6\">",
- "<img src=\"/images/cluster.png\" width=\"100%\" />",
+ "<div class='col-xs-7'>",
+ "<img src='/images/cluster.png' width='100%' />",
"</div>",
- "<div class=\"col-xs-6 col-sm-6 col-md-6\">",
- "On clusters screen you can:",
+ "<div class='col-xs-5 padding-left-dflt'>",
+ "On <b>Clusters screen</b> you can:",
"<ul>",
- "<li>Configure all cluster properties grouped by logical </li>",
- "<li>Configure domain models on Model screen</li>",
- "<li>Configure clusters on Clusters screen</li>",
- "<li>See and download generated project for configured cluster on Summary screen</li>",
+ "<li>Configure cluster properties</li>",
+ "<li>Associate cluster with caches</li>",
+ "<li>Preview XML and Java code</li>",
"</ul>",
"</div>"
]
@@ -42,25 +42,88 @@
{
"title": "Domain model screen",
"message": [
- "TODO"
+ "<div class='col-xs-7'>",
+ "<img src='/images/domains.png' width='100%' />",
+ "</div>",
+ "<div class='col-xs-5 padding-left-dflt'>",
+ "On <b>Domain model screen</b> you can:",
+ "<ul>",
+ "<li>Import domain model from database</li>",
+ "<li>Try demo import</li>",
+ "<li>Associate domain model with caches</li>",
+ "<li>Configure types for SQL queries</li>",
+ "<li>Preview XML and Java code</li>",
+ "</ul>",
+ "</div>"
]
},
{
"title": "Caches screen",
"message": [
- "TODO"
+ "<div class='col-xs-7'>",
+ "<img src='/images/cache.png' width='100%' />",
+ "</div>",
+ "<div class='col-xs-5 padding-left-dflt'>",
+ "On <b>Caches screen</b> you can:",
+ "<ul>",
+ "<li>Configure cache properties</li>",
+ "<li>Associate cache with clusters</li>",
+ "<li>Associate cache with domain model</li>",
+ "<li>Configure cache store</li>",
+ "<li>Preview XML and Java code</li>",
+ "</ul>",
+ "</div>"
]
},
{
"title": "IGFS screen",
"message": [
- "TODO"
+ "<div class='col-xs-7'>",
+ "<img src='/images/igfs.png' width='100%' />",
+ "</div>",
+ "<div class='col-xs-5 padding-left-dflt'>",
+ "On <b>IGFS screen</b> you can:",
+ "<ul>",
+ "<li>Configure IGFS properties</li>",
+ "<li>Associate IGFS with clusters</li>",
+ "<li>Preview XML and Java code</li>",
+ "</ul>",
+ "</div>"
]
},
{
"title": "Summary screen",
"message": [
- "TODO"
+ "<div class='col-xs-7'>",
+ "<img src='/images/summary.png' width='100%' />",
+ "</div>",
+ "<div class='col-xs-5 padding-left-dflt'>",
+ "On <b>Summary screen</b> you can:",
+ "<ul>",
+ "<li>Preview full XML configuration</li>",
+ "<li>Preview generated Java code</li>",
+ "<li>Preview Docker file</li>",
+ "<li>Preview pom.xml</li>",
+ "<li>Download ZIP with fully functional project</li>",
+ "</ul>",
+ "</div>"
]
- }
+ },
+ {
+ "title": "SQL screen",
+ "message": [
+ "<div class='col-xs-7'>",
+ "<img src='/images/query-table.png' width='100%' />",
+ "</div>",
+ "<div class='col-xs-5 padding-left-dflt'>",
+ "On <b>SQL screen</b> you can:",
+ "<ul>",
+ "<li>Execute any SQL against cluster</li>",
+ "<li>Explain SQL</li>",
+ "<li>View data in tabular format and charts</li>",
+ "<li>Execute any SQL with specified refresh rate</li>",
+ "</ul>",
+ "</div>"
+ ]
+ }
]
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/getting-started/main.js b/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
index e124374..0fb3692 100644
--- a/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
@@ -25,8 +25,13 @@ angular
.provider('igniteGettingStarted', function() {
const items = PAGES;
- this.push = (data) => {
- items.splice(items.length - 1, 0, data);
+ this.push = (before, data) => {
+ const idx = _.findIndex(items, {title: before});
+
+ if (idx < 0)
+ items.push(data);
+ else
+ items.splice(idx, 0, data);
};
this.$get = [function() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
index 6d774d4..6b56341 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.jade
@@ -96,7 +96,7 @@ div
li Hostname and port range (e.g. host1.com:47500..47510, host2:47502..47508, etc)
| If port is 0 or not provided then default port will be used (depends on discovery SPI configuration)#[br]
| If port range is provided (e.g. host:port1..port2) the following should be considered:#[br]
- ul: li port1 < port2 should be true
+ ul: li port1 < port2 should be true
li Both port1 and port2 should be greater than 0
ignite-form-group-add(ng-click='group.add = [{}]')
| Add new address
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
index 63cff4b..8d0d2e9 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
@@ -22,8 +22,9 @@ var concat = require('gulp-concat');
var sequence = require('gulp-sequence');
var paths = [
- './app/**/*.js',
- './app/**/*.jade'
+ './app/**/*.js',
+ './app/**/*.jade',
+ './app/data/*.json'
];
var legacy_paths = [
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/public/images/igfs.png
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/images/igfs.png b/modules/control-center-web/src/main/js/public/images/igfs.png
new file mode 100644
index 0000000..53f9d37
Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/igfs.png differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 676c155..975a3c4 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1443,6 +1443,10 @@ a {
padding-top: 10px;
}
+.padding-left-dflt {
+ padding-left: 10px;
+}
+
.padding-bottom-dflt {
padding-bottom: 10px;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/77430e5e/modules/control-center-web/src/main/js/views/templates/getting-started.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/getting-started.jade b/modules/control-center-web/src/main/js/views/templates/getting-started.jade
index 816d8ca..a6b8beb 100644
--- a/modules/control-center-web/src/main/js/views/templates/getting-started.jade
+++ b/modules/control-center-web/src/main/js/views/templates/getting-started.jade
@@ -18,7 +18,7 @@
#errors-container.modal-header.header
button.close(ng-click='close()' aria-hidden='true') ×
h4.modal-title {{title}}
- .import-domain-model-wizard-page(style='margin-bottom: 256px')
+ .import-domain-model-wizard-page(style='margin-bottom: 310px')
.col-xs-12(ng-bind-html='message')
.modal-footer
.checkbox