From 4b2269ea88cdd007af9c6d2dab78ba32cd7b3c52 Mon Sep 17 00:00:00 2001
From: Tommy Parnell <tparnell8@gmail.com>
Date: Mon, 10 Aug 2015 20:36:12 -0400
Subject: [PATCH] fix this thing

---
 app/views/index.vash |  9 ++++----
 deploy.cmd           |  2 +-
 gulpfile.js          | 54 ++++++++++++++++++++++++++++----------------
 package.json         |  2 ++
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/app/views/index.vash b/app/views/index.vash
index 68db100..d0c7fbf 100644
--- a/app/views/index.vash
+++ b/app/views/index.vash
@@ -14,9 +14,8 @@
     <link rel="stylesheet" href="/components/bootstrap/dist/css/bootstrap.css" />
 
     <link rel="stylesheet" href="/components/font-awesome/css/font-awesome.min.css" />
-    <link rel="stylesheet" href="/css/GithubActivity.css" />
-    <link rel="stylesheet" href="/css/styles.min.css" />
-    <link rel="stylesheet" href="/css/Site.css" />
+
+    <link rel="stylesheet" href="/css/bundle.css" />
     <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/octicons/2.0.2/octicons.min.css">
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -320,13 +319,13 @@
 </footer>
 <script src="/components/moment/min/moment.min.js" ></script>
 <script src="/components/jquery/dist/jquery.min.js"></script>
-<script src="/dist/respond.js" ></script>
+<script src="/js/respond.js" ></script>
 <script src="/components/mustache/mustache.js" ></script>
 <script src="/components/jquery-rss/dist/jquery.rss.min.js" ></script>
 <script src="/components/jquery.easing/js/jquery.easing.min.js" ></script>
 <script src="/components/lodestoneapi.min/index.js" ></script>
 <script src="/components/bootstrap/dist/js/bootstrap.min.js" ></script>
-<script src="/dist/GithubActivity.js" ></script>
+<script src="/js/GithubActivity.js" ></script>
 <script src="/js/main.js"></script>
 
 </body>
diff --git a/deploy.cmd b/deploy.cmd
index 7f01a50..ed81db4 100644
--- a/deploy.cmd
+++ b/deploy.cmd
@@ -109,7 +109,7 @@ IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
 IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" (
   pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install gulp
-  call .\node_modules\.bin\gulp compress
+  call .\node_modules\.bin\gulp publish
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )
diff --git a/gulpfile.js b/gulpfile.js
index 57ac3c5..348ed5a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,27 +2,31 @@ var gulp = require('gulp'),
   nodemon = require('gulp-nodemon'),
   plumber = require('gulp-plumber'),
   livereload = require('gulp-livereload'),
-  less = require('gulp-less'),
    concatCss = require('gulp-concat-css'),
-   uglify = require('gulp-uglify');
+   uglify = require('gulp-uglify'),
+   cachebust = require('gulp-cache-bust'),
+   minifyCss = require('gulp-minify-css');
 
-gulp.task('less', function () {
-  gulp.src('./public/css/*.less')
-    .pipe(plumber())
-    .pipe(less())
-    .pipe(gulp.dest('./public/css'))
-    .pipe(livereload());
-});
 
-gulp.task('combineCss', function(){
-  gulp.src('./public/**/*.css')
-  .pipe(concatCss("bundle.css"))
-  .pipe(gulp.dest('public/out'));
 
-});
 
 gulp.task('watch', function() {
   gulp.watch('./public/css/*.less', ['less']);
+  gulp.watch('./public/css/*.css', ['combineCss']);
+});
+
+
+gulp.task('combineCss', function(){
+  return gulp.src('./public/css/*.css')
+  .pipe(concatCss("bundle.css"))
+  .pipe(gulp.dest('public/css'));
+
+});
+
+gulp.task('minfiyCss', function(){
+  return gulp.src('public/css/*.css')
+   .pipe(minifyCss({compatibility: 'ie8'}))
+   .pipe(gulp.dest('public/css'));
 });
 
 gulp.task('develop', function () {
@@ -37,19 +41,31 @@ gulp.task('develop', function () {
   });
 });
 
-gulp.task('compress', function() {
+gulp.task('minifyJs', function() {
   return gulp.src('public/js/*.js')
     .pipe(uglify())
-    .pipe(gulp.dest('public/dist'));
+    .pipe(gulp.dest('public/js'));
+});
+
+
+gulp.task('cachebust', function(){
+  return gulp.src('app/views/index.vash')
+      .pipe(cachebust({
+          type: 'timestamp'
+      }))
+      .pipe(gulp.dest('./app/views'));
+
 });
 
 gulp.task('publish', [
-  'less'
+  'combineCss',
+  'minifyJs',
+  'cachebust',
+  'develop'
 ]);
 
 gulp.task('default', [
-  'less',
   'develop',
-  'compress',
+  'combineCss',
   'watch'
 ]);
diff --git a/package.json b/package.json
index c038aa7..cd49b1a 100644
--- a/package.json
+++ b/package.json
@@ -22,9 +22,11 @@
   },
   "devDependencies": {
     "gulp": "~3.8.10",
+    "gulp-cache-bust": "^1.0.1",
     "gulp-concat-css": "^2.2.0",
     "gulp-less": "~3.0.1",
     "gulp-livereload": "~3.8.0",
+    "gulp-minify-css": "^1.2.0",
     "gulp-nodemon": "~2.0.2",
     "gulp-plumber": "~1.0.0",
     "gulp-uglify": "^1.2.0"