diff --git a/.air.toml b/.air.toml
new file mode 100644
index 0000000..ef0cd98
--- /dev/null
+++ b/.air.toml
@@ -0,0 +1,46 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+ args_bin = []
+ bin = "./tmp/main"
+ cmd = "templ generate && go build -o ./tmp/main ."
+ delay = 1000
+ exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+ exclude_file = []
+ exclude_regex = ["_test.go", ".*_templ.go"]
+ exclude_unchanged = false
+ follow_symlink = false
+ full_bin = ""
+ include_dir = []
+ include_ext = ["go", "tpl", "tmpl", "templ", "html"]
+ include_file = []
+ kill_delay = "0s"
+ log = "build-errors.log"
+ poll = false
+ poll_interval = 0
+ post_cmd = []
+ pre_cmd = []
+ rerun = false
+ rerun_delay = 500
+ send_interrupt = false
+ stop_on_error = false
+
+[color]
+ app = ""
+ build = "yellow"
+ main = "magenta"
+ runner = "green"
+ watcher = "cyan"
+
+[log]
+ main_only = false
+ time = false
+
+[misc]
+ clean_on_exit = false
+
+[screen]
+ clear_on_rebuild = false
+ keep_scroll = true
diff --git a/flake.lock b/flake.lock
index f7cd2ed..8a87c42 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,41 @@
{
"nodes": {
+ "flake-utils": {
+ "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": [
+ "templ",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1694102001,
+ "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1702830618,
@@ -16,9 +52,68 @@
"type": "github"
}
},
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1694422566,
+ "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs",
+ "templ": "templ"
+ }
+ },
+ "templ": {
+ "inputs": {
+ "gitignore": "gitignore",
+ "nixpkgs": "nixpkgs_2",
+ "xc": "xc"
+ },
+ "locked": {
+ "lastModified": 1704923336,
+ "narHash": "sha256-aS/k5kkf8kShS5hoyHjnGCZrDnJxawstO/hzTcBPziY=",
+ "owner": "a-h",
+ "repo": "templ",
+ "rev": "914bc73f8030166c9f8bd46af62f5f9bb2c3b089",
+ "type": "github"
+ },
+ "original": {
+ "owner": "a-h",
+ "repo": "templ",
+ "type": "github"
+ }
+ },
+ "xc": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": [
+ "templ",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1703164129,
+ "narHash": "sha256-kCcCqqwvjN07H8FPG4tXsRVRcMqT8dUNt9pwW1kKAe8=",
+ "owner": "joerdav",
+ "repo": "xc",
+ "rev": "0655cccfcf036556aeaddfb8f45dc7e8dd1b3680",
+ "type": "github"
+ },
+ "original": {
+ "owner": "joerdav",
+ "repo": "xc",
+ "type": "github"
}
}
},
diff --git a/flake.nix b/flake.nix
index e5416bf..9b96797 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,12 @@
description = "Recount's server/backend, written in Go";
# Nixpkgs / NixOS version to use.
- inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ inputs = {
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ templ.url = "github:a-h/templ";
+ };
- outputs = { self, nixpkgs }:
+ outputs = { self, nixpkgs, templ }:
let
# Generate a user-friendly version number.
version = builtins.substring 0 8 self.lastModifiedDate;
@@ -18,12 +21,13 @@
# Nixpkgs instantiated for supported system types.
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
+ templ_function = system: templ.packages.${system}.templ;
in
{
-
# Provide some binary packages for selected system types.
packages = forAllSystems (system:
let
+ inherit system;
pkgs = nixpkgsFor.${system};
in
{
@@ -33,6 +37,9 @@
default = pkgs.buildGoModule {
pname = "recount-server";
inherit version;
+ preBuild = ''
+ ${templ_function system}/bin/templ generate
+ '';
# In 'nix develop', we don't need a copy of the source tree
# in the Nix store.
src = ./.;
@@ -61,10 +68,22 @@
devShells = forAllSystems (system:
- let pkgs = nixpkgsFor.${system};
+ let
+ inherit system;
+ pkgs = nixpkgsFor.${system};
in {
default = pkgs.mkShell {
- buildInputs = with pkgs; [ go gopls gotools go-tools ];
+ shellHook = ''
+ alias gotest='templ generate;go run . -d'
+ '';
+ buildInputs = with pkgs; [
+ air # live go app reloading
+ go
+ gopls
+ gotools
+ go-tools
+ (templ_function system)
+ ];
};
});
};
diff --git a/go.mod b/go.mod
index 9695e91..931d5cb 100644
--- a/go.mod
+++ b/go.mod
@@ -12,8 +12,9 @@ require (
)
require (
+ github.com/a-h/templ v0.2.513 // indirect
github.com/ggicci/owl v0.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-isatty v0.0.19 // indirect
- golang.org/x/sys v0.12.0 // indirect
+ github.com/mattn/go-isatty v0.0.20 // indirect
+ golang.org/x/sys v0.14.0 // indirect
)
diff --git a/go.sum b/go.sum
index 1169d8b..da44165 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+github.com/a-h/templ v0.2.513 h1:ZmwGAOx4NYllnHy+FTpusc4+c5msoMpPIYX0Oy3dNqw=
+github.com/a-h/templ v0.2.513/go.mod h1:9gZxTLtRzM3gQxO8jr09Na0v8/jfliS97S9W5SScanM=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -24,6 +26,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
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-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.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -38,5 +42,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/web/index.templ b/web/index.templ
new file mode 100644
index 0000000..bebfdc0
--- /dev/null
+++ b/web/index.templ
@@ -0,0 +1,6 @@
+package web
+
+templ hello(name string) {
+ Hello { name }
+ SUPRISE!!!
+}
diff --git a/web/index_templ.go b/web/index_templ.go
new file mode 100644
index 0000000..d3f21fc
--- /dev/null
+++ b/web/index_templ.go
@@ -0,0 +1,48 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.529
+package web
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+func hello(name string) templ.Component {
+ 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)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Hello ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ var templ_7745c5c3_Var2 string
+ templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(name)
+ if templ_7745c5c3_Err != nil {
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/index.templ`, Line: 3, Col: 21}
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
SUPRISE!!!
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ if !templ_7745c5c3_IsBuffer {
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+ }
+ return templ_7745c5c3_Err
+ })
+}
diff --git a/web/router.go b/web/router.go
index 5c4cd30..8e4eea7 100644
--- a/web/router.go
+++ b/web/router.go
@@ -3,9 +3,17 @@ package web
import (
"net/http"
+ "context"
+
"github.com/go-chi/chi/v5"
+ "github.com/rs/zerolog"
+ "github.com/rs/zerolog/log"
)
+func SetLogLevel(level zerolog.Level) {
+ zerolog.SetGlobalLevel(level)
+}
+
func WebRouter() http.Handler {
r := chi.NewRouter()
r.Get("/", getIndex)
@@ -13,5 +21,7 @@ func WebRouter() http.Handler {
}
func getIndex(w http.ResponseWriter, req *http.Request) {
-
+ log.Debug().Msg("Got index")
+ component := hello("Nick")
+ component.Render(context.Background(), w)
}