works on #475 and #479

justpy/htmlcomponents.py

@@ -9,6 +9,7 @@
 from .tailwind import Tailwind
 import logging
 import httpx
+from .template import PageOptions
 
 # Dictionary for translating from tag to class
 _tag_class_dict = {}
@@ -48,7 +49,6 @@ def __call__(self, cls, **kwargs):
         register_component(cls, self.tag, self.attributes)
         return cls
 
-
 class WebPage:
     # TODO: Add page events online, beforeunload, resize
     instances = {}

justpy/justpy.py

@@ -14,6 +14,7 @@
 from .chartcomponents import *
 from .gridcomponents import *
 from .quasarcomponents import *
+from .template import Context
 
 # from .misccomponents import *
 from .meadows import *
@@ -255,6 +256,9 @@ async def get(self, request):
             "page_options": page_options,
             "html": load_page.html,
         }
+        # wrap the context in a context object to make it available
+        context_obj=Context(context)
+        context["context_obj"]=context_obj
         response = templates.TemplateResponse(load_page.template_file, context)
         if SESSIONS and new_cookie:
             cookie_value = cookie_signer.sign(request.state.session_id)

justpy/template.py

@@ -0,0 +1,40 @@
+'''
+Created on 2022-09-07
+
+@author: wf
+'''
+class Context:
+    """ 
+    legacy context handler, encapsulates context
+    """
+
+    def __init__(self,context_dict:dict):
+        self.context_dict=context_dict
+        self.page_options=PageOptions(context_dict.get("page_options",{}))
+
+    def as_javascript(self):
+        """
+        generate my initial JavaScript
+        """
+        title=self.page_options.getTitle()
+        debug=str(self.page_options.getDebug()).lower()
+        javascript=f"""let justpy_core=new JustpyCore(
+      this, // window
+      '{title}', // title
+      {debug}   // debug
+    );"""
+        return javascript
+
+class PageOptions:
+    """
+    legacy page_options handler, encapsulating page_options
+    """
+
+    def __init__(self,page_options_dict:dict):
+        self.page_options_dict=page_options_dict 
+
+    def getTitle(self):
+        return self.page_options_dict.get("title","JustPy")
+
+    def getDebug(self):
+        return self.page_options_dict.get("debug",False)

justpy/templates/js/justpy_core.js

@@ -78,9 +78,10 @@
 class JustpyCore {
 
   // create a JustpyCore instance
-  constructor(window,title) {
+  constructor(window,title,debug) {
 	this.window=window
     this.setTitle(title);
+    this.debug=debug
   }
 
   // set the title

justpy/templates/main.html

@@ -18,10 +18,9 @@
     <script src='/templates/js/{{file_name}}.js'></script>
 {%- endfor %}
     <script>
-    let justp_core=new JustpyCore(
-    		this, // window
-    		'{{ page_options.title }}' // title
-    	);
+    {%- if context_obj %}
+    {{ context_obj.as_javascript() | safe }}
+    {% endif %}
     {%- for event in page_options.events %}
         document.addEventListener('{{ event }}', function (evt) {
             console.log(evt);
@@ -79,11 +78,10 @@
 
         socket.addEventListener('message', function (event) {
             msg = JSON.parse(event.data);
-            {% if page_options.debug %}
+            if (justpy_core.debug) {
                 console.log('Message received from server ', msg);
                 console.log(event);
-            {% endif %}
-
+            }
             let e = {};
             switch (msg.type) {
                 case 'page_update':

tests/test_importability.py

@@ -28,7 +28,7 @@ def test_importability(self):
             assert justpy
             outputText = outputBuf.getvalue()
         debug = self.debug
-        # debug=True
+        #debug=True
         if debug:
             print(outputText)
         self.assertTrue("Module directory" in outputText)