Merge branch 'dev' into 'master'

Dev

See merge request turris/reforis/reforis_diagnostics!8

.gitignore

@@ -109,4 +109,4 @@ venv.bak/
 ## mypy
 .mypy_cache/
 
-reforis_static/diagnostics/app.min.js
+reforis_static/reforis_diagnostics/js/app.min.js

js/package.json

@@ -6,7 +6,7 @@
     "url": "https://gitlab.labs.nic.cz/turris/reforis/diagnostics.git"
   },
   "license": "GPL-3.0",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Diagnostics plugins for Foris.",
   "main": "./src/app.js",
   "dependencies": {

js/webpack.config.js

@@ -12,7 +12,7 @@ module.exports = () => ({
     entry: "./src/app.js",
     output: {
         filename: "app.min.js",
-        path: path.join(__dirname, "../reforis_static/diagnostics/"),
+        path: path.join(__dirname, "../reforis_static/reforis_diagnostics/js"),
     },
     resolve: {
         modules: [

reforis_diagnostics/__init__.py

@@ -21,7 +21,7 @@ blueprint = Blueprint('Diagnostics', __name__, url_prefix='/diagnostics/api')
 # pylint: disable=invalid-name
 diagnostics = {
     'blueprint': blueprint,
-    'js_app_path': 'diagnostics/app.min.js',
+    'js_app_path': 'reforis_diagnostics/js/app.min.js',
     'translations_path': BASE_DIR / 'translations',
 }
 

setup.py

@@ -32,7 +32,7 @@ class CustomBuild(build_py):
 
 setuptools.setup(
     name=NAME,
-    version='2.0.0',
+    version='2.0.1',
     packages=setuptools.find_packages(exclude=['tests']),
     include_package_data=True,