From 44762ac3d3edf0a47773968a6800a7b668d963f9 Mon Sep 17 00:00:00 2001 From: Drew Gottlieb Date: Mon, 9 Mar 2015 00:38:31 -0400 Subject: [PATCH 1/7] Added config.web.compress_css. Also specified url for Lato font with https. --- config.example.js | 3 +++ logic/web/handlers.js | 2 +- utils/load_config.js | 1 + views/layouts/page.ejs | 6 +++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config.example.js b/config.example.js index 6f874e1..95449f4 100644 --- a/config.example.js +++ b/config.example.js @@ -46,6 +46,9 @@ module.exports = { // Secret strong used for authentication. Make this unique. secret: 'change me!', + // Compress css generated from less. + compress_css: true, + // Max upload file size (in mb). max_file_size: 50 }, diff --git a/logic/web/handlers.js b/logic/web/handlers.js index 9f10443..2b659cc 100644 --- a/logic/web/handlers.js +++ b/logic/web/handlers.js @@ -37,7 +37,7 @@ exports.init = function(app) { src: base_dir + '/less', dest: tmpDir, prefix: '/styles', - compress: !config.web.debug, + compress: config.web.compress_css, force: config.web.debug })); diff --git a/utils/load_config.js b/utils/load_config.js index 444cc78..61e3792 100644 --- a/utils/load_config.js +++ b/utils/load_config.js @@ -25,6 +25,7 @@ var default_values = { debug: true, title: 'CSH DJ', secret: 'change me!', + compress_css: true, max_file_size: 50, }, auth: { diff --git a/views/layouts/page.ejs b/views/layouts/page.ejs index 9773f2e..71144b6 100644 --- a/views/layouts/page.ejs +++ b/views/layouts/page.ejs @@ -24,10 +24,14 @@ name="viewport" content="width=device-width, user-scalable=no, initial-scale=1" /> + <% if (config.web.compress_css) { %> + + <% } else { %> + <% } %> <%- stylesheets %> From 10d8c7537402bf753c7ade261d09859bf04eb522 Mon Sep 17 00:00:00 2001 From: Drew Gottlieb Date: Mon, 9 Mar 2015 00:45:42 -0400 Subject: [PATCH 2/7] Added config.web.compress_js to prefer serving minified js. --- config.example.js | 3 +++ utils/load_config.js | 1 + views/layouts/page.ejs | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/config.example.js b/config.example.js index 95449f4..2b7c41c 100644 --- a/config.example.js +++ b/config.example.js @@ -49,6 +49,9 @@ module.exports = { // Compress css generated from less. compress_css: true, + // Use minified js where possible. + compress_js: true, + // Max upload file size (in mb). max_file_size: 50 }, diff --git a/utils/load_config.js b/utils/load_config.js index 61e3792..6933e99 100644 --- a/utils/load_config.js +++ b/utils/load_config.js @@ -26,6 +26,7 @@ var default_values = { title: 'CSH DJ', secret: 'change me!', compress_css: true, + compress_js: true, max_file_size: 50, }, auth: { diff --git a/views/layouts/page.ejs b/views/layouts/page.ejs index 71144b6..9badc70 100644 --- a/views/layouts/page.ejs +++ b/views/layouts/page.ejs @@ -96,7 +96,11 @@ + <% if (config.web.compress_js) { %> + + <% } else { %> + <% } %>