IoSL/service-aware-frontend
3
0
Fork 0
generated from Luis/nextjs-python-web-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed AnyURL problem

Browse Source
This commit is contained in:
Qubasa
2023-10-22 22:38:04 +02:00
parent d78a3bc684
commit e5c0bc7fd4
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/clan-cli/clan_cli/webui/server.py
View File

@@ -12,7 +12,7 @@ from typing import Iterator
# XXX: can we dynamically load this using nix develop? # XXX: can we dynamically load this using nix develop?
import uvicorn import uvicorn
from pydantic import AnyUrl, IPvAnyAddress from pydantic import AnyUrl, IPvAnyAddress
from pydantic.tools import parse_obj_as
from clan_cli.errors import ClanError from clan_cli.errors import ClanError
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -25,7 +25,9 @@ def open_browser(base_url: AnyUrl, sub_url: str) -> None:
break break
except OSError: except OSError:
time.sleep(i) 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) _open_browser(url)

5
pkgs/ui/.eslintrc.json
View File

@@ -3,5 +3,8 @@
"extends": ["next/core-web-vitals", "plugin:tailwindcss/recommended", "plugin:@typescript-eslint/recommended"], "extends": ["next/core-web-vitals", "plugin:tailwindcss/recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser", "parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"], "plugins": ["@typescript-eslint"],
"ignorePatterns": ["**/src/api/*"] "ignorePatterns": ["**/src/api/*"],
"rules": {
"@typescript-eslint/no-explicit-any": "off"
}
} }

1
pkgs/ui/flake-module.nix
View File

@@ -8,6 +8,7 @@
{ {
packages = { packages = {
ui = base.pkg.global; ui = base.pkg.global;
theme = base.pkg.theme;
ui-assets = pkgs.callPackage ./nix/ui-assets.nix { }; ui-assets = pkgs.callPackage ./nix/ui-assets.nix { };
# EXAMPLE: GITEA_TOKEN=$(rbw get -f GITEA_TOKEN git.clan.lol) nix run .#update-ui-assets # 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 { }; update-ui-assets = pkgs.callPackage ./nix/update-ui-assets.nix { };