ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [42/50] [abbrv] ignite git commit: IGNITE-3319 Review.
Date Mon, 20 Jun 2016 02:59:05 GMT
IGNITE-3319 Review.


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

Branch: refs/heads/ignite-3262
Commit: d075cca2246fdeedd2b43e2d579ff8ab7306f724
Parents: 595a42f
Author: Andrey Novikov <anovikov@apache.org>
Authored: Thu Jun 16 13:51:12 2016 +0700
Committer: Andrey Novikov <anovikov@apache.org>
Committed: Thu Jun 16 13:51:12 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/.gitignore      |  1 -
 modules/web-console/src/main/js/app/app.js      |  6 +--
 .../src/main/js/gulpfile.babel.js/paths.js      | 57 ++++++++------------
 .../src/main/js/gulpfile.babel.js/tasks/copy.js | 12 ++---
 .../main/js/gulpfile.babel.js/tasks/watch.js    |  2 -
 .../main/js/gulpfile.babel.js/webpack/common.js | 31 ++++++-----
 .../webpack/environments/development.js         |  5 +-
 7 files changed, 52 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/.gitignore
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/.gitignore b/modules/web-console/src/main/js/.gitignore
index 43f716c..a6af5e1 100644
--- a/modules/web-console/src/main/js/.gitignore
+++ b/modules/web-console/src/main/js/.gitignore
@@ -7,4 +7,3 @@ ignite_modules_temp/*
 public/stylesheets/*.css
 serve/config/*.json
 serve/agent_dists/*.zip
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/app.js b/modules/web-console/src/main/js/app/app.js
index 6fe84c2..a33e385 100644
--- a/modules/web-console/src/main/js/app/app.js
+++ b/modules/web-console/src/main/js/app/app.js
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import '../public/stylesheets/style.scss';
 
 import './decorator/select';
@@ -56,7 +57,7 @@ import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive';
 import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directive';
 import igniteUiAcePojos from './directives/ui-ace-pojos/ui-ace-pojos.directive';
 import igniteBsAffixUpdate from './directives/bs-affix-update.directive';
-import igniteСentered from './directives/centered/centered.directive.js';
+import igniteCentered from './directives/centered/centered.directive.js';
 
 // Services.
 import cleanup from './services/cleanup.service';
@@ -102,7 +103,6 @@ import 'controllers/sql-controller';
 // Inject external modules.
 import 'ignite_modules_temp/index';
 
-
 import baseTemplate from '../views/base.jade';
 
 angular
@@ -153,7 +153,7 @@ angular
 .directive(...igniteUiAceDocker)
 .directive(...igniteUiAcePojos)
 .directive(...igniteBsAffixUpdate)
-.directive(...igniteСentered)
+.directive(...igniteCentered)
 // Services.
 .service(...cleanup)
 .service(...confirm)

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
index 9a1e61a..2ce6bcb 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
@@ -29,57 +29,48 @@ const sassPaths = [
 ];
 
 const jadePaths = [
-    '!./views/error.jade',
     './views/*.jade',
     './views/**/*.jade'
 ];
 
-const jadeModulePaths = [
-    igniteModulesDir + '/**/view/**/*.jade'
-];
-
-const resourcePaths = [
-    './controllers/**/*.json',
-    './public/**/*.png',
-    './public/*.ico'
-];
-
-const resourceModulePaths = [
-    igniteModulesDir + '/**/controllers/models/*.json',
-    igniteModulesDir + '/**/images/*.png'
-];
-
 const jsPaths = [
     './{app,controllers,generator}/*.js',
     './{app,controllers,generator}/**/*.js'
 ];
 
-const jsModulePaths = [
-    igniteModulesTemp + '/index.js',
-    igniteModulesTemp + '/**/main.js',
-    igniteModulesTemp + '/**/module.js',
-    igniteModulesTemp + '/**/app/modules/*.js',
-    igniteModulesTemp + '/**/app/modules/**/*.js',
-    igniteModulesTemp + '/**/app/modules/**/*.jade'
-];
-
 const appPaths = [
     './app/**/*.сss',
     './app/**/*.jade',
     './app/data/*.json'
 ].concat(jsPaths);
 
