42 Commits

Author SHA1 Message Date
8ff14878bb fix(deps): update all dependencies
Some checks failed
renovate/artifacts Artifact file update failure
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing
2025-02-21 05:23:36 +00:00
678ec08491 chore(deps): update rust crate serde to v1.0.218
Some checks failed
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is failing
2025-02-21 01:27:05 +00:00
c43e551e59 chore(deps): update dependency @playwright/test to v1.50.1
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2025-02-01 01:25:19 +00:00
601bcc6cd4 chore(deps): update dependency @playwright/test to v1.50.0
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2025-01-24 01:28:50 +00:00
1df752f2ad fix(deps): update rust crate wasm-bindgen to v0.2.100
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2025-01-13 01:25:19 +00:00
ce031beeea chore(deps): update rust crate serde to v1.0.217
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-28 01:24:41 +00:00
e37cfd562d chore(deps): update rust crate serde to v1.0.216
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-11 05:20:28 +00:00
c1ae2313ac chore(deps): update dependency @playwright/test to v1.49.1
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-10 05:22:18 +00:00
1c8dd7d4f1 fix(deps): update rust crate wasm-bindgen to v0.2.99
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-07 01:26:28 +00:00
89363030cb chore(deps): update dependency @playwright/test to v1.49.0
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-02 01:41:30 +00:00
0a1f296ac3 fix(deps): update tokio-tracing monorepo
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-01 05:21:20 +00:00
54e90bce18 fix(deps): update rust crate wasm-bindgen to v0.2.97
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-12-01 01:21:48 +00:00
5cc03e6800 chore(deps): update rust crate serde to v1.0.215
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-11-30 05:38:29 +00:00
eea0086005 fix(deps): update rust crate wasm-bindgen to v0.2.96
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-11-30 01:33:37 +00:00
817975356b fix(deps): update rust crate wasm-bindgen to v0.2.95
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2024-10-11 00:19:37 +00:00
41abfaae15 fix(deps): update rust crate wasm-bindgen to v0.2.94
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2024-10-10 00:21:13 +00:00
d4f80f2c7f chore(deps): update dependency @playwright/test to v1.46.1
Some checks failed
continuous-integration/drone/push Build is failing
2024-08-22 00:20:16 +02:00
0b81065271 fix(deps): update rust crate wasm-bindgen to v0.2.93
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2024-08-21 22:19:34 +00:00
5478867683 chore(deps): update rust crate serde to v1.0.208
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2024-08-21 20:44:51 +00:00
8533b9d128 fix(deps): update all dependencies
Some checks failed
continuous-integration/drone/push Build is failing
2024-07-06 15:28:33 +02:00
d79c0d0286 chore(deps): update dependency @playwright/test to v1.45.1
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2024-07-06 13:26:52 +00:00
6ef4c7db0f chore(deps): update dependency @playwright/test to v1.44.1
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2024-05-25 21:08:20 +02:00
e8cbf65e8b fix(deps): update all dependencies
Some checks reported errors
continuous-integration/drone/pr Build encountered an error
continuous-integration/drone/push Build encountered an error
2024-05-25 19:08:07 +00:00
e4ee378ac0 chore(deps): update rust crate serde to v1.0.203
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-05-25 18:34:21 +00:00
3b68ce9591 fix(deps): update rust crate anyhow to 1.0.86
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-05-18 12:31:14 +00:00
12a43adf75 fix(deps): update rust crate anyhow to 1.0.85
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-05-17 22:46:29 +00:00
7726dff664 fix(deps): update rust crate anyhow to 1.0.84
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-05-17 18:23:08 +00:00
94d766c893 fix(deps): update rust crate serde_json to 1.0.117
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-05-08 00:45:57 +00:00
b7ca41a0f3 fix(deps): update rust crate anyhow to 1.0.83
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-05-06 18:24:25 +00:00
0ad488ba72 fix(deps): update rust crate simple_logger to v5
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-04-30 16:23:17 +00:00
7cd8538a0d fix(deps): update rust crate serde_json to 1.0.116
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-04-16 06:13:38 +00:00
e40a4dd701 chore(deps): update rust crate chrono to 0.4.38
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-04-15 10:11:49 +00:00
20ecb13171 fix(deps): update rust crate anyhow to 1.0.82
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2024-04-10 04:34:25 +00:00
934fd83287 Merge pull request 'fix(deps): update all dependencies' (#3) from renovate/all into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: https://git.front.kjuulh.io/kjuulh/como-web/pulls/3
2024-04-08 20:05:38 +00:00
6cf2ff56a3 feat: add please
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
Signed-off-by: kjuulh <contact@kjuulh.io>
2024-04-08 22:05:00 +02:00
87c1a1fdb2 feat: add drone
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing
Signed-off-by: kjuulh <contact@kjuulh.io>
2024-04-08 22:02:45 +02:00
ff354f0ccb feat: fix deps
Signed-off-by: kjuulh <contact@kjuulh.io>
2024-04-08 21:58:58 +02:00
00f5c58e39 fix(deps): update all dependencies
Some checks failed
renovate/artifacts Artifact file update failure
2024-04-06 20:11:24 +00:00
21ff2cd443 Merge pull request 'Configure Renovate' (#1) from renovate/configure into main
Reviewed-on: https://git.front.kjuulh.io/kjuulh/como-web/pulls/1
2024-04-06 20:07:59 +00:00
8c022a46c4 Add renovate.json 2023-10-20 21:16:49 +00:00
a7986e304c feat: update to newest leptos
Signed-off-by: kjuulh <contact@kjuulh.io>
2023-10-20 23:06:21 +02:00
8ee2ca5c14 feat: with updated things
Signed-off-by: kjuulh <contact@kjuulh.io>
2023-07-07 21:23:52 +02:00
34 changed files with 1572 additions and 1035 deletions

2
.drone.yml Normal file
View File

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

1898
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,8 @@
[workspace] [workspace]
[workspace.dependencies] [workspace.dependencies]
uuid = { version = "1.3.0", features = ["v4", "serde"] } uuid = { version = "1.8.0", features = ["v4", "serde"] }
chrono = { version = "0.4.23", features = ["serde"] } chrono = { version = "0.4.38", features = ["serde"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
@@ -16,33 +16,34 @@ crate-type = ["cdylib", "rlib"]
[dependencies] [dependencies]
console_error_panic_hook = "0.1" console_error_panic_hook = "0.1"
console_log = "0.2" console_log = "1.0"
cfg-if = "1" cfg-if = "1"
lazy_static = "1" lazy_static = "1"
leptos = { version = "*", default-features = false, features = ["serde"] } leptos = { version = "*", features = ["serde"] }
leptos_meta = { version = "*", default-features = false } leptos_dom = { version = "*" }
leptos_axum = { version = "*", default-features = false, optional = true } leptos_meta = { version = "*" }
leptos_router = { version = "*", default-features = false } leptos_axum = { version = "*", optional = true }
leptos_router = { version = "*" }
log = "0.4" log = "0.4"
simple_logger = "4" simple_logger = "5"
thiserror = "1" thiserror = "2"
axum = { version = "0.6.1", optional = true } axum = { version = "0.8.0", optional = true }
tower = { version = "0.4.13", optional = true } tower = { version = "0.5.0", optional = true }
tower-http = { version = "0.3.4", features = ["fs"], optional = true } tower-http = { version = "0.6.0", 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" wasm-bindgen = "0.2"
tracing-subscriber = { version = "0.3.16", optional = true, features = [ tracing-subscriber = { version = "0.3.18", optional = true, features = [
"env-filter", "env-filter",
] } ] }
tracing = { version = "0.1.37", features = ["log"], optional = true } tracing = { version = "0.1.40", features = ["log"], optional = true }
anyhow = { version = "1.0.71" } anyhow = { version = "1.0.86" }
serde = { workspace = true } serde = { workspace = true }
chrono = { workspace = true } chrono = { workspace = true }
uuid = { workspace = true, features = ["v4", "wasm-bindgen", "js", "serde"] } uuid = { workspace = true, features = ["v4", "js", "serde"] }
graphql_client = { version = "0.13.0", features = ["reqwest"] } graphql_client = { version = "0.14.0", features = ["reqwest"] }
reqwasm = "0.5.0" reqwasm = "0.5.0"
serde_json = "1.0.96" serde_json = "1.0.117"
[features] [features]
hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"] hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
@@ -54,11 +55,16 @@ ssr = [
"leptos/ssr", "leptos/ssr",
"leptos_meta/ssr", "leptos_meta/ssr",
"leptos_router/ssr", "leptos_router/ssr",
"leptos_dom/ssr",
"dep:leptos_axum", "dep:leptos_axum",
"dep:tracing-subscriber", "dep:tracing-subscriber",
"dep:tracing", "dep:tracing",
] ]
[package.metadata.cargo-all-features]
denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
skip_feature_sets = [["ssr", "hydrate"]]
[package.metadata.leptos] [package.metadata.leptos]
# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
output-name = "como_web" output-name = "como_web"

View File

@@ -5,6 +5,17 @@ base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-plan.git"
vars: vars:
service: "como-web" service: "como-web"
deployments: "git@git.front.kjuulh.io:como/deployments.git" 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: scripts:
render_como_templates: render_como_templates:

View File

@@ -13,61 +13,96 @@
} }
}, },
"node_modules/@playwright/test": { "node_modules/@playwright/test": {
"version": "1.28.0", "version": "1.50.1",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.0.tgz", "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
"integrity": "sha512-vrHs5DFTPwYox5SGKq/7TDn/S4q6RA1zArd7uhO6EyP9hj3XgZBBM12ktMbnDQNxh/fL1IUKsTNLxihmsU38lQ==", "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/node": "*", "playwright": "1.50.1"
"playwright-core": "1.28.0"
}, },
"bin": { "bin": {
"playwright": "cli.js" "playwright": "cli.js"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=18"
} }
}, },
"node_modules/@types/node": { "node_modules/fsevents": {
"version": "18.11.9", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true
},
"node_modules/playwright-core": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.0.tgz",
"integrity": "sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==",
"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.50.1",
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
"integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
"dev": true,
"dependencies": {
"playwright-core": "1.50.1"
},
"bin": { "bin": {
"playwright": "cli.js" "playwright": "cli.js"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=18"
},
"optionalDependencies": {
"fsevents": "2.3.2"
}
},
"node_modules/playwright-core": {
"version": "1.50.1",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
"integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
"dev": true,
"bin": {
"playwright-core": "cli.js"
},
"engines": {
"node": ">=18"
} }
} }
}, },
"dependencies": { "dependencies": {
"@playwright/test": { "@playwright/test": {
"version": "1.28.0", "version": "1.50.1",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.0.tgz", "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
"integrity": "sha512-vrHs5DFTPwYox5SGKq/7TDn/S4q6RA1zArd7uhO6EyP9hj3XgZBBM12ktMbnDQNxh/fL1IUKsTNLxihmsU38lQ==", "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "*", "playwright": "1.50.1"
"playwright-core": "1.28.0"
} }
}, },
"@types/node": { "fsevents": {
"version": "18.11.9", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true "dev": true,
"optional": true
},
"playwright": {
"version": "1.50.1",
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
"integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
"dev": true,
"requires": {
"fsevents": "2.3.2",
"playwright-core": "1.50.1"
}
}, },
"playwright-core": { "playwright-core": {
"version": "1.28.0", "version": "1.50.1",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.0.tgz", "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
"integrity": "sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==", "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
"dev": true "dev": true
} }
} }

