Merge 4a221f2 into 7e150ef

GrupaZero · Mar 3, 2017 · fbed987 · fbed987
2 parents 7e150ef + 4a221f2
commit fbed987
Show file tree

Hide file tree

Showing 30 changed files with 15,667 additions and 94 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -26,9 +26,17 @@ elixir(mix => {
     )
       .copy(
       'node_modules/bootstrap-sass/assets/fonts/bootstrap',
-      'public/fonts/bootstrap'
+      'public/build/fonts/bootstrap'
     )
 
     .sass('app.scss')
-    .webpack('app.js');
+    .webpack('app.js')
+
+    .version(['css/app.css', 'js/app.js']);
+
+    if (mix.production) {
+        mix.version([
+            'css/app.css', 'js/app.js'
+        ]);
+    }
 });
diff --git a/package.json b/package.json
@@ -20,6 +20,9 @@
     "font-awesome": "^4.6.3",
     "jquery-colorbox": "^1.6.4",
     "jquery-match-height": "^0.7.0",
+    "vue": "2.1",
+    "vue-resource": "1.0",
+    "vue-template-compiler": "2.1",
     "vue-i18n": "^4.9.0"
   }
 }