Add renovate.json

.drone.yml

@@ -1,2 +0,0 @@
-kind: template
-load: cuddle-empty-plan.yaml

Cargo.toml

@@ -1,8 +1,8 @@
 [workspace]
 
 [workspace.dependencies]
-uuid = { version = "1.8.0", features = ["v4", "serde"] }
+uuid = { version = "1.3.0", features = ["v4", "serde"] }
-chrono = { version = "0.4.38", features = ["serde"] }
+chrono = { version = "0.4.23", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 
 
@@ -16,34 +16,33 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 console_error_panic_hook = "0.1"
-console_log = "1.0"
+console_log = "0.2"
 cfg-if = "1"
 lazy_static = "1"
-leptos = { version = "*",  features = ["serde"] }
+leptos = { version = "*", default-features = false, features = ["serde"] }
-leptos_dom = { version = "*" }
+leptos_meta = { version = "*", default-features = false }
-leptos_meta = { version = "*" }
+leptos_axum = { version = "*", default-features = false, optional = true }
-leptos_axum = { version = "*", optional = true }
+leptos_router = { version = "*", default-features = false }
-leptos_router = { version = "*" }
 log = "0.4"
-simple_logger = "5"
+simple_logger = "4"
 thiserror = "1"
-axum = { version = "0.7.5", optional = true }
+axum = { version = "0.6.1", optional = true }
 tower = { version = "0.4.13", optional = true }
-tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tower-http = { version = "0.3.4", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"], optional = true }
+tokio = { version = "1", features = ["time"], optional = true }
 wasm-bindgen = "0.2"
-tracing-subscriber = { version = "0.3.18", optional = true, features = [
+tracing-subscriber = { version = "0.3.16", optional = true, features = [
   "env-filter",
 ] }
-tracing = { version = "0.1.40", features = ["log"], optional = true }
+tracing = { version = "0.1.37", features = ["log"], optional = true }
-anyhow = { version = "1.0.86" }
+anyhow = { version = "1.0.71" }
 
 serde = { workspace = true }
 chrono = { workspace = true }
-uuid = { workspace = true, features = ["v4", "js", "serde"] }
+uuid = { workspace = true, features = ["v4", "wasm-bindgen", "js", "serde"] }
-graphql_client = { version = "0.14.0", features = ["reqwest"] }
+graphql_client = { version = "0.13.0", features = ["reqwest"] }
 reqwasm = "0.5.0"
-serde_json = "1.0.117"
+serde_json = "1.0.96"
 
 [features]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
@@ -55,16 +54,11 @@ ssr = [
   "leptos/ssr",
   "leptos_meta/ssr",
   "leptos_router/ssr",
-  "leptos_dom/ssr",
   "dep:leptos_axum",
   "dep:tracing-subscriber",
   "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"

cuddle.yaml

@@ -5,17 +5,6 @@ base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-plan.git"
 vars:
   service: "como-web"
   deployments: "git@git.front.kjuulh.io:como/deployments.git"
-  registry: "kasperhermansen"
-
-please:
-  project:
-    owner: kjuulh
-    repository: "como-web"
-    branch: main
-  settings:
-    api_url: https://git.front.kjuulh.io  
-
-
 
 scripts:
   render_como_templates:

end2end/package-lock.json

@@ -13,96 +13,61 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.54.1",
+      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.0.tgz",
-      "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
+      "integrity": "sha512-vrHs5DFTPwYox5SGKq/7TDn/S4q6RA1zArd7uhO6EyP9hj3XgZBBM12ktMbnDQNxh/fL1IUKsTNLxihmsU38lQ==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.54.1"
+        "@types/node": "*",
+        "playwright-core": "1.28.0"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=14"
       }
     },
-    "node_modules/fsevents": {
+    "node_modules/@types/node": {
-      "version": "2.3.2",
+      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
-      "dev": true,
+      "dev": true
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/playwright": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
-      "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
-      "dev": true,
-      "dependencies": {
-        "playwright-core": "1.54.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
     },
     "node_modules/playwright-core": {
-      "version": "1.54.1",
+      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.0.tgz",
-      "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
+      "integrity": "sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==",
       "dev": true,
       "bin": {
-        "playwright-core": "cli.js"
+        "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=14"
       }
     }
   },
   "dependencies": {
     "@playwright/test": {
-      "version": "1.54.1",
+      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.0.tgz",
-      "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
+      "integrity": "sha512-vrHs5DFTPwYox5SGKq/7TDn/S4q6RA1zArd7uhO6EyP9hj3XgZBBM12ktMbnDQNxh/fL1IUKsTNLxihmsU38lQ==",
       "dev": true,
       "requires": {
-        "playwright": "1.54.1"
+        "@types/node": "*",
+        "playwright-core": "1.28.0"
       }
     },
-    "fsevents": {
+    "@types/node": {
-      "version": "2.3.2",
+      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
-      "dev": true,
+      "dev": true
-      "optional": true
-    },
-    "playwright": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
-      "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
-      "dev": true,
-      "requires": {
-        "fsevents": "2.3.2",
-        "playwright-core": "1.54.1"
-      }
     },
     "playwright-core": {
-      "version": "1.54.1",
+      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.0.tgz",
-      "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
+      "integrity": "sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==",
       "dev": true
     }
   }

input.css

@@ -12,15 +12,3 @@ html, body {
 .feature-case {
   @apply m-8 border-blue-700 border-2 rounded-lg p-4;
 }
-
-.dashboard-list-item {
-  @apply flex flex-col justify-center hover:dark:bg-blue-900 cursor-pointer select-none px-4 py-2 border-y border-y-gray-800;
-}
-
-.dashboard-list-project {
-  @apply dark:bg-gray-800 hover:dark:bg-blue-900 text-gray-300;
-}
-
-.dashboard-item {
-  @apply pl-6
-}

scripts/dev.sh

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

scripts/nodev.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-tmux kill-window -t dev || true
+tmux kill-session -t dev || true

scripts/refresh:schema.sh

@@ -9,14 +9,4 @@ graphql-client generate \
   --schema-path src/api/graphql/schema/schema.json \
   src/features/navbar_projects/graphql/queries.graphql \
   --output-directory src/features/navbar_projects/gen \
-  --custom-scalars-module='crate::common::graphql' \
+  --custom-scalars-module='crate::common::graphql'
-  --variables-derives='Clone,Debug' \
-  --response-derives='Clone,Debug'
-
-graphql-client generate \
-  --schema-path src/api/graphql/schema/schema.json \
-  src/features/dashboard_list_view/graphql/queries.graphql \
-  --output-directory src/features/dashboard_list_view/gen \
-  --custom-scalars-module='crate::common::graphql' \
-  --variables-derives='Clone,Debug' \
-  --response-derives='Clone,Debug'

something/.drone.yml

@@ -1,2 +0,0 @@
-kind: template
-load: cuddle-empty-plan.yaml

something/.gitignore

@@ -1 +0,0 @@
-.cuddle/

something/cuddle.yaml

@@ -1,16 +0,0 @@
-# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
-
-base: "git@git.front.kjuulh.io:kjuulh/cuddle-empty-plan.git"
-
-vars:
-  service: "como-web"
-  registry: kasperhermansen
-
-please:
-  project:
-    owner: kjuulh
-    repository: "como-web"
-    branch: main
-  settings:
-    api_url: https://git.front.kjuulh.io  
-

something/renovate.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}

src/api/graphql/schema/schema.json

@@ -767,7 +767,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "Project",
+                  "name": "ProjectDto",
                   "ofType": null
                 }
               }
@@ -789,7 +789,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Project",
+                      "name": "ProjectDto",
                       "ofType": null
                     }
                   }

