#158 fixed invalid font urls on admin page, when behind the proxy

bugy · Jan 17, 2019 · ea500e8 · ea500e8
1 parent 7552aef
commit ea500e8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/utils/tool_utils.py b/src/utils/tool_utils.py
@@ -12,7 +12,7 @@ def validate_web_build_exists(project_path):
     if not os.path.exists(web_folder):
         raise InvalidWebBuildException(web_folder + ' does not exist. \n' + how_to_fix_build_message)
 
-    required_files = ['index.js', 'index.html', 'index-deps.css', 'admin.html', os.path.join('admin', 'admin.js')]
+    required_files = ['index.js', 'index.html', 'index-deps.css', 'admin.html', 'admin.js']
     for file in required_files:
         file_path = os.path.join(web_folder, file)
         if not os.path.exists(file_path):

diff --git a/src/web/server.py b/src/web/server.py
@@ -490,7 +490,7 @@ def validate_execution_id(execution_id, request_handler, only_active=True):
 
 
 class AuthorizedStaticFileHandler(BaseStaticHandler):
-    admin_files = ['css/admin.css', 'js/admin/*', 'admin.html']
+    admin_files = ['admin.html', 'css/admin.css', 'admin.js', 'admin-deps.css']
 
     @check_authorization
     def validate_absolute_path(self, root, absolute_path):

diff --git a/web-src/js/admin/admin.js → web-src/js/admin.js b/web-src/js/admin/admin.js → web-src/js/admin.js
@@ -1,9 +1,9 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import '../style_imports';
-import ExecutionsLogPage from './executions-log-page';
-import ExecutionsLog from './executions-log';
-import ExecutionDetails from './execution-details';
+import './style_imports';
+import ExecutionsLogPage from './admin/executions-log-page';
+import ExecutionsLog from './admin/executions-log';
+import ExecutionDetails from './admin/execution-details';
 
 Vue.use(VueRouter);
 

diff --git a/web-src/package.json b/web-src/package.json
@@ -18,16 +18,16 @@
     "babel-loader": "^8.0.4",
     "chai": "^4.2.0",
     "copy-webpack-plugin": "^4.6.0",
-    "css-loader": "^1.0.1",
-    "file-loader": "^2.0.0",
+    "css-loader": "^2.1.0",
+    "file-loader": "^3.0.0",
     "html-webpack-plugin": "^3.2.0",
     "karma": "3.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-mocha": "^1.3.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "^3.0.5",
-    "mini-css-extract-plugin": "^0.4.4",
+    "mini-css-extract-plugin": "^0.5.0",
     "mocha": "^5.2.0",
     "style-loader": "^0.23.1",
     "vue-loader": "^15.4.2",

diff --git a/web-src/webpack.common.js b/web-src/webpack.common.js
@@ -8,7 +8,7 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin');
 module.exports = {
     entry: {
         'index': './js/index.js',
-        'admin/admin': './js/admin/admin.js',
+        'admin': './js/admin.js',
         'login': './js/login.js'
     },
     output: {
@@ -36,7 +36,7 @@ module.exports = {
             }),
             new HtmlWebpackPlugin({
                 template: 'admin.html',
-                chunks: ['admin/admin'],
+                chunks: ['admin'],
                 filename: 'admin.html',
                 inject: false
             }),