diff --git a/internal/database/queries.go b/internal/database/queries.go
index 828d3d4..3260504 100644
--- a/internal/database/queries.go
+++ b/internal/database/queries.go
Picture string
CategoryId string
Description string
+ URI string
}
type Category struct {
for rows.Next() {
article := Article{}
var category_id sql.NullString
- if err := rows.Scan(&article.Id, &article.Title, &article.Content, &article.Picture, &category_id, &article.Description); err != nil {
+ if err := rows.Scan(&article.Id, &article.Title, &article.Content, &article.Picture, &category_id, &article.Description, &article.URI); err != nil {
return nil, err
}
if category_id.Valid {
}
func GetCategoryArticles(db *sql.DB, category string) ([]Article, error) {
- stmtOut, err := db.Prepare("SELECT article_id, article_title, article_content, article_picture, article_description FROM articles INNER JOIN categories ON articles.category_id = categories.category_id WHERE category_name = ?;")
+ stmtOut, err := db.Prepare("SELECT article_id, article_title, article_content, article_picture, article_description, article_uri FROM articles INNER JOIN categories ON articles.category_id = categories.category_id WHERE category_name = ?;")
if err != nil {
return nil, err
}
for rows.Next() {
article := Article{}
- if err := rows.Scan(&article.Id, &article.Title, &article.Content, &article.Picture, &article.Description); err != nil {
+ if err := rows.Scan(&article.Id, &article.Title, &article.Content, &article.Picture, &article.Description, &article.URI); err != nil {
return nil, err
}
articles = append(articles, article)
diff --git a/web/static/styles.css b/web/static/styles.css
index 4fd57db..d649979 100644
--- a/web/static/styles.css
+++ b/web/static/styles.css
.uutis-lista {
display: grid;
gap: 10px;
- grid-template-columns: repeat(2, 1fr);
+ grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
grid-auto-rows: 1fr;
}
.uutis-kuva {
object-fit: cover;
aspect-ratio: 16/9;
- width: 495px;
+ width: 100%;
+ height: 100%;
}
.uutis-tiedot {
diff --git a/web/templates/index.html b/web/templates/index.html
index 5bb49d7..5ac59ad 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
</header>
<main class="uutis-lista">
{{range .Articles}}
- <a href="{{.Title}}">
+ <a href="{{.URI}}">
<article class="uutis-kortti">
<img src="{{.Picture}}" class="uutis-kuva">
<div class="uutis-tiedot">