Compare commits

1 Commits

Author SHA1 Message Date
dea49ffd39 feat: UI overhaul
All checks were successful
actionlint check / actionlint check (pull_request) Successful in 9s
conventional commit messages check / conventional commit messages check (pull_request) Successful in 10s
conventional pull request title check / conventional pull request title check (pull_request) Successful in 6s
dotenv-linter check / dotenv-linter check (pull_request) Successful in 20s
GitLeaks check / GitLeaks check (pull_request) Successful in 15s
checkov check / checkov check (pull_request) Successful in 1m11s
hadolint check / hadolint check (pull_request) Successful in 15s
htmlhint check / htmlhint check (pull_request) Successful in 27s
markdownlint check / markdownlint check (pull_request) Successful in 25s
Prettier check / Prettier check (pull_request) Successful in 26s
Stylelint check / Stylelint check (pull_request) Successful in 19s
ShellCheck check / ShellCheck check (pull_request) Successful in 40m25s
yamllint check / yamllint check (pull_request) Successful in 40m9s
Rust check / Rust check (pull_request) Successful in 1h0m51s
2026-01-28 19:46:53 +01:00
6 changed files with 15 additions and 20 deletions

View File

@@ -1,4 +1,5 @@
use crate::internationalization::get_language_identifier; use crate::internationalization::get_language_identifier;
use crate::route::Route; use crate::route::Route;
use dioxus::core_macro::rsx; use dioxus::core_macro::rsx;
use dioxus::dioxus_core::Element; use dioxus::dioxus_core::Element;
@@ -7,13 +8,6 @@ use dioxus_i18n::prelude::*;
use dioxus_i18n::unic_langid::langid; use dioxus_i18n::unic_langid::langid;
const FAVICON: Asset = asset!("/assets/favicon.ico"); const FAVICON: Asset = asset!("/assets/favicon.ico");
/* Once https://github.com/DioxusLabs/dioxus/issues/4490 is resolved, hopefully it will be
sufficient to just include the single icon.png. */
#[used]
static IMAGES_DIRECTORY: Asset = asset!(
"/assets/images",
AssetOptions::builder().with_hash_suffix(false)
);
#[used] #[used]
static FONTS_DIRECTORY: Asset = asset!( static FONTS_DIRECTORY: Asset = asset!(
"/assets/fonts", "/assets/fonts",

View File

@@ -16,9 +16,7 @@ pub(crate) fn Input(
rsx! { rsx! {
input { input {
class: format!( class: format!(
/* `w-full` is required for the Chromium renderer to allow the input to shrink "pt-3 pb-2.25 {} bg-gray-800-muted enabled:hover:bg-gray-800 enabled:focus:bg-gray-800 drop-shadow-[0_calc(0px_-_var(--spacing))_0_var(--color-gray-900-muted)] rounded-xl outline-0 {} transition-all duration-150 {}",
properly. */
"pt-3 pb-2.25 w-full {} bg-gray-800-muted enabled:hover:bg-gray-800 enabled:focus:bg-gray-800 drop-shadow-[0_calc(0px_-_var(--spacing))_0_var(--color-gray-900-muted)] rounded-xl outline-0 {} transition-all duration-150 {}",
match r#type.as_str() { match r#type.as_str() {
"date" => "ps-3.25 pe-3", "date" => "ps-3.25 pe-3",
_ => "px-4" _ => "px-4"
@@ -32,6 +30,7 @@ pub(crate) fn Input(
name: name.clone(), name: name.clone(),
r#type, r#type,
id: id.unwrap_or(format!("input_{}", name)), id: id.unwrap_or(format!("input_{}", name)),
autofocus,
oninput: move |event| { oninput: move |event| {
if let Some(oninput) = oninput { if let Some(oninput) = oninput {
oninput.call(event); oninput.call(event);
@@ -42,11 +41,6 @@ pub(crate) fn Input(
onchange.call(event); onchange.call(event);
} }
}, },
onmounted: move |element| async move {
if let Some(true) = autofocus {
let _ = element.set_focus(true).await;
}
},
..attributes ..attributes
} }
} }

View File

@@ -64,6 +64,9 @@ pub(crate) fn ProjectForm() -> Element {
if let Some(project) = project { if let Some(project) = project {
let result = delete_project(project.id).await; let result = delete_project(project.id).await;
if result.is_ok() { if result.is_ok() {
/* TODO: Might not work on mobile due to
https://dioxuslabs.com/learn/0.7/essentials/router/navigation#history-buttons.
*/
navigator.go_back(); navigator.go_back();
} }
} else { } else {

View File

@@ -10,7 +10,7 @@ pub(crate) fn ProjectSelect(initial_selected_id: Option<i32>) -> Element {
rsx! { rsx! {
select { select {
name: "project_id", name: "project_id",
class: "px-4 pt-3 pb-2.25 bg-gray-800-muted enabled:hover:bg-gray-800 enabled:active:bg-gray-800 drop-shadow-[0_calc(0px_-_var(--spacing))_0_var(--color-gray-900-muted)] rounded-xl grow cursor-pointer transition-all duration-150", class: "px-4 pt-3 pb-2.25 bg-gray-800-muted enabled:hover:bg-gray-800 enabled:active:bg-gray-800 drop-shadow-[0_calc(0px_-_var(--spacing))_0_var(--color-gray-900-muted)] rounded-xl grow cursor-pointer",
id: "input_project_id", id: "input_project_id",
option { option {
value: 0, value: 0,

View File

@@ -11,6 +11,7 @@ pub(crate) fn ReoccurrenceIntervalInput(
class_buttons: Option<&'static str>, class_buttons: Option<&'static str>,
) -> Element { ) -> Element {
rsx! { rsx! {
// TODO: Abstract into SelectButton. Make it sank into the surface by default, like other inputs (abstract those too haha), and rise it up on selection (rationale: it will influence what is on the surface).
SelectButton { SelectButton {
icon: FaBan, icon: FaBan,
is_selected: reoccurrence_interval().is_none(), is_selected: reoccurrence_interval().is_none(),

View File

@@ -172,7 +172,7 @@ pub(crate) fn TaskForm() -> Element {
required: true, required: true,
initial_value: task.as_ref().map(|task| task.title.clone()), initial_value: task.as_ref().map(|task| task.title.clone()),
r#type: "text", r#type: "text",
autofocus: task.is_none() autofocus: true
} }
}, },
div { div {
@@ -246,16 +246,16 @@ pub(crate) fn TaskForm() -> Element {
r#for: "input_category_calendar_date" r#for: "input_category_calendar_date"
}, },
div { div {
class: "grow grid grid-cols-7 gap-3", class: "grow flex flex-row gap-3",
Input { Input {
class: "grow col-span-4", class: "grow",
name: "category_calendar_date", name: "category_calendar_date",
r#type: "date", r#type: "date",
required: true, required: true,
initial_value: date.format("%Y-%m-%d").to_string(), initial_value: date.format("%Y-%m-%d").to_string(),
}, },
Input { Input {
class: "grow col-span-3", class: "grow",
name: "category_calendar_time", name: "category_calendar_time",
r#type: "time", r#type: "time",
initial_value: time.map(|calendar_time| initial_value: time.map(|calendar_time|
@@ -367,6 +367,9 @@ pub(crate) fn TaskForm() -> Element {
edit_task(task.id, new_task).await.map(|_| ()) edit_task(task.id, new_task).await.map(|_| ())
}; };
if result.is_ok() { if result.is_ok() {
/* TODO: Might not work on mobile due to
https://dioxuslabs.com/learn/0.7/essentials/router/navigation#history-buttons.
*/
navigator.go_back(); navigator.go_back();
} }
} else { } else {