diff --git a/README.md b/README.md index e28fe7f..737840e 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ Go server-side rendered HTML combined with the projects below enable you to crea ### Screenshots -#### Inline validation +#### Inline form validation Inline validation @@ -761,6 +761,7 @@ Many examples of its usage are available in the included examples: - All navigation links use [boost](https://htmx.org/docs/#boosting) which dynamically replaces the page content with an AJAX request, providing a SPA-like experience. - All forms use either [boost](https://htmx.org/docs/#boosting) or [hx-post](https://htmx.org/docs/#triggers) to submit via AJAX. - The mock search autocomplete modal uses [hx-get](https://htmx.org/docs/#targets) to fetch search results from the server via AJAX and update the UI. +- The mock posts on the homepage/dashboard use [hx-get](https://htmx.org/docs/#targets) to fetch and page posts vi AJAX. All of this can be easily accomplished without writing any JavaScript at all. @@ -947,6 +948,7 @@ Thank you to all of the following amazing projects for making this possible. - [bulma](https://github.com/jgthms/bulma) - [docker](https://www.docker.com/) - [echo](https://github.com/labstack/echo) +- [echo-contrib](https://github.com/labstack/echo-contrib) - [ent](https://github.com/ent/ent) - [envdecode](https://github.com/joeshaw/envdecode) - [go](https://go.dev/) diff --git a/routes/reset_password.go b/routes/reset_password.go index 169e601..577e6b7 100644 --- a/routes/reset_password.go +++ b/routes/reset_password.go @@ -4,7 +4,6 @@ import ( "github.com/mikestefanello/pagoda/context" "github.com/mikestefanello/pagoda/controller" "github.com/mikestefanello/pagoda/ent" - "github.com/mikestefanello/pagoda/ent/user" "github.com/mikestefanello/pagoda/msg" "github.com/labstack/echo/v4" @@ -63,10 +62,9 @@ func (c *ResetPassword) Post(ctx echo.Context) error { usr := ctx.Get(context.UserKey).(*ent.User) // Update the user - _, err = c.Container.ORM.User. + _, err = usr. Update(). SetPassword(hash). - Where(user.ID(usr.ID)). Save(ctx.Request().Context()) if err != nil { diff --git a/routes/verify_email.go b/routes/verify_email.go index 3f247b5..59d137c 100644 --- a/routes/verify_email.go +++ b/routes/verify_email.go @@ -47,11 +47,10 @@ func (c *VerifyEmail) Get(ctx echo.Context) error { // Verify the user, if needed if !usr.Verified { - err = c.Container.ORM.User. + usr, err = usr. Update(). SetVerified(true). - Where(user.ID(usr.ID)). - Exec(ctx.Request().Context()) + Save(ctx.Request().Context()) if err != nil { return c.Fail(ctx, err, "failed to set user as verified") diff --git a/templates/pages/reset-password.gohtml b/templates/pages/reset-password.gohtml index 93a469b..dfae948 100644 --- a/templates/pages/reset-password.gohtml +++ b/templates/pages/reset-password.gohtml @@ -1,5 +1,5 @@ {{define "content"}} -
+