From 6486e5e7f18f3eb88d3e3dc7109c512106317628 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Mon, 4 Mar 2024 17:15:57 +0200 Subject: [PATCH] chore: update... everything --- .gitignore | 2 + flake.lock | 117 ++++++-- flake.nix | 18 +- go.mod | 31 +- go.sum | 53 ++-- internal/components/adminpartials_templ.go | 266 +++++++---------- internal/components/base_templ.go | 269 ++++++++--------- internal/components/index_templ.go | 89 ++---- internal/components/login_templ.go | 80 ++--- internal/components/manage_templ.go | 291 ++++++------------ internal/components/manageadmin_templ.go | 207 +++++-------- internal/components/managepartials_templ.go | 311 +++++++++----------- scripts/go_run_dev.sh | 6 + static/styles.css | 22 +- 14 files changed, 765 insertions(+), 997 deletions(-) create mode 100644 .gitignore create mode 100755 scripts/go_run_dev.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0b3197f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +tmp/ +internal/components/*_templ.txt diff --git a/flake.lock b/flake.lock index 0197eee..2e256f7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -21,34 +54,40 @@ "type": "github" } }, - "nixpkgs": { + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "templ", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1697379843, - "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", + "lastModified": 1705314449, + "narHash": "sha256-yfQQ67dLejP0FLK76LKHbkzcQqNIrux6MFe32MMFGNQ=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "gomod2nix", "type": "github" } }, - "nixpkgs-staging-next": { + "nixpkgs": { "locked": { - "lastModified": 1697522482, - "narHash": "sha256-PIggwFrGfBihQLyGsewFv8sbx/Z7LPy8MVkImYea9U0=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c61915bc9615d3995d4f4dae505ae68a359eab7b", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { "owner": "nixos", - "ref": "staging-next", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -56,31 +95,69 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-staging-next": "nixpkgs-staging-next", "templ": "templ" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "templ": { "inputs": { "gitignore": "gitignore", + "gomod2nix": "gomod2nix", "nixpkgs": [ "nixpkgs" - ] + ], + "xc": "xc" }, "locked": { - "lastModified": 1696004991, - "narHash": "sha256-ieTfgvPu+JKMLi6EvdWYqC2n4TKFJjmQ3TBLK/e9zZ0=", + "lastModified": 1709294205, + "narHash": "sha256-jMoAocMDq8U1JsYoH3PFzZbnjSAzhifLwNZoKY+ambA=", "owner": "a-h", "repo": "templ", - "rev": "efd33120d9e83e5b9c9c1b06272d5bfcce246436", + "rev": "2a7ab8400e6e3813a650bb7e4618ef9eddebe2b1", "type": "github" }, "original": { "owner": "a-h", - "ref": "tags/v0.2.364", + "ref": "tags/v0.2.598", "repo": "templ", "type": "github" } + }, + "xc": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "templ", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703164129, + "narHash": "sha256-kCcCqqwvjN07H8FPG4tXsRVRcMqT8dUNt9pwW1kKAe8=", + "owner": "joerdav", + "repo": "xc", + "rev": "0655cccfcf036556aeaddfb8f45dc7e8dd1b3680", + "type": "github" + }, + "original": { + "owner": "joerdav", + "repo": "xc", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index af5107e..effff24 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,13 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-staging-next.url = "github:nixos/nixpkgs/staging-next"; templ = { - url = "github:a-h/templ?ref=tags/v0.2.364"; + url = "github:a-h/templ?ref=tags/v0.2.598"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-staging-next, templ }: + outputs = inputs@{ self, nixpkgs, templ }: let allSystems = [ "x86_64-linux" @@ -16,24 +15,21 @@ forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f { pkgs = import nixpkgs { inherit system; }; - pkgs-staging-next = import nixpkgs-staging-next { inherit system; }; templ-pkg = inputs.templ.packages.${system}.default; }); in { - devShells = forAllSystems ({ pkgs, pkgs-staging-next, templ-pkg }: { + devShells = forAllSystems ({ pkgs, templ-pkg }: { default = pkgs.mkShell { buildInputs = [ - #pkgs.go - #pkgs.gopls - pkgs-staging-next.go - pkgs-staging-next.gopls + pkgs.go + pkgs.gopls # sqlite web inspector for developing pkgs.sqlite-web - pkgs.nodePackages.tailwindcss - pkgs.nodePackages."@tailwindcss/language-server" + pkgs.tailwindcss + pkgs.tailwindcss-language-server templ-pkg ]; diff --git a/go.mod b/go.mod index 245e93d..cc0cd14 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,19 @@ module git.src.quest/~skye/felu-ddns -go 1.20 +go 1.21 + +toolchain go1.21.7 require ( git.src.quest/~skye/erya-go v0.0.0-20231011145529-3201c2bf8ec7 - github.com/a-h/templ v0.2.364 - github.com/alexedwards/scs/v2 v2.5.1 + github.com/a-h/templ v0.2.598 + github.com/alexedwards/scs/v2 v2.7.0 github.com/gin-gonic/gin v1.9.1 - github.com/matthewhartstonge/argon2 v0.3.4 - github.com/mattn/go-sqlite3 v1.14.17 - github.com/miekg/dns v1.1.56 + github.com/matthewhartstonge/argon2 v1.0.0 + github.com/mattn/go-sqlite3 v1.14.22 + github.com/miekg/dns v1.1.58 github.com/oklog/ulid/v2 v2.1.0 - golang.org/x/sync v0.4.0 + golang.org/x/sync v0.6.0 ) require ( @@ -24,12 +26,11 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.15.5 // indirect github.com/goccy/go-json v0.10.2 // indirect - github.com/google/go-cmp v0.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.2.4 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect @@ -37,12 +38,12 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect golang.org/x/arch v0.5.0 // indirect - golang.org/x/crypto v0.14.0 // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/tools v0.13.0 // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.17.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 4a0e1eb..1a88f13 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ git.src.quest/~skye/erya-go v0.0.0-20231011145529-3201c2bf8ec7 h1:gWLmY6ctJQ5Ai3TYmmmURac39QebNYVn34y7m3zOY1I= git.src.quest/~skye/erya-go v0.0.0-20231011145529-3201c2bf8ec7/go.mod h1:RY9TiE6xOBUzCrej1BjSRdvfyL45VKB2fsXjTDT/d/A= -github.com/a-h/templ v0.2.364 h1:4vseUATyAzacrOOU1jPmLfkxet6Yg/NAmsA/4rDDhfo= -github.com/a-h/templ v0.2.364/go.mod h1:6Lfhsl3Z4/vXl7jjEjkJRCqoWDGjDnuKgzjYMDSddas= -github.com/alexedwards/scs/v2 v2.5.1 h1:EhAz3Kb3OSQzD8T+Ub23fKsiuvE0GzbF5Lgn0uTwM3Y= -github.com/alexedwards/scs/v2 v2.5.1/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8= +github.com/a-h/templ v0.2.598 h1:6jMIHv6wQZvdPxTuv87erW4RqN/FPU0wk7ZHN5wVuuo= +github.com/a-h/templ v0.2.598/go.mod h1:SA7mtYwVEajbIXFRh3vKdYm/4FYyLQAtPH1+KxzGPA8= +github.com/alexedwards/scs/v2 v2.7.0 h1:DY4rqLCM7UIR9iwxFS0++z1NhTzQlKV30aMHkJCDWKw= +github.com/alexedwards/scs/v2 v2.7.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -25,6 +25,7 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -53,14 +54,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= -github.com/matthewhartstonge/argon2 v0.3.4 h1:4TU3B1XWTKoZtTd7z8+fklURHWw6a5du+M7mD35CsXA= -github.com/matthewhartstonge/argon2 v0.3.4/go.mod h1:aLGFnNR9awGSbndX9GCFP3JXn67Sgui7F0pHpJur+vg= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= -github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= -github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= +github.com/matthewhartstonge/argon2 v1.0.0 h1:e65fkae6O8Na6YTy2HAccUbXR+GQHOnpQxeWGqWCRIw= +github.com/matthewhartstonge/argon2 v1.0.0/go.mod h1:Fm4FHZxdxCM6hg21Jkz3YZVKnU7VnTlqDQ3ghS/Myok= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= +github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -95,22 +96,22 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y= golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/internal/components/adminpartials_templ.go b/internal/components/adminpartials_templ.go index a3b0fd6..a306d5f 100644 --- a/internal/components/adminpartials_templ.go +++ b/internal/components/adminpartials_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -13,200 +14,153 @@ import "git.src.quest/~skye/felu-ddns/internal/db" import "strconv" func AdminPartialUsersList(users []db.User) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, err = templBuffer.WriteString("") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } for _, user := range users { - _, err = templBuffer.WriteString("") - if err != nil { - return err + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 5) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var_2 := `Id` - _, err = templBuffer.WriteString(var_2) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_3 := `Email` - _, err = templBuffer.WriteString(var_3) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_4 := `Is Admin` - _, err = templBuffer.WriteString(var_4) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + var templ_7745c5c3_Var2 string + templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(user.Email) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/adminpartials.templ`, Line: 30, Col: 19} } - var var_5 string = user.Email - _, err = templBuffer.WriteString(templ.EscapeString(var_5)) - if err != nil { - return err + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 4) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - var var_6 string = strconv.FormatBool(user.IsAdmin) - _, err = templBuffer.WriteString(templ.EscapeString(var_6)) - if err != nil { - return err + var templ_7745c5c3_Var3 string + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.FormatBool(user.IsAdmin)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/adminpartials.templ`, Line: 35, Col: 41} } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 6) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } func AdminPartialDomainsList(domains []db.Domain) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_7 := templ.GetChildren(ctx) - if var_7 == nil { - var_7 = templ.NopComponent + templ_7745c5c3_Var4 := templ.GetChildren(ctx) + if templ_7745c5c3_Var4 == nil { + templ_7745c5c3_Var4 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, err = templBuffer.WriteString("") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 7) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } for _, domain := range domains { - _, err = templBuffer.WriteString("") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 13) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var_8 := `Id` - _, err = templBuffer.WriteString(var_8) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_9 := `Domain` - _, err = templBuffer.WriteString(var_9) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_10 := `A Record` - _, err = templBuffer.WriteString(var_10) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_11 := `Owner (ID/Email)` - _, err = templBuffer.WriteString(var_11) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - var var_12 string = domain.Domain - _, err = templBuffer.WriteString(templ.EscapeString(var_12)) - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 10) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + var templ_7745c5c3_Var6 string + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(domain.A) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/adminpartials.templ`, Line: 77, Col: 17} } - var var_13 string = domain.A - _, err = templBuffer.WriteString(templ.EscapeString(var_13)) - if err != nil { - return err + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 14) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/internal/components/base_templ.go b/internal/components/base_templ.go index a5a3c1d..91f2e6d 100644 --- a/internal/components/base_templ.go +++ b/internal/components/base_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -16,190 +17,166 @@ func serviceName() string { } func BaseBase(title string) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, err = templBuffer.WriteString("") - if err != nil { - return err + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - var var_3 string = title - _, err = templBuffer.WriteString(templ.EscapeString(var_3)) - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 2) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - err = var_1.Render(ctx, templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 3) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) - } - return err + return templ_7745c5c3_Err }) } func Base(title string) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_5 := templ.GetChildren(ctx) - if var_5 == nil { - var_5 = templ.NopComponent + templ_7745c5c3_Var3 := templ.GetChildren(ctx) + if templ_7745c5c3_Var3 == nil { + templ_7745c5c3_Var3 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_6 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + templ_7745c5c3_Var4 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 4) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - var var_7 string = serviceName() - _, err = templBuffer.WriteString(templ.EscapeString(var_7)) - if err != nil { - return err + var templ_7745c5c3_Var5 string + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(serviceName()) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/base.templ`, Line: 33, Col: 48} } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - err = var_5.Render(ctx, templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 5) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ_7745c5c3_Var3.Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 6) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - return err + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) + } + return templ_7745c5c3_Err }) - err = BaseBase(title).Render(templ.WithChildren(ctx, var_6), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = BaseBase(title).Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } func ManageBase(title string) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_8 := templ.GetChildren(ctx) - if var_8 == nil { - var_8 = templ.NopComponent + templ_7745c5c3_Var6 := templ.GetChildren(ctx) + if templ_7745c5c3_Var6 == nil { + templ_7745c5c3_Var6 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_9 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var var_10 string = serviceName() - _, err = templBuffer.WriteString(templ.EscapeString(var_10)) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_11 := `User Settings` - _, err = templBuffer.WriteString(var_11) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - err = var_8.Render(ctx, templBuffer) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) - } - return err + templ_7745c5c3_Var7 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 7) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var8 string + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(serviceName()) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/base.templ`, Line: 46, Col: 37} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 8) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ_7745c5c3_Var6.Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 9) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) + } + return templ_7745c5c3_Err }) - err = BaseBase(title).Render(templ.WithChildren(ctx, var_9), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = BaseBase(title).Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/internal/components/index_templ.go b/internal/components/index_templ.go index 261530f..fc7d695 100644 --- a/internal/components/index_templ.go +++ b/internal/components/index_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -10,76 +11,40 @@ import "io" import "bytes" func Index() templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_2 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + templ_7745c5c3_Var2 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - var_3 := `have info about the service here,` - _, err = templBuffer.WriteString(var_3) - if err != nil { - return err + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString(" ") - if err != nil { - return err - } - var_4 := `with a login button somewhere.` - _, err = templBuffer.WriteString(var_4) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var_5 := `and also something something, basic index page info, bla bla` - _, err = templBuffer.WriteString(var_5) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) - } - return err + return templ_7745c5c3_Err }) - err = Base("Index").Render(templ.WithChildren(ctx, var_2), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = Base("Index").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/internal/components/login_templ.go b/internal/components/login_templ.go index 98de132..16e5e98 100644 --- a/internal/components/login_templ.go +++ b/internal/components/login_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -10,67 +11,40 @@ import "io" import "bytes" func Login() templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_2 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + templ_7745c5c3_Var2 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) - } - return err + return templ_7745c5c3_Err }) - err = Base("Login").Render(templ.WithChildren(ctx, var_2), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = Base("Login").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/internal/components/manage_templ.go b/internal/components/manage_templ.go index 04e721e..f9bdd92 100644 --- a/internal/components/manage_templ.go +++ b/internal/components/manage_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -22,231 +23,113 @@ func getUpdateACommand() string { } func Manage() templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_2 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var_3 := `Temp Docs, wip (click)` - _, err = templBuffer.WriteString(var_3) - if err != nil { - return err - } - _, err = templBuffer.WriteString("

") - if err != nil { - return err - } - var_4 := `Updating A Records automatically` - _, err = templBuffer.WriteString(var_4) - if err != nil { - return err - } - _, err = templBuffer.WriteString("

") - if err != nil { - return err - } - var_5 := `The following should be ran via some automation, like a cron job.` - _, err = templBuffer.WriteString(var_5) - if err != nil { - return err - } - _, err = templBuffer.WriteString(" ") - if err != nil { - return err - } - var_6 := `You are on your own till real docs are made.` - _, err = templBuffer.WriteString(var_6) - if err != nil { - return err - } - _, err = templBuffer.WriteString("

") - if err != nil { - return err - } - var var_7 string = getUpdateACommand() - _, err = templBuffer.WriteString(templ.EscapeString(var_7)) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var var_9 string = getDomainPattern() - _, err = templBuffer.WriteString(templ.EscapeString(var_9)) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) - } - return err + templ_7745c5c3_Var2 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var3 string + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(getUpdateACommand()) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/manage.templ`, Line: 28, Col: 33} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 2) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(getDomainPattern()) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/components/manage.templ`, Line: 38, Col: 31} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 3) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) + } + return templ_7745c5c3_Err }) - err = ManageBase("Manage").Render(templ.WithChildren(ctx, var_2), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = ManageBase("Manage").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } func ManageUser(currentEmail string) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_12 := templ.GetChildren(ctx) - if var_12 == nil { - var_12 = templ.NopComponent + templ_7745c5c3_Var5 := templ.GetChildren(ctx) + if templ_7745c5c3_Var5 == nil { + templ_7745c5c3_Var5 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_13 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 5) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) } - return err + return templ_7745c5c3_Err }) - err = ManageBase("Settings").Render(templ.WithChildren(ctx, var_13), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = ManageBase("Settings").Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/internal/components/manageadmin_templ.go b/internal/components/manageadmin_templ.go index fcef06d..a713cdf 100644 --- a/internal/components/manageadmin_templ.go +++ b/internal/components/manageadmin_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -10,172 +11,118 @@ import "io" import "bytes" func ManageAdmin() templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_2 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + templ_7745c5c3_Var2 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - var_3 := `todo: probs have like stats and that kinda stuff here` - _, err = templBuffer.WriteString(var_3) - if err != nil { - return err + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var_4 := `Users` - _, err = templBuffer.WriteString(var_4) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_5 := `Domains` - _, err = templBuffer.WriteString(var_5) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) - } - return err + return templ_7745c5c3_Err }) - err = ManageBase("ManageAdmin").Render(templ.WithChildren(ctx, var_2), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = ManageBase("ManageAdmin").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } func ManageAdminUsers() templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_6 := templ.GetChildren(ctx) - if var_6 == nil { - var_6 = templ.NopComponent + templ_7745c5c3_Var3 := templ.GetChildren(ctx) + if templ_7745c5c3_Var3 == nil { + templ_7745c5c3_Var3 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_7 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 2) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) } - return err + return templ_7745c5c3_Err }) - err = ManageBase("ManageAdmin").Render(templ.WithChildren(ctx, var_7), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = ManageBase("ManageAdmin").Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } func ManageAdminDomains() templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_11 := templ.GetChildren(ctx) - if var_11 == nil { - var_11 = templ.NopComponent + templ_7745c5c3_Var5 := templ.GetChildren(ctx) + if templ_7745c5c3_Var5 == nil { + templ_7745c5c3_Var5 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var_12 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + templ_7745c5c3_Var6 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 3) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = io.Copy(w, templBuffer) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer) } - return err + return templ_7745c5c3_Err }) - err = ManageBase("ManageAdmin").Render(templ.WithChildren(ctx, var_12), templBuffer) - if err != nil { - return err + templ_7745c5c3_Err = ManageBase("ManageAdmin").Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/internal/components/managepartials_templ.go b/internal/components/managepartials_templ.go index d565205..876e24a 100644 --- a/internal/components/managepartials_templ.go +++ b/internal/components/managepartials_templ.go @@ -1,5 +1,6 @@ -// Code generated by templ@(devel) DO NOT EDIT. +// Code generated by templ - DO NOT EDIT. +// templ: version: v0.2.598 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -24,194 +25,168 @@ func toggleApiKeyVisibility(id string) templ.ComponentScript { input.type = "password"; }; eye_vis.classList.toggle("hidden"); - eye_hid.classList.toggle("hidden");}`, - Call: templ.SafeScript(`__templ_toggleApiKeyVisibility_542b`, id), + eye_hid.classList.toggle("hidden"); +}`, + Call: templ.SafeScript(`__templ_toggleApiKeyVisibility_542b`, id), + CallInline: templ.SafeScriptInline(`__templ_toggleApiKeyVisibility_542b`, id), } } func ManagePartialDomains(domains []db.Domain) templ.Component { - return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) { - templBuffer, templIsBuffer := w.(*bytes.Buffer) - if !templIsBuffer { - templBuffer = templ.GetBuffer() - defer templ.ReleaseBuffer(templBuffer) + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - var_1 := templ.GetChildren(ctx) - if var_1 == nil { - var_1 = templ.NopComponent + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) if len(domains) > 0 { - _, err = templBuffer.WriteString("") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } for _, domain := range domains { - _, err = templBuffer.WriteString("") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 16) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var_2 := `Domain` - _, err = templBuffer.WriteString(var_2) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_3 := `A Record` - _, err = templBuffer.WriteString(var_3) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var_4 := `Api Key` - _, err = templBuffer.WriteString(var_4) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - var var_5 string = domain.Domain - _, err = templBuffer.WriteString(templ.EscapeString(var_5)) - if err != nil { - return err - } - _, err = templBuffer.WriteString("") - if err != nil { - return err - } - var var_6 string = getDomainPattern() - _, err = templBuffer.WriteString(templ.EscapeString(var_6)) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err - } - err = templ.RenderScriptItems(ctx, templBuffer, toggleApiKeyVisibility(domain.Id)) - if err != nil { - return err - } - _, err = templBuffer.WriteString("
") - if err != nil { - return err + templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 17) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } } - if !templIsBuffer { - _, err = templBuffer.WriteTo(w) + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) } - return err + return templ_7745c5c3_Err }) } diff --git a/scripts/go_run_dev.sh b/scripts/go_run_dev.sh new file mode 100755 index 0000000..e000f9e --- /dev/null +++ b/scripts/go_run_dev.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh +export GIN_MODE=release +export FELU_DB_PATH=tmp/ +export FELU_DNS_PATTERN=ddns.feludns.arpa. + +go run cmd/felu/main.go diff --git a/static/styles.css b/static/styles.css index 5cc0cb9..43e8e32 100644 --- a/static/styles.css +++ b/static/styles.css @@ -1,5 +1,5 @@ /* -! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com +! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com */ /* @@ -32,9 +32,11 @@ 4. Use the user's configured `sans` font-family by default. 5. Use the user's configured `sans` font-feature-settings by default. 6. Use the user's configured `sans` font-variation-settings by default. +7. Disable tap highlights on iOS */ -html { +html, +:host { line-height: 1.5; /* 1 */ -webkit-text-size-adjust: 100%; @@ -44,12 +46,14 @@ html { -o-tab-size: 4; tab-size: 4; /* 3 */ - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 4 */ font-feature-settings: normal; /* 5 */ font-variation-settings: normal; /* 6 */ + -webkit-tap-highlight-color: transparent; + /* 7 */ } /* @@ -121,8 +125,10 @@ strong { } /* -1. Use the user's configured `mono` font family by default. -2. Correct the odd `em` font sizing in all browsers. +1. Use the user's configured `mono` font-family by default. +2. Use the user's configured `mono` font-feature-settings by default. +3. Use the user's configured `mono` font-variation-settings by default. +4. Correct the odd `em` font sizing in all browsers. */ code, @@ -131,8 +137,12 @@ samp, pre { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; /* 1 */ - font-size: 1em; + font-feature-settings: normal; /* 2 */ + font-variation-settings: normal; + /* 3 */ + font-size: 1em; + /* 4 */ } /* -- 2.44.1