From 85e7eaa3a1c9024c02cc9a63744cdfb144cc3737 Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Sat, 23 May 2020 07:56:12 -0700 Subject: adds tmpl, css, and fileserver --- cmd/web/main.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/web/main.go b/cmd/web/main.go index 3f16dec..f215d1e 100644 --- a/cmd/web/main.go +++ b/cmd/web/main.go @@ -4,29 +4,43 @@ import ( "log" "net/http" "os" + "path" "github.com/go-chi/chi" "git.ofmax.li/iserv/internal/db/redis" + "git.ofmax.li/iserv/internal/fs" "git.ofmax.li/iserv/internal/image" + "go.ofmax.li/tmpl" ) func main() { connPool := redis.CreatePool("localhost:6379") db := redis.NewRedisImageRepo(connPool) + renderer, err := tmpl.NewHTMLTmpl("templates") + if err != nil { + log.Fatal(err) + } + storagePath, err := os.Getwd() if err != nil { log.Fatal("couldn't find directory to write images to") } - imageService := image.NewService(db, storagePath) + // Image + imageService := image.NewService(db, storagePath, renderer) imageHandler := image.NewHandler(imageService) + imageFile := fs.NewHandler(storagePath) + // Static Files + staticFiles := fs.NewHandler(path.Join(storagePath, "static")) r := chi.NewRouter() - r.Get("/i", imageHandler.GetImage) - r.Post("/i", imageHandler.PostImage) + r.Get("/i/{fileName}", imageHandler.GetImage) + r.Post("/u", imageHandler.PostImage) + r.Get("/f/*", imageFile) + r.Get("/static/*", staticFiles) log.Print("starting imageserv") log.Fatal(http.ListenAndServe(":8080", r)) } -- cgit v1.2.3