Merge branch 'main' of https://github.com/ifpen/chalk-it

ifpen · Dec 12, 2024 · dfba73e · dfba73e
2 parents ec7fd26 + 38ba01b
commit dfba73e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/back_end/common/template_utils.py b/back_end/common/template_utils.py
@@ -11,8 +11,6 @@
 
 
 from flask import render_template_string
-import re
-import os
 import json
 from pathlib import Path
 
@@ -50,12 +48,8 @@ def render_template(cls, root_dir: str, xprjson_path: str, file_name: str) -> st
 
         # Prepare the script with dynamic JSON data
         script = f"""
-        <script type="text/javascript">
-            try {{               
-                window.chalkitLoadDashboard({json.dumps(config_data)});
-            }} catch (error) {{
-                console.error('Error loading dashboard:', error);
-            }}
+        <script id="dashboard_data" type="application/json">
+            {json.dumps(config_data)}
         </script>
         """
 

diff --git a/back_end/render/render.py b/back_end/render/render.py
@@ -30,14 +30,10 @@ class RenderApp:
     def __init__(self) -> None:
         """Initialize the Flask app, configure paths, and set up routes."""
         # Instance-specific attributes
-        self.XPRJSON_FILE_PATH = (
-            Path(__file__).resolve().parent.parent.parent / "untitled.xprjson"
-        )
+        self.XPRJSON_FILE_PATH = Path("dashboard.xprjson")
         self.DEBUG = False
         # Determine the base directory for HTML templates
-        self.BASE_DIR = (
-            Path(__file__).resolve().parent.parent.parent / "front-end" / "build"
-        )
+        self.BASE_DIR = Path(__file__).parent.parent.resolve()
 
         # Flask app and blueprint setup
         self.app: Flask = Flask(__name__)