Migrated files page.

Author: mikestefanello

pkg/handlers/auth.go

@@ -19,13 +19,11 @@ import (
 	"github.com/mikestefanello/pagoda/pkg/ui"
 )
 
-type (
-	Auth struct {
-		auth *services.AuthClient
-		mail *services.MailClient
-		orm  *ent.Client
-	}
-)
+type Auth struct {
+	auth *services.AuthClient
+	mail *services.MailClient
+	orm  *ent.Client
+}
 
 func init() {
 	Register(new(Auth))
@@ -81,7 +79,7 @@ func (h *Auth) ForgotPasswordSubmit(ctx echo.Context) error {
 		return err
 	}
 
-	// Attempt to load the user
+	// Attempt to load the user.
 	u, err := h.orm.User.
 		Query().
 		Where(user.Email(strings.ToLower(input.Email))).
@@ -95,7 +93,7 @@ func (h *Auth) ForgotPasswordSubmit(ctx echo.Context) error {
 		return fail(err, "error querying user during forgot password")
 	}
 
-	// Generate the token
+	// Generate the token.
 	token, pt, err := h.auth.GeneratePasswordResetToken(ctx, u.ID)
 	if err != nil {
 		return fail(err, "error generating password reset token")
@@ -105,7 +103,7 @@ func (h *Auth) ForgotPasswordSubmit(ctx echo.Context) error {
 		"user_id", u.ID,
 	)
 
-	// Email the user
+	// Email the user.
 	url := ctx.Echo().Reverse(routenames.ResetPassword, u.ID, pt.ID, token)
 	err = h.mail.
 		Compose().
@@ -145,7 +143,7 @@ func (h *Auth) LoginSubmit(ctx echo.Context) error {
 		return err
 	}
 
-	// Attempt to load the user
+	// Attempt to load the user.
 	u, err := h.orm.User.
 		Query().
 		Where(user.Email(strings.ToLower(input.Email))).
@@ -159,13 +157,13 @@ func (h *Auth) LoginSubmit(ctx echo.Context) error {
 		return fail(err, "error querying user during login")
 	}
 
-	// Check if the password is correct
+	// Check if the password is correct.
 	err = h.auth.CheckPassword(input.Password, u.Password)
 	if err != nil {
 		return authFailed()
 	}
 
-	// Log the user in
+	// Log the user in.
 	err = h.auth.Login(ctx, u.ID)
 	if err != nil {
 		return fail(err, "unable to log in user")
@@ -206,13 +204,13 @@ func (h *Auth) RegisterSubmit(ctx echo.Context) error {
 		return err
 	}
 
-	// Hash the password
+	// Hash the password.
 	pwHash, err := h.auth.HashPassword(input.Password)
 	if err != nil {
 		return fail(err, "unable to hash password")
 	}
 
-	// Attempt creating the user
+	// Attempt creating the user.
 	u, err := h.orm.User.
 		Create().
 		SetName(input.Name).
@@ -235,7 +233,7 @@ func (h *Auth) RegisterSubmit(ctx echo.Context) error {
 		return fail(err, "unable to create user")
 	}
 
-	// Log the user in
+	// Log the user in.
 	err = h.auth.Login(ctx, u.ID)
 	if err != nil {
 		log.Ctx(ctx).Error("unable to log user in",
@@ -250,7 +248,7 @@ func (h *Auth) RegisterSubmit(ctx echo.Context) error {
 
 	msg.Success(ctx, "Your account has been created. You are now logged in.")
 
-	// Send the verification email
+	// Send the verification email.
 	h.sendVerificationEmail(ctx, u)
 
 	return redirect.New(ctx).
@@ -259,7 +257,7 @@ func (h *Auth) RegisterSubmit(ctx echo.Context) error {
 }
 
 func (h *Auth) sendVerificationEmail(ctx echo.Context, usr *ent.User) {
-	// Generate a token
+	// Generate a token.
 	token, err := h.auth.GenerateEmailVerificationToken(usr.Email)
 	if err != nil {
 		log.Ctx(ctx).Error("unable to generate email verification token",
@@ -269,7 +267,7 @@ func (h *Auth) sendVerificationEmail(ctx echo.Context, usr *ent.User) {
 		return
 	}
 
-	// Send the email
+	// Send the email.
 	url := ctx.Echo().Reverse(routenames.VerifyEmail, token)
 	err = h.mail.
 		Compose().
@@ -306,16 +304,16 @@ func (h *Auth) ResetPasswordSubmit(ctx echo.Context) error {
 		return err
 	}
 
-	// Hash the new password
+	// Hash the new password.
 	hash, err := h.auth.HashPassword(input.Password)
 	if err != nil {
 		return fail(err, "unable to hash password")
 	}
 
-	// Get the requesting user
+	// Get the requesting user.
 	usr := ctx.Get(context.UserKey).(*ent.User)
 
-	// Update the user
+	// Update the user.
 	_, err = usr.
 		Update().
 		SetPassword(hash).
@@ -325,7 +323,7 @@ func (h *Auth) ResetPasswordSubmit(ctx echo.Context) error {
 		return fail(err, "unable to update password")
 	}
 
-	// Delete all password tokens for this user
+	// Delete all password tokens for this user.
 	err = h.auth.DeletePasswordTokens(ctx, usr.ID)
 	if err != nil {
 		return fail(err, "unable to delete password tokens")
@@ -340,7 +338,7 @@ func (h *Auth) ResetPasswordSubmit(ctx echo.Context) error {
 func (h *Auth) VerifyEmail(ctx echo.Context) error {
 	var usr *ent.User
 
-	// Validate the token
+	// Validate the token.
 	token := ctx.Param("token")
 	email, err := h.auth.ValidateEmailVerificationToken(token)
 	if err != nil {
@@ -350,7 +348,7 @@ func (h *Auth) VerifyEmail(ctx echo.Context) error {
 			Go()
 	}
 
-	// Check if it matches the authenticated user
+	// Check if it matches the authenticated user.
 	if u := ctx.Get(context.AuthenticatedUserKey); u != nil {
 		authUser := u.(*ent.User)
 
@@ -359,7 +357,7 @@ func (h *Auth) VerifyEmail(ctx echo.Context) error {
 		}
 	}
 
-	// Query to find a matching user, if needed
+	// Query to find a matching user, if needed.
 	if usr == nil {
 		usr, err = h.orm.User.
 			Query().
@@ -371,7 +369,7 @@ func (h *Auth) VerifyEmail(ctx echo.Context) error {
 		}
 	}
 
-	// Verify the user, if needed
+	// Verify the user, if needed.
 	if !usr.Verified {
 		usr, err = usr.
 			Update().

pkg/handlers/cache.go

@@ -11,11 +11,9 @@ import (
 	"github.com/mikestefanello/pagoda/pkg/ui"
 )
 
-type (
-	Cache struct {
-		cache *services.CacheClient
-	}
-)
+type Cache struct {
+	cache *services.CacheClient
+}
 
 func init() {
 	Register(new(Cache))
@@ -59,7 +57,7 @@ func (h *Cache) Submit(ctx echo.Context) error {
 		return err
 	}
 
-	// Set the cache
+	// Set the cache.
 	err := h.cache.
 		Set().
 		Key("page_cache_example").

pkg/handlers/files.go

@@ -7,69 +7,47 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/mikestefanello/pagoda/pkg/msg"
-	"github.com/mikestefanello/pagoda/pkg/page"
+	"github.com/mikestefanello/pagoda/pkg/routenames"
 	"github.com/mikestefanello/pagoda/pkg/services"
-	"github.com/mikestefanello/pagoda/templates"
+	"github.com/mikestefanello/pagoda/pkg/ui"
 	"github.com/spf13/afero"
 )
 
-const (
-	routeNameFiles       = "files"
-	routeNameFilesSubmit = "files.submit"
-)
-
-type (
-	Files struct {
-		files afero.Fs
-		*services.TemplateRenderer
-	}
-
-	File struct {
-		Name     string
-		Size     int64
-		Modified string
-	}
-)
+type Files struct {
+	files afero.Fs
+}
 
 func init() {
 	Register(new(Files))
 }
 
 func (h *Files) Init(c *services.Container) error {
-	h.TemplateRenderer = c.TemplateRenderer
 	h.files = c.Files
 	return nil
 }
 
 func (h *Files) Routes(g *echo.Group) {
-	g.GET("/files", h.Page).Name = routeNameFiles
-	g.POST("/files", h.Submit).Name = routeNameFilesSubmit
+	g.GET("/files", h.Page).Name = routenames.Files
+	g.POST("/files", h.Submit).Name = routenames.FilesSubmit
 }
 
 func (h *Files) Page(ctx echo.Context) error {
-	p := page.New(ctx)
-	p.Layout = templates.LayoutMain
-	p.Name = templates.PageFiles
-	p.Title = "Upload a file"
-
-	// Send a list of all uploaded files to the template to be rendered.
+	// Compile a list of all uploaded files to be rendered.
 	info, err := afero.ReadDir(h.files, "")
 	if err != nil {
 		return err
 	}
 
-	files := make([]File, 0)
+	files := make([]*ui.File, 0)
 	for _, file := range info {
-		files = append(files, File{
+		files = append(files, &ui.File{
 			Name:     file.Name(),
 			Size:     file.Size(),
 			Modified: file.ModTime().Format(time.DateTime),
 		})
 	}
 
-	p.Data = files
-
-	return h.RenderPage(ctx, p)
+	return ui.UploadFile(ctx, files)
 }
 
 func (h *Files) Submit(ctx echo.Context) error {

pkg/handlers/pages.go

@@ -62,10 +62,9 @@ func (h *Pages) HomeOld(ctx echo.Context) error {
 
 func (h *Pages) Home(ctx echo.Context) error {
 	pgr := page.NewPager(ctx, 4)
-	p := h.fetchPosts(&pgr)
 
 	return ui.Home(ctx, ui.Posts{
-		Posts: p,
+		Posts: h.fetchPosts(&pgr),
 		Pager: pgr,
 	})
 }

pkg/log/log.go

@@ -7,12 +7,12 @@ import (
 	"github.com/mikestefanello/pagoda/pkg/context"
 )
 
-// Set sets a logger in the context
+// Set sets a logger in the context.
 func Set(ctx echo.Context, logger *slog.Logger) {
 	ctx.Set(context.LoggerKey, logger)
 }
 
-// Ctx returns the logger stored in context, or provides the default logger if one is not present
+// Ctx returns the logger stored in context, or provides the default logger if one is not present.
 func Ctx(ctx echo.Context) *slog.Logger {
 	if l, ok := ctx.Get(context.LoggerKey).(*slog.Logger); ok {
 		return l
@@ -21,7 +21,7 @@ func Ctx(ctx echo.Context) *slog.Logger {
 	return Default()
 }
 
-// Default returns the default logger
+// Default returns the default logger.
 func Default() *slog.Logger {
 	return slog.Default()
 }

pkg/routenames/names.go

@@ -19,4 +19,6 @@ const (
 	TaskSubmit           = "task.submit"
 	Cache                = "cache"
 	CacheSubmit          = "cache.submit"
+	Files                = "files"
+	FilesSubmit          = "files.submit"
 )

pkg/services/mail.go

@@ -39,20 +39,20 @@ func NewMailClient(cfg *config.Config) (*MailClient, error) {
 	}, nil
 }
 
-// Compose creates a new email
+// Compose creates a new email.
 func (m *MailClient) Compose() *mail {
 	return &mail{
 		client: m,
 		from:   m.config.Mail.FromAddress,
 	}
 }
 
-// skipSend determines if mail sending should be skipped
+// skipSend determines if mail sending should be skipped.
 func (m *MailClient) skipSend() bool {
 	return m.config.App.Environment != config.EnvProduction
 }
 
-// send attempts to send the email
+// send attempts to send the email.
 func (m *MailClient) send(email *mail, ctx echo.Context) error {
 	switch {
 	case email.to == "":
@@ -73,15 +73,15 @@ func (m *MailClient) send(email *mail, ctx echo.Context) error {
 		email.body = buf.String()
 	}
 
-	// Check if mail sending should be skipped
+	// Check if mail sending should be skipped.
 	if m.skipSend() {
 		log.Ctx(ctx).Debug("skipping email delivery",
 			"to", email.to,
 		)
 		return nil
 	}
 
-	// TODO: Finish based on your mail sender of choice!
+	// TODO: Finish based on your mail sender of choice or stop logging below!
 	log.Ctx(ctx).Info("sending email",
 		"to", email.to,
 		"subject", email.subject,
@@ -121,7 +121,7 @@ func (m *mail) Component(component gomponents.Node) *mail {
 	return m
 }
 
-// Send attempts to send the email
+// Send attempts to send the email.
 func (m *mail) Send(ctx echo.Context) error {
 	return m.client.send(m, ctx)
 }