View File

@@ -12,3 +12,15 @@ html, body {
.feature-case { .feature-case {
@apply m-8 border-blue-700 border-2 rounded-lg p-4; @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
}

3
renovate.json Normal file
View File

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

View File

@@ -1,20 +1,6 @@
#!/bin/bash #!/bin/bash
tmux new-session -d -s dev zellij run -- sh -c "cuddle x leptos:dev"
# allow for user input zellij run -- sh -c "cuddle x tailwind:watch"
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

View File

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

View File

@@ -9,4 +9,14 @@ graphql-client generate \
--schema-path src/api/graphql/schema/schema.json \ --schema-path src/api/graphql/schema/schema.json \
src/features/navbar_projects/graphql/queries.graphql \ src/features/navbar_projects/graphql/queries.graphql \
--output-directory src/features/navbar_projects/gen \ --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'

2
something/.drone.yml Normal file
View File

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

1
something/.gitignore vendored Normal file
View File

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

16
something/cuddle.yaml Normal file
View File

@@ -0,0 +1,16 @@
# 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

3
something/renovate.json Normal file
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,56 @@
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>
}
}

View File

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

View File

@@ -0,0 +1,93 @@
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/> }
}

View File

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

View File

@@ -0,0 +1,81 @@
#![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,
}
}
}

