Apparently for 2 weeks (yes 2 whole fucking weeks) I was using NamedExec wrong instead of MustExec so inserts haven't worked since then. Other than that, this is a more cleaned up MVC style setup than before.
This commit is contained in:
parent
1785a8e4f5
commit
bac4472c3a
5 changed files with 127 additions and 93 deletions
49
main.go
49
main.go
|
@ -5,7 +5,7 @@ import (
|
|||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
"zedshaw.games/webapp/tools"
|
||||
"zedshaw.games/webapp/api"
|
||||
"zedshaw.games/webapp/data"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/gofiber/fiber/v2/middleware/logger"
|
||||
|
@ -41,51 +41,52 @@ func main() {
|
|||
sess.Set("fuck", "off")
|
||||
|
||||
sql, args, err := sq.Select("*").From("stream").ToSql()
|
||||
return tools.SelectJson[data.Stream](db, c, err, sql, args...)
|
||||
err = data.SelectJson[data.Stream](db, c, err, sql, args...)
|
||||
|
||||
return api.IfErrNil(err, c)
|
||||
})
|
||||
|
||||
app.Get("/api/stream/:id", func (c *fiber.Ctx) error {
|
||||
sql, args, err := sq.Select("*").From("stream").Where("id", c.Params("id")).ToSql()
|
||||
return tools.GetJson[data.Stream](db, c, err, sql, args...)
|
||||
|
||||
err = data.GetJson[data.Stream](db, c, err, sql, args...)
|
||||
return api.IfErrNil(err, c)
|
||||
})
|
||||
|
||||
app.Get("/api/stream/:id/links", func (c *fiber.Ctx) error {
|
||||
sql, args, err := sq.Select("*").From("stream_link").Where("stream_id", c.Params("id")).ToSql()
|
||||
|
||||
return tools.SelectJson[data.Link](db, c, err, sql, args...)
|
||||
err = data.SelectJson[data.Link](db, c, err, sql, args...)
|
||||
|
||||
return api.IfErrNil(err, c)
|
||||
})
|
||||
|
||||
|
||||
app.Post("/api/login", func (c *fiber.Ctx) error {
|
||||
login, err := tools.ReceivePost[data.Login](c)
|
||||
|
||||
if(err != nil) {
|
||||
log.Println(err)
|
||||
c.Redirect("/error/")
|
||||
}
|
||||
login, err := api.ReceivePost[data.Login](c)
|
||||
if(err != nil) { goto fail }
|
||||
|
||||
log.Printf("username: %s; password: %s", login.Username, login.Password);
|
||||
|
||||
return c.Redirect("/")
|
||||
|
||||
fail:
|
||||
return api.IfErrNil(err, c)
|
||||
})
|
||||
|
||||
app.Post("/api/link", func (c *fiber.Ctx) error {
|
||||
link, err := tools.ReceivePost[data.Link](c)
|
||||
if(err != nil) {
|
||||
log.Println(err)
|
||||
c.Redirect("/live/")
|
||||
}
|
||||
var sql string
|
||||
var args []interface{}
|
||||
|
||||
sql, args, err := sq.Insert("stream_link").Columns("stream_id", "url", "description").Values(link.StreamId, link.Url, link.Description).ToSql()
|
||||
link, err := api.ReceivePost[data.Link](c)
|
||||
if err != nil { goto fail }
|
||||
|
||||
err = tools.Insert(db, err, sql, args...)
|
||||
sql, args, err = sq.Insert("stream_link").Columns("stream_id", "url", "description").Values(link.StreamId, link.Url, link.Description).ToSql()
|
||||
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return c.Redirect("/live/")
|
||||
} else {
|
||||
return c.Redirect("/live/")
|
||||
}
|
||||
err = data.Insert(db, err, sql, args...)
|
||||
return c.Redirect("/live/")
|
||||
|
||||
fail:
|
||||
return api.IfErrNil(err, c)
|
||||
})
|
||||
|
||||
app.Static("/", "./public")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue