Diff between b8e80e6f7013d57c5df8f52714f75d39bf2151d5 and 8191139327922a8c5ee4784205d6528b5661e8c0

Changed Files

File Additions Deletions Status
internal/database/queries.go +4 -3 modified
web/static/styles.css +3 -2 modified
web/templates/index.html +1 -1 modified

Full Patch

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
@@ -13,6 +13,7 @@ type Article struct {
 	Picture     string
 	CategoryId  string
 	Description string
+	URI         string
 }
 
 type Category struct {
@@ -30,7 +31,7 @@ func GetArticles(db *sql.DB) ([]Article, error) {
 	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 {
@@ -61,7 +62,7 @@ func GetCategories(db *sql.DB) ([]Category, error) {
 }
 
 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
 	}
@@ -75,7 +76,7 @@ func GetCategoryArticles(db *sql.DB, category string) ([]Article, error) {
 
 	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
@@ -39,7 +39,7 @@ nav {
 .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;
 }
 
@@ -58,7 +58,8 @@ nav {
 .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
@@ -27,7 +27,7 @@
     </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">