Add more connection logging

Troubleshooting react relative resource paths Minor jsx changes
OpenVoiceOS · Oct 5, 2023 · c40a603 · c40a603
1 parent d42304c
commit c40a603
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/ovos_gui/bus.py b/ovos_gui/bus.py
@@ -221,11 +221,12 @@ def on_message(self, message: str):
             if framework is None:
                 # mycroft-gui api
                 qt = msg_data.get("qt_version") or default_qt_version
+                LOG.debug(f"Backwards-compat handling for qt{qt} client")
                 if int(qt) == 6:
                     framework = "qt6"
                 else:
                     framework = "qt5"
-
+            LOG.info(f"New connection for framework: {framework}")
             self._framework = framework
         else:
             # message not in spec

diff --git a/ovos_gui/page.py b/ovos_gui/page.py
@@ -68,6 +68,9 @@ def get_uri(self, framework: str = "qt5", server_url: str = None) -> str:
                 if server_url.startswith("/"):
                     LOG.debug(f"No schema in server_url, assuming 'file'")
                     server_url = f"file://{server_url}"
+                elif server_url.startswith("./") or \
+                        server_url.startswith("../"):
+                    LOG.debug(r'Relative path; assuming no schema expected')
                 else:
                     LOG.debug(f"No schema in server_url, assuming 'http'")
                     server_url = f"http://{server_url}"

diff --git a/ovos_gui/res/gui/react/SYSTEM_TextFrame.jsx b/ovos_gui/res/gui/react/SYSTEM_TextFrame.jsx
@@ -1,11 +1,12 @@
-import React, { Component } from "react";
+import React from "react";
 import { ContentElement } from "core_components/utils";
 
-export function RenderPage(props) {
+function RenderPage(props) {
 	const skill_props = props.skillState;
-
+	console.log(skill_props)
 	return (
 		<div className="v-aligned-container text-center">
+			<div className="v-aligned-container text-center">
             <ContentElement
 				elementType={"TextFrame"}
 				id={"title"}
@@ -14,6 +15,8 @@ export function RenderPage(props) {
 				display={skill_props.display}
 				duration={15000}
 			/>
+			</div>
+			<div className="v-aligned-container text-center">
 			<ContentElement
 				elementType={"TextFrame"}
 				id={"text"}
@@ -22,6 +25,9 @@ export function RenderPage(props) {
 				display={skill_props.display}
 				duration={15000}
 			/>
+			</div>
 		</div>
 	);
 }
+
+export default RenderPage