build: migrate to Dioxus 0.6
This commit is contained in:
@ -8,9 +8,9 @@ use chrono::{Datelike, Local};
|
||||
use dioxus::core_macro::rsx;
|
||||
use dioxus::dioxus_core::Element;
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_i18n::prelude::i18n;
|
||||
use dioxus_i18n::t;
|
||||
use dioxus_query::prelude::QueryResult;
|
||||
use dioxus_sdk::i18n::use_i18;
|
||||
use dioxus_sdk::translate;
|
||||
|
||||
const CALENDAR_LENGTH_DAYS: usize = 366 * 3;
|
||||
|
||||
@ -23,14 +23,12 @@ pub(crate) fn CategoryCalendarPage() -> Element {
|
||||
});
|
||||
let tasks_query_result = tasks.result();
|
||||
|
||||
let i18 = use_i18();
|
||||
|
||||
rsx! {
|
||||
match tasks_query_result.value() {
|
||||
QueryResult::Ok(QueryValue::TasksWithSubtasks(tasks))
|
||||
| QueryResult::Loading(Some(QueryValue::TasksWithSubtasks(tasks))) => {
|
||||
let today_date = Local::now().date_naive();
|
||||
|
||||
|
||||
rsx! {
|
||||
div {
|
||||
class: "pt-4 flex flex-col gap-8",
|
||||
@ -42,16 +40,15 @@ pub(crate) fn CategoryCalendarPage() -> Element {
|
||||
div {
|
||||
class: "pt-1",
|
||||
{
|
||||
date_current.format_localized(translate!(
|
||||
i18,
|
||||
date_current.format_localized(t!(
|
||||
if date_current.year() == Local::now().year() {
|
||||
"formats.date_weekday_format"
|
||||
"date-weekday-format"
|
||||
} else {
|
||||
"formats.date_weekday_year_format"
|
||||
"date-weekday-year-format"
|
||||
}
|
||||
).as_str(),
|
||||
LocaleFromLanguageIdentifier::from(
|
||||
&(i18.selected_language)()
|
||||
&i18n().language()
|
||||
).into()
|
||||
)
|
||||
.to_string()
|
||||
@ -60,7 +57,7 @@ pub(crate) fn CategoryCalendarPage() -> Element {
|
||||
}
|
||||
TaskList {
|
||||
tasks: tasks.iter().filter(|task| {
|
||||
if let Category::Calendar { date, .. }
|
||||
if let Category::Calendar { date, .. }
|
||||
= task.task().category() {
|
||||
*date == date_current
|
||||
} else {
|
||||
@ -70,7 +67,7 @@ pub(crate) fn CategoryCalendarPage() -> Element {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
QueryResult::Loading(None) => rsx! {
|
||||
|
Reference in New Issue
Block a user