From aff352335b613cf4dd670cab00ca452d9874baae Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 29 Jul 2016 15:17:15 +0300
Subject: [PATCH] Minor fixes on build scripts.

---
 gulpfile.js           | 10 +++++-----
 scripts/dist-view.clj |  6 +++---
 scripts/figwheel.clj  |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index a68799a3a..3df17e981 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -69,7 +69,7 @@ gulp.task("scss:main", scssPipeline({
 
 gulp.task("scss:view", scssPipeline({
   input: paths.app + "styles/view.scss",
-  output: paths.output + "view/css/"
+  output: paths.output + "css/"
 }));
 
 gulp.task("scss", ["scss:main", "scss:view"]);
@@ -107,8 +107,8 @@ gulp.task("template:main", templatePipeline({
 gulp.task("template:view", templatePipeline({
   input: paths.app + "view.mustache",
   output: paths.output + "view/",
-  jspath: "/view/js/view.js",
-  csspath: "/view/css/view.css"
+  jspath: "/js/view.js",
+  csspath: "/css/view.css"
 }));
 
 gulp.task("template", ["template:view",
@@ -140,8 +140,8 @@ gulp.task("dist:template:main", templatePipeline({
 gulp.task("dist:template:view", templatePipeline({
   input: paths.app + "view.mustache",
   output: paths.dist + "view/",
-  jspath: "/view/js/main.js",
-  csspath: "/view/css/main.css"
+  jspath: "/js/view.js",
+  csspath: "/css/view.css"
 }));
 
 gulp.task("dist:template", ["dist:template:view",
diff --git a/scripts/dist-view.clj b/scripts/dist-view.clj
index bd3e2c517..a45a60974 100644
--- a/scripts/dist-view.clj
+++ b/scripts/dist-view.clj
@@ -8,9 +8,9 @@
    {:main 'uxbox.view
     :parallel-build false
     :warnings {:ns-var-clash false}
-    :output-to "dist/view/js/view.js"
-    :source-map "dist/view/js/view.js.map"
-    :output-dir "dist/view/js/view/"
+    :output-to "dist/js/view.js"
+    :source-map "dist/js/view.js.map"
+    :output-dir "dist/js/view/"
     :closure-defines {"uxbox.config.url" "https://test.uxbox.io/api"
                       "uxbox.config.viewurl" "https://test.uxbox.io/view/"}
     :optimizations :simple
diff --git a/scripts/figwheel.clj b/scripts/figwheel.clj
index 890e1e7a3..5d23381eb 100644
--- a/scripts/figwheel.clj
+++ b/scripts/figwheel.clj
@@ -21,7 +21,7 @@
       :language-out :ecmascript5
       :output-to "resources/public/js/main.js"
       :output-dir "resources/public/js/main"
-      :asset-path "js/main"
+      :asset-path "/js/main"
       :verbose true}}
 
     {:id "view"
@@ -34,9 +34,9 @@
       :warnings {:ns-var-clash false}
       :language-in  :ecmascript6
       :language-out :ecmascript5
-      :output-to "resources/public/view/js/view.js"
-      :output-dir "resources/public/view/js/view"
-      :asset-path "js/view"
+      :output-to "resources/public/js/view.js"
+      :output-dir "resources/public/js/view"
+      :asset-path "/js/view"
       :verbose true}}
     ]})