diff --git a/db/sql_logger.go b/db/sql_logger.go index a782f2c..8a5f7b6 100644 --- a/db/sql_logger.go +++ b/db/sql_logger.go @@ -14,8 +14,6 @@ type sqlLogger struct{} func (sqlLogger) Log(ctx context.Context, level sqldblogger.Level, msg string, data map[string]interface{}) { var lvl slog.Level - msg = strings.TrimSpace(msg) - switch level { case sqldblogger.LevelDebug, sqldblogger.LevelTrace, sqldblogger.LevelInfo: lvl = slog.LevelDebug @@ -23,5 +21,9 @@ func (sqlLogger) Log(ctx context.Context, level sqldblogger.Level, msg string, d lvl = slog.LevelError } - log.New(ctx).With("sql", data).Level(lvl).Log(msg) + entry := log.New(ctx) + if entry.Accept(lvl) { + msg = strings.TrimSpace(msg) + entry.With("sql", data).Level(lvl).Log(msg) + } } diff --git a/pkg/log/log.go b/pkg/log/log.go index 7e1cdf3..f6dd4d0 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -101,6 +101,10 @@ func New(ctx context.Context) *Entry { return &Entry{ctx: ctx, handler: h, time: time.Now()} } +func (entry *Entry) Accept(lvl slog.Level) bool { + return entry.handler.Enabled(entry.ctx, lvl) +} + func (entry *Entry) Caller(caller caller.Caller) *Entry { entry.caller = caller return entry diff --git a/tailwind.config.js b/tailwind.config.js index 3ef61f5..1ac6034 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -2,7 +2,11 @@ module.exports = { content: ["./views/**/*.templ"], theme: { - extend: {}, + extend: { + screens: { + xs: "480px", + }, + }, }, plugins: [ require("daisyui"), diff --git a/views/subredditsview/detailsview/detailsview.templ b/views/subredditsview/detailsview/detailsview.templ index a675886..1ccd7f2 100644 --- a/views/subredditsview/detailsview/detailsview.templ +++ b/views/subredditsview/detailsview/detailsview.templ @@ -39,7 +39,7 @@ templ DetailsContent(c *views.Context, data Data) {

Subreddit { data.Subreddit.Name }

-
+

Total Images: { strconv.FormatInt(data.TotalImages, 10) } diff --git a/views/subredditsview/subredditsview.templ b/views/subredditsview/subredditsview.templ index 86a3565..ff194df 100644 --- a/views/subredditsview/subredditsview.templ +++ b/views/subredditsview/subredditsview.templ @@ -24,7 +24,7 @@ templ SubredditContent(c *views.Context, data Data) {

No Subreddits Found

Click here to add a new subreddit.

} else { -
+

{ strconv.FormatInt(data.Subreddits.Total, 10) } Subreddits Registered

Add Subreddit
@@ -40,31 +40,28 @@ templ SubredditContent(c *views.Context, data Data) { } templ SubredditCard(c *views.Context, data *models.Subreddit) { -
+ if len(data.R.Images) > 0 {
- - { - + {
} else {
- - @imagePlaceholder() - + @imagePlaceholder()
}
- -

{ data.Name }

-
+

{ data.Name }

-
+ } templ imagePlaceholder() {