From 177663c73f3d708120b975a74eebd0951177a53b Mon Sep 17 00:00:00 2001 From: Samuel Johnson Date: Mon, 24 Nov 2025 00:38:12 -0500 Subject: Add blog posts to front page --- cmd/web/handlers/blog.go | 30 ++++++++++++++++++++++++++++++ cmd/web/handlers/routes.go | 5 ++++- cmd/web/main.go | 24 +++++++++++++++++++++++- 3 files changed, 57 insertions(+), 2 deletions(-) (limited to 'cmd/web') diff --git a/cmd/web/handlers/blog.go b/cmd/web/handlers/blog.go index d995583..07ab361 100644 --- a/cmd/web/handlers/blog.go +++ b/cmd/web/handlers/blog.go @@ -1,14 +1,19 @@ package handlers import ( + "database/sql" "html/template" "log" "net/http" + + "paterissa.net/mblog/internal/models" ) type blogContext struct { err *log.Logger + db *sql.DB + Rows []models.Post Name string } @@ -18,6 +23,31 @@ func (ctx *blogContext) index(w http.ResponseWriter, r *http.Request) { return } + offset := r.URL.Query().Get("offset") + if offset == "" { + offset = "20" + } + + rows, err := ctx.db.Query("SELECT * FROM posts WHERE id < " + offset + " ORDER BY id DESC LIMIT 20;") + if err != nil { + ctx.err.Print(err.Error()) + http.Error(w, "Internal Server Error", 500) + return + } + defer rows.Close() + + for rows.Next() { + var p models.Post + + if err = rows.Scan(&p.Id, &p.Name, &p.Time, &p.Content); err != nil { + ctx.err.Print(err.Error()) + http.Error(w, "Internal Server Error", 500) + return + } + + ctx.Rows = append(ctx.Rows, p) + } + files := []string{ "ui/html/base.tmpl.html", "ui/html/music_player.tmpl.html", diff --git a/cmd/web/handlers/routes.go b/cmd/web/handlers/routes.go index 91c27a2..e9fd0f5 100644 --- a/cmd/web/handlers/routes.go +++ b/cmd/web/handlers/routes.go @@ -1,13 +1,16 @@ package handlers import ( + "database/sql" "net/http" + "paterissa.net/mblog/cmd/web/types" ) -func RegisterEndpoints(app types.Application) *http.ServeMux { +func RegisterEndpoints(app types.Application, db *sql.DB) *http.ServeMux { blog := blogContext{ err: app.Err, + db: db, Name: app.Env.Webmaster, } audio := fsContext{ diff --git a/cmd/web/main.go b/cmd/web/main.go index 619cc93..42b672a 100644 --- a/cmd/web/main.go +++ b/cmd/web/main.go @@ -1,6 +1,7 @@ package main import ( + "database/sql" "fmt" "log" "net/http" @@ -9,6 +10,8 @@ import ( "github.com/joho/godotenv" + _ "github.com/jackc/pgx/v5/stdlib" + "paterissa.net/mblog/cmd/web/handlers" "paterissa.net/mblog/cmd/web/types" ) @@ -28,6 +31,11 @@ func main() { app.Env.Webmaster = os.Getenv("webmaster") app.Env.Db.Name = os.Getenv("db_name") + app.Env.Db.Port, err = strconv.ParseUint(os.Getenv("db_port"), 10, 64) + if err != nil { + app.Env.Db.Port = 5432 + } + app.Env.Db.Host = os.Getenv("db_host") app.Env.Db.Username = os.Getenv("db_user") app.Env.Db.Password = os.Getenv("db_pass") app.Env.AppPort, err = strconv.ParseUint(os.Getenv("web_port"), 10, 64) @@ -35,7 +43,21 @@ func main() { app.Env.AppPort = 5005 } - router := handlers.RegisterEndpoints(app) + connStr := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", + app.Env.Db.Host, + app.Env.Db.Port, + app.Env.Db.Username, + app.Env.Db.Password, + app.Env.Db.Name, + ) + db, err := sql.Open("pgx", connStr) + if err != nil { + fmt.Fprintf(os.Stderr, "Failed to open DB: %v\n", err) + os.Exit(1) + } + defer db.Close() + + router := handlers.RegisterEndpoints(app, db) srv := &http.Server{ Addr: fmt.Sprintf(":%d", app.Env.AppPort), ErrorLog: app.Err, -- cgit v1.2.3