nice-gui-utils 0.1.8.dev0__tar.gz → 0.2.0.dev4__tar.gz

{nice-gui-utils-0.1.8.dev0 → nice-gui-utils-0.2.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nice-gui-utils
-Version: 0.1.8.dev0
+Version: 0.2.0.dev4
 Summary: Utils to use with NiceGUI.
 Author: Harter Kern
 Project-URL: Homepage, https://gitlab.com/harter-kern-public/nice-gui-utils
@@ -8,7 +8,7 @@ Project-URL: Bug Tracker, https://gitlab.com/harter-kern-public/nice-gui-utils/-
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nicegui>=1.4.0

{nice-gui-utils-0.1.8.dev0 → nice-gui-utils-0.2.0.dev4}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nice-gui-utils"
-version = "0.1.8dev"
+version = "0.2.0dev4"
 dynamic = ["dependencies"]
 authors = [
     { name = "Harter Kern" },
 ]
 description = "Utils to use with NiceGUI."
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -23,6 +23,7 @@ dependencies = { file = ["requirements.txt"] }
 where = ["src"]
 [tool.setuptools.package-data]
 keycloak_js = ["*.js"]
+router = ["*.js"]
 
 [project.urls]
 "Homepage" = "https://gitlab.com/harter-kern-public/nice-gui-utils"

nice-gui-utils-0.2.0.dev4/src/keycloak_js/keycloak.js

@@ -0,0 +1,42 @@
+export default {
+    template: "<div></div>",
+    mounted() {
+        this.keycloak = new Keycloak({
+            url: this.url,
+            realm: this.realm,
+            clientId: this.clientId
+        });
+
+        this.keycloak.init(this.initOptions).then(
+                authenticated => {
+                    if (authenticated) {
+                        this.keycloak.onTokenExpired = this.keycloak.updateToken;
+                    }
+                }
+
+        );
+    },
+    methods: {
+        token() {
+            return this.keycloak.token;
+        },
+        refreshToken() {
+            return this.keycloak.refreshToken;
+        },
+        authenticated() {
+            return this.keycloak.authenticated;
+        },
+        login(options) {
+            return this.keycloak.login(options);
+        },
+        logout(options) {
+            return this.keycloak.logout(options);
+        }
+    },
+    props: {
+        url: String,
+        realm: String,
+        clientId: String,
+        initOptions: Object
+    }
+};

{nice-gui-utils-0.1.8.dev0 → nice-gui-utils-0.2.0.dev4}/src/keycloak_js/keycloak.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import AnyStr, Dict
+from typing import AnyStr, Dict, Any
 
 from nicegui import ui
 from nicegui.awaitable_response import AwaitableResponse
@@ -22,25 +22,14 @@ class Keycloak(ui.element, component='keycloak.js'):
                  init_options: Dict = None):
         super().__init__()
 
-        ui.add_head_html('<script src="'
-                         f'{js_source}'
-                         '"></script>')
-        ui.add_head_html(
-            f"""<script>const keycloakConfig = {{
-                url: '{config.url}',
-                realm: '{config.realm}',
-                clientId: '{config.client_id}'
-            }}</script>""")
-        ui.add_head_html(
-            "<script>const globalKeycloakInstance = new Keycloak(keycloakConfig);</script>")
-
-        if not init_options:
-            self.init_options = {}
-        else:
-            self.init_options = init_options
-
-    def initialize(self, options=None) -> AwaitableResponse:
-        return self.run_method('initialize', self.init_options if not options else options)
+        ui.add_head_html(f'<script src="{js_source}"></script>')
+
+        props: Dict[str, Any] = self._props
+        props['url'] = config.url
+        props['realm'] = config.realm
+        props['clientId'] = config.client_id
+
+        props['initOptions'] = init_options if init_options else {}
 
     def token(self) -> AwaitableResponse:
         return self.run_method('token')

{nice-gui-utils-0.1.8.dev0 → nice-gui-utils-0.2.0.dev4}/src/nice_gui_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nice-gui-utils
-Version: 0.1.8.dev0
+Version: 0.2.0.dev4
 Summary: Utils to use with NiceGUI.
 Author: Harter Kern
 Project-URL: Homepage, https://gitlab.com/harter-kern-public/nice-gui-utils
