From 7ae41cbe63e7c5b7fe4e5f9205ced3d1cb652d7e Mon Sep 17 00:00:00 2001 From: cubedro Date: Wed, 27 May 2015 13:16:56 +0300 Subject: [PATCH] renamed public to src and moved views in it --- Gruntfile.js | 22 +++++++++--------- app.js | 2 +- {public => src}/css/animation.css | 0 {public => src}/css/bootstrap.min.css | 0 {public => src}/css/minimal-icons-codes.css | 0 .../css/minimal-icons-embedded.css | 0 .../css/minimal-icons-ie7-codes.css | 0 {public => src}/css/minimal-icons-ie7.css | 0 {public => src}/css/minimal-icons.css | 0 {public => src}/css/style.css | 0 {public => src}/css/toastr.min.css | 0 {public => src}/fonts/Simple-Line-Icons.ttf | Bin {public => src}/fonts/minimal-icons.eot | Bin {public => src}/fonts/minimal-icons.svg | 0 {public => src}/fonts/minimal-icons.ttf | Bin {public => src}/fonts/minimal-icons.woff | Bin {public => src}/images/favicon.ico | Bin {public => src}/images/favicon.png | Bin {public => src}/images/screenshot-v0.0.1.jpg | Bin {public => src}/images/screenshot-v0.0.2.jpg | Bin {public => src}/images/screenshot-v0.0.5.jpg | Bin {public => src}/images/screenshot.jpg | Bin {public => src}/js/app.js | 0 {public => src}/js/controllers.js | 0 {public => src}/js/directives.js | 0 {public => src}/js/filters.js | 0 {public => src}/js/lib/angular.js | 0 {public => src}/js/lib/angular.min.js | 0 {public => src}/js/lib/angular.min.js.map | 0 {public => src}/js/lib/bootstrap.min.js | 0 {public => src}/js/lib/d3.js | 0 {public => src}/js/lib/d3.min.js | 0 {public => src}/js/lib/d3.tip.min.js | 0 {public => src}/js/lib/datamaps.min.js | 0 {public => src}/js/lib/jquery-1.11.3.js | 0 {public => src}/js/lib/jquery-1.11.3.min.js | 0 .../js/lib/jquery-1.11.3.min.js.map | 0 {public => src}/js/lib/jquery.sparkline.js | 0 .../js/lib/jquery.sparkline.min.js | 0 {public => src}/js/lib/lodash.js | 0 {public => src}/js/lib/lodash.min.js | 0 {public => src}/js/lib/moment.en.min.js | 0 {public => src}/js/lib/moment.js | 0 {public => src}/js/lib/moment.min.js | 0 {public => src}/js/lib/primus.min.js | 0 {public => src}/js/lib/toastr.min.js | 0 {public => src}/js/lib/topojson.min.js | 0 {public => src}/js/script.js | 0 {views => src/views}/error.jade | 0 {views => src/views}/index.jade | 0 {views => src/views}/layout.jade | 0 51 files changed, 12 insertions(+), 12 deletions(-) rename {public => src}/css/animation.css (100%) rename {public => src}/css/bootstrap.min.css (100%) rename {public => src}/css/minimal-icons-codes.css (100%) rename {public => src}/css/minimal-icons-embedded.css (100%) rename {public => src}/css/minimal-icons-ie7-codes.css (100%) rename {public => src}/css/minimal-icons-ie7.css (100%) rename {public => src}/css/minimal-icons.css (100%) rename {public => src}/css/style.css (100%) rename {public => src}/css/toastr.min.css (100%) rename {public => src}/fonts/Simple-Line-Icons.ttf (100%) rename {public => src}/fonts/minimal-icons.eot (100%) rename {public => src}/fonts/minimal-icons.svg (100%) rename {public => src}/fonts/minimal-icons.ttf (100%) rename {public => src}/fonts/minimal-icons.woff (100%) rename {public => src}/images/favicon.ico (100%) rename {public => src}/images/favicon.png (100%) rename {public => src}/images/screenshot-v0.0.1.jpg (100%) rename {public => src}/images/screenshot-v0.0.2.jpg (100%) rename {public => src}/images/screenshot-v0.0.5.jpg (100%) rename {public => src}/images/screenshot.jpg (100%) rename {public => src}/js/app.js (100%) rename {public => src}/js/controllers.js (100%) rename {public => src}/js/directives.js (100%) rename {public => src}/js/filters.js (100%) rename {public => src}/js/lib/angular.js (100%) rename {public => src}/js/lib/angular.min.js (100%) rename {public => src}/js/lib/angular.min.js.map (100%) rename {public => src}/js/lib/bootstrap.min.js (100%) rename {public => src}/js/lib/d3.js (100%) rename {public => src}/js/lib/d3.min.js (100%) rename {public => src}/js/lib/d3.tip.min.js (100%) rename {public => src}/js/lib/datamaps.min.js (100%) rename {public => src}/js/lib/jquery-1.11.3.js (100%) rename {public => src}/js/lib/jquery-1.11.3.min.js (100%) rename {public => src}/js/lib/jquery-1.11.3.min.js.map (100%) rename {public => src}/js/lib/jquery.sparkline.js (100%) rename {public => src}/js/lib/jquery.sparkline.min.js (100%) rename {public => src}/js/lib/lodash.js (100%) rename {public => src}/js/lib/lodash.min.js (100%) rename {public => src}/js/lib/moment.en.min.js (100%) rename {public => src}/js/lib/moment.js (100%) rename {public => src}/js/lib/moment.min.js (100%) rename {public => src}/js/lib/primus.min.js (100%) rename {public => src}/js/lib/toastr.min.js (100%) rename {public => src}/js/lib/topojson.min.js (100%) rename {public => src}/js/script.js (100%) rename {views => src/views}/error.jade (100%) rename {views => src/views}/index.jade (100%) rename {views => src/views}/layout.jade (100%) diff --git a/Gruntfile.js b/Gruntfile.js index a240723..1051b52 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,12 +1,12 @@ -var src = 'public/'; +var src = 'src/'; var dest = 'dist/'; var scripts = [ - 'public/js/app.js', - 'public/js/controllers.js', - 'public/js/filters.js', - 'public/js/directives.js', - 'public/js/script.js' + 'src/js/app.js', + 'src/js/controllers.js', + 'src/js/filters.js', + 'src/js/directives.js', + 'src/js/script.js' ]; var vendor = [ @@ -49,7 +49,7 @@ module.exports = function(grunt) { } }, files: { - 'dist/index.html': 'views/index.jade' + 'dist/index.html': 'src/views/index.jade' } } }, @@ -58,28 +58,28 @@ module.exports = function(grunt) { files: [ { expand: true, - cwd: 'public/fonts/', + cwd: 'src/fonts/', src: ['minimal-*.*'], dest: 'dist/fonts/', filter: 'isFile' }, { expand: true, - cwd: 'public/images/', + cwd: 'src/images/', src: ['*.ico'], dest: 'dist/', filter: 'isFile' }, { expand: true, - cwd: 'public/css/', + cwd: 'src/css/', src: styles, dest: 'dist/css/', filter: 'isFile' }, { expand: true, - cwd: 'public/js/lib/', + cwd: 'src/js/lib/', src: ['*.*'], dest: 'dist/js/lib' } diff --git a/app.js b/app.js index d19e40f..5e7e2ff 100644 --- a/app.js +++ b/app.js @@ -23,7 +23,7 @@ if( process.env.NODE_ENV !== 'production' ) var bodyParser = require('body-parser'); // view engine setup - app.set('views', path.join(__dirname, 'views')); + app.set('views', path.join(__dirname, 'src/views')); app.set('view engine', 'jade'); app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: false })); diff --git a/public/css/animation.css b/src/css/animation.css similarity index 100% rename from public/css/animation.css rename to src/css/animation.css diff --git a/public/css/bootstrap.min.css b/src/css/bootstrap.min.css similarity index 100% rename from public/css/bootstrap.min.css rename to src/css/bootstrap.min.css diff --git a/public/css/minimal-icons-codes.css b/src/css/minimal-icons-codes.css similarity index 100% rename from public/css/minimal-icons-codes.css rename to src/css/minimal-icons-codes.css diff --git a/public/css/minimal-icons-embedded.css b/src/css/minimal-icons-embedded.css similarity index 100% rename from public/css/minimal-icons-embedded.css rename to src/css/minimal-icons-embedded.css diff --git a/public/css/minimal-icons-ie7-codes.css b/src/css/minimal-icons-ie7-codes.css similarity index 100% rename from public/css/minimal-icons-ie7-codes.css rename to src/css/minimal-icons-ie7-codes.css diff --git a/public/css/minimal-icons-ie7.css b/src/css/minimal-icons-ie7.css similarity index 100% rename from public/css/minimal-icons-ie7.css rename to src/css/minimal-icons-ie7.css diff --git a/public/css/minimal-icons.css b/src/css/minimal-icons.css similarity index 100% rename from public/css/minimal-icons.css rename to src/css/minimal-icons.css diff --git a/public/css/style.css b/src/css/style.css similarity index 100% rename from public/css/style.css rename to src/css/style.css diff --git a/public/css/toastr.min.css b/src/css/toastr.min.css similarity index 100% rename from public/css/toastr.min.css rename to src/css/toastr.min.css diff --git a/public/fonts/Simple-Line-Icons.ttf b/src/fonts/Simple-Line-Icons.ttf similarity index 100% rename from public/fonts/Simple-Line-Icons.ttf rename to src/fonts/Simple-Line-Icons.ttf diff --git a/public/fonts/minimal-icons.eot b/src/fonts/minimal-icons.eot similarity index 100% rename from public/fonts/minimal-icons.eot rename to src/fonts/minimal-icons.eot diff --git a/public/fonts/minimal-icons.svg b/src/fonts/minimal-icons.svg similarity index 100% rename from public/fonts/minimal-icons.svg rename to src/fonts/minimal-icons.svg diff --git a/public/fonts/minimal-icons.ttf b/src/fonts/minimal-icons.ttf similarity index 100% rename from public/fonts/minimal-icons.ttf rename to src/fonts/minimal-icons.ttf diff --git a/public/fonts/minimal-icons.woff b/src/fonts/minimal-icons.woff similarity index 100% rename from public/fonts/minimal-icons.woff rename to src/fonts/minimal-icons.woff diff --git a/public/images/favicon.ico b/src/images/favicon.ico similarity index 100% rename from public/images/favicon.ico rename to src/images/favicon.ico diff --git a/public/images/favicon.png b/src/images/favicon.png similarity index 100% rename from public/images/favicon.png rename to src/images/favicon.png diff --git a/public/images/screenshot-v0.0.1.jpg b/src/images/screenshot-v0.0.1.jpg similarity index 100% rename from public/images/screenshot-v0.0.1.jpg rename to src/images/screenshot-v0.0.1.jpg diff --git a/public/images/screenshot-v0.0.2.jpg b/src/images/screenshot-v0.0.2.jpg similarity index 100% rename from public/images/screenshot-v0.0.2.jpg rename to src/images/screenshot-v0.0.2.jpg diff --git a/public/images/screenshot-v0.0.5.jpg b/src/images/screenshot-v0.0.5.jpg similarity index 100% rename from public/images/screenshot-v0.0.5.jpg rename to src/images/screenshot-v0.0.5.jpg diff --git a/public/images/screenshot.jpg b/src/images/screenshot.jpg similarity index 100% rename from public/images/screenshot.jpg rename to src/images/screenshot.jpg diff --git a/public/js/app.js b/src/js/app.js similarity index 100% rename from public/js/app.js rename to src/js/app.js diff --git a/public/js/controllers.js b/src/js/controllers.js similarity index 100% rename from public/js/controllers.js rename to src/js/controllers.js diff --git a/public/js/directives.js b/src/js/directives.js similarity index 100% rename from public/js/directives.js rename to src/js/directives.js diff --git a/public/js/filters.js b/src/js/filters.js similarity index 100% rename from public/js/filters.js rename to src/js/filters.js diff --git a/public/js/lib/angular.js b/src/js/lib/angular.js similarity index 100% rename from public/js/lib/angular.js rename to src/js/lib/angular.js diff --git a/public/js/lib/angular.min.js b/src/js/lib/angular.min.js similarity index 100% rename from public/js/lib/angular.min.js rename to src/js/lib/angular.min.js diff --git a/public/js/lib/angular.min.js.map b/src/js/lib/angular.min.js.map similarity index 100% rename from public/js/lib/angular.min.js.map rename to src/js/lib/angular.min.js.map diff --git a/public/js/lib/bootstrap.min.js b/src/js/lib/bootstrap.min.js similarity index 100% rename from public/js/lib/bootstrap.min.js rename to src/js/lib/bootstrap.min.js diff --git a/public/js/lib/d3.js b/src/js/lib/d3.js similarity index 100% rename from public/js/lib/d3.js rename to src/js/lib/d3.js diff --git a/public/js/lib/d3.min.js b/src/js/lib/d3.min.js similarity index 100% rename from public/js/lib/d3.min.js rename to src/js/lib/d3.min.js diff --git a/public/js/lib/d3.tip.min.js b/src/js/lib/d3.tip.min.js similarity index 100% rename from public/js/lib/d3.tip.min.js rename to src/js/lib/d3.tip.min.js diff --git a/public/js/lib/datamaps.min.js b/src/js/lib/datamaps.min.js similarity index 100% rename from public/js/lib/datamaps.min.js rename to src/js/lib/datamaps.min.js diff --git a/public/js/lib/jquery-1.11.3.js b/src/js/lib/jquery-1.11.3.js similarity index 100% rename from public/js/lib/jquery-1.11.3.js rename to src/js/lib/jquery-1.11.3.js diff --git a/public/js/lib/jquery-1.11.3.min.js b/src/js/lib/jquery-1.11.3.min.js similarity index 100% rename from public/js/lib/jquery-1.11.3.min.js rename to src/js/lib/jquery-1.11.3.min.js diff --git a/public/js/lib/jquery-1.11.3.min.js.map b/src/js/lib/jquery-1.11.3.min.js.map similarity index 100% rename from public/js/lib/jquery-1.11.3.min.js.map rename to src/js/lib/jquery-1.11.3.min.js.map diff --git a/public/js/lib/jquery.sparkline.js b/src/js/lib/jquery.sparkline.js similarity index 100% rename from public/js/lib/jquery.sparkline.js rename to src/js/lib/jquery.sparkline.js diff --git a/public/js/lib/jquery.sparkline.min.js b/src/js/lib/jquery.sparkline.min.js similarity index 100% rename from public/js/lib/jquery.sparkline.min.js rename to src/js/lib/jquery.sparkline.min.js diff --git a/public/js/lib/lodash.js b/src/js/lib/lodash.js similarity index 100% rename from public/js/lib/lodash.js rename to src/js/lib/lodash.js diff --git a/public/js/lib/lodash.min.js b/src/js/lib/lodash.min.js similarity index 100% rename from public/js/lib/lodash.min.js rename to src/js/lib/lodash.min.js diff --git a/public/js/lib/moment.en.min.js b/src/js/lib/moment.en.min.js similarity index 100% rename from public/js/lib/moment.en.min.js rename to src/js/lib/moment.en.min.js diff --git a/public/js/lib/moment.js b/src/js/lib/moment.js similarity index 100% rename from public/js/lib/moment.js rename to src/js/lib/moment.js diff --git a/public/js/lib/moment.min.js b/src/js/lib/moment.min.js similarity index 100% rename from public/js/lib/moment.min.js rename to src/js/lib/moment.min.js diff --git a/public/js/lib/primus.min.js b/src/js/lib/primus.min.js similarity index 100% rename from public/js/lib/primus.min.js rename to src/js/lib/primus.min.js diff --git a/public/js/lib/toastr.min.js b/src/js/lib/toastr.min.js similarity index 100% rename from public/js/lib/toastr.min.js rename to src/js/lib/toastr.min.js diff --git a/public/js/lib/topojson.min.js b/src/js/lib/topojson.min.js similarity index 100% rename from public/js/lib/topojson.min.js rename to src/js/lib/topojson.min.js diff --git a/public/js/script.js b/src/js/script.js similarity index 100% rename from public/js/script.js rename to src/js/script.js diff --git a/views/error.jade b/src/views/error.jade similarity index 100% rename from views/error.jade rename to src/views/error.jade diff --git a/views/index.jade b/src/views/index.jade similarity index 100% rename from views/index.jade rename to src/views/index.jade diff --git a/views/layout.jade b/src/views/layout.jade similarity index 100% rename from views/layout.jade rename to src/views/layout.jade