View File

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

View File

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

View File

@@ -1,6 +1,5 @@
use graphql_client::{GraphQLQuery, Response}; use graphql_client::{GraphQLQuery, Response};
use leptos::*; use leptos::*;
use leptos_router::*;
use crate::features::navbar_projects::gen::queries::get_projects_list_view::{ use crate::features::navbar_projects::gen::queries::get_projects_list_view::{
ResponseData, Variables, ResponseData, Variables,
@@ -18,27 +17,37 @@ pub async fn get_projects_list() -> anyhow::Result<Vec<GetProjectsListViewGetPro
.send() .send()
.await?; .await?;
let response_body: Response<ResponseData> = res.json().await?; let response_body: Response<ResponseData> = res.json().await?;
Ok(response_body.data.unwrap().get_projects) Ok(response_body
.data
.ok_or(anyhow::anyhow!("failed to get projects list"))?
.get_projects)
} }
#[component] #[component]
pub fn NavbarProjectsView( pub fn NavbarProjectsView(
cx: Scope,
projects: Resource<(), Vec<GetProjectsListViewGetProjects>>, projects: Resource<(), Vec<GetProjectsListViewGetProjects>>,
) -> impl IntoView { ) -> impl IntoView {
let projects_view = move || { 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() { 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 projects
.into_iter() .into_iter()
.map(|project| { .map(|project| {
view! { cx, view! {
<a href=format!("/dash/project/{}", & project.id) class="project-item"> <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} {&project.name}
</div> </div>
</a> </a>
@@ -48,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] #[component]
pub fn NavbarProjects(cx: Scope) -> impl IntoView { pub fn NavbarProjects() -> impl IntoView {
let projects = 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/> }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
/* /*
! tailwindcss v3.3.2 | MIT License | https://tailwindcss.com ! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
*/ */
/* /*
@@ -191,6 +191,10 @@ select,
textarea { textarea {
font-family: inherit; font-family: inherit;
/* 1 */ /* 1 */
font-feature-settings: inherit;
/* 1 */
font-variation-settings: inherit;
/* 1 */
font-size: 100%; font-size: 100%;
/* 1 */ /* 1 */
font-weight: inherit; font-weight: inherit;
@@ -341,6 +345,14 @@ menu {
padding: 0; padding: 0;
} }
/*
Reset default styling for dialogs.
*/
dialog {
padding: 0;
}
/* /*
Prevent resizing textareas horizontally by default. Prevent resizing textareas horizontally by default.
*/ */
@@ -522,10 +534,6 @@ video {
--tw-backdrop-sepia: ; --tw-backdrop-sepia: ;
} }
.absolute {
position: absolute;
}
.relative { .relative {
position: relative; position: relative;
} }
@@ -550,6 +558,14 @@ video {
display: flex; display: flex;
} }
.\!hidden {
display: none !important;
}
.hidden {
display: none;
}
.h-screen { .h-screen {
height: 100vh; height: 100vh;
} }
@@ -558,6 +574,10 @@ video {
min-width: 200px; min-width: 200px;
} }
.flex-grow {
flex-grow: 1;
}
.cursor-pointer { .cursor-pointer {
cursor: pointer; cursor: pointer;
} }
@@ -580,6 +600,12 @@ video {
justify-content: space-between; 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]) { .space-x-4 > :not([hidden]) ~ :not([hidden]) {
--tw-space-x-reverse: 0; --tw-space-x-reverse: 0;
margin-right: calc(1rem * var(--tw-space-x-reverse)); margin-right: calc(1rem * var(--tw-space-x-reverse));
@@ -629,6 +655,16 @@ video {
padding: 1rem; padding: 1rem;
} }
.px-0 {
padding-left: 0px;
padding-right: 0px;
}
.px-0\.5 {
padding-left: 0.125rem;
padding-right: 0.125rem;
}
.px-2 { .px-2 {
padding-left: 0.5rem; padding-left: 0.5rem;
padding-right: 0.5rem; padding-right: 0.5rem;
@@ -657,6 +693,11 @@ video {
font-weight: 700; font-weight: 700;
} }
.text-gray-50 {
--tw-text-opacity: 1;
color: rgb(249 250 251 / var(--tw-text-opacity));
}
.text-red-50 { .text-red-50 {
--tw-text-opacity: 1; --tw-text-opacity: 1;
color: rgb(254 242 242 / var(--tw-text-opacity)); color: rgb(254 242 242 / var(--tw-text-opacity));
@@ -667,6 +708,10 @@ video {
color: rgb(255 255 255 / var(--tw-text-opacity)); 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 { html, body {
scroll-behavior: smooth; scroll-behavior: smooth;
min-height: 100%; min-height: 100%;
@@ -694,6 +739,53 @@ html, body {
padding: 1rem; 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) { @media (prefers-color-scheme: dark) {
.dark\:text-gray-300 { .dark\:text-gray-300 {
--tw-text-opacity: 1; --tw-text-opacity: 1;