This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new e3a6aac IGNITE-9799 Web Console: Removed unused code. e3a6aac is described below commit e3a6aac8174121ea5efa454fd3a3367eea040666 Author: Alexander Kalinin <verba...@yandex.ru> AuthorDate: Mon Mar 25 21:50:03 2019 +0700 IGNITE-9799 Web Console: Removed unused code. --- modules/web-console/frontend/app/app.js | 1 - .../frontend/app/components/page-landing/index.js | 13 +---- .../app/components/page-landing/template.pug | 4 +- modules/web-console/frontend/app/vendor.js | 3 -- modules/web-console/frontend/package.json | 5 -- .../public/images/page-landing-carousel-2.png | Bin 34564 -> 0 bytes .../public/images/page-landing-carousel-3.png | Bin 27808 -> 0 bytes ...g-carousel-1.png => page-landing-ui-sample.png} | Bin .../frontend/public/stylesheets/style.scss | 60 +++++++++++++++++++++ 9 files changed, 62 insertions(+), 24 deletions(-) diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js index 64e0152..4d048ab 100644 --- a/modules/web-console/frontend/app/app.js +++ b/modules/web-console/frontend/app/app.js @@ -176,7 +176,6 @@ export default angular 'ui.grid.saveState', 'ui.grid.selection', 'ui.router', - 'ui.carousel', // Base modules. 'ignite-console.core', 'ignite-console.ace', diff --git a/modules/web-console/frontend/app/components/page-landing/index.js b/modules/web-console/frontend/app/components/page-landing/index.js index cabb5bbde..b893279 100644 --- a/modules/web-console/frontend/app/components/page-landing/index.js +++ b/modules/web-console/frontend/app/components/page-landing/index.js @@ -27,18 +27,7 @@ export default angular 'ignite-console.user' ]) .component('pageLanding', { - template, - controller: class LandingController { - static images = [ - '/images/page-landing-carousel-1.png', - '/images/page-landing-carousel-2.png', - '/images/page-landing-carousel-3.png' - ]; - - $onInit() { - this.images = LandingController.images; - } - } + template }) .config(['$stateProvider', function($stateProvider) { // set up the states diff --git a/modules/web-console/frontend/app/components/page-landing/template.pug b/modules/web-console/frontend/app/components/page-landing/template.pug index ffbc3f2..a0ddc86 100644 --- a/modules/web-console/frontend/app/components/page-landing/template.pug +++ b/modules/web-console/frontend/app/components/page-landing/template.pug @@ -22,9 +22,7 @@ section.intro-container-wrapper p It provides an interactive configuration wizard which helps you create and download configuration files and code snippets for your Apache Ignite projects. Additionally, the tool allows you to automatically load SQL metadata from any RDBMS, run SQL queries on your in-memory cache, and view execution plans, in-memory schema, and streaming charts. a#signup_show.btn.btn-lg.btn-primary.btn-custom(ui-sref='signup') Sign Up .col-lg-6.col-md-6.col-sm-6.col-xs-12 - ui-carousel(slides='$ctrl.images' autoplay='true' slides-to-show='1' arrows='false') - carousel-item - img(src='{{item}}') + img(src='/images/page-landing-ui-sample.png') section.features-container-wrapper .container.features-container .section-title The Web Console allows you to: diff --git a/modules/web-console/frontend/app/vendor.js b/modules/web-console/frontend/app/vendor.js index 1c6e9ab..2800739 100644 --- a/modules/web-console/frontend/app/vendor.js +++ b/modules/web-console/frontend/app/vendor.js @@ -51,12 +51,9 @@ import 'file-saver'; import 'jszip'; import 'nvd3'; import 'lodash'; -import 'angular-ui-carousel'; import 'angular-gridster/dist/angular-gridster.min.css'; import 'angular-tree-control/css/tree-control-attribute.css'; import 'angular-tree-control/css/tree-control.css'; import 'angular-ui-grid/ui-grid.css'; -import 'angular-motion/dist/angular-motion.css'; import 'nvd3/build/nv.d3.css'; -import 'angular-ui-carousel/dist/ui-carousel.css'; diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index 998e51f..d24adfe 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -34,18 +34,15 @@ "angular-acl": "0.1.10", "angular-animate": "1.7.6", "angular-aria": "1.7.6", - "angular-cookies": "1.7.6", "angular-drag-and-drop-lists": "1.4.0", "angular-gridster": "0.13.14", "angular-messages": "1.7.6", - "angular-motion": "0.4.4", "angular-nvd3": "1.0.9", "angular-sanitize": "1.7.6", "angular-smart-table": "2.1.11", "angular-strap": "2.3.12", "angular-translate": "2.18.1", "angular-tree-control": "0.2.28", - "angular-ui-carousel": "0.1.10", "angular-ui-grid": "4.6.1", "angular-ui-validate": "1.2.3", "angular1-async-filter": "1.1.0", @@ -115,8 +112,6 @@ "html-loader": "1.0.0-alpha.0", "html-webpack-plugin": "3.2.0", "ignore-loader": "0.1.2", - "jasmine-core": "2.6.4", - "json-loader": "0.5.7", "karma": "^4.0.0", "karma-babel-preprocessor": "8.0.0-beta.0", "karma-chrome-launcher": "2.2.0", diff --git a/modules/web-console/frontend/public/images/page-landing-carousel-2.png b/modules/web-console/frontend/public/images/page-landing-carousel-2.png deleted file mode 100644 index 375ea0f..0000000 Binary files a/modules/web-console/frontend/public/images/page-landing-carousel-2.png and /dev/null differ diff --git a/modules/web-console/frontend/public/images/page-landing-carousel-3.png b/modules/web-console/frontend/public/images/page-landing-carousel-3.png deleted file mode 100644 index f8109f6..0000000 Binary files a/modules/web-console/frontend/public/images/page-landing-carousel-3.png and /dev/null differ diff --git a/modules/web-console/frontend/public/images/page-landing-carousel-1.png b/modules/web-console/frontend/public/images/page-landing-ui-sample.png similarity index 100% rename from modules/web-console/frontend/public/images/page-landing-carousel-1.png rename to modules/web-console/frontend/public/images/page-landing-ui-sample.png diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss index be31060..9414615 100644 --- a/modules/web-console/frontend/public/stylesheets/style.scss +++ b/modules/web-console/frontend/public/stylesheets/style.scss @@ -1658,6 +1658,66 @@ th[st-sort] { } } +.modal-backdrop { + background-color: rgba(0, 0, 0, 0.6) !important; +} + +.am-fade-and-scale { + animation-duration: 0.3s; + animation-timing-function: ease-in-out; + animation-fill-mode: backwards; + + &.ng-enter, &.am-fade-and-scale-add, &.ng-hide-remove, &.ng-move { + animation-name: fadeAndScaleIn; + } + + &.ng-leave, &.am-fade-and-scale-remove, &.ng-hide, &.ng-move { + animation-name: fadeAndScaleOut; + } + + &.ng-enter { + visibility: hidden; + animation-name: fadeAndScaleIn; + animation-play-state: paused; + + &.ng-enter-active { + visibility: visible; + animation-play-state: running; + } + } + + &.ng-leave { + animation-name: fadeAndScaleOut; + animation-play-state: paused; + + &.ng-leave-active { + animation-play-state: running; + } + } + + +} + +@keyframes fadeAndScaleIn { + from { + opacity: 0; + transform: scale(0.7); + } + to { + opacity: 1; + } +} + +@keyframes fadeAndScaleOut { + from { + opacity: 1; + } + to { + opacity: 0; + transform: scale(0.7); + } +} + .panel-tip-container { display: inline-block; }