src/app.rs

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

src/common/layout.rs

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

src/fallback.rs

@@ -3,26 +3,28 @@ use cfg_if::cfg_if;
 cfg_if! { if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
     use axum::response::Response as AxumResponse;
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
-    use leptos::{LeptosOptions, view};
+    use std::sync::Arc;
-    use crate::app::App;
+    use leptos::{LeptosOptions, Errors, view};
+    use crate::app::{App, AppProps};
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+        let options = &*options;
         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 || view!{ <App/> }
+                move |cx| view!{ cx, <App/> }
             );
             handler(req).await.into_response()
         }

src/features.rs

@@ -1,3 +1 @@
-pub mod command_line;
-pub mod dashboard_list_view;
 pub mod navbar_projects;

src/features/command_line/mod.rs

@@ -1,56 +0,0 @@
-use leptos::*;
-
-#[derive(Clone, Debug)]
-pub struct CommandLineState {
-    hidden: bool,
-}
-
-#[component]
-pub fn CommandLineModalView() -> impl IntoView {
-    view! { <div>"modal"</div> }
-}
-
-#[component]
-pub fn CommandLineModal() -> impl IntoView {
-    let state =
-        use_context::<RwSignal<CommandLineState>>().expect("command line state must be provided");
-
-    let (hidden, _) = create_slice(state, |state| state.hidden, |state, n| state.hidden = n);
-
-    view! {
-        {move || {
-            if !hidden.get() {
-                view! { <CommandLineModalView/> }
-            } else {
-                view! {  }.into_view()
-            }
-        }}
-    }
-}
-
-#[component]
-pub fn CommandLine(children: Children) -> impl IntoView {
-    let state = create_rw_signal(CommandLineState { hidden: true });
-    provide_context(state);
-    let (hidden, set_hidden) =
-        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.set(!hidden.get());
-                    //log!("toggle command")
-                }
-                _ => {}
-            }
-        }
-    });
-
-    view! {
-        <div>
-            <div>{children()}</div>
-            <CommandLineModal/>
-        </div>
-    }
-}

