fix lints

This commit is contained in:
2025-02-17 13:03:31 +01:00
parent 92d9184723
commit aa9ad6d9d0
9 changed files with 21 additions and 20 deletions

View File

@@ -6,5 +6,8 @@ language-servers = ["rust-analyzer", "tailwindcss-ls"]
# procMacro = { ignored = { leptos_macro = ["server"] } } # procMacro = { ignored = { leptos_macro = ["server"] } }
cargo = { features = ["ssr", "hydrate"] } cargo = { features = ["ssr", "hydrate"] }
[language-server.rust-analyzer.config.check]
command = "clippy"
[language-server.tailwindcss-ls] [language-server.tailwindcss-ls]
config = { userLanguages = { rust = "html", "*.rs" = "html" } } config = { userLanguages = { rust = "html", "*.rs" = "html" } }

View File

@@ -84,6 +84,4 @@ pub fn Home() -> impl IntoView {
tracing::debug!("navigated"); tracing::debug!("navigated");
} }
}); });
leptos::view! {}
} }

View File

@@ -2,7 +2,7 @@ use leptos::prelude::*;
use web_sys::MouseEvent; use web_sys::MouseEvent;
#[component] #[component]
pub fn Button(#[prop(into)] text: String, onclick: impl Fn(MouseEvent) -> () + 'static) -> impl IntoView { pub fn Button(#[prop(into)] text: String, onclick: impl Fn(MouseEvent) + 'static) -> impl IntoView {
view! { view! {
<button <button
on:click=onclick on:click=onclick

View File

@@ -23,7 +23,7 @@ pub fn Problem(#[prop(into)] dim: Signal<models::WallDimensions>, #[prop(into)]
view! { view! {
<div class="grid grid-cols-[auto,1fr] gap-8"> <div class="grid grid-cols-[auto,1fr] gap-8">
<div class=move || { grid_classes.clone() }>{holds}</div> <div class=move || { grid_classes }>{holds}</div>
</div> </div>
} }
} }

View File

@@ -52,7 +52,7 @@ pub mod v2 {
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, derive_more::FromStr, derive_more::Display)] #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, derive_more::FromStr, derive_more::Display)]
pub struct WallUid(pub uuid::Uuid); pub struct WallUid(pub uuid::Uuid);
impl WallUid { impl WallUid {
pub fn new() -> Self { pub fn create() -> Self {
Self(uuid::Uuid::new_v4()) Self(uuid::Uuid::new_v4())
} }
} }
@@ -70,7 +70,7 @@ pub mod v2 {
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, derive_more::FromStr, derive_more::Display)] #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, derive_more::FromStr, derive_more::Display)]
pub struct ProblemUid(pub uuid::Uuid); pub struct ProblemUid(pub uuid::Uuid);
impl ProblemUid { impl ProblemUid {
pub fn new() -> Self { pub fn create() -> Self {
Self(uuid::Uuid::new_v4()) Self(uuid::Uuid::new_v4())
} }
} }

View File

@@ -79,19 +79,24 @@ pub fn Wall() -> impl IntoView {
<StyledHeader items=Signal::derive(header_items) /> <StyledHeader items=Signal::derive(header_items) />
<div class="m-2"> <div class="m-2">
<Suspense fallback=move || view! { <p>"Loading..."</p> } > <Suspense fallback=move || {
view! { <p>"Loading..."</p> }
}>
{move || Suspend::new(async move { {move || Suspend::new(async move {
tracing::info!("executing Suspend future"); tracing::info!("executing Suspend future");
let wall = wall.await?; let wall = wall.await?;
let v = view! { let v = view! {
<div class="grid grid-cols-[auto,1fr] gap-8"> <div class="grid grid-cols-[auto,1fr] gap-8">
<Grid wall=wall.clone() problem=problem_signal /> <Grid wall=wall.clone() problem=problem_signal />
<div> <div>
<div> <div>
<p>{move || problem_signal.get().map(|p| p.name.clone())}</p> <p>
<p>{move || problem_signal.get().map(|p| p.set_by.clone())}</p> {move || problem_signal.get().map(|p| p.name.clone())}
</p>
<p>
{move || problem_signal.get().map(|p| p.set_by.clone())}
</p>
</div> </div>
<Button <Button

View File

@@ -47,7 +47,7 @@ pub(crate) async fn import_mini_moonboard_problems(config: &Config, db: Database
mini_moonboard::Method::FootlessPlusKickboard => models::Method::FootlessPlusKickboard, mini_moonboard::Method::FootlessPlusKickboard => models::Method::FootlessPlusKickboard,
}; };
let problem_id = models::ProblemUid::new(); let problem_id = models::ProblemUid::create();
let problem = models::Problem { let problem = models::Problem {
uid: problem_id, uid: problem_id,

6
flake.lock generated
View File

@@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729251766, "lastModified": 1739793388,
"narHash": "sha256-/tOGBbFKgIii6L0VZdJ2MFdhzTt0BtEsAFbWITXeIxA=", "narHash": "sha256-mf0FJ7JJi5gTUFz0SyWF8bqqonxoFD2DG9D785uyYJM=",
"owner": "plul", "owner": "plul",
"repo": "basecamp", "repo": "basecamp",
"rev": "aae7006aec576140aadf3fdea4ed7eae904dda14", "rev": "f0f702ef6d5e8446eb8cd64e56fe1fe3cfbc677d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -75,12 +75,7 @@
}; };
nixosModules.default = nixosModules.default =
{ { config, lib, ... }:
config,
pkgs,
lib,
...
}:
let let
cfg = config.services.ascend; cfg = config.services.ascend;
in in