diff --git a/cmd/legit/main.go b/cmd/legit/main.go index 058d60ef..4043640b 100644 --- a/cmd/legit/main.go +++ b/cmd/legit/main.go @@ -3,8 +3,10 @@ package main import ( "flag" "fmt" + "html/template" "log" "net/http" + "path/filepath" "github.com/icyphox/bild/legit/config" "github.com/icyphox/bild/legit/routes" @@ -20,7 +22,9 @@ func main() { log.Fatal(err) } - mux := routes.Handlers(c) + t := template.Must(template.ParseGlob(filepath.Join(c.Dirs.Templates, "*"))) + + mux := routes.Handlers(c, t) addr := fmt.Sprintf("%s:%d", c.Server.Host, c.Server.Port) log.Println("starting server on", addr) log.Fatal(http.ListenAndServe(addr, mux)) diff --git a/flake.nix b/flake.nix index 26293f00..49d65b75 100644 --- a/flake.nix +++ b/flake.nix @@ -15,30 +15,36 @@ }; }; - outputs = { - self, - nixpkgs, - gitignore, - rust-overlay, - }: let - supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - nixpkgsFor = forAllSystems (system: - import nixpkgs { - inherit system; - overlays = [(import rust-overlay)]; - }); - in { - defaultPackage = forAllSystems (system: self.packages.${system}.legit); - formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra); - devShells = forAllSystems (system: let - pkgs = nixpkgsFor.${system}; - rust-bin = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; - in { - default = pkgs.mkShell { - nativeBuildInputs = [ - pkgs.go - pkgs.air + outputs = + { self + , nixpkgs + , gitignore + , rust-overlay + , + }: + let + supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + nixpkgsFor = forAllSystems (system: + import nixpkgs { + inherit system; + overlays = [ (import rust-overlay) ]; + }); + in + { + defaultPackage = forAllSystems (system: self.packages.${system}.legit); + formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra); + devShells = forAllSystems (system: + let + pkgs = nixpkgsFor.${system}; + rust-bin = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + in + { + default = pkgs.mkShell { + nativeBuildInputs = [ + pkgs.go + pkgs.air + pkgs.templ pkgs.httpie pkgs.bacon diff --git a/go.mod b/go.mod index e2b25d54..7018017b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/icyphox/bild -go 1.22.0 +go 1.23 + +toolchain go1.23.4 require ( github.com/alecthomas/chroma/v2 v2.14.0 @@ -33,9 +35,9 @@ require ( github.com/sergi/go-diff v1.3.1 // indirect github.com/skeema/knownhosts v1.3.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - golang.org/x/crypto v0.28.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/sys v0.26.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.28.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index d47d13dc..7d79b8c5 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -134,8 +134,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -158,8 +158,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -167,8 +167,8 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -176,8 +176,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/legit/routes/handler.go b/legit/routes/handler.go index cf61fd79..b55ad014 100644 --- a/legit/routes/handler.go +++ b/legit/routes/handler.go @@ -1,6 +1,7 @@ package routes import ( + "html/template" "net/http" "github.com/go-chi/chi/v5" @@ -29,10 +30,11 @@ func (d *deps) Multiplex(w http.ResponseWriter, r *http.Request) { } } -func Handlers(c *config.Config) http.Handler { +func Handlers(c *config.Config, t *template.Template) http.Handler { r := chi.NewRouter() - d := deps{c} + d := deps{c, t} + r.Get("/login", d.Login) r.Get("/static/{file}", d.ServeStatic) r.Route("/@{user}", func(r chi.Router) { diff --git a/legit/routes/routes.go b/legit/routes/routes.go index bfffbf87..f4c9f71c 100644 --- a/legit/routes/routes.go +++ b/legit/routes/routes.go @@ -22,6 +22,7 @@ import ( type deps struct { c *config.Config + t *template.Template } func (d *deps) Index(w http.ResponseWriter, r *http.Request) { @@ -73,14 +74,11 @@ func (d *deps) Index(w http.ResponseWriter, r *http.Request) { return infos[j].d.Before(infos[i].d) }) - tpath := filepath.Join(d.c.Dirs.Templates, "*") - t := template.Must(template.ParseGlob(tpath)) - data := make(map[string]interface{}) data["meta"] = d.c.Meta data["info"] = infos - if err := t.ExecuteTemplate(w, "index", data); err != nil { + if err := d.t.ExecuteTemplate(w, "index", data); err != nil { log.Println(err) return } @@ -143,9 +141,6 @@ func (d *deps) RepoIndex(w http.ResponseWriter, r *http.Request) { return } - tpath := filepath.Join(d.c.Dirs.Templates, "*") - t := template.Must(template.ParseGlob(tpath)) - if len(commits) >= 3 { commits = commits[:3] } @@ -161,7 +156,7 @@ func (d *deps) RepoIndex(w http.ResponseWriter, r *http.Request) { data["meta"] = d.c.Meta data["gomod"] = isGoModule(gr) - if err := t.ExecuteTemplate(w, "repo", data); err != nil { + if err := d.t.ExecuteTemplate(w, "repo", data); err != nil { log.Println(err) return } @@ -327,9 +322,6 @@ func (d *deps) Log(w http.ResponseWriter, r *http.Request) { return } - tpath := filepath.Join(d.c.Dirs.Templates, "*") - t := template.Must(template.ParseGlob(tpath)) - data := make(map[string]interface{}) data["commits"] = commits data["meta"] = d.c.Meta @@ -339,7 +331,7 @@ func (d *deps) Log(w http.ResponseWriter, r *http.Request) { data["desc"] = getDescription(path) data["log"] = true - if err := t.ExecuteTemplate(w, "log", data); err != nil { + if err := d.t.ExecuteTemplate(w, "log", data); err != nil { log.Println(err) return } @@ -367,9 +359,6 @@ func (d *deps) Diff(w http.ResponseWriter, r *http.Request) { return } - tpath := filepath.Join(d.c.Dirs.Templates, "*") - t := template.Must(template.ParseGlob(tpath)) - data := make(map[string]interface{}) data["commit"] = diff.Commit @@ -381,7 +370,7 @@ func (d *deps) Diff(w http.ResponseWriter, r *http.Request) { data["ref"] = ref data["desc"] = getDescription(path) - if err := t.ExecuteTemplate(w, "commit", data); err != nil { + if err := d.t.ExecuteTemplate(w, "commit", data); err != nil { log.Println(err) return } @@ -414,9 +403,6 @@ func (d *deps) Refs(w http.ResponseWriter, r *http.Request) { return } - tpath := filepath.Join(d.c.Dirs.Templates, "*") - t := template.Must(template.ParseGlob(tpath)) - data := make(map[string]interface{}) data["meta"] = d.c.Meta @@ -426,7 +412,7 @@ func (d *deps) Refs(w http.ResponseWriter, r *http.Request) { data["tags"] = tags data["desc"] = getDescription(path) - if err := t.ExecuteTemplate(w, "refs", data); err != nil { + if err := d.t.ExecuteTemplate(w, "refs", data); err != nil { log.Println(err) return } @@ -438,3 +424,10 @@ func (d *deps) ServeStatic(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, f) } + +func (d *deps) Login(w http.ResponseWriter, r *http.Request) { + if err := d.t.ExecuteTemplate(w, "login", nil); err != nil { + log.Println(err) + return + } +} diff --git a/legit/templates/login.html b/legit/templates/login.html new file mode 100644 index 00000000..68aed3ee --- /dev/null +++ b/legit/templates/login.html @@ -0,0 +1,29 @@ +{{ define "login" }} + + {{ template "head" . }} + + +
+
+

+ You will be redirected to bsky.app (or your PDS) to complete + login. +

+
+ +
+ +
+
+ + +{{ end }}