From d67a32e951c6116adc3ad14d31f26a6459333648 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Thu, 29 Dec 2016 09:44:31 -0200
Subject: Use only dist folder for serving application

---
 service/pixelated/resources/login_resource.py | 4 ++--
 service/pixelated/resources/root_resource.py  | 4 ++--
 web-ui/webpack.config.js                      | 2 +-
 web-ui/webpack.production.config.js           | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index ed0cb54e..2a11b73e 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -40,11 +40,11 @@ def _get_startup_folder():
 
 
 def _get_static_folder():
-    static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app"))
+    static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "dist"))
     # this is a workaround for packaging
     if not os.path.exists(static_folder):
         static_folder = os.path.abspath(
-            os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "app"))
+            os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist"))
     if not os.path.exists(static_folder):
         static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')
     return static_folder
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index 8df76c70..101ff6b8 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -111,11 +111,11 @@ class RootResource(BaseResource):
         return os.path.join(path, '..', 'assets')
 
     def _get_static_folder(self):
-        static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app"))
+        static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "dist"))
         # this is a workaround for packaging
         if not os.path.exists(static_folder):
             static_folder = os.path.abspath(
-                os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "app"))
+                os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist"))
         if not os.path.exists(static_folder):
             static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')
         return static_folder
diff --git a/web-ui/webpack.config.js b/web-ui/webpack.config.js
index eb64aab8..a79d98be 100644
--- a/web-ui/webpack.config.js
+++ b/web-ui/webpack.config.js
@@ -6,7 +6,7 @@ module.exports = {
   entry: './app/js/index.js',
   node: { fs: 'empty' },
   output: {
-    path: path.join(__dirname, '/app/'),
+    path: path.join(__dirname, 'dist'),
     filename: 'app.min.js',
     publicPath: '/assets/'
   },
diff --git a/web-ui/webpack.production.config.js b/web-ui/webpack.production.config.js
index b8531080..79884ad7 100644
--- a/web-ui/webpack.production.config.js
+++ b/web-ui/webpack.production.config.js
@@ -53,6 +53,7 @@ module.exports = {
     new CopyWebpackPlugin([
       { context: 'app/', from: '404.html' },
       { context: 'app/', from: 'index.html' },
+      { context: 'app/', from: 'css/*' },
       { context: 'app/', from: 'fonts/*' },
       { context: 'app/', from: 'locales/**/*' },
       { context: 'app/', from: 'bower_components/font-awesome/fonts/*' },
-- 
cgit v1.2.3