You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ve...@apache.org on 2015/06/22 23:47:58 UTC
[3/8] incubator-atlas git commit: HDPDGI-86: Vishal: Remove
unnecessary files from dist
HDPDGI-86: Vishal: Remove unnecessary files from dist
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/4cce8b26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4cce8b26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4cce8b26
Branch: refs/heads/master
Commit: 4cce8b267193cf3a42223363c9036616811a0569
Parents: 970115d
Author: Vishal Kadam <vi...@gmail.com>
Authored: Thu Jun 18 19:20:13 2015 -0400
Committer: Vishal Kadam <vi...@gmail.com>
Committed: Thu Jun 18 19:20:13 2015 -0400
----------------------------------------------------------------------
dashboard/v2/.gitignore | 2 +-
dashboard/v2/gruntfile.js | 18 ++------
.../v2/public/modules/home/views/home.html | 2 +-
.../v2/public/modules/search/searchRoutes.js | 1 -
dashboard/v2/server.js | 48 --------------------
5 files changed, 7 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4cce8b26/dashboard/v2/.gitignore
----------------------------------------------------------------------
diff --git a/dashboard/v2/.gitignore b/dashboard/v2/.gitignore
index 737d51e..e5ee796 100755
--- a/dashboard/v2/.gitignore
+++ b/dashboard/v2/.gitignore
@@ -25,4 +25,4 @@ public/dist
*.tgz
node/
dist/
-**/app.min.js
+**/app.min.js
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4cce8b26/dashboard/v2/gruntfile.js
----------------------------------------------------------------------
diff --git a/dashboard/v2/gruntfile.js b/dashboard/v2/gruntfile.js
index 2c2fb21..9535c7a 100755
--- a/dashboard/v2/gruntfile.js
+++ b/dashboard/v2/gruntfile.js
@@ -32,7 +32,7 @@ module.exports = function(grunt) {
},
js: {
files: ['public/**/*.js', '!public/lib/**', '!public/dist/**', '!public/js/app.min.js'],
- tasks: ['shell', 'copy:mainjs']
+ tasks: ['shell']
},
html: {
files: ['public/**/*.html'],
@@ -86,7 +86,7 @@ module.exports = function(grunt) {
}
}
},
- dist: 'public/js/app.min.js',
+ dist: 'dist/js/app.min.js',
modules: grunt.file.expand(
'public/js/app.js',
'public/js/routes.js',
@@ -130,16 +130,8 @@ module.exports = function(grunt) {
dist: {
expand: true,
cwd: 'public/',
- src: '**',
- dest: 'dist',
- },
- mainjs: {
- expand: true,
- cwd: 'public/',
- src: 'js/app.min.js',
- dest: 'dist/js/',
- flatten: true,
- filter: 'isFile'
+ src: ['**', '!js/**/*.js', '!modules/**/*.js'],
+ dest: 'dist'
}
},
clean: ['public/lib', 'dist'],
@@ -164,7 +156,7 @@ module.exports = function(grunt) {
grunt.registerTask('default', ['devUpdate', 'bower', 'jshint', 'jsbeautifier:default']);
grunt.registerTask('server', ['jshint', 'build', 'concurrent']);
- grunt.registerTask('build', ['clean', 'bower', 'copy:dist', 'minify', 'copy:mainjs']);
+ grunt.registerTask('build', ['clean', 'bower', 'copy:dist', 'minify']);
grunt.registerTask('minify', 'Minify the all js', function() {
var done = this.async();
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4cce8b26/dashboard/v2/public/modules/home/views/home.html
----------------------------------------------------------------------
diff --git a/dashboard/v2/public/modules/home/views/home.html b/dashboard/v2/public/modules/home/views/home.html
index 37f0a1a..4e93782 100755
--- a/dashboard/v2/public/modules/home/views/home.html
+++ b/dashboard/v2/public/modules/home/views/home.html
@@ -17,5 +17,5 @@
-->
<section class="text-center">
- <img data-ui-sref="search" data-ui-sref="search" class="pointer" src="modules/home/img/splash.png"/>
+ <img data-ui-sref="search" class="pointer" src="modules/home/img/splash.png"/>
</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4cce8b26/dashboard/v2/public/modules/search/searchRoutes.js
----------------------------------------------------------------------
diff --git a/dashboard/v2/public/modules/search/searchRoutes.js b/dashboard/v2/public/modules/search/searchRoutes.js
index c6100ec..abfe322 100755
--- a/dashboard/v2/public/modules/search/searchRoutes.js
+++ b/dashboard/v2/public/modules/search/searchRoutes.js
@@ -21,7 +21,6 @@
//Setting up route
angular.module('dgc.search').config(['$stateProvider',
function($stateProvider) {
- // states for my app
$stateProvider.state('search', {
url: '/search?query',
templateUrl: '/modules/search/views/search.html',
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4cce8b26/dashboard/v2/server.js
----------------------------------------------------------------------
diff --git a/dashboard/v2/server.js b/dashboard/v2/server.js
deleted file mode 100755
index ebfb11c..0000000
--- a/dashboard/v2/server.js
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env node
-
-/*
- * 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.
- */
-
-'use strict';
-
-/**
- * Module dependencies.
- */
-var express = require('express');
-
-/**
- * Main application entry file.
- * Please note that the order of loading is important.
- */
-
-// Initializing system variables
-var config = require('./server/config/config'),
- app = express();
-
-// Express settings
-require('./server/config/express')(app);
-
-// Start the app by listening on <port>
-var port = process.env.PORT || config.port;
-app.listen(port);
-
-console.log('Environment is = "' + config.nodeEnv + '"');
-console.log('Express app started on port ' + port + ' using config\n', JSON.stringify(config, null, 4));
-
-// Expose app
-module.exports = app;