From b37c73cf144628d54d4c72048e9e4c199920baf4 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@libresolutions.network>
Date: Thu, 4 Dec 2025 22:56:33 -0500
Subject: [PATCH] touching up navbar options

---
 Cargo.toml      |  1 -
 docs/install.md |  3 ++-
 src/ui.rs       | 12 ++++--------
 src/widgets.rs  | 29 ++++++++++++++++++++++++-----
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5e6e6d7..2f0d932 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ chrono = "0.4.41"
 rss_content = { git = "https://code.gabe.rocks/gabriel/rss_content", version = "0.1.1" }
 url = "2.5.4"
 #rfd = "0.15.4" (for importing files)
-
 [profile.dev]
 debug=true
 incremental = true
diff --git a/docs/install.md b/docs/install.md
index d30dfba..7e82f1f 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -3,4 +3,5 @@
 ⚠️ I don't actually recommend you do this, but it's an option for those interested in experiencing the project as it evolves.
 
 
-Things are very basic right now, but you're welcome to `cargo install --git "https://code.gabe.rocks/gabriel/rss-tool"` and try it out. Eventually I will learn how to make upgrades seamless...
+Things are very basic right now, but you're welcome to `cargo install --git "https://code.gabe.rocks/gabriel/rss-tool"` and try it out. 
+Eventually I will learn how to make upgrades seamless...
diff --git a/src/ui.rs b/src/ui.rs
index aa1d55e..616f122 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -167,7 +167,7 @@ fn home(state: &State) -> Element<'_, Message> {
             .height(iced::Fill),
         button("Go to test!").on_press(Message::ChangePage(Page::Testing))
     ))
-    .padding(15)
+    .padding(0)
     .height(Fill)
     .width(Fill)
     .into()
@@ -175,7 +175,7 @@ fn home(state: &State) -> Element<'_, Message> {
 
 fn feed_layout(state: &State) -> Element<'_, Message> {
     container(column!(
-        button(text("Home")).on_press(Message::ChangePage(Page::Home)),
+        widgets::navbar(state),
         scrollable(widgets::list_items(state.current_feed))
             .width(iced::Fill)
             .height(iced::Fill),
@@ -191,12 +191,7 @@ fn item_view(state: &State) -> Element<'_, Message> {
         None => {"".to_owned()}
     };
     container(column!(
-        row!(
-            button(text("Home")).on_press(Message::ChangePage(Page::Home)),
-            button(text("Feed")).on_press(Message::ChangePage(Page::FeedView))
-        )
-        .spacing(10),
-        text(title).size(34),
+        widgets::navbar(state),
         media_view(state),
         content_view(state),
     ))
@@ -230,6 +225,7 @@ fn category_view(state: &State) -> Element<'_,Message> {
 
 fn testing(state: &State) -> Element<'_, Message> {
     column!(
+        widgets::navbar(state),
         text("Dev Panel"),
         button("Add gabe.rocks").on_press(Message::AddFeed(String::from("https://gabe.rocks/rss"))),
         button("Add LSN").on_press(Message::AddFeed(String::from(
diff --git a/src/widgets.rs b/src/widgets.rs
index feac03e..d6440ca 100644
--- a/src/widgets.rs
+++ b/src/widgets.rs
@@ -106,19 +106,38 @@ pub fn navbar (state: &ui::State) -> Element<Message>{
             row::Row::new().push(
                 button("All Items").on_press(Message::ChangePage(Page::AllItems))
             ).push(button("Categories").on_press(Message::ChangePage(Page::CategoryView)))
+            .push(button("Dev Panel").on_press(Message::ChangePage(Page::Testing)))
             .spacing(5).padding(5)
         },
         Page::FeedView => {
-            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)
+            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
+            .push(
+                button("All Items").on_press(Message::ChangePage(Page::AllItems))
+            )
+            .spacing(5).padding(5)
         },
         Page::AllItems => {
-            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)}
+            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
+            .push(button("Dev Panel").on_press(Message::ChangePage(Page::Testing)))
+            .spacing(5).padding(5)}
         Page::CategoryView => {
-            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)}
+            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
+            .push(
+                button("All Items").on_press(Message::ChangePage(Page::AllItems))
+            )
+            .spacing(5).padding(5)}
         Page::Testing => {
-            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)}
+            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
+            .push(
+                button("All Items").on_press(Message::ChangePage(Page::AllItems))
+            )
+            .spacing(5).padding(5)}
         Page::ItemView => {
-            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)}
+            row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
+            .push(
+                button("All Items").on_press(Message::ChangePage(Page::AllItems))
+            )
+            .spacing(5).padding(5)}
     }.into()
 
 }