src/components/category_today_task_list.rs

@@ -1,5 +1,4 @@
 use crate::components::task_list::TaskList;
-use crate::components::task_list_item::TaskListItem;
 use crate::hooks::use_tasks_with_subtasks_in_category;
 use crate::internationalization::LocaleFromLanguageIdentifier;
 use crate::models::category::Category;
@@ -59,23 +58,8 @@ pub(crate) fn CategoryTodayTaskList() -> Element {
                         {t!("long-term")._upper_first()}
                     }
                 }
-                div {
-                    for task in long_term_tasks {
-                        div {
-                            key: "{task.task.id}",
-                            class: format!(
-                                "px-7 pt-5 {} flex flex-row gap-4",
-                                if task.task.deadline.is_some() {
-                                    "pb-0.5"
-                                } else {
-                                    "pb-5"
-                                }
-                            ),
-                            TaskListItem {
-                                task: task.clone()
-                            }
-                        }
-                    }
+                TaskList {
+                    tasks: long_term_tasks
                 }
             }
             if !overdue_tasks.is_empty() {

src/components/navigation.rs

@@ -4,7 +4,7 @@ use dioxus::prelude::*;
 use dioxus_free_icons::Icon;
 use dioxus_free_icons::icons::fa_solid_icons::{
     FaBars, FaCalendarDay, FaCalendarDays, FaCheck, FaForward, FaHourglassHalf, FaInbox, FaList,
-    FaTrashCan, FaWater,
+    FaQuestion, FaTrashCan,
 };
 
 #[component]
@@ -56,8 +56,8 @@ pub(crate) fn Navigation(expanded: Signal<bool>) -> Element {
                         icon: FaCheck
                     },
                     NavigationItem {
-                        route: Route::CategoryLongTermPage,
-                        icon: FaWater
+                        route: Route::CategorySomedayMaybePage,
+                        icon: FaQuestion
                     },
                     NavigationItem {
                         route: Route::CategoryWaitingForPage,

src/components/task_form.rs

@@ -67,7 +67,6 @@ pub(crate) fn TaskForm(task: Option<Task>, on_successful_submit: EventHandler<()
                     reoccurrence: None,
                     time: None,
                 },
-                Route::CategoryLongTermPage => Category::LongTerm,
                 _ => Category::Inbox,
             }
         }

src/route/mod.rs

@@ -2,7 +2,6 @@ use crate::layouts;
 use crate::views::category_calendar_page::CategoryCalendarPage;
 use crate::views::category_done_page::CategoryDonePage;
 use crate::views::category_inbox_page::CategoryInboxPage;
-use crate::views::category_long_term_page::CategoryLongTermPage;
 use crate::views::category_next_steps_page::CategoryNextStepsPage;
 use crate::views::category_someday_maybe_page::CategorySomedayMaybePage;
 use crate::views::category_today_page::CategoryTodayPage;
@@ -31,8 +30,6 @@ pub(crate) enum Route {
         CategoryNextStepsPage,
         #[route("/calendar")]
         CategoryCalendarPage,
-        #[route("/long-term")]
-        CategoryLongTermPage,
         #[route("/done")]
         CategoryDonePage,
         #[route("/trash")]

src/views/category_long_term_page.rs

@@ -1,17 +0,0 @@
-use crate::components::error_boundary_message::ErrorBoundaryMessage;
-use crate::models::category::Category;
-use crate::views::category_page::CategoryPage;
-use dioxus::core_macro::rsx;
-use dioxus::dioxus_core::Element;
-use dioxus::prelude::*;
-
-#[component]
-pub(crate) fn CategoryLongTermPage() -> Element {
-    rsx! {
-        ErrorBoundaryMessage {
-            CategoryPage {
-                category: Category::LongTerm,
-            }
-        }
-    }
-}

src/views/mod.rs

@@ -1,7 +1,6 @@
 pub(crate) mod category_calendar_page;
 pub(crate) mod category_done_page;
 pub(crate) mod category_inbox_page;
-pub(crate) mod category_long_term_page;
 pub(crate) mod category_next_steps_page;
 pub(crate) mod category_page;
 pub(crate) mod category_someday_maybe_page;