Add renovate.json

Signed-off-by: kjuulh <contact@kjuulh.io>

.gitignore

@@ -12,4 +12,3 @@ test-results/
 end2end/playwright-report/
 playwright/.cache/
 .cuddle/
-.helix/

Cargo.toml

@@ -19,18 +19,18 @@ console_error_panic_hook = "0.1"
 console_log = "0.2"
 cfg-if = "1"
 lazy_static = "1"
-leptos = { version = "*", default-features = false, features = ["serde"] }
-leptos_dom = { version = "*", default-features = false }
-leptos_meta = { version = "*", default-features = false }
-leptos_axum = { version = "*", default-features = false, optional = true }
-leptos_router = { version = "*", default-features = false }
+leptos = { version = "*",  features = ["serde"] }
+leptos_dom = { version = "*" }
+leptos_meta = { version = "*" }
+leptos_axum = { version = "*", optional = true }
+leptos_router = { version = "*" }
 log = "0.4"
 simple_logger = "4"
 thiserror = "1"
 axum = { version = "0.6.1", optional = true }
 tower = { version = "0.4.13", optional = true }
 tower-http = { version = "0.3.4", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["time"], optional = true }
+tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"], optional = true }
 wasm-bindgen = "0.2"
 tracing-subscriber = { version = "0.3.16", optional = true, features = [
   "env-filter",
@@ -61,6 +61,10 @@ ssr = [
   "dep:tracing",
 ]
 
+[package.metadata.cargo-all-features]
+denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
+skip_feature_sets = [["ssr", "hydrate"]]
+
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name   
 output-name = "como_web"

scripts/dev.sh

@@ -1,20 +1,6 @@
 #!/bin/bash
 
-tmux new-window -n dev
+zellij run -- sh -c "cuddle x leptos:dev"
 
-# allow for user input
-tmux split-window -h
-
-# leptos
-tmux send-keys -t dev "cuddle x leptos:dev" C-m
-
-tmux split-window -v
-# tailwind
-tmux send-keys -t dev "cuddle x tailwind:watch" C-m
-
-# set user input to first 
-tmux select-pane -t 0
-
-
-tmux attach-session -t dev
+zellij run -- sh -c "cuddle x tailwind:watch"
 

src/app.rs

@@ -4,48 +4,48 @@ use leptos_router::*;
 
 use crate::common::layout::DashboardLayout;
 use crate::routes::dash::home::DashHomePage;
-use crate::routes::features_view::features_view;
+use crate::routes::features_view::FeaturesView;
 use crate::routes::home::HomePage;
 
 #[component]
-pub fn App(cx: Scope) -> impl IntoView {
+pub fn App() -> impl IntoView {
     // Provides context that manages stylesheets, titles, meta tags, etc.
-    provide_meta_context(cx);
+    provide_meta_context();
 
-    view! { cx,
+    view! {
         <Stylesheet id="leptos" href="/pkg/como_web.css"/>
         <Router>
             <main>
                 <Routes>
                     <Route
                         path=""
-                        view=|cx| {
-                            view! { cx, <HomePage/> }
+                        view=|| {
+                            view! { <HomePage/> }
                         }
                     />
                     <Route
                         path="/dash"
-                        view=|cx| {
-                            view! { cx, <DashboardLayout/> }
+                        view=|| {
+                            view! { <DashboardLayout/> }
                         }
                     >
                         <Route
                             path=""
-                            view=|cx| {
-                                view! { cx, <DashHomePage/> }
+                            view=|| {
+                                view! { <DashHomePage/> }
                             }
                         />
                         <Route
                             path="home"
-                            view=|cx| {
-                                view! { cx, <DashHomePage/> }
+                            view=|| {
+                                view! { <DashHomePage/> }
                             }
                         />
                     </Route>
                     <Route
                         path="/features"
-                        view=|cx| {
-                            features_view(cx)
+                        view=|| {
+                            view! { <FeaturesView/> }
                         }
                     />
                 </Routes>

src/common/layout.rs

@@ -5,9 +5,9 @@ use crate::features::command_line::CommandLine;
 use crate::features::navbar_projects::NavbarProjects;
 
 #[component]
-pub fn DashNav(cx: Scope) -> impl IntoView {
-    view! { cx,
-        <nav class="min-w-[200px] p-4 space-y-4 h-screen max-h-screen sticky top-0 select-none bg-gray-800 overflow-auto">
+pub fn DashNav() -> impl IntoView {
+    view! {
+        <nav class="min-w-[200px] p-4 space-y-4 h-screen sticky top-0 select-none bg-gray-800">
             <div>
                 <a href="/dash/home" class="text-xl">
                     "como"
@@ -35,8 +35,8 @@ pub fn DashNav(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-pub fn DashboardLayout(cx: Scope) -> impl IntoView {
-    view! { cx,
+pub fn DashboardLayout() -> impl IntoView {
+    view! {
         <div class="flex flex-row">
             <DashNav/>
             <div id="content" class="px-0.5 flex-grow">

src/fallback.rs

@@ -10,20 +10,19 @@ cfg_if! { if #[cfg(feature = "ssr")] {
     use axum::response::Response as AxumResponse;
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
-    use std::sync::Arc;
-    use leptos::{LeptosOptions, Errors, view};
-    use crate::app::{App, AppProps};
+    use leptos::{LeptosOptions, view};
+    use crate::app::App;
 
     pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();
 
         if res.status() == StatusCode::OK {
-           res.into_response()
+            res.into_response()
         } else{
             let handler = leptos_axum::render_app_to_stream(
                 options.to_owned(),
-                move |cx| view!{ cx, <App/> }
+                move || view!{ <App/> }
             );
             handler(req).await.into_response()
         }

src/features/command_line/mod.rs

@@ -6,50 +6,50 @@ pub struct CommandLineState {
 }
 
 #[component]
-pub fn CommandLineModalView(cx: Scope) -> impl IntoView {
-    view! { cx, <div>"modal"</div> }
+pub fn CommandLineModalView() -> impl IntoView {
+    view! { <div>"modal"</div> }
 }
 
 #[component]
-pub fn CommandLineModal(cx: Scope) -> impl IntoView {
+pub fn CommandLineModal() -> impl IntoView {
     let state =
-        use_context::<RwSignal<CommandLineState>>(cx).expect("command line state must be provided");
+        use_context::<RwSignal<CommandLineState>>().expect("command line state must be provided");
 
-    let (hidden, _) = create_slice(cx, state, |state| state.hidden, |state, n| state.hidden = n);
+    let (hidden, _) = create_slice(state, |state| state.hidden, |state, n| state.hidden = n);
 
-    view! { cx,
+    view! {
         {move || {
             if !hidden.get() {
-                view! { cx, <CommandLineModalView/> }
+                view! { <CommandLineModalView/> }
             } else {
-                view! { cx, <div></div> }.into_view(cx)
+                view! {  }.into_view()
             }
         }}
     }
 }
 
 #[component]
-pub fn CommandLine(cx: Scope, children: Children) -> impl IntoView {
-    let state = create_rw_signal(cx, CommandLineState { hidden: true });
-    provide_context(cx, state);
+pub fn CommandLine(children: Children) -> impl IntoView {
+    let state = create_rw_signal(CommandLineState { hidden: true });
+    provide_context(state);
     let (hidden, set_hidden) =
-        create_slice(cx, state, |state| state.hidden, |state, n| state.hidden = n);
+        create_slice(state, |state| state.hidden, |state, n| state.hidden = n);
 
     leptos_dom::helpers::window_event_listener(ev::keypress, move |event| {
         if event.ctrl_key() {
             match event.code().as_str() {
                 "KeyK" => {
-                    //set_hidden(!hidden.get());
-                    log!("toggle command")
+                    set_hidden.set(!hidden.get());
+                    //log!("toggle command")
                 }
                 _ => {}
             }
         }
     });
 
-    view! { cx,
+    view! {
         <div>
-            <div>{children(cx)}</div>
+            <div>{children()}</div>
             <CommandLineModal/>
         </div>
     }

src/features/dashboard_list_view/dashboard_list_view.rs

@@ -24,17 +24,14 @@ pub async fn get_projects_list() -> anyhow::Result<Vec<GetProjectsListViewGetPro
 }
 
 #[component]
-pub fn DashboardItemView(cx: Scope, item: GetProjectsListViewGetProjectsItems) -> impl IntoView {
-    view! { cx, <div class="dashboard-list-item dashboard-item">{item.title}</div> }
+pub fn DashboardItemView(item: GetProjectsListViewGetProjectsItems) -> impl IntoView {
+    view! { <div class="dashboard-list-item dashboard-item">{item.title}</div> }
 }
 
 #[component]
-pub fn DashboardProjectItemView(
-    cx: Scope,
-    project: GetProjectsListViewGetProjects,
-) -> impl IntoView {
-    view! { cx,
-        <div class="dashboard-list-item dashboard-list-project">
+pub fn DashboardProjectItemView(project: GetProjectsListViewGetProjects) -> impl IntoView {
+    view! {
+       <div class="dashboard-list-item dashboard-list-project">
             <a href=format!("/dash/project/{}", & project.id) class="project-item flex flex-row">
                 <div class="space-x-2">
                     <span>{&project.name}</span>
@@ -48,20 +45,24 @@ pub fn DashboardProjectItemView(
 
 #[component]
 pub fn DashboardListView(
-    cx: Scope,
     projects: Resource<(), Vec<GetProjectsListViewGetProjects>>,
 ) -> impl IntoView {
     let projects_view = move || {
-        projects.with(cx, |projects| {
+        projects.with(|projects| {
+            if projects.is_none() {
+                return Vec::new();
+            }
+            let projects = projects.as_ref().unwrap();
+
             if projects.is_empty() {
-                return vec![view! { cx, <div class="project-item">"No projects"</div> }.into_any()];
+                return vec![view! { <div class="project-item">"No projects"</div> }.into_any()];
             }
 
             projects
                 .into_iter()
                 .filter(|project| !project.items.is_empty())
                 .map(|project| {
-                    view! { cx,
+                    view! {
                         <div>
                             <DashboardProjectItemView project=project.clone()/>
                             {&project
@@ -69,10 +70,10 @@ pub fn DashboardListView(
                                 .clone()
                                 .into_iter()
                                 .map(|item| {
-                                    view! { cx, <DashboardItemView item=item/> }
+                                    view! { <DashboardItemView item=item/> }
                                 })
                                 .collect::<Vec<_>>()
-                                .into_view(cx)}
+                                .into_view()}
                         </div>
                     }
                     .into_any()
@@ -81,13 +82,12 @@ pub fn DashboardListView(
         })
     };
 
-    view! { cx, <div class="project-items">{projects_view}</div> }
+    view! {<div class="project-items">{projects_view}</div> }
 }
 
 #[component]
-pub fn DashboardList(cx: Scope) -> impl IntoView {
-    let projects =
-        create_local_resource(cx, || (), |_| async { get_projects_list().await.unwrap() });
+pub fn DashboardList() -> impl IntoView {
+    let projects = create_local_resource(|| (), |_| async { get_projects_list().await.unwrap() });
 
-    view! { cx, <DashboardListView projects=projects/> }
+    view! {<DashboardListView projects=projects/> }
 }

src/features/navbar_projects/navbar_projects.rs

@@ -25,20 +25,28 @@ pub async fn get_projects_list() -> anyhow::Result<Vec<GetProjectsListViewGetPro
 
 #[component]
 pub fn NavbarProjectsView(
-    cx: Scope,
     projects: Resource<(), Vec<GetProjectsListViewGetProjects>>,
 ) -> impl IntoView {
     let projects_view = move || {
-        projects.with(cx, |projects| {
+        projects.with(|projects| {
+            if projects.is_none() {
+                return Vec::new()
+            }
+            let projects = projects.as_ref().unwrap();
+
+
             if projects.is_empty() {
-                return vec![view! { cx, <div class="project-item">"No projects"</div> }.into_any()];
+                return vec![view! { <div class="project-item">"No projects"</div> }.into_any()];
             }
 
             projects
                 .into_iter()
                 .map(|project| {
-                    view! { cx,
+                    view! { 
                         <a href=format!("/dash/project/{}", & project.id) class="project-item">
+
+
+
                                <div class="project-item-name hover:dark:bg-blue-700 rounded-md p-0.5 px-2">
                                 {&project.name}
                             </div>
@@ -49,13 +57,13 @@ pub fn NavbarProjectsView(
         })
     };
 
-    view! { cx, <div class="project-items space-y-1">{projects_view}</div> }
+    view! { <div class="project-items space-y-1">{projects_view}</div> }
 }
 
 #[component]
-pub fn NavbarProjects(cx: Scope) -> impl IntoView {
+pub fn NavbarProjects() -> impl IntoView {
     let projects =
-        create_local_resource(cx, || (), |_| async { get_projects_list().await.unwrap() });
+        create_local_resource(|| (), |_| async { get_projects_list().await.unwrap() });
 
-    view! { cx, <NavbarProjectsView projects=projects/> }
+    view! { <NavbarProjectsView projects=projects/> }
 }

src/lib.rs

@@ -19,8 +19,8 @@ if #[cfg(feature = "hydrate")] {
 
       console_error_panic_hook::set_once();
 
-      leptos::mount_to_body(move |cx| {
-          view! { cx, <App/> }
+      leptos::mount_to_body(move || {
+          view! { <App/> }
       });
     }
 }

src/main.rs

@@ -18,19 +18,19 @@ async fn main() {
     let addr = conf.leptos_options.site_addr;
     let leptos_options = conf.leptos_options;
     // Generate the list of routes in your Leptos App
-    let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
+    let routes = generate_route_list(App);
 
     como_web::api::register();
 
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
-        .leptos_routes(&leptos_options.clone(), routes, |cx| view! { cx, <App/> })
+        .leptos_routes(&leptos_options.clone(), routes, || view! { <App/> })
         .fallback(file_and_error_handler)
         .with_state(leptos_options);
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-    log!("listening on http://{}", &addr);
+    // log!("listening on http://{}", &addr);
     axum::Server::bind(&addr)
         .serve(app.into_make_service())
         .await

src/routes/dash/home.rs

@@ -3,8 +3,8 @@ use leptos::*;
 use crate::features::dashboard_list_view::DashboardList;
 
 #[component]
-pub fn DashHomePage(cx: Scope) -> impl IntoView {
-    view! { cx,
+pub fn DashHomePage() -> impl IntoView {
+    view! {
         <div class="home-dash">
             <DashboardList/>
         </div>

src/routes/features_view.rs

@@ -1,14 +1,12 @@
-use leptos::{ev, html::*, *};
+use leptos::*;
 use uuid::Uuid;
 
 use crate::features::navbar_projects::gen::queries::get_projects_list_view::GetProjectsListViewGetProjects;
-use crate::features::navbar_projects::{
-    NavbarProjects, NavbarProjectsProps, NavbarProjectsView, NavbarProjectsViewProps,
-};
+use crate::features::navbar_projects::NavbarProjectsView;
 
-pub fn features_view(cx: Scope) -> impl IntoView {
+#[component]
+pub fn FeaturesView() -> impl IntoView {
     let projects = create_local_resource(
-        cx,
         || (),
         |_| async {
             vec![
@@ -25,24 +23,21 @@ pub fn features_view(cx: Scope) -> impl IntoView {
     );
 
     let emptyProjects: Resource<(), Vec<GetProjectsListViewGetProjects>> =
-        create_local_resource(cx, || (), |_| async { Vec::new() });
+        create_local_resource(|| (), |_| async { Vec::new() });
 
-    return div(cx).child(
-        div(cx)
-            .classes("space-y-5 p-2")
-            .child(h1(cx).child("NavbarProjects"))
-            .child(h2(cx).child("Projects"))
-            .child(
-                div(cx)
-                    .classes("feature-case")
-                    .child(NavbarProjectsView(cx, NavbarProjectsViewProps { projects })),
-            )
-            .child(h2(cx).child("no projects"))
-            .child(div(cx).classes("feature-case").child(NavbarProjectsView(
-                cx,
-                NavbarProjectsViewProps {
-                    projects: emptyProjects,
-                },
-            ))),
-    );
+    view! {
+        <div>
+            <div class="space-y-5 p-2">
+                <h1>"NavbarProjects"</h1>
+                <h2>"Projects"</h2>
+                <div class="feature-case">
+                    <NavbarProjectsView projects=projects/>
+                </div>
+                <h2>"no projects"</h2>
+                <div class="feature-case">
+                    <NavbarProjectsView projects=emptyProjects/>
+                </div>
+            </div>
+        </div>
+    }
 }

src/routes/home.rs

@@ -1,8 +1,8 @@
 use leptos::*;
 
 #[component]
-pub fn Navbar(cx: Scope) -> impl IntoView {
-    view! { cx,
+pub fn Navbar() -> impl IntoView {
+    view! {
         <div class="flex flex-row justify-between items-center bg-gray-800 p-4">
             <div class="flex flex-row items-center">
                 <div class="text-2xl text-white font-bold">"Como - Todo"</div>
@@ -19,8 +19,8 @@ pub fn Navbar(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-pub fn HomePage(cx: Scope) -> impl IntoView {
-    view! { cx,
+pub fn HomePage() -> impl IntoView {
+    view! {
         <Navbar/>
         <h1 class="text-xl text-red-50">"Welcome to Leptos!"</h1>
     }

style/output.css

@@ -570,10 +570,6 @@ video {
   height: 100vh;
 }
 
-.max-h-screen {
-  max-height: 100vh;
-}
-
 .min-w-\[200px\] {
   min-width: 200px;
 }
@@ -634,10 +630,6 @@ video {
   margin-bottom: calc(1.25rem * var(--tw-space-y-reverse));
 }
 
-.overflow-auto {
-  overflow: auto;
-}
-
 .rounded-md {
   border-radius: 0.375rem;
 }