src/features/dashboard_list_view.rs

@@ -1,4 +0,0 @@
-pub mod dashboard_list_view;
-pub mod gen;
-
-pub use dashboard_list_view::*;

src/features/dashboard_list_view/dashboard_list_view.rs

@@ -1,93 +0,0 @@
-use graphql_client::{GraphQLQuery, Response};
-use leptos::*;
-
-use crate::features::dashboard_list_view::gen::queries::get_projects_list_view::GetProjectsListViewGetProjectsItems;
-
-use super::gen::queries::get_projects_list_view::{
-    GetProjectsListViewGetProjects, ResponseData, Variables,
-};
-use super::gen::queries::GetProjectsListView;
-
-pub async fn get_projects_list() -> anyhow::Result<Vec<GetProjectsListViewGetProjects>> {
-    let request_body = GetProjectsListView::build_query(Variables {});
-    let payload = serde_json::to_string(&request_body)?;
-    let res = reqwasm::http::Request::post("http://localhost:3001/graphql")
-        .credentials(reqwasm::http::RequestCredentials::Include)
-        .body(payload)
-        .send()
-        .await?;
-    let response_body: Response<ResponseData> = res.json().await?;
-    Ok(response_body
-        .data
-        .ok_or(anyhow::anyhow!("failed to get projects list"))?
-        .get_projects)
-}
-
-#[component]
-pub fn DashboardItemView(item: GetProjectsListViewGetProjectsItems) -> impl IntoView {
-    view! { <div class="dashboard-list-item dashboard-item">{item.title}</div> }
-}
-
-#[component]
-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>
-                    <span class="text-gray-50">{project.items.len()}</span>
-                    <span class="flex-grow"></span>
-                </div>
-            </a>
-        </div>
-    }
-}
-
-#[component]
-pub fn DashboardListView(
-    projects: Resource<(), Vec<GetProjectsListViewGetProjects>>,
-) -> impl IntoView {
-    let projects_view = move || {
-        projects.with(|projects| {
-            if projects.is_none() {
-                return Vec::new();
-            }
-            let projects = projects.as_ref().unwrap();
-
-            if projects.is_empty() {
-                return vec![view! { <div class="project-item">"No projects"</div> }.into_any()];
-            }
-
-            projects
-                .into_iter()
-                .filter(|project| !project.items.is_empty())
-                .map(|project| {
-                    view! {
-                        <div>
-                            <DashboardProjectItemView project=project.clone()/>
-                            {&project
-                                .items
-                                .clone()
-                                .into_iter()
-                                .map(|item| {
-                                    view! { <DashboardItemView item=item/> }
-                                })
-                                .collect::<Vec<_>>()
-                                .into_view()}
-                        </div>
-                    }
-                    .into_any()
-                })
-                .collect::<Vec<_>>()
-        })
-    };
-
-    view! {<div class="project-items">{projects_view}</div> }
-}
-
-#[component]
-pub fn DashboardList() -> impl IntoView {
-    let projects = create_local_resource(|| (), |_| async { get_projects_list().await.unwrap() });
-
-    view! {<DashboardListView projects=projects/> }
-}

src/features/dashboard_list_view/gen/mod.rs