-const appModulePaths = [
+const resourcePaths = [
+    './public/**/*.png',
+    './public/*.ico'
+];
+
+const jadeModulePaths = [
+    igniteModulesDir + '/**/view/**/*.jade'
+];
+
+const jsModulePaths = [
     igniteModulesDir + '/index.js',
     igniteModulesDir + '/**/main.js',
     igniteModulesDir + '/**/module.js',
-    igniteModulesDir + '/**/app/**/*.css',
-    igniteModulesDir + '/**/app/data/*.json',
     igniteModulesDir + '/**/app/modules/*.js',
     igniteModulesDir + '/**/app/modules/**/*.js',
     igniteModulesDir + '/**/app/modules/**/*.jade'
 ];
 
+const appModulePaths = [
+    igniteModulesDir + '/**/app/**/*.css',
+    igniteModulesDir + '/**/app/data/*.json'
+].concat(jsModulePaths);
+
+const resourceModulePaths = [
+    igniteModulesDir + '/**/images/*.png'
+];
+
 export {
     rootDir,
     srcDir,
@@ -90,14 +81,12 @@ export {
     sassPaths,
 
     jadePaths,
-    jadeModulePaths,
-
     resourcePaths,
-    resourceModulePaths,
-
     jsPaths,
-    jsModulePaths,
-
     appPaths,
+
+    jadeModulePaths,
+    resourceModulePaths,
+    jsModulePaths,
     appModulePaths
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index ac31fdd..d2abfe6 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -22,23 +22,21 @@ import sequence from 'gulp-sequence';
 import { destDir, rootDir, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp
} from '../paths';
 
 gulp.task('copy', (cb) => {
-    const tasks = ['copy:resource', 'copy:ignite_modules:resource', 'copy:ignite_modules:js'];
+    const tasks = ['copy:resource', 'copy:ignite_modules:js', 'copy:ignite_modules:resource'];
     
     return sequence(tasks, cb);
 });
 
+gulp.task('copy:resource', () =>
+    gulp.src(resourcePaths)
+        .pipe(gulp.dest(destDir))
+);
 
 gulp.task('copy:ignite_modules:js', () =>
     gulp.src(jsModulePaths)
-        .pipe(cache('copy:ignite_modules:js'))
         .pipe(gulp.dest(`${rootDir}/${igniteModulesTemp}`))
 );
 
-gulp.task('copy:resource', () =>
-    gulp.src(resourcePaths)
-        .pipe(gulp.dest(destDir))
-);
-
 gulp.task('copy:ignite_modules:resource', () =>
     gulp.src(resourceModulePaths)
         .pipe(gulp.dest(`${destDir}/ignite_modules`))

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index b958816..f708e67 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -28,6 +28,4 @@ gulp.task('watch', ['build'], () => {
     gulp.watch(resourcePaths, ['copy:resource']);
     gulp.watch(resourceModulePaths, ['copy:ignite_modules:resource']);
     gulp.watch(appModulePaths, ['watch:ignite-modules']);
-    gulp.watch(appPaths, ['copy']);
 });
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index 1369328..941f79a 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -32,35 +32,39 @@ const development = NODE_ENV === 'development';
 const node_modules_path = path.resolve('node_modules');
 const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
 
-
 export default () => {
-
-    const webpackConfig = {
+    return {
         node: {
             fs: 'empty'
         },
-        
+
         // Entry points.
         entry: {
             polyfill: 'babel-polyfill',
             app: path.join(srcDir, 'app.js'),
             vendor: path.join(srcDir, 'vendor.js')
         },
-        
+
         // Output system.
         output: {
             path: destDir,
             publicPath: './',
             filename: '[name].js'
         },
-        
+
         // Resolves modules.
         resolve: {
-            extensions: ['', '.js'],
+            extensions: [
+                '',
+                '.js'
+            ],
             root: [rootDir],
-            modulesDirectories: [node_modules_path, './'],
+            modulesDirectories: [
+                node_modules_path,
+                './'
+            ]
         },
-        
+
         // Modules resolvers.
         module: {
             noParse: [],
@@ -99,14 +103,17 @@ export default () => {
                     loader: 'babel-loader',
                     query: {
                         cacheDirectory: true,
-                        plugins: ['transform-runtime', 'add-module-exports'],
+                        plugins: ['transform-runtime',
+                            'add-module-exports'],
                         presets: ['angular']
 
                     }
                 },
                 {
                     test: /\.css$/,
-                    loaders: ['style-loader', 'css-loader?sourceMap', 'postcss-loader']
+                    loaders: ['style-loader',
+                        'css-loader?sourceMap',
+                        'postcss-loader']
                 },
                 {
                     test: /\.(scss|sass)$/,
@@ -179,6 +186,4 @@ export default () => {
             progressPlugin
         ]
     };
-
-    return webpackConfig;
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index 766bda8..6b23450 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -19,7 +19,7 @@ import webpack from 'webpack';
 import {destDir, rootDir} from '../../paths';
 
 export default () => {
-    let plugins = [
+    const plugins = [
         new webpack.HotModuleReplacementPlugin()
     ];
 
@@ -44,8 +44,9 @@ export default () => {
                 '/api/v1/*': {
                     target: 'http://localhost:3000',
                     changeOrigin: true,
-                    rewrite: function(req) {
+                    rewrite: (req) => {
                         req.url = req.url.replace(/^\/api\/v1/, '');
+
                         return req;
                     }
                 }


Mime
View raw message