sort desc and add entry-only route

zaknesler · May 4, 2024 · 48cd349 · 48cd349
1 parent 33db31a
commit 48cd349
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/crates/blend-db/src/repo/entry.rs b/crates/blend-db/src/repo/entry.rs
@@ -21,7 +21,7 @@ impl EntryRepo {
 
     pub async fn get_entries(&self) -> DbResult<Vec<model::Entry>> {
         sqlx::query_as::<_, model::Entry>(
-            "SELECT uuid, feed_uuid, url, title, summary, published_at, updated_at FROM entries",
+            "SELECT uuid, feed_uuid, url, title, summary, published_at, updated_at FROM entries ORDER BY published_at DESC",
         )
         .fetch_all(&self.db)
         .await
@@ -32,7 +32,7 @@ impl EntryRepo {
         &self,
         feed_uuid: &uuid::Uuid,
     ) -> DbResult<Vec<model::Entry>> {
-        sqlx::query_as::<_, model::Entry>("SELECT uuid, feed_uuid, url, title, summary, published_at, updated_at FROM entries WHERE feed_uuid = ?1")
+        sqlx::query_as::<_, model::Entry>("SELECT uuid, feed_uuid, url, title, summary, published_at, updated_at FROM entries WHERE feed_uuid = ?1 ORDER BY published_at DESC")
             .bind(feed_uuid)
             .fetch_all(&self.db)
             .await

diff --git a/ui/src/pages/feed.tsx b/ui/src/pages/feed.tsx
@@ -18,7 +18,7 @@ export default () => {
         <EntriesList />
       </Panel>
 
-      {params.feed_uuid && params.entry_uuid && <EntryPanel />}
+      {params.entry_uuid && <EntryPanel />}
     </>
   );
 };
@@ -75,7 +75,7 @@ const EntriesList = () => {
             <For each={entries.data}>
               {entry => (
                 <A
-                  href={`/feeds/${entry.feed_uuid}/entries/${entry.uuid}`}
+                  href={params.feed_uuid ? `/feeds/${entry.feed_uuid}/entries/${entry.uuid}` : `/entries/${entry.uuid}`}
                   activeClass="border-gray-500 bg-gray-100"
                   inactiveClass="bg-gray-50 border-gray-200 hover:border-gray-300 hover:bg-gray-100"
                   class="flex flex-col gap-2 rounded-lg border p-4 focus:border-gray-500 focus:outline-none focus:ring-4 focus:ring-gray-200"

diff --git a/ui/src/router.tsx b/ui/src/router.tsx
@@ -4,7 +4,7 @@ import { lazy } from 'solid-js';
 export default () => (
   <Router root={lazy(() => import('./layouts/base'))}>
     <Route
-      path={['/', '/feeds/:feed_uuid', '/feeds/:feed_uuid/entries/:entry_uuid']}
+      path={['/', '/feeds/:feed_uuid', '/feeds/:feed_uuid/entries/:entry_uuid', '/entries/:entry_uuid']}
       component={lazy(() => import('./pages/feed'))}
     />
     <Route path="*" component={lazy(() => import('./pages/404'))} />