diff --git a/Dockerfile b/Dockerfile index 624a49c..a467206 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app ENV CGO_ENABLED=1 # Install sqlc for code generation -RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.30.0 +RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.31.1 # Install build dependencies for bun + assets RUN apt-get update && apt-get install -y ca-certificates sqlite3 curl unzip && rm -rf /var/lib/apt/lists/* diff --git a/internal/db/models.go b/internal/db/models.go index 348e609..5a112f2 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -66,8 +66,8 @@ type User struct { ID string `json:"id"` Username string `json:"username"` PasswordHash string `json:"password_hash"` - AvatarURL string `json:"avatar_url"` CreatedAt time.Time `json:"created_at"` + AvatarUrl string `json:"avatar_url"` } type WatchListEntry struct { diff --git a/internal/db/queries.sql.go b/internal/db/queries.sql.go index 109f755..653aa93 100644 --- a/internal/db/queries.sql.go +++ b/internal/db/queries.sql.go @@ -469,7 +469,7 @@ func (q *Queries) GetUpcomingSeasons(ctx context.Context, userID string) ([]GetU } const getUser = `-- name: GetUser :one -SELECT id, username, password_hash, avatar_url, created_at FROM user WHERE id = ? LIMIT 1 +SELECT id, username, password_hash, created_at, avatar_url FROM user WHERE id = ? LIMIT 1 ` func (q *Queries) GetUser(ctx context.Context, id string) (User, error) { @@ -479,14 +479,14 @@ func (q *Queries) GetUser(ctx context.Context, id string) (User, error) { &i.ID, &i.Username, &i.PasswordHash, - &i.AvatarURL, &i.CreatedAt, + &i.AvatarUrl, ) return i, err } const getUserByUsername = `-- name: GetUserByUsername :one -SELECT id, username, password_hash, avatar_url, created_at FROM user WHERE username = ? LIMIT 1 +SELECT id, username, password_hash, created_at, avatar_url FROM user WHERE username = ? LIMIT 1 ` func (q *Queries) GetUserByUsername(ctx context.Context, username string) (User, error) { @@ -496,8 +496,8 @@ func (q *Queries) GetUserByUsername(ctx context.Context, username string) (User, &i.ID, &i.Username, &i.PasswordHash, - &i.AvatarURL, &i.CreatedAt, + &i.AvatarUrl, ) return i, err } diff --git a/templates/components/header.gohtml b/templates/components/header.gohtml index 16d6e91..663fb95 100644 --- a/templates/components/header.gohtml +++ b/templates/components/header.gohtml @@ -43,7 +43,7 @@