diff --git a/.bowerrc b/.bowerrc
index 666f347..44491d3 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
{
- "directory": "client/bower_components"
+ "directory": "bower_components"
}
diff --git a/.gitignore b/.gitignore
index 943735c..de1f547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ stylesheets
/data
.tmp
+.build
diff --git a/Gruntfile.js b/Gruntfile.js
index 167b7c5..2664211 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,6 +8,7 @@ module.exports = function (grunt) {
} catch(e) {
localConfig = {};
}
+ var mozjpeg = require('imagemin-mozjpeg');
// Load grunt tasks automatically, when needed
require('jit-grunt')(grunt, {
@@ -22,6 +23,7 @@ module.exports = function (grunt) {
browserify: 'grunt-browserify',
bower: 'grunt-bower-task',
preprocess: 'grunt-preprocess',
+ uglify: 'grunt-contrib-uglify',
});
// Time how long tasks take. Can help when optimizing build times
@@ -118,7 +120,7 @@ module.exports = function (grunt) {
html: {
files: [
'<%= yeoman.client %>/*.html'],
- tasks: ['preprocess', 'injector', 'wiredep']
+ tasks: ['injector', 'wiredep']
},
gruntfile: {
files: ['Gruntfile.js']
@@ -150,24 +152,24 @@ module.exports = function (grunt) {
sprite:{
css: {
src: 'client/images/modern/icons/*.png',
- dest: '.tmp/sprite/spritesheet.png',
- destCss: '.tmp/sprite/sprites.css',
+ dest: '.build/images/spritesheet.png',
+ destCss: '.build/css/sprites.css',
cssOpts: {
cssSelector: function(i) { return "."+i.name; }
}
},
scss: {
src: 'client/images/modern/icons/*.png',
- dest: '.tmp/sprite/spritesheet.png',
- destCss: '.tmp/sprite/sprites.scss',
+ dest: '.build/images/spritesheet.png',
+ destCss: '.build/scss/sprite/sprites.scss',
cssOpts: {
cssSelector: function(i) { return "."+i.name; }
}
},
},
browserify: {
- '.tmp/app/pocketciv.js': [ 'src/**/*.js'],
- '.tmp/app/web.js': [ 'client/app/*.js', 'client/app/**/*.js', 'client/components/**/*.js' ]
+ '.build/js/pocketciv.js': [ 'src/**/*.js'],
+ '.build/js/web.js': [ '.build/app/*.js', '.build/app/**/*.js' ]
},
// Empties folders to start fresh
@@ -177,10 +179,7 @@ module.exports = function (grunt) {
dot: true,
src: [
'.tmp',
- '<%= yeoman.dist %>/*',
- '!<%= yeoman.dist %>/.git*',
- '!<%= yeoman.dist %>/.openshift',
- '!<%= yeoman.dist %>/Procfile'
+ '.build',
]
}]
},
@@ -188,28 +187,28 @@ module.exports = function (grunt) {
},
// Bower install
+ /*
bower: {
install: {
//just run 'grunt bower:install' and you'll see files from your Bower packages in lib directory
options: {
- targetDir: './client/bower_components/'
+ layout: 'byComponent',
+ install: false,
+ verbose: true,
+ targetDir: '.tmp/bower_components/'
}
}
},
+ */
preprocess: {
- options: {
- context : {
- DEBUG: true
- }
- },
html: {
src: 'client/index.html',
- dest: '.tmp/index.html'
+ dest: '.build/index.html'
},
js: {
- src: '.tmp/app/web.js',
- dest: '.tmp/app.web.js'
+ src: 'client/app/controller.js',
+ dest: '.build/app/controller.js'
}
},
@@ -221,9 +220,9 @@ module.exports = function (grunt) {
dist: {
files: [{
expand: true,
- cwd: '.tmp/',
+ cwd: '.build/',
src: '{,*/}*.css',
- dest: '.tmp/'
+ dest: '.build/'
}]
}
},
@@ -265,9 +264,12 @@ module.exports = function (grunt) {
// Automatically inject Bower components into the app
wiredep: {
target: {
- src: '.tmp/index.html',
- ignorePath: '<%= yeoman.client %>/',
- exclude: [/bootstrap-sass-official/, /bootstrap.js/, '/json3/', '/es5-shim/', /bootstrap.css/, /font-awesome.css/ ]
+ //cwd: '.tmp',
+ //bowerJson: '../bower.json',
+ src: '.build/index.html',
+ ignorePath: 'client/',
+ //directory: '.tmp/bower_components/',
+ exclude: [/bootstrap-sass-official/, /bootstrap.js/, '/json3/', '/es5-shim/', /font-awesome.css/ ]
}
},
@@ -276,10 +278,10 @@ module.exports = function (grunt) {
dist: {
files: {
src: [
- '<%= yeoman.dist %>/public/{,*/}*.js',
- '<%= yeoman.dist %>/public/{,*/}*.css',
- '<%= yeoman.dist %>/public/assets/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
- '<%= yeoman.dist %>/public/assets/fonts/*'
+ '.tmp/{,*/}*.js',
+ '.tmp/{,*/}*.css',
+ //'.build/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
+ //'<%= yeoman.dist %>/public/assets/fonts/*'
]
}
}
@@ -316,14 +318,16 @@ module.exports = function (grunt) {
// The following *-min tasks produce minified files in the dist folder
imagemin: {
- dist: {
- files: [{
- expand: true,
- cwd: '<%= yeoman.client %>/assets/images',
- src: '{,*/}*.{png,jpg,jpeg,gif}',
- dest: '<%= yeoman.dist %>/public/assets/images'
- }]
- }
+ dist: { // Target
+ options: { // Target options
+ //optimizationLevel: 3,
+ //svgoPlugins: [{ removeViewBox: false }],
+ //use: [mozjpeg()]
+ },
+ files: { // Dictionary of files
+ '.tmp/images/spritesheet.png': '.build/images/spritesheet.png', // 'destination': 'source'
+ }
+ },
},
svgmin: {
@@ -387,42 +391,33 @@ module.exports = function (grunt) {
// Copies remaining files to places other tasks can use
copy: {
- dist: {
+ build: {
files: [{
expand: true,
dot: true,
- cwd: '<%= yeoman.client %>',
- dest: '<%= yeoman.dist %>/public',
+ cwd: 'client',
+ dest: '.build',
src: [
- '*.{ico,png,txt}',
- '.htaccess',
- 'bower_components/**/*',
- 'assets/images/{,*/}*.{webp}',
- 'assets/fonts/**/*',
- 'index.html'
+ '**/*.js',
+ '**/*.html',
+ '**/*.css',
+ '**/*.scss',
]
- }, {
- expand: true,
- cwd: '.tmp/images',
- dest: '<%= yeoman.dist %>/public/assets/images',
- src: ['generated/*']
- }, {
+ }]
+ },
+ tmp: {
+ files: [{
expand: true,
- dest: '<%= yeoman.dist %>',
+ dot: true,
+ cwd: '.build',
+ dest: '.tmp',
src: [
- 'package.json',
- 'server/**/*'
+ '**/sprites.css',
]
}]
},
- styles: {
- expand: true,
- cwd: '<%= yeoman.client %>',
- dest: '.tmp/',
- src: ['{app,components}/**/*.css']
- }
},
-
+
buildcontrol: {
options: {
dir: 'dist',
@@ -510,44 +505,67 @@ module.exports = function (grunt) {
all: localConfig
},
- // Compiles Jade to html
- jade: {
- compile: {
- options: {
- data: {
- debug: false
- }
- },
- files: [{
- expand: true,
- cwd: '<%= yeoman.client %>',
- src: [
- '{app,components}/**/*.jade'
- ],
- dest: '.tmp',
- ext: '.html'
- }]
- }
- },
// Compiles Sass to CSS
sass: {
server: {
options: {
loadPath: [
- '<%= yeoman.client %>/bower_components',
- '<%= yeoman.client %>/app',
- '<%= yeoman.client %>/components',
- '.tmp',
+ 'bower_components',
+ '.build/app',
+ '.build/scss',
],
compass: false
},
files: {
- '.tmp/app/app.css' : '<%= yeoman.client %>/app/app.scss'
+ '.build/css/app.css' : '.build/app/app.scss'
}
}
},
-
+
+
+ // Uglify
+ uglify: {
+ options: {
+ mangle: false
+ },
+ dist: {
+ files: {
+ '.tmp/app.min.js': ['.build/js/*.js']
+ }
+ }
+ },
+
+ cssmin: {
+ target: {
+ files: [{
+ expand: true,
+ cwd: '.build/css',
+ src: ['*.css', '!*.min.css', "!sprites.css"],
+ dest: '.tmp',
+ ext: '.min.css'
+ }]
+ }
+ },
+
+ htmlmin: {
+ dist: { // Target
+ options: { // Target options
+ removeComments: true,
+ collapseWhitespace: true
+ },
+ files: [{
+ expand: true,
+ cwd: '.build',
+ src: ['app/**/*.html'],
+ dest: '.tmp',
+ },{ // Dictionary of files
+ '.tmp/index.html': '.build/index.html', // 'destination': 'source'
+ }
+ ]
+ },
+ },
+
injector: {
options: {
@@ -556,7 +574,7 @@ module.exports = function (grunt) {
scripts: {
options: {
transform: function(filePath) {
- filePath = filePath.replace('/client/', '');
+ filePath = filePath.replace('/.build/', '');
filePath = filePath.replace('/.tmp/', '');
return '';
},
@@ -565,16 +583,9 @@ module.exports = function (grunt) {
},
files: {
//'<%= yeoman.client %>/index.html': [
- '.tmp/index.html': [
- [
- //'{.tmp,<%= yeoman.client %>}/components/HexagonTools/js/HexagonTools.js',
- //'{.tmp,<%= yeoman.client %>}/components/**/*.js',
- '{.tmp,<%= yeoman.client %>}/{app,components}/**/pocketciv.js',
- '{.tmp,<%= yeoman.client %>}/{app,components}/**/web.js',
- '!{.tmp,<%= yeoman.client %>}/app/app.js',
- '!{.tmp,<%= yeoman.client %>}/{app,components}/**/*.spec.js',
- '!{.tmp,<%= yeoman.client %>}/{app,components}/**/*.mock.js']
- ]
+ '.build/index.html': [
+ [ '.tmp/*.js' ]
+ ]
}
},
@@ -583,16 +594,16 @@ module.exports = function (grunt) {
options: {
transform: function(filePath) {
filePath = filePath.replace('/client/app/', '');
- filePath = filePath.replace('/client/components/', '');
+ filePath = filePath.replace('/.build/app/', '');
return '@import \'' + filePath + '\';';
},
starttag: '// injector',
endtag: '// endinjector'
},
files: {
- '<%= yeoman.client %>/app/app.scss': [
- '<%= yeoman.client %>/{app,components}/**/*.{scss,sass}',
- '!<%= yeoman.client %>/app/app.{scss,sass}'
+ '.build/app/app.scss': [
+ '.build/app/**/*.{scss,sass}',
+ '!.build/app/app.scss'
]
}
},
@@ -601,7 +612,7 @@ module.exports = function (grunt) {
css: {
options: {
transform: function(filePath) {
- filePath = filePath.replace('/client/', '');
+ filePath = filePath.replace('/.build/', '');
filePath = filePath.replace('/.tmp/', '');
return '';
},
@@ -609,30 +620,11 @@ module.exports = function (grunt) {
endtag: ''
},
files: {
- //'<%= yeoman.client %>/index.html': [
- '.tmp/index.html': [
- '<%= yeoman.client %>/{app,components}/**/*.css',
- '.tmp/**/*.css'
+ '.build/index.html': [
+ '.tmp/*.css', '.tmp/css/*.css'
]
}
},
-
- sprite: {
- options: {
- transform: function(filePath) {
- filePath = filePath.replace('/client/', '');
- filePath = filePath.replace('/.tmp/', '');
- return '';
- },
- starttag: '',
- endtag: ''
- },
- files: {
- '.tmp/index.html': [
- '<%= yeoman.client %>/{app,components}/**/*.css'
- ]
- }
- }
},
});
@@ -655,10 +647,10 @@ module.exports = function (grunt) {
grunt.registerTask('serve', function (target) {
if (target === 'dist') {
return grunt.task.run([
- 'build',
+ //'build',
'env:all',
'env:prod',
- 'express:prod',
+ 'express:dev',
'express-keepalive'
]);
}
@@ -684,13 +676,13 @@ module.exports = function (grunt) {
grunt.task.run([
'clean:server',
'env:all',
- 'preprocess',
'injector:sass',
'browserify',
'sprite',
'concurrent:server',
'injector',
'wiredep',
+ 'preprocess',
'autoprefixer',
'express:dev',
'wait',
@@ -747,23 +739,35 @@ module.exports = function (grunt) {
});
grunt.registerTask('heroku', [
- 'clean:server',
+ 'clean',
'env:prod',
- 'bower',
+ 'copy:build',
+// 'bower',
'preprocess',
- 'injector:sass',
+ 'wiredep',
'browserify',
'sprite',
- 'injector:sprite',
- 'injector:scripts',
+ 'injector:sass',
+ 'sass',
+ 'uglify',
+ 'autoprefixer',
+ 'cssmin',
+ 'copy:tmp',
+ 'rev',
+ 'injector',
+ 'htmlmin',
+ 'imagemin',
+
+
+ /*
+ 'injector:sass',
'injector:css',
'concurrent:server',
'injector',
- 'wiredep',
- 'autoprefixer',
//'express:dev',
//'wait',
//'open',
//'watch'
+ */
]);
};
diff --git a/bower.json b/bower.json
index e4d86eb..68e7d1e 100644
--- a/bower.json
+++ b/bower.json
@@ -30,5 +30,13 @@
"bootstrap-sass-official": "~3.3.3",
"jquery-overflowandroid": "~0.7.7",
"angulartics": "~0.17.2"
+ },
+ "exportsOverride": {
+ "bootstrap-sass-official": {
+ "": "assets/stylesheets/bootstrap/_variables.scss"
+ },
+ "requirejs": {
+ "js": "require.js"
+ }
}
}
diff --git a/client/app/controller.js b/client/app/controller.js
index 18e6ffe..3052e6a 100644
--- a/client/app/controller.js
+++ b/client/app/controller.js
@@ -400,9 +400,9 @@ pocketcivApp.controller('MainGame', function ($scope, $http, $localStorage, $ana
$scope.engine = new pocketciv.EngineBuild({});
$scope.engine.phase = "";
$scope.godMode = false;
- // @exclude
+ //@exclude
$scope.godMode = true;
- // @endexclude
+ //@endexclude
$scope.toggleGod = function(gm) {
$scope.godMode = gm;
diff --git a/client/images/modern/icons-se7eccb6047.png b/client/images/modern/icons-se7eccb6047.png
deleted file mode 100644
index d134892..0000000
Binary files a/client/images/modern/icons-se7eccb6047.png and /dev/null differ
diff --git a/client/index.html b/client/index.html
index fed8fd8..8b03156 100644
--- a/client/index.html
+++ b/client/index.html
@@ -6,14 +6,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
PocketCiv Online
diff --git a/package.json b/package.json
index 221d01c..c28dfda 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"grunt-contrib-htmlmin": "~0.2.0",
"grunt-contrib-imagemin": "~0.7.1",
"grunt-contrib-jshint": "~0.10.0",
- "grunt-contrib-uglify": "~0.4.0",
+ "grunt-contrib-uglify": "^0.4.1",
"grunt-contrib-jade": "^0.11.0",
"grunt-contrib-sass": "^0.7.3",
"grunt-asset-injector": "^0.1.0",
@@ -42,8 +42,10 @@
"mustache": "^0.8.2",
"time-grunt": "~0.3.1",
"jit-grunt": "^0.5.0",
+ "grunt-rev": "~0.1.0",
"angular-sanitize": "0.0.1",
- "grunt-preprocess": "^4.1.0"
+ "grunt-preprocess": "^4.1.0",
+ "imagemin-mozjpeg": "^4.0.0"
},
"devDependencies": {
"grunt": "~0.4.4",
@@ -51,7 +53,6 @@
"grunt-google-cdn": "~0.4.0",
"grunt-newer": "~0.7.0",
"grunt-ng-annotate": "^0.2.3",
- "grunt-rev": "~0.1.0",
"grunt-svgmin": "~0.4.0",
"grunt-usemin": "~2.1.1",
"grunt-node-inspector": "~0.1.5",
diff --git a/server/app.js b/server/app.js
index cfbcf8e..d1557c8 100644
--- a/server/app.js
+++ b/server/app.js
@@ -25,6 +25,7 @@ var db = mongo.db(process.env.MONGOHQ_URL || "mongodb://localhost:27017/pocketci
app.use(express.static(__dirname+"/../.tmp/"))
app.use(express.static(__dirname+"/../client/"))
+app.use('/bower_components', express.static(__dirname+"/../bower_components/"))
app.use(bodyParser.json());