diff --git a/pkgs/clan-cli/clan_cli/webui/server.py b/pkgs/clan-cli/clan_cli/webui/server.py index 5f03820..a647599 100644 --- a/pkgs/clan-cli/clan_cli/webui/server.py +++ b/pkgs/clan-cli/clan_cli/webui/server.py @@ -12,7 +12,7 @@ from typing import Iterator # XXX: can we dynamically load this using nix develop? import uvicorn from pydantic import AnyUrl, IPvAnyAddress - +from pydantic.tools import parse_obj_as from clan_cli.errors import ClanError log = logging.getLogger(__name__) @@ -25,7 +25,9 @@ def open_browser(base_url: AnyUrl, sub_url: str) -> None: break except OSError: time.sleep(i) - url = AnyUrl(f"{base_url}/{sub_url.removeprefix('/')}") + url = parse_obj_as( + AnyUrl, f"{base_url}/{sub_url.removeprefix('/')}" + ) _open_browser(url) diff --git a/pkgs/ui/.eslintrc.json b/pkgs/ui/.eslintrc.json index 41f3ebc..891a985 100644 --- a/pkgs/ui/.eslintrc.json +++ b/pkgs/ui/.eslintrc.json @@ -3,5 +3,8 @@ "extends": ["next/core-web-vitals", "plugin:tailwindcss/recommended", "plugin:@typescript-eslint/recommended"], "parser": "@typescript-eslint/parser", "plugins": ["@typescript-eslint"], - "ignorePatterns": ["**/src/api/*"] + "ignorePatterns": ["**/src/api/*"], + "rules": { + "@typescript-eslint/no-explicit-any": "off" + } } diff --git a/pkgs/ui/flake-module.nix b/pkgs/ui/flake-module.nix index 12335ec..2d2d9bc 100644 --- a/pkgs/ui/flake-module.nix +++ b/pkgs/ui/flake-module.nix @@ -8,6 +8,7 @@ { packages = { ui = base.pkg.global; + theme = base.pkg.theme; ui-assets = pkgs.callPackage ./nix/ui-assets.nix { }; # EXAMPLE: GITEA_TOKEN=$(rbw get -f GITEA_TOKEN git.clan.lol) nix run .#update-ui-assets update-ui-assets = pkgs.callPackage ./nix/update-ui-assets.nix { };