From 0d234b52a8844be964f1978504b3a96809a197e5 Mon Sep 17 00:00:00 2001 From: Spark Plug Date: Wed, 4 Sep 2024 07:24:31 -0400 Subject: [PATCH] rename appregistry -> workshop --- external/fmt | 1 + external/mdbook-mermaid | 1 + services/user/AppRegistry/Cargo.toml | 16 ------- services/user/AppRegistry/plugin/src/lib.rs | 15 ------- services/user/AppRegistry/src/lib.rs | 2 - services/user/AppRegistry/ui/index.html | 13 ------ .../user/{AppRegistry => Workshop}/Cargo.lock | 40 +++++++++--------- services/user/Workshop/Cargo.toml | 16 +++++++ .../{AppRegistry/ui => Workshop}/README.md | 11 +++-- .../plugin/Cargo.lock | 16 +++---- .../plugin/Cargo.toml | 4 +- services/user/Workshop/plugin/src/lib.rs | 15 +++++++ .../plugin/wit/world.wit | 2 +- .../query/Cargo.lock | 24 +++++------ .../query/Cargo.toml | 8 ++-- .../query/src/lib.rs | 12 +++--- .../service/Cargo.lock | 42 +++++++++---------- .../service/Cargo.toml | 8 ++-- .../service/src/lib.rs | 4 +- services/user/Workshop/src/lib.rs | 2 + .../ui/.eslintignore | 0 .../ui/.eslintrc.cjs | 0 .../{AppRegistry => Workshop}/ui/.gitignore | 0 .../ui/components.json | 0 services/user/Workshop/ui/index.html | 13 ++++++ .../{AppRegistry => Workshop}/ui/package.json | 4 +- .../ui/postcss.config.cjs | 0 .../ui/prettier.config.cjs | 0 .../ui/public/vite.svg | 0 .../ui/src/components/account-switcher.tsx | 0 .../ui/src/components/app-metadata-form.tsx | 0 .../ui/src/components/index.ts | 0 .../ui/src/components/nav-menu.tsx | 0 .../ui/src/components/nav.tsx | 0 .../ui/src/fixtures/data.ts | 0 .../ui/src/hooks/index.ts | 0 .../ui/src/hooks/use-local-storage.ts | 0 .../ui/src/hooks/use-user.ts | 0 .../ui/src/layouts/default.tsx | 0 .../ui/src/lib/utils.ts | 4 +- .../{AppRegistry => Workshop}/ui/src/main.tsx | 0 .../ui/src/routes/about.tsx | 2 +- .../ui/src/routes/home.tsx | 0 .../ui/src/routes/index.ts | 0 .../ui/src/routes/manage-metadata.tsx | 0 .../ui/src/shad/components/ui/button.tsx | 0 .../ui/src/shad/components/ui/form.tsx | 0 .../ui/src/shad/components/ui/input.tsx | 0 .../ui/src/shad/components/ui/label.tsx | 0 .../ui/src/shad/components/ui/radio-group.tsx | 0 .../ui/src/shad/components/ui/select.tsx | 0 .../ui/src/shad/components/ui/separator.tsx | 0 .../ui/src/shad/components/ui/tabs.tsx | 0 .../ui/src/shad/components/ui/textarea.tsx | 0 .../ui/src/shad/components/ui/toggle.tsx | 0 .../ui/src/shad/components/ui/tooltip.tsx | 0 .../ui/src/styles/editor.css | 0 .../ui/src/styles/globals.css | 0 .../ui/src/types/index.ts | 0 .../ui/src/vite-env.d.ts | 0 .../ui/tailwind.config.cjs | 0 .../ui/tsconfig.json | 0 .../ui/tsconfig.node.json | 0 .../ui/vite.config.ts | 2 +- .../{AppRegistry => Workshop}/ui/yarn.lock | 0 65 files changed, 141 insertions(+), 136 deletions(-) create mode 160000 external/fmt create mode 160000 external/mdbook-mermaid delete mode 100644 services/user/AppRegistry/Cargo.toml delete mode 100644 services/user/AppRegistry/plugin/src/lib.rs delete mode 100644 services/user/AppRegistry/src/lib.rs delete mode 100644 services/user/AppRegistry/ui/index.html rename services/user/{AppRegistry => Workshop}/Cargo.lock (99%) create mode 100644 services/user/Workshop/Cargo.toml rename services/user/{AppRegistry/ui => Workshop}/README.md (65%) rename services/user/{AppRegistry => Workshop}/plugin/Cargo.lock (99%) rename services/user/{AppRegistry => Workshop}/plugin/Cargo.toml (87%) create mode 100644 services/user/Workshop/plugin/src/lib.rs rename services/user/{AppRegistry => Workshop}/plugin/wit/world.wit (85%) rename services/user/{AppRegistry => Workshop}/query/Cargo.lock (99%) rename services/user/{AppRegistry => Workshop}/query/Cargo.toml (55%) rename services/user/{AppRegistry => Workshop}/query/src/lib.rs (62%) rename services/user/{AppRegistry => Workshop}/service/Cargo.lock (99%) rename services/user/{AppRegistry => Workshop}/service/Cargo.toml (73%) rename services/user/{AppRegistry => Workshop}/service/src/lib.rs (96%) create mode 100644 services/user/Workshop/src/lib.rs rename services/user/{AppRegistry => Workshop}/ui/.eslintignore (100%) rename services/user/{AppRegistry => Workshop}/ui/.eslintrc.cjs (100%) rename services/user/{AppRegistry => Workshop}/ui/.gitignore (100%) rename services/user/{AppRegistry => Workshop}/ui/components.json (100%) create mode 100644 services/user/Workshop/ui/index.html rename services/user/{AppRegistry => Workshop}/ui/package.json (98%) rename services/user/{AppRegistry => Workshop}/ui/postcss.config.cjs (100%) rename services/user/{AppRegistry => Workshop}/ui/prettier.config.cjs (100%) rename services/user/{AppRegistry => Workshop}/ui/public/vite.svg (100%) rename services/user/{AppRegistry => Workshop}/ui/src/components/account-switcher.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/components/app-metadata-form.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/components/index.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/components/nav-menu.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/components/nav.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/fixtures/data.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/hooks/index.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/hooks/use-local-storage.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/hooks/use-user.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/layouts/default.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/lib/utils.ts (97%) rename services/user/{AppRegistry => Workshop}/ui/src/main.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/routes/about.tsx (84%) rename services/user/{AppRegistry => Workshop}/ui/src/routes/home.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/routes/index.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/routes/manage-metadata.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/button.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/form.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/input.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/label.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/radio-group.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/select.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/separator.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/tabs.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/textarea.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/toggle.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/shad/components/ui/tooltip.tsx (100%) rename services/user/{AppRegistry => Workshop}/ui/src/styles/editor.css (100%) rename services/user/{AppRegistry => Workshop}/ui/src/styles/globals.css (100%) rename services/user/{AppRegistry => Workshop}/ui/src/types/index.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/src/vite-env.d.ts (100%) rename services/user/{AppRegistry => Workshop}/ui/tailwind.config.cjs (100%) rename services/user/{AppRegistry => Workshop}/ui/tsconfig.json (100%) rename services/user/{AppRegistry => Workshop}/ui/tsconfig.node.json (100%) rename services/user/{AppRegistry => Workshop}/ui/vite.config.ts (98%) rename services/user/{AppRegistry => Workshop}/ui/yarn.lock (100%) diff --git a/external/fmt b/external/fmt new file mode 160000 index 000000000..7bdf0628b --- /dev/null +++ b/external/fmt @@ -0,0 +1 @@ +Subproject commit 7bdf0628b1276379886c7f6dda2cef2b3b374f0b diff --git a/external/mdbook-mermaid b/external/mdbook-mermaid new file mode 160000 index 000000000..ff4055846 --- /dev/null +++ b/external/mdbook-mermaid @@ -0,0 +1 @@ +Subproject commit ff4055846ac93e13dc0ce4a52c391d925f443676 diff --git a/services/user/AppRegistry/Cargo.toml b/services/user/AppRegistry/Cargo.toml deleted file mode 100644 index 4abc6e2ce..000000000 --- a/services/user/AppRegistry/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "app_registry_package" -edition = "2021" -version = "0.1.0" - -[package.metadata.psibase] -package-name = "AppRegistry" -description = "Registry for psibase apps" -services = ["app-registry"] - -[lib] -crate-type = ["rlib"] - -[dependencies] -app-registry = { path = "service", version = "0.1.0" } -r-app-reg = { path = "query", version = "0.1.0" } diff --git a/services/user/AppRegistry/plugin/src/lib.rs b/services/user/AppRegistry/plugin/src/lib.rs deleted file mode 100644 index 77fa9b98e..000000000 --- a/services/user/AppRegistry/plugin/src/lib.rs +++ /dev/null @@ -1,15 +0,0 @@ -#[allow(warnings)] -mod bindings; - -use bindings::exports::app_registry::plugin::test::Guest as Test; -use bindings::host::common::types as CommonTypes; - -struct AppRegistryPlugin; - -impl Test for AppRegistryPlugin { - fn foo() -> Result<(), CommonTypes::Error> { - Ok(()) - } -} - -bindings::export!(AppRegistryPlugin with_types_in bindings); diff --git a/services/user/AppRegistry/src/lib.rs b/services/user/AppRegistry/src/lib.rs deleted file mode 100644 index 75a5f67de..000000000 --- a/services/user/AppRegistry/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub use r_app_reg; -pub use app_registry; diff --git a/services/user/AppRegistry/ui/index.html b/services/user/AppRegistry/ui/index.html deleted file mode 100644 index f33e09d7d..000000000 --- a/services/user/AppRegistry/ui/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - App Registry - - -
- - - diff --git a/services/user/AppRegistry/Cargo.lock b/services/user/Workshop/Cargo.lock similarity index 99% rename from services/user/AppRegistry/Cargo.lock rename to services/user/Workshop/Cargo.lock index 1007aa667..48d9db979 100644 --- a/services/user/AppRegistry/Cargo.lock +++ b/services/user/Workshop/Cargo.lock @@ -112,24 +112,6 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "app-registry" -version = "0.1.0" -dependencies = [ - "async-graphql", - "psibase", - "serde", - "serde_json", -] - -[[package]] -name = "app_registry_package" -version = "0.1.0" -dependencies = [ - "app-registry", - "r-app-reg", -] - [[package]] name = "ascii_utils" version = "0.9.3" @@ -1555,13 +1537,13 @@ dependencies = [ ] [[package]] -name = "r-app-reg" +name = "r-workshop" version = "0.1.0" dependencies = [ - "app-registry", "async-graphql", "psibase", "serde", + "workshop", ] [[package]] @@ -2719,6 +2701,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "workshop" +version = "0.1.0" +dependencies = [ + "async-graphql", + "psibase", + "serde", + "serde_json", +] + +[[package]] +name = "workshop_package" +version = "0.1.0" +dependencies = [ + "r-workshop", + "workshop", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/services/user/Workshop/Cargo.toml b/services/user/Workshop/Cargo.toml new file mode 100644 index 000000000..ca1181cb9 --- /dev/null +++ b/services/user/Workshop/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "workshop_package" +edition = "2021" +version = "0.1.0" + +[package.metadata.psibase] +package-name = "Workshop" +description = "Workshop for psibase apps" +services = ["workshop"] + +[lib] +crate-type = ["rlib"] + +[dependencies] +workshop = { path = "service", version = "0.1.0" } +r-workshop = { path = "query", version = "0.1.0" } diff --git a/services/user/AppRegistry/ui/README.md b/services/user/Workshop/README.md similarity index 65% rename from services/user/AppRegistry/ui/README.md rename to services/user/Workshop/README.md index 88e8e8123..393639a20 100644 --- a/services/user/AppRegistry/ui/README.md +++ b/services/user/Workshop/README.md @@ -1,4 +1,4 @@ -# Psibase AppRegistry +# Psibase Workshop Steps to run the app in dev mode: @@ -10,10 +10,13 @@ open http://localhost:8080 # go through the steps to create a network in dev mode, name the producer as prod and confirm -# ui development, from this ui folder +# TODO: steps to deploy the package + +# ui development +cd ui yarn dev -open http://appregistry.psibase.127.0.0.1.sslip.io:8081/ +open http://workshop.psibase.127.0.0.1.sslip.io:8081/ -# about writing a psibase service (kind of a smart contract in evm world) +# wip: about writing a psibase service open http://docs.psibase.127.0.0.1.sslip.io:8080/development/services/rust-service/index.html ``` diff --git a/services/user/AppRegistry/plugin/Cargo.lock b/services/user/Workshop/plugin/Cargo.lock similarity index 99% rename from services/user/AppRegistry/plugin/Cargo.lock rename to services/user/Workshop/plugin/Cargo.lock index fde852739..b3f47e295 100644 --- a/services/user/AppRegistry/plugin/Cargo.lock +++ b/services/user/Workshop/plugin/Cargo.lock @@ -112,14 +112,6 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "app-registry-plugin" -version = "0.1.0" -dependencies = [ - "psibase", - "wit-bindgen-rt", -] - [[package]] name = "ascii_utils" version = "0.9.3" @@ -2708,6 +2700,14 @@ dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "workshop-plugin" +version = "0.1.0" +dependencies = [ + "psibase", + "wit-bindgen-rt", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/services/user/AppRegistry/plugin/Cargo.toml b/services/user/Workshop/plugin/Cargo.toml similarity index 87% rename from services/user/AppRegistry/plugin/Cargo.toml rename to services/user/Workshop/plugin/Cargo.toml index e593cd487..50fc671ae 100644 --- a/services/user/AppRegistry/plugin/Cargo.toml +++ b/services/user/Workshop/plugin/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "app-registry-plugin" +name = "workshop-plugin" version = "0.1.0" edition = "2021" @@ -11,7 +11,7 @@ psibase = { path="../../../../rust/psibase" } crate-type = ["cdylib"] [package.metadata.component] -package = "app-registry:plugin" +package = "workshop:plugin" [package.metadata.component.target] world = "psibase-plugin" diff --git a/services/user/Workshop/plugin/src/lib.rs b/services/user/Workshop/plugin/src/lib.rs new file mode 100644 index 000000000..2c37c9a0f --- /dev/null +++ b/services/user/Workshop/plugin/src/lib.rs @@ -0,0 +1,15 @@ +#[allow(warnings)] +mod bindings; + +use bindings::exports::workshop::plugin::test::Guest as Test; +use bindings::host::common::types as CommonTypes; + +struct WorkshopPlugin; + +impl Test for WorkshopPlugin { + fn foo() -> Result<(), CommonTypes::Error> { + Ok(()) + } +} + +bindings::export!(WorkshopPlugin with_types_in bindings); diff --git a/services/user/AppRegistry/plugin/wit/world.wit b/services/user/Workshop/plugin/wit/world.wit similarity index 85% rename from services/user/AppRegistry/plugin/wit/world.wit rename to services/user/Workshop/plugin/wit/world.wit index 106bbd985..e72ef3785 100644 --- a/services/user/AppRegistry/plugin/wit/world.wit +++ b/services/user/Workshop/plugin/wit/world.wit @@ -1,4 +1,4 @@ -package app-registry:plugin; +package workshop:plugin; interface test { use host:common/types.{error}; diff --git a/services/user/AppRegistry/query/Cargo.lock b/services/user/Workshop/query/Cargo.lock similarity index 99% rename from services/user/AppRegistry/query/Cargo.lock rename to services/user/Workshop/query/Cargo.lock index 02008b8f0..48c861b4e 100644 --- a/services/user/AppRegistry/query/Cargo.lock +++ b/services/user/Workshop/query/Cargo.lock @@ -112,16 +112,6 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "app-registry" -version = "0.1.0" -dependencies = [ - "async-graphql", - "psibase", - "serde", - "serde_json", -] - [[package]] name = "ascii_utils" version = "0.9.3" @@ -1547,13 +1537,13 @@ dependencies = [ ] [[package]] -name = "r-app-reg" +name = "r-workshop" version = "0.1.0" dependencies = [ - "app-registry", "async-graphql", "psibase", "serde", + "workshop", ] [[package]] @@ -2711,6 +2701,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "workshop" +version = "0.1.0" +dependencies = [ + "async-graphql", + "psibase", + "serde", + "serde_json", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/services/user/AppRegistry/query/Cargo.toml b/services/user/Workshop/query/Cargo.toml similarity index 55% rename from services/user/AppRegistry/query/Cargo.toml rename to services/user/Workshop/query/Cargo.toml index 31d77c30c..91f5f75fc 100644 --- a/services/user/AppRegistry/query/Cargo.toml +++ b/services/user/Workshop/query/Cargo.toml @@ -1,15 +1,15 @@ [package] -name = "r-app-reg" -description = "Query service for AppRegistry" +name = "r-workshop" +description = "Query service for Workshop" edition = "2021" version = "0.1.0" publish = false [package.metadata.psibase] -plugin = "app-registry-plugin" +plugin = "workshop-plugin" [dependencies] psibase = { path = "../../../../rust/psibase" } serde = "1.0" -app-registry = { path = "../service", version = "0.1.0" } +workshop = { path = "../service", version = "0.1.0" } async-graphql = "7.0.7" diff --git a/services/user/AppRegistry/query/src/lib.rs b/services/user/Workshop/query/src/lib.rs similarity index 62% rename from services/user/AppRegistry/query/src/lib.rs rename to services/user/Workshop/query/src/lib.rs index 6500b736c..87a2cf0e5 100644 --- a/services/user/AppRegistry/query/src/lib.rs +++ b/services/user/Workshop/query/src/lib.rs @@ -1,7 +1,7 @@ #[psibase::service] #[allow(non_snake_case)] mod service { - use app_registry; + use workshop; use async_graphql::*; use psibase::*; @@ -13,8 +13,8 @@ mod service { async fn app_metadata( &self, account_id: AccountNumber, - ) -> Option { - app_registry::service::AppMetadataTable::new() + ) -> Option { + workshop::service::AppMetadataTable::new() .get_index_pk() .get(&account_id) } @@ -22,15 +22,15 @@ mod service { async fn event( &self, id: u64, - ) -> Result { + ) -> Result { get_event(id) } } #[action] fn serveSys(request: HttpRequest) -> Option { - None.or_else(|| serve_content(&request, &app_registry::service::WebContentTable::new())) - .or_else(|| serve_simple_ui::(&request)) + None.or_else(|| serve_content(&request, &workshop::service::WebContentTable::new())) + .or_else(|| serve_simple_ui::(&request)) .or_else(|| serve_graphql(&request, Query)) .or_else(|| serve_graphiql(&request)) } diff --git a/services/user/AppRegistry/service/Cargo.lock b/services/user/Workshop/service/Cargo.lock similarity index 99% rename from services/user/AppRegistry/service/Cargo.lock rename to services/user/Workshop/service/Cargo.lock index 56f52e8a0..bc567bfb0 100644 --- a/services/user/AppRegistry/service/Cargo.lock +++ b/services/user/Workshop/service/Cargo.lock @@ -112,25 +112,6 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "app-registry" -version = "0.1.0" -dependencies = [ - "app_registry_package", - "async-graphql", - "psibase", - "serde", - "serde_json", -] - -[[package]] -name = "app_registry_package" -version = "0.1.0" -dependencies = [ - "app-registry", - "r-app-reg", -] - [[package]] name = "ascii_utils" version = "0.9.3" @@ -1556,13 +1537,13 @@ dependencies = [ ] [[package]] -name = "r-app-reg" +name = "r-workshop" version = "0.1.0" dependencies = [ - "app-registry", "async-graphql", "psibase", "serde", + "workshop", ] [[package]] @@ -2720,6 +2701,25 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "workshop" +version = "0.1.0" +dependencies = [ + "async-graphql", + "psibase", + "serde", + "serde_json", + "workshop_package", +] + +[[package]] +name = "workshop_package" +version = "0.1.0" +dependencies = [ + "r-workshop", + "workshop", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/services/user/AppRegistry/service/Cargo.toml b/services/user/Workshop/service/Cargo.toml similarity index 73% rename from services/user/AppRegistry/service/Cargo.toml rename to services/user/Workshop/service/Cargo.toml index 77724393c..70b81279e 100644 --- a/services/user/AppRegistry/service/Cargo.toml +++ b/services/user/Workshop/service/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "app-registry" -description = "App Registry Service" +name = "workshop" +description = "Workshop Service" edition = "2021" version = "0.1.0" [package.metadata.psibase] -server = "r-tpack" +server = "r-workshop" [package.metadata.psibase.dependencies] HttpServer = "0.12.0" @@ -21,4 +21,4 @@ async-graphql = "7.0.7" serde_json = "1.0.120" [dev-dependencies] -app_registry_package = { path = "..", version = "0.1.0" } +workshop_package = { path = "..", version = "0.1.0" } diff --git a/services/user/AppRegistry/service/src/lib.rs b/services/user/Workshop/service/src/lib.rs similarity index 96% rename from services/user/AppRegistry/service/src/lib.rs rename to services/user/Workshop/service/src/lib.rs index 1017b1dcb..3b3c6fd04 100644 --- a/services/user/AppRegistry/service/src/lib.rs +++ b/services/user/Workshop/service/src/lib.rs @@ -91,8 +91,8 @@ pub mod service { } -#[psibase::test_case(packages("AppRegistry"))] -fn test_app_registry(chain: psibase::Chain) -> Result<(), psibase::Error> { +#[psibase::test_case(packages("Workshop"))] +fn test_set_app_metadata(chain: psibase::Chain) -> Result<(), psibase::Error> { // use psibase::services::http_server; // use psibase::HttpBody; // use serde_json::{json, Value}; diff --git a/services/user/Workshop/src/lib.rs b/services/user/Workshop/src/lib.rs new file mode 100644 index 000000000..b30bb03dd --- /dev/null +++ b/services/user/Workshop/src/lib.rs @@ -0,0 +1,2 @@ +pub use r_workshop; +pub use workshop; diff --git a/services/user/AppRegistry/ui/.eslintignore b/services/user/Workshop/ui/.eslintignore similarity index 100% rename from services/user/AppRegistry/ui/.eslintignore rename to services/user/Workshop/ui/.eslintignore diff --git a/services/user/AppRegistry/ui/.eslintrc.cjs b/services/user/Workshop/ui/.eslintrc.cjs similarity index 100% rename from services/user/AppRegistry/ui/.eslintrc.cjs rename to services/user/Workshop/ui/.eslintrc.cjs diff --git a/services/user/AppRegistry/ui/.gitignore b/services/user/Workshop/ui/.gitignore similarity index 100% rename from services/user/AppRegistry/ui/.gitignore rename to services/user/Workshop/ui/.gitignore diff --git a/services/user/AppRegistry/ui/components.json b/services/user/Workshop/ui/components.json similarity index 100% rename from services/user/AppRegistry/ui/components.json rename to services/user/Workshop/ui/components.json diff --git a/services/user/Workshop/ui/index.html b/services/user/Workshop/ui/index.html new file mode 100644 index 000000000..4fb14969a --- /dev/null +++ b/services/user/Workshop/ui/index.html @@ -0,0 +1,13 @@ + + + + + + + Psibase Workshop + + +
+ + + diff --git a/services/user/AppRegistry/ui/package.json b/services/user/Workshop/ui/package.json similarity index 98% rename from services/user/AppRegistry/ui/package.json rename to services/user/Workshop/ui/package.json index 775fe7611..6f4f49518 100644 --- a/services/user/AppRegistry/ui/package.json +++ b/services/user/Workshop/ui/package.json @@ -1,5 +1,5 @@ { - "name": "app-registry", + "name": "workshop", "private": true, "version": "0.0.0", "type": "module", @@ -63,4 +63,4 @@ "vite-plugin-wasm": "^3.3.0", "vite-tsconfig-paths": "^4.3.2" } -} +} \ No newline at end of file diff --git a/services/user/AppRegistry/ui/postcss.config.cjs b/services/user/Workshop/ui/postcss.config.cjs similarity index 100% rename from services/user/AppRegistry/ui/postcss.config.cjs rename to services/user/Workshop/ui/postcss.config.cjs diff --git a/services/user/AppRegistry/ui/prettier.config.cjs b/services/user/Workshop/ui/prettier.config.cjs similarity index 100% rename from services/user/AppRegistry/ui/prettier.config.cjs rename to services/user/Workshop/ui/prettier.config.cjs diff --git a/services/user/AppRegistry/ui/public/vite.svg b/services/user/Workshop/ui/public/vite.svg similarity index 100% rename from services/user/AppRegistry/ui/public/vite.svg rename to services/user/Workshop/ui/public/vite.svg diff --git a/services/user/AppRegistry/ui/src/components/account-switcher.tsx b/services/user/Workshop/ui/src/components/account-switcher.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/components/account-switcher.tsx rename to services/user/Workshop/ui/src/components/account-switcher.tsx diff --git a/services/user/AppRegistry/ui/src/components/app-metadata-form.tsx b/services/user/Workshop/ui/src/components/app-metadata-form.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/components/app-metadata-form.tsx rename to services/user/Workshop/ui/src/components/app-metadata-form.tsx diff --git a/services/user/AppRegistry/ui/src/components/index.ts b/services/user/Workshop/ui/src/components/index.ts similarity index 100% rename from services/user/AppRegistry/ui/src/components/index.ts rename to services/user/Workshop/ui/src/components/index.ts diff --git a/services/user/AppRegistry/ui/src/components/nav-menu.tsx b/services/user/Workshop/ui/src/components/nav-menu.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/components/nav-menu.tsx rename to services/user/Workshop/ui/src/components/nav-menu.tsx diff --git a/services/user/AppRegistry/ui/src/components/nav.tsx b/services/user/Workshop/ui/src/components/nav.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/components/nav.tsx rename to services/user/Workshop/ui/src/components/nav.tsx diff --git a/services/user/AppRegistry/ui/src/fixtures/data.ts b/services/user/Workshop/ui/src/fixtures/data.ts similarity index 100% rename from services/user/AppRegistry/ui/src/fixtures/data.ts rename to services/user/Workshop/ui/src/fixtures/data.ts diff --git a/services/user/AppRegistry/ui/src/hooks/index.ts b/services/user/Workshop/ui/src/hooks/index.ts similarity index 100% rename from services/user/AppRegistry/ui/src/hooks/index.ts rename to services/user/Workshop/ui/src/hooks/index.ts diff --git a/services/user/AppRegistry/ui/src/hooks/use-local-storage.ts b/services/user/Workshop/ui/src/hooks/use-local-storage.ts similarity index 100% rename from services/user/AppRegistry/ui/src/hooks/use-local-storage.ts rename to services/user/Workshop/ui/src/hooks/use-local-storage.ts diff --git a/services/user/AppRegistry/ui/src/hooks/use-user.ts b/services/user/Workshop/ui/src/hooks/use-user.ts similarity index 100% rename from services/user/AppRegistry/ui/src/hooks/use-user.ts rename to services/user/Workshop/ui/src/hooks/use-user.ts diff --git a/services/user/AppRegistry/ui/src/layouts/default.tsx b/services/user/Workshop/ui/src/layouts/default.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/layouts/default.tsx rename to services/user/Workshop/ui/src/layouts/default.tsx diff --git a/services/user/AppRegistry/ui/src/lib/utils.ts b/services/user/Workshop/ui/src/lib/utils.ts similarity index 97% rename from services/user/AppRegistry/ui/src/lib/utils.ts rename to services/user/Workshop/ui/src/lib/utils.ts index 8a5cd0bb9..6a4b93348 100644 --- a/services/user/AppRegistry/ui/src/lib/utils.ts +++ b/services/user/Workshop/ui/src/lib/utils.ts @@ -1,4 +1,4 @@ -import { AppRegistryFormData } from "@components/app-registry-form"; +import { AppMetadataFormData } from "@components/app-metadata-form"; import { type ClassValue, clsx } from "clsx"; import { twMerge } from "tailwind-merge"; @@ -28,7 +28,7 @@ export function debounce any>( } export async function mockSubmitToAPI( - data: AppRegistryFormData, + data: AppMetadataFormData, successMessage: string, accountId: string, id?: string, diff --git a/services/user/AppRegistry/ui/src/main.tsx b/services/user/Workshop/ui/src/main.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/main.tsx rename to services/user/Workshop/ui/src/main.tsx diff --git a/services/user/AppRegistry/ui/src/routes/about.tsx b/services/user/Workshop/ui/src/routes/about.tsx similarity index 84% rename from services/user/AppRegistry/ui/src/routes/about.tsx rename to services/user/Workshop/ui/src/routes/about.tsx index aa7b34cd1..678424d5c 100644 --- a/services/user/AppRegistry/ui/src/routes/about.tsx +++ b/services/user/Workshop/ui/src/routes/about.tsx @@ -7,7 +7,7 @@ export function About() {

About

-
App Registry app
+
About Workshop app
); } diff --git a/services/user/AppRegistry/ui/src/routes/home.tsx b/services/user/Workshop/ui/src/routes/home.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/routes/home.tsx rename to services/user/Workshop/ui/src/routes/home.tsx diff --git a/services/user/AppRegistry/ui/src/routes/index.ts b/services/user/Workshop/ui/src/routes/index.ts similarity index 100% rename from services/user/AppRegistry/ui/src/routes/index.ts rename to services/user/Workshop/ui/src/routes/index.ts diff --git a/services/user/AppRegistry/ui/src/routes/manage-metadata.tsx b/services/user/Workshop/ui/src/routes/manage-metadata.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/routes/manage-metadata.tsx rename to services/user/Workshop/ui/src/routes/manage-metadata.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/button.tsx b/services/user/Workshop/ui/src/shad/components/ui/button.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/button.tsx rename to services/user/Workshop/ui/src/shad/components/ui/button.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/form.tsx b/services/user/Workshop/ui/src/shad/components/ui/form.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/form.tsx rename to services/user/Workshop/ui/src/shad/components/ui/form.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/input.tsx b/services/user/Workshop/ui/src/shad/components/ui/input.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/input.tsx rename to services/user/Workshop/ui/src/shad/components/ui/input.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/label.tsx b/services/user/Workshop/ui/src/shad/components/ui/label.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/label.tsx rename to services/user/Workshop/ui/src/shad/components/ui/label.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/radio-group.tsx b/services/user/Workshop/ui/src/shad/components/ui/radio-group.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/radio-group.tsx rename to services/user/Workshop/ui/src/shad/components/ui/radio-group.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/select.tsx b/services/user/Workshop/ui/src/shad/components/ui/select.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/select.tsx rename to services/user/Workshop/ui/src/shad/components/ui/select.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/separator.tsx b/services/user/Workshop/ui/src/shad/components/ui/separator.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/separator.tsx rename to services/user/Workshop/ui/src/shad/components/ui/separator.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/tabs.tsx b/services/user/Workshop/ui/src/shad/components/ui/tabs.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/tabs.tsx rename to services/user/Workshop/ui/src/shad/components/ui/tabs.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/textarea.tsx b/services/user/Workshop/ui/src/shad/components/ui/textarea.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/textarea.tsx rename to services/user/Workshop/ui/src/shad/components/ui/textarea.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/toggle.tsx b/services/user/Workshop/ui/src/shad/components/ui/toggle.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/toggle.tsx rename to services/user/Workshop/ui/src/shad/components/ui/toggle.tsx diff --git a/services/user/AppRegistry/ui/src/shad/components/ui/tooltip.tsx b/services/user/Workshop/ui/src/shad/components/ui/tooltip.tsx similarity index 100% rename from services/user/AppRegistry/ui/src/shad/components/ui/tooltip.tsx rename to services/user/Workshop/ui/src/shad/components/ui/tooltip.tsx diff --git a/services/user/AppRegistry/ui/src/styles/editor.css b/services/user/Workshop/ui/src/styles/editor.css similarity index 100% rename from services/user/AppRegistry/ui/src/styles/editor.css rename to services/user/Workshop/ui/src/styles/editor.css diff --git a/services/user/AppRegistry/ui/src/styles/globals.css b/services/user/Workshop/ui/src/styles/globals.css similarity index 100% rename from services/user/AppRegistry/ui/src/styles/globals.css rename to services/user/Workshop/ui/src/styles/globals.css diff --git a/services/user/AppRegistry/ui/src/types/index.ts b/services/user/Workshop/ui/src/types/index.ts similarity index 100% rename from services/user/AppRegistry/ui/src/types/index.ts rename to services/user/Workshop/ui/src/types/index.ts diff --git a/services/user/AppRegistry/ui/src/vite-env.d.ts b/services/user/Workshop/ui/src/vite-env.d.ts similarity index 100% rename from services/user/AppRegistry/ui/src/vite-env.d.ts rename to services/user/Workshop/ui/src/vite-env.d.ts diff --git a/services/user/AppRegistry/ui/tailwind.config.cjs b/services/user/Workshop/ui/tailwind.config.cjs similarity index 100% rename from services/user/AppRegistry/ui/tailwind.config.cjs rename to services/user/Workshop/ui/tailwind.config.cjs diff --git a/services/user/AppRegistry/ui/tsconfig.json b/services/user/Workshop/ui/tsconfig.json similarity index 100% rename from services/user/AppRegistry/ui/tsconfig.json rename to services/user/Workshop/ui/tsconfig.json diff --git a/services/user/AppRegistry/ui/tsconfig.node.json b/services/user/Workshop/ui/tsconfig.node.json similarity index 100% rename from services/user/AppRegistry/ui/tsconfig.node.json rename to services/user/Workshop/ui/tsconfig.node.json diff --git a/services/user/AppRegistry/ui/vite.config.ts b/services/user/Workshop/ui/vite.config.ts similarity index 98% rename from services/user/AppRegistry/ui/vite.config.ts rename to services/user/Workshop/ui/vite.config.ts index 6c6e8ba20..63a16dabf 100644 --- a/services/user/AppRegistry/ui/vite.config.ts +++ b/services/user/Workshop/ui/vite.config.ts @@ -132,7 +132,7 @@ const psibase = (service: string, isServing?: boolean) => { export default defineConfig(({ command }) => ({ plugins: [ react(), - psibase("appregistry", command === "serve"), + psibase("workshop", command === "serve"), wasm(), topLevelAwait(), tsconfigPaths(), diff --git a/services/user/AppRegistry/ui/yarn.lock b/services/user/Workshop/ui/yarn.lock similarity index 100% rename from services/user/AppRegistry/ui/yarn.lock rename to services/user/Workshop/ui/yarn.lock