@@ -1 +0,0 @@
-pub mod queries;

src/features/dashboard_list_view/gen/queries.rs

@@ -1,81 +0,0 @@
-#![allow(clippy::all, warnings)]
-pub struct GetProjectsListView;
-pub mod get_projects_list_view {
-    #![allow(dead_code)]
-    use std::result::Result;
-    pub const OPERATION_NAME: &str = "GetProjectsListView";
-    pub const QUERY : & str = "query GetProjectsListView {\n  getProjects {\n    id\n    name\n\n    items {\n      id\n      title\n      description\n      state\n    }\n  }\n}\n" ;
-    use super::*;
-    use serde::{Deserialize, Serialize};
-    #[allow(dead_code)]
-    type Boolean = bool;
-    #[allow(dead_code)]
-    type Float = f64;
-    #[allow(dead_code)]
-    type Int = i64;
-    #[allow(dead_code)]
-    type ID = String;
-    type UUID = crate::common::graphql::UUID;
-    #[derive(Clone, Debug)]
-    pub enum ItemState {
-        CREATED,
-        DONE,
-        ARCHIVED,
-        DELETED,
-        Other(String),
-    }
-    impl ::serde::Serialize for ItemState {
-        fn serialize<S: serde::Serializer>(&self, ser: S) -> Result<S::Ok, S::Error> {
-            ser.serialize_str(match *self {
-                ItemState::CREATED => "CREATED",
-                ItemState::DONE => "DONE",
-                ItemState::ARCHIVED => "ARCHIVED",
-                ItemState::DELETED => "DELETED",
-                ItemState::Other(ref s) => &s,
-            })
-        }
-    }
-    impl<'de> ::serde::Deserialize<'de> for ItemState {
-        fn deserialize<D: ::serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-            let s: String = ::serde::Deserialize::deserialize(deserializer)?;
-            match s.as_str() {
-                "CREATED" => Ok(ItemState::CREATED),
-                "DONE" => Ok(ItemState::DONE),
-                "ARCHIVED" => Ok(ItemState::ARCHIVED),
-                "DELETED" => Ok(ItemState::DELETED),
-                _ => Ok(ItemState::Other(s)),
-            }
-        }
-    }
-    #[derive(Serialize, Clone, Debug)]
-    pub struct Variables;
-    #[derive(Deserialize, Clone, Debug)]
-    pub struct ResponseData {
-        #[serde(rename = "getProjects")]
-        pub get_projects: Vec<GetProjectsListViewGetProjects>,
-    }
-    #[derive(Deserialize, Clone, Debug)]
-    pub struct GetProjectsListViewGetProjects {
-        pub id: UUID,
-        pub name: String,
-        pub items: Vec<GetProjectsListViewGetProjectsItems>,
-    }
-    #[derive(Deserialize, Clone, Debug)]
-    pub struct GetProjectsListViewGetProjectsItems {
-        pub id: UUID,
-        pub title: String,
-        pub description: Option<String>,
-        pub state: ItemState,
-    }
-}
-impl graphql_client::GraphQLQuery for GetProjectsListView {
-    type Variables = get_projects_list_view::Variables;
-    type ResponseData = get_projects_list_view::ResponseData;
-    fn build_query(variables: Self::Variables) -> ::graphql_client::QueryBody<Self::Variables> {
-        graphql_client::QueryBody {
-            variables,
-            query: get_projects_list_view::QUERY,
-            operation_name: get_projects_list_view::OPERATION_NAME,
-        }
-    }
-}

src/features/dashboard_list_view/graphql/queries.graphql

@@ -1,13 +0,0 @@
-query GetProjectsListView {
-  getProjects {
-    id
-    name
-
-    items {
-      id
-      title
-      description
-      state
-    }
-  }
-}

src/features/navbar_projects/gen/queries.rs