@@ -8,7 +8,7 @@ Project-URL: Bug Tracker, https://gitlab.com/harter-kern-public/nice-gui-utils/-
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nicegui>=1.4.0

{nice-gui-utils-0.1.8.dev0 → nice-gui-utils-0.2.0.dev4}/src/nice_gui_utils.egg-info/SOURCES.txt

@@ -10,4 +10,7 @@ src/nice_gui_utils.egg-info/SOURCES.txt
 src/nice_gui_utils.egg-info/dependency_links.txt
 src/nice_gui_utils.egg-info/requires.txt
 src/nice_gui_utils.egg-info/top_level.txt
+src/router/__init__.py
+src/router/router.py
+src/router/router_frame.js
 tests/test_login.py

{nice-gui-utils-0.1.8.dev0 → nice-gui-utils-0.2.0.dev4}/src/nice_gui_utils.egg-info/top_level.txt

@@ -1 +1,2 @@
 keycloak_js
+router

nice-gui-utils-0.2.0.dev4/src/router/router.py

@@ -0,0 +1,55 @@
+from functools import singledispatchmethod
+from typing import Callable, Dict, Optional, AnyStr, Union, Any
+
+from nicegui import background_tasks, helpers, ui
+
+
+class _RouterFrame(ui.element, component='router_frame.js'):
+
+    def __init__(self, check_interval: int):
+        super().__init__()
+
+        props: Dict[AnyStr, Any] = self._props
+        props['checkInterval'] = check_interval
+
+    def update_history(self, path):
+        self.run_method('updateHistory', path)
+
+
+class Router:
+
+    def __init__(self, check_interval: int = None) -> None:
+        self.routes: Dict[AnyStr, Callable] = {}
+        self.content: Optional[ui.element] = None
+        self.router_frame: _RouterFrame = _RouterFrame(check_interval if check_interval else 10)
+
+    def path(self, path: str):
+        def decorator(func: Callable):
+            self.routes[path] = func
+            return func
+
+        return decorator
+
+    @singledispatchmethod
+    def go_to(self, target: Union[Callable, AnyStr]):
+        path = {target: path for path, target in self.routes.items()}[target]
+        self.go_to(path)
+
+    @go_to.register
+    def _(self, target: str):
+        path = target
+        builder = self.routes[target]
+
+        async def build() -> None:
+            with self.content:
+                self.router_frame.update_history(path)
+                result = builder()
+                if helpers.is_coroutine_function(builder):
+                    await result
+
+        self.content.clear()
+        background_tasks.create(build())
+
+    def frame(self) -> ui.element:
+        self.content = self.router_frame.on('open', lambda e: self.go_to(e.args))
+        return self.content

nice-gui-utils-0.2.0.dev4/src/router/router_frame.js

@@ -0,0 +1,26 @@
+export default {
+    template: "<div><slot></slot></div>",
+    mounted() {
+        window.addEventListener("popstate", (event) => {
+            if (event.state?.page) {
+                this.$emit("open", event.state.page);
+            }
+        });
+        const connectInterval = setInterval(async () => {
+            if (window.socket.id === undefined)
+                return;
+            this.$emit("open", window.location.pathname);
+            clearInterval(connectInterval);
+        }, this.checkInterval);
+    },
+    props: {
+        checkInterval: Number
+    },
+    methods: {
+        updateHistory(path) {
+            if (window.location.pathname !== path) {
+                history.pushState({page: path}, "", path);
+            }
+        }
+    }
+};

nice-gui-utils-0.1.8.dev0/src/keycloak_js/keycloak.js

@@ -1,33 +0,0 @@
-export default {
-    template: "<div></div>",
-    mounted() {
-        this.keycloak = globalKeycloakInstance;
-    },
-    methods: {
-        initialize(initConfig) {
-            this.keycloak.init(initConfig).then(
-                    authenticated => {
-                        if (authenticated) {
-                            this.keycloak.onTokenExpired = this.keycloak.updateToken;
-                        }
-                    }
-
-            );
-        },
-        token() {
-            return this.keycloak.token;
-        },
-        refreshToken() {
-            return this.keycloak.refreshToken;
-        },
-        authenticated() {
-            return this.keycloak.authenticated;
-        },
-        login(options) {
-            return this.keycloak.login(options);
-        },
-        logout(options) {
-            return this.keycloak.logout(options);
-        }
-    }
-};