From dd81e23d679c48c6b4f451f37c143a870d4b3593 Mon Sep 17 00:00:00 2001
From: Steve Nyemba <nyemba@gmail.com>
Date: Thu, 27 Oct 2022 22:23:21 -0500
Subject: [PATCH] bug fix with context handling

---
 config.json               |  5 +++--
 content/index.html        |  2 +-
 content/participants.html |  6 +++---
 static/js/studio.js       | 15 +++++++++++----
 templates/header.html     |  2 +-
 templates/index.html      |  5 ++++-
 templates/pane.html       |  2 +-
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/config.json b/config.json
index ac492fb..4ad465d 100644
--- a/config.json
+++ b/config.json
@@ -1,10 +1,11 @@
 {
     "system": {
+        "id":"genomix.studio",
         "version": "0.0.1",
-        "context": "",
+        "context": "/studio",
         "logo": "logo.svg",
         "app": {
-            "debug": true,
+            "debug": true, "host":"0.0.0.0","threaded":true,
             "port": "9000"
         }
     },
diff --git a/content/index.html b/content/index.html
index 0826a1e..3deddc8 100644
--- a/content/index.html
+++ b/content/index.html
@@ -63,7 +63,7 @@
         outline: 0px;
     }
 </style>
-<script src="static/js/studio.js"></script>
+<script src="{{system.context}}/static/js/studio.js"></script>
 <div class="studio-pane">
 
   
diff --git a/content/participants.html b/content/participants.html
index f6d55cc..1b56028 100644
--- a/content/participants.html
+++ b/content/participants.html
@@ -1,7 +1,7 @@
 
-<link href="{{context}}/static/css/default.css" type="text/css" rel="stylesheet">
-<link href="{{context}}/static/css/border.css" type="text/css" rel="stylesheet">
-<link href="{{context}}/static/css/border.css" type="text/css" rel="stylesheet">
+<link href="{{system.context}}/static/css/default.css" type="text/css" rel="stylesheet">
+<link href="{{system.context}}/static/css/border.css" type="text/css" rel="stylesheet">
+<link href="{{system.context}}/static/css/border.css" type="text/css" rel="stylesheet">
 <script src="{{system.context}}/static/js/fontawesome/js/all.js"></script>
 <script src="{{system.context}}/static/js/jquery/jquery.js"></script>
 <script src="{{system.context}}/static/js/search.js"></script>
diff --git a/static/js/studio.js b/static/js/studio.js
index 8d6b471..de6cb24 100644
--- a/static/js/studio.js
+++ b/static/js/studio.js
@@ -13,7 +13,9 @@ var _build = function(){
     var http = HttpClient.instance()
     http.setHeader('Content-Type','application/json')
     http.setData (JSON.stringify(_body))
-    http.post('/api/studio/_build',function(x){
+    var _context = sessionStorage.getItem('genomix.studio')
+    var _uri     = _context + '/api/studio/_build'
+    http.post(_uri,function(x){
         stream = 'data:image/png;base64,' + x.responseText
         jx.dom.set.attribute('image','src',stream)
         // jx.dom.set.attribute('_avatar2','src',stream)
@@ -55,7 +57,9 @@ _save = function(){
    http = HttpClient.instance()
    http.setHeader('content-type','application/json')
    http.setData(JSON.stringify(_body))
-   http.post('/api/studio/_save',function(x){
+   var _context = sessionStorage.getItem('genomix.studio')
+   var _uri     = _context+'/api/studio/_save'
+   http.post(_uri,function(x){
        if(x.status == 200){
             //
             //
@@ -77,7 +81,9 @@ var _dialog = function(title,icon,msg,_pointer){
     var http = HttpClient.instance()
     http.setHeader('uri','dialog.html')
     http.setHeader('dom','_dialog')
-    http.post('/page',function(x){
+    var _context    = sessionStorage.getItem('genomix.studio')
+    var _uri        = _context + '/page'
+    http.post(_uri,function(x){
         var _html = x.responseText.replace(/:title/,title).replace(/:message/,msg).replace(/:icon/,icon)
         jx.modal.show({html:_html,id:'_dialog'})
         if (_pointer == null){
@@ -96,4 +102,5 @@ var _reset = function(){
     // jx.dom.set.attribute('image','src','')
     _open('basic')
     _build()
-}
\ No newline at end of file
+}
+
diff --git a/templates/header.html b/templates/header.html
index 4d12892..94c1329 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,5 +1,5 @@
 {% if layout.header.logo == True %}
-    <img src="{{context}}/static/img/{{system.logo}}">
+    <img src="{{system.context}}/static/img/{{system.logo}}">
 {% endif %}
     <div>
         <div class="title">{{layout.header.title}}</div>
diff --git a/templates/index.html b/templates/index.html
index 4fee6f4..8769e8d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -36,7 +36,10 @@ Vanderbilt University Medical Center
         <script src="{{system.context}}/static/js/search.js"></script>
         <script src="{{system.context}}/static/js/fontawesome/js/all.js"></script>
     </head>
-     
+    <script>
+        sessionStorage.setItem('{{system.id}}','{{system.context|safe}}')
+        
+    </script>
     <body>
        
       <div class="main">
diff --git a/templates/pane.html b/templates/pane.html
index a0fb378..87eb801 100644
--- a/templates/pane.html
+++ b/templates/pane.html
@@ -20,7 +20,7 @@
 </style>
 <div class="border-round border">
     <div class="bold">Existing Avatars</div>
-    <iframe width="100%" height="255px" scrolling="no" src="/page?uri=participants.html" frameborder="0" allowfullscreen></iframe>
+    <iframe width="100%" height="255px" scrolling="no" src="{{system.context}}/page?uri=participants.html" frameborder="0" allowfullscreen></iframe>
     
 </div>