@@ -17,14 +17,14 @@ pub mod get_projects_list_view {
     #[allow(dead_code)]
     type ID = String;
     type UUID = crate::common::graphql::UUID;
-    #[derive(Serialize, Clone, Debug)]
+    #[derive(Serialize)]
     pub struct Variables;
-    #[derive(Deserialize, Clone, Debug)]
+    #[derive(Deserialize)]
     pub struct ResponseData {
         #[serde(rename = "getProjects")]
         pub get_projects: Vec<GetProjectsListViewGetProjects>,
     }
-    #[derive(Deserialize, Clone, Debug)]
+    #[derive(Deserialize)]
     pub struct GetProjectsListViewGetProjects {
         pub id: UUID,
         pub name: String,

src/features/navbar_projects/navbar_projects.rs

@@ -1,5 +1,6 @@
 use graphql_client::{GraphQLQuery, Response};
 use leptos::*;
+use leptos_router::*;
 
 use crate::features::navbar_projects::gen::queries::get_projects_list_view::{
     ResponseData, Variables,
@@ -17,37 +18,27 @@ pub async fn get_projects_list() -> anyhow::Result<Vec<GetProjectsListViewGetPro
         .send()
         .await?;
     let response_body: Response<ResponseData> = res.json().await?;
-    Ok(response_body
+    Ok(response_body.data.unwrap().get_projects)
-        .data
-        .ok_or(anyhow::anyhow!("failed to get projects list"))?
-        .get_projects)
 }
 
 #[component]
 pub fn NavbarProjectsView(
+    cx: Scope,
     projects: Resource<(), Vec<GetProjectsListViewGetProjects>>,
 ) -> impl IntoView {
     let projects_view = move || {
-        projects.with(|projects| {
+        projects.with(cx, |projects| {
-            if projects.is_none() {
-                return Vec::new()
-            }
-            let projects = projects.as_ref().unwrap();
-
 
             if projects.is_empty() {
-                return vec![view! { <div class="project-item">"No projects"</div> }.into_any()];
+                return vec![view! { cx, <div class="project-item">"No projects"</div> }.into_any()];
             }
 
             projects
                 .into_iter()
                 .map(|project| {
-                    view! { 
+                    view! { cx,
                         <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">
-
-
-                               <div class="project-item-name hover:dark:bg-blue-700 rounded-md p-0.5 px-2">
                                 {&project.name}
                             </div>
                         </a>
@@ -57,13 +48,13 @@ pub fn NavbarProjectsView(
         })
     };
 
-    view! { <div class="project-items space-y-1">{projects_view}</div> }
+    view! { cx, <div class="project-items space-y-1">{projects_view}</div> }
 }
 
 #[component]
-pub fn NavbarProjects() -> impl IntoView {
+pub fn NavbarProjects(cx: Scope) -> impl IntoView {
     let projects =
-        create_local_resource(|| (), |_| async { get_projects_list().await.unwrap() });
+        create_local_resource(cx, || (), |_| async { get_projects_list().await.unwrap() });
 
-    view! { <NavbarProjectsView projects=projects/> }
+    view! { cx, <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 || {
+      leptos::mount_to_body(move |cx| {
-          view! { <App/> }
+          view! { cx, <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(App);
+    let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
 
     como_web::api::register();
 
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
-        .leptos_routes(&leptos_options.clone(), routes, || view! { <App/> })
+        .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <App/> })
         .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(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.rs

@@ -1,3 +1,4 @@
 pub mod dash;
 pub mod features_view;
 pub mod home;
+

src/routes/dash/home.rs

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

src/routes/features_view.rs

@@ -5,8 +5,9 @@ use crate::features::navbar_projects::gen::queries::get_projects_list_view::GetP
 use crate::features::navbar_projects::NavbarProjectsView;
 
 #[component]
-pub fn FeaturesView() -> impl IntoView {
+pub fn FeaturesView(cx: Scope) -> impl IntoView {
     let projects = create_local_resource(
+        cx,
         || (),
         |_| async {
             vec![
@@ -23,11 +24,11 @@ pub fn FeaturesView() -> impl IntoView {
     );
 
     let emptyProjects: Resource<(), Vec<GetProjectsListViewGetProjects>> =
-        create_local_resource(|| (), |_| async { Vec::new() });
+        create_local_resource(cx, || (), |_| async { Vec::new() });
 
-    view! {
+    view! { cx,
         <div>
-            <div class="space-y-5 p-2">
+            <div class="space-y-5">
                 <h1>"NavbarProjects"</h1>
                 <h2>"Projects"</h2>
                 <div class="feature-case">

src/routes/home.rs

@@ -1,8 +1,8 @@
 use leptos::*;
 
 #[component]
-pub fn Navbar() -> impl IntoView {
+pub fn Navbar(cx: Scope) -> impl IntoView {
-    view! {
+    view! { cx,
         <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() -> impl IntoView {
 }
 
 #[component]
-pub fn HomePage() -> impl IntoView {
+pub fn HomePage(cx: Scope) -> impl IntoView {
-    view! {
+    view! { cx,
         <Navbar/>
         <h1 class="text-xl text-red-50">"Welcome to Leptos!"</h1>
     }

style/output.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.2 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -191,10 +191,6 @@ select,
 textarea {
   font-family: inherit;
   /* 1 */
-  font-feature-settings: inherit;
-  /* 1 */
-  font-variation-settings: inherit;
-  /* 1 */
   font-size: 100%;
   /* 1 */
   font-weight: inherit;
@@ -345,14 +341,6 @@ menu {
   padding: 0;
 }
 
-/*
-Reset default styling for dialogs.
-*/
-
-dialog {
-  padding: 0;
-}
-
 /*
 Prevent resizing textareas horizontally by default.
 */
@@ -534,6 +522,10 @@ video {
   --tw-backdrop-sepia:  ;
 }
 
+.absolute {
+  position: absolute;
+}
+
 .relative {
   position: relative;
 }
@@ -558,14 +550,6 @@ video {
   display: flex;
 }
 
-.\!hidden {
-  display: none !important;
-}
-
-.hidden {
-  display: none;
-}
-
 .h-screen {
   height: 100vh;
 }
@@ -574,10 +558,6 @@ video {
   min-width: 200px;
 }
 
-.flex-grow {
-  flex-grow: 1;
-}
-
 .cursor-pointer {
   cursor: pointer;
 }
@@ -600,12 +580,6 @@ video {
   justify-content: space-between;
 }
 
-.space-x-2 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(0.5rem * var(--tw-space-x-reverse));
-  margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
 .space-x-4 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
   margin-right: calc(1rem * var(--tw-space-x-reverse));
@@ -655,16 +629,6 @@ video {
   padding: 1rem;
 }
 
-.px-0 {
-  padding-left: 0px;
-  padding-right: 0px;
-}
-
-.px-0\.5 {
-  padding-left: 0.125rem;
-  padding-right: 0.125rem;
-}
-
 .px-2 {
   padding-left: 0.5rem;
   padding-right: 0.5rem;
@@ -693,11 +657,6 @@ video {
   font-weight: 700;
 }
 
-.text-gray-50 {
-  --tw-text-opacity: 1;
-  color: rgb(249 250 251 / var(--tw-text-opacity));
-}
-
 .text-red-50 {
   --tw-text-opacity: 1;
   color: rgb(254 242 242 / var(--tw-text-opacity));
@@ -708,10 +667,6 @@ video {
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
-.filter {
-  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
-}
-
 html, body {
   scroll-behavior: smooth;
   min-height: 100%;
@@ -739,53 +694,6 @@ html, body {
   padding: 1rem;
 }
 
-.dashboard-list-item {
-  display: flex;
-  cursor: pointer;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-          user-select: none;
-  flex-direction: column;
-  justify-content: center;
-  border-top-width: 1px;
-  border-bottom-width: 1px;
-  --tw-border-opacity: 1;
-  border-top-color: rgb(31 41 55 / var(--tw-border-opacity));
-  border-bottom-color: rgb(31 41 55 / var(--tw-border-opacity));
-  padding-left: 1rem;
-  padding-right: 1rem;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-}
-
-@media (prefers-color-scheme: dark) {
-  .dashboard-list-item:hover {
-    --tw-bg-opacity: 1;
-    background-color: rgb(30 58 138 / var(--tw-bg-opacity));
-  }
-}
-
-.dashboard-list-project {
-  --tw-text-opacity: 1;
-  color: rgb(209 213 219 / var(--tw-text-opacity));
-}
-
-@media (prefers-color-scheme: dark) {
-  .dashboard-list-project {
-    --tw-bg-opacity: 1;
-    background-color: rgb(31 41 55 / var(--tw-bg-opacity));
-  }
-
-  .dashboard-list-project:hover {
-    --tw-bg-opacity: 1;
-    background-color: rgb(30 58 138 / var(--tw-bg-opacity));
-  }
-}
-
-.dashboard-item {
-  padding-left: 1.5rem;
-}
-
 @media (prefers-color-scheme: dark) {
   .dark\:text-gray-300 {
     --tw-text-opacity: 1;