From 20d76c2a564e08e7aa5d88266a0616f60a1e7bc0 Mon Sep 17 00:00:00 2001
From: mace <safemind@posteo.net>
Date: Sun, 19 Nov 2023 14:03:03 +0100
Subject: [PATCH] database error message, date sorting

---
 src/database.rs                 | 2 +-
 src/reader/get.rs               | 3 ++-
 vue/src/assets/main.css         | 4 ++++
 vue/src/components/RssFeeds.vue | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/database.rs b/src/database.rs
index e5b2924..66ea680 100755
--- a/src/database.rs
+++ b/src/database.rs
@@ -8,5 +8,5 @@ pub fn establish_connection() -> PgConnection {
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     PgConnection::establish(&database_url)
-        .unwrap_or_else(|_| panic!("Error connecting to database {}", database_url))
+        .unwrap_or_else(|e| panic!("Error connecting to database {}: {}", database_url, e))
 }
diff --git a/src/reader/get.rs b/src/reader/get.rs
index 9b57b03..02ad398 100755
--- a/src/reader/get.rs
+++ b/src/reader/get.rs
@@ -2,7 +2,7 @@ use crate::json_serialization::user::JsonUser;
 use crate::models::feed::rss_feed::Feed;
 use crate::models::feed_item::rss_feed_item::FeedItem;
 use crate::reader::structs::feed::FeedAggregate;
-use crate::schema::feed_item::{feed_id, read};
+use crate::schema::feed_item::{feed_id, id, read};
 use crate::{
     database::establish_connection,
     json_serialization::articles::Articles,
@@ -31,6 +31,7 @@ pub async fn get(path: web::Path<JsonUser>, req: HttpRequest) -> impl Responder
         let existing_item: Vec<FeedItem> = feed_item::table
             .filter(feed_id.eq(feed.id))
             .filter(read.eq(false))
+            .order(id.asc())
             .load(&mut connection)
             .unwrap();
 
diff --git a/vue/src/assets/main.css b/vue/src/assets/main.css
index 05b2159..9320b1a 100644
--- a/vue/src/assets/main.css
+++ b/vue/src/assets/main.css
@@ -54,3 +54,7 @@ a,
   font-size: 21px;
   font-weight: bold;
 }
+
+h3 {
+  font-size: 14px;
+}
diff --git a/vue/src/components/RssFeeds.vue b/vue/src/components/RssFeeds.vue
index 0123976..43443c1 100644
--- a/vue/src/components/RssFeeds.vue
+++ b/vue/src/components/RssFeeds.vue
@@ -181,6 +181,7 @@ onMounted(() => {
       <template v-for="(   feed, index   ) in    feeds   ">
         <div v-bind:id="index" class="observe">
           <h2 @click="getReadable(feed, index)" class="feed-title">{{ feed.title }}</h2>
+          <h3>{{ feed.timestamp }}</h3>
           <p class="feed-content" v-html='feed.content'></p>
         </div>
       </template>