From 6e16fc6b2bdaceb87c81550d69215027ad9e90f6 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sat, 21 Oct 2023 11:14:58 +0200 Subject: [PATCH] feat: move project to crates Signed-off-by: kjuulh --- Cargo.toml | 22 +++++++------------ {como_api => crates/como_api}/Cargo.toml | 0 .../como_api}/src/controllers/auth.rs | 0 .../como_api}/src/controllers/graphql.rs | 0 .../como_api}/src/controllers/mod.rs | 0 {como_api => crates/como_api}/src/lib.rs | 0 {como_api => crates/como_api}/src/router.rs | 0 .../como_api}/src/zitadel/client.rs | 0 .../como_api}/src/zitadel/mod.rs | 0 {como_auth => crates/como_auth}/Cargo.toml | 0 {como_auth => crates/como_auth}/src/auth.rs | 0 .../como_auth}/src/introspection.rs | 0 {como_auth => crates/como_auth}/src/lib.rs | 0 {como_auth => crates/como_auth}/src/oauth.rs | 0 .../como_auth}/src/session.rs | 0 {como_bin => crates/como_bin}/Cargo.toml | 0 {como_bin => crates/como_bin}/src/error.rs | 0 {como_bin => crates/como_bin}/src/main.rs | 0 {como_core => crates/como_core}/Cargo.toml | 0 {como_core => crates/como_core}/report.json | 0 .../como_core}/src/items/mod.rs | 0 {como_core => crates/como_core}/src/lib.rs | 0 .../como_core}/src/projects/mod.rs | 0 .../como_core}/src/users/mod.rs | 0 .../como_domain}/Cargo.toml | 0 .../como_domain}/src/common/mod.rs | 0 .../como_domain}/src/common/user.rs | 0 .../como_domain}/src/item/mod.rs | 0 .../como_domain}/src/item/queries.rs | 0 .../como_domain}/src/item/requests.rs | 0 .../como_domain}/src/item/responses.rs | 0 .../como_domain}/src/lib.rs | 0 .../como_domain}/src/projects/mod.rs | 0 .../como_domain}/src/projects/mutation.rs | 0 .../como_domain}/src/projects/queries.rs | 0 .../como_domain}/src/projects/requests.rs | 0 .../como_domain}/src/projects/responses.rs | 0 .../como_domain}/src/users/mod.rs | 0 .../como_domain}/src/users/requests.rs | 0 .../como_domain}/src/users/responses.rs | 0 {como_gql => crates/como_gql}/Cargo.toml | 0 {como_gql => crates/como_gql}/src/graphql.rs | 0 {como_gql => crates/como_gql}/src/items.rs | 0 {como_gql => crates/como_gql}/src/lib.rs | 0 {como_gql => crates/como_gql}/src/projects.rs | 0 .../como_infrastructure}/.sqlx/.gitkeep | 0 .../como_infrastructure}/Cargo.toml | 0 .../como_infrastructure}/build.rs | 0 .../20220808220223_initial_migration.sql | 0 .../20230528154039_with-project.sql | 0 .../migrations/20230603152353_items.sql | 0 .../20230604084033_alter_state_string.sql | 0 .../como_infrastructure}/sqlx-data.json | 0 .../como_infrastructure}/src/configs/mod.rs | 0 .../como_infrastructure}/src/database/mod.rs | 0 .../como_infrastructure}/src/lib.rs | 0 .../como_infrastructure}/src/register.rs | 0 .../src/repositories/mod.rs | 0 .../src/services/item_service.rs | 0 .../como_infrastructure}/src/services/mod.rs | 0 .../src/services/project_service.rs | 0 .../src/services/user_service.rs | 0 scripts/run_como.sh | 2 +- 63 files changed, 9 insertions(+), 15 deletions(-) rename {como_api => crates/como_api}/Cargo.toml (100%) rename {como_api => crates/como_api}/src/controllers/auth.rs (100%) rename {como_api => crates/como_api}/src/controllers/graphql.rs (100%) rename {como_api => crates/como_api}/src/controllers/mod.rs (100%) rename {como_api => crates/como_api}/src/lib.rs (100%) rename {como_api => crates/como_api}/src/router.rs (100%) rename {como_api => crates/como_api}/src/zitadel/client.rs (100%) rename {como_api => crates/como_api}/src/zitadel/mod.rs (100%) rename {como_auth => crates/como_auth}/Cargo.toml (100%) rename {como_auth => crates/como_auth}/src/auth.rs (100%) rename {como_auth => crates/como_auth}/src/introspection.rs (100%) rename {como_auth => crates/como_auth}/src/lib.rs (100%) rename {como_auth => crates/como_auth}/src/oauth.rs (100%) rename {como_auth => crates/como_auth}/src/session.rs (100%) rename {como_bin => crates/como_bin}/Cargo.toml (100%) rename {como_bin => crates/como_bin}/src/error.rs (100%) rename {como_bin => crates/como_bin}/src/main.rs (100%) rename {como_core => crates/como_core}/Cargo.toml (100%) rename {como_core => crates/como_core}/report.json (100%) rename {como_core => crates/como_core}/src/items/mod.rs (100%) rename {como_core => crates/como_core}/src/lib.rs (100%) rename {como_core => crates/como_core}/src/projects/mod.rs (100%) rename {como_core => crates/como_core}/src/users/mod.rs (100%) rename {como_domain => crates/como_domain}/Cargo.toml (100%) rename {como_domain => crates/como_domain}/src/common/mod.rs (100%) rename {como_domain => crates/como_domain}/src/common/user.rs (100%) rename {como_domain => crates/como_domain}/src/item/mod.rs (100%) rename {como_domain => crates/como_domain}/src/item/queries.rs (100%) rename {como_domain => crates/como_domain}/src/item/requests.rs (100%) rename {como_domain => crates/como_domain}/src/item/responses.rs (100%) rename {como_domain => crates/como_domain}/src/lib.rs (100%) rename {como_domain => crates/como_domain}/src/projects/mod.rs (100%) rename {como_domain => crates/como_domain}/src/projects/mutation.rs (100%) rename {como_domain => crates/como_domain}/src/projects/queries.rs (100%) rename {como_domain => crates/como_domain}/src/projects/requests.rs (100%) rename {como_domain => crates/como_domain}/src/projects/responses.rs (100%) rename {como_domain => crates/como_domain}/src/users/mod.rs (100%) rename {como_domain => crates/como_domain}/src/users/requests.rs (100%) rename {como_domain => crates/como_domain}/src/users/responses.rs (100%) rename {como_gql => crates/como_gql}/Cargo.toml (100%) rename {como_gql => crates/como_gql}/src/graphql.rs (100%) rename {como_gql => crates/como_gql}/src/items.rs (100%) rename {como_gql => crates/como_gql}/src/lib.rs (100%) rename {como_gql => crates/como_gql}/src/projects.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/.sqlx/.gitkeep (100%) rename {como_infrastructure => crates/como_infrastructure}/Cargo.toml (100%) rename {como_infrastructure => crates/como_infrastructure}/build.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/migrations/20220808220223_initial_migration.sql (100%) rename {como_infrastructure => crates/como_infrastructure}/migrations/20230528154039_with-project.sql (100%) rename {como_infrastructure => crates/como_infrastructure}/migrations/20230603152353_items.sql (100%) rename {como_infrastructure => crates/como_infrastructure}/migrations/20230604084033_alter_state_string.sql (100%) rename {como_infrastructure => crates/como_infrastructure}/sqlx-data.json (100%) rename {como_infrastructure => crates/como_infrastructure}/src/configs/mod.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/database/mod.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/lib.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/register.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/repositories/mod.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/services/item_service.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/services/mod.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/services/project_service.rs (100%) rename {como_infrastructure => crates/como_infrastructure}/src/services/user_service.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 75dbe07..5707607 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,17 @@ [workspace] members = [ - "como_bin", - "como_core", - "como_domain", - "como_infrastructure", - "como_gql", - "como_api", - "como_auth", + "crates/*" ] resolver = "2" [workspace.dependencies] -como_bin = { path = "./como_bin/" } -como_core = { path = "./como_core/" } -como_domain = { path = "./como_domain/" } -como_infrastructure = { path = "./como_infrastructure/" } -como_gql = { path = "./como_gql/" } -como_api = { path = "./como_api/" } -como_auth = { path = "./como_auth/" } +como_bin = { path = "./crates/como_bin/" } +como_core = { path = "./crates/como_core/" } +como_domain = { path = "./crates/como_domain/" } +como_infrastructure = { path = "./crates/como_infrastructure/" } +como_gql = { path = "./crates/como_gql/" } +como_api = { path = "./crates/como_api/" } +como_auth = { path = "./crates/como_auth/" } async-trait = "0.1.68" async-graphql = { version = "5.0.9", features = ["uuid"] } diff --git a/como_api/Cargo.toml b/crates/como_api/Cargo.toml similarity index 100% rename from como_api/Cargo.toml rename to crates/como_api/Cargo.toml diff --git a/como_api/src/controllers/auth.rs b/crates/como_api/src/controllers/auth.rs similarity index 100% rename from como_api/src/controllers/auth.rs rename to crates/como_api/src/controllers/auth.rs diff --git a/como_api/src/controllers/graphql.rs b/crates/como_api/src/controllers/graphql.rs similarity index 100% rename from como_api/src/controllers/graphql.rs rename to crates/como_api/src/controllers/graphql.rs diff --git a/como_api/src/controllers/mod.rs b/crates/como_api/src/controllers/mod.rs similarity index 100% rename from como_api/src/controllers/mod.rs rename to crates/como_api/src/controllers/mod.rs diff --git a/como_api/src/lib.rs b/crates/como_api/src/lib.rs similarity index 100% rename from como_api/src/lib.rs rename to crates/como_api/src/lib.rs diff --git a/como_api/src/router.rs b/crates/como_api/src/router.rs similarity index 100% rename from como_api/src/router.rs rename to crates/como_api/src/router.rs diff --git a/como_api/src/zitadel/client.rs b/crates/como_api/src/zitadel/client.rs similarity index 100% rename from como_api/src/zitadel/client.rs rename to crates/como_api/src/zitadel/client.rs diff --git a/como_api/src/zitadel/mod.rs b/crates/como_api/src/zitadel/mod.rs similarity index 100% rename from como_api/src/zitadel/mod.rs rename to crates/como_api/src/zitadel/mod.rs diff --git a/como_auth/Cargo.toml b/crates/como_auth/Cargo.toml similarity index 100% rename from como_auth/Cargo.toml rename to crates/como_auth/Cargo.toml diff --git a/como_auth/src/auth.rs b/crates/como_auth/src/auth.rs similarity index 100% rename from como_auth/src/auth.rs rename to crates/como_auth/src/auth.rs diff --git a/como_auth/src/introspection.rs b/crates/como_auth/src/introspection.rs similarity index 100% rename from como_auth/src/introspection.rs rename to crates/como_auth/src/introspection.rs diff --git a/como_auth/src/lib.rs b/crates/como_auth/src/lib.rs similarity index 100% rename from como_auth/src/lib.rs rename to crates/como_auth/src/lib.rs diff --git a/como_auth/src/oauth.rs b/crates/como_auth/src/oauth.rs similarity index 100% rename from como_auth/src/oauth.rs rename to crates/como_auth/src/oauth.rs diff --git a/como_auth/src/session.rs b/crates/como_auth/src/session.rs similarity index 100% rename from como_auth/src/session.rs rename to crates/como_auth/src/session.rs diff --git a/como_bin/Cargo.toml b/crates/como_bin/Cargo.toml similarity index 100% rename from como_bin/Cargo.toml rename to crates/como_bin/Cargo.toml diff --git a/como_bin/src/error.rs b/crates/como_bin/src/error.rs similarity index 100% rename from como_bin/src/error.rs rename to crates/como_bin/src/error.rs diff --git a/como_bin/src/main.rs b/crates/como_bin/src/main.rs similarity index 100% rename from como_bin/src/main.rs rename to crates/como_bin/src/main.rs diff --git a/como_core/Cargo.toml b/crates/como_core/Cargo.toml similarity index 100% rename from como_core/Cargo.toml rename to crates/como_core/Cargo.toml diff --git a/como_core/report.json b/crates/como_core/report.json similarity index 100% rename from como_core/report.json rename to crates/como_core/report.json diff --git a/como_core/src/items/mod.rs b/crates/como_core/src/items/mod.rs similarity index 100% rename from como_core/src/items/mod.rs rename to crates/como_core/src/items/mod.rs diff --git a/como_core/src/lib.rs b/crates/como_core/src/lib.rs similarity index 100% rename from como_core/src/lib.rs rename to crates/como_core/src/lib.rs diff --git a/como_core/src/projects/mod.rs b/crates/como_core/src/projects/mod.rs similarity index 100% rename from como_core/src/projects/mod.rs rename to crates/como_core/src/projects/mod.rs diff --git a/como_core/src/users/mod.rs b/crates/como_core/src/users/mod.rs similarity index 100% rename from como_core/src/users/mod.rs rename to crates/como_core/src/users/mod.rs diff --git a/como_domain/Cargo.toml b/crates/como_domain/Cargo.toml similarity index 100% rename from como_domain/Cargo.toml rename to crates/como_domain/Cargo.toml diff --git a/como_domain/src/common/mod.rs b/crates/como_domain/src/common/mod.rs similarity index 100% rename from como_domain/src/common/mod.rs rename to crates/como_domain/src/common/mod.rs diff --git a/como_domain/src/common/user.rs b/crates/como_domain/src/common/user.rs similarity index 100% rename from como_domain/src/common/user.rs rename to crates/como_domain/src/common/user.rs diff --git a/como_domain/src/item/mod.rs b/crates/como_domain/src/item/mod.rs similarity index 100% rename from como_domain/src/item/mod.rs rename to crates/como_domain/src/item/mod.rs diff --git a/como_domain/src/item/queries.rs b/crates/como_domain/src/item/queries.rs similarity index 100% rename from como_domain/src/item/queries.rs rename to crates/como_domain/src/item/queries.rs diff --git a/como_domain/src/item/requests.rs b/crates/como_domain/src/item/requests.rs similarity index 100% rename from como_domain/src/item/requests.rs rename to crates/como_domain/src/item/requests.rs diff --git a/como_domain/src/item/responses.rs b/crates/como_domain/src/item/responses.rs similarity index 100% rename from como_domain/src/item/responses.rs rename to crates/como_domain/src/item/responses.rs diff --git a/como_domain/src/lib.rs b/crates/como_domain/src/lib.rs similarity index 100% rename from como_domain/src/lib.rs rename to crates/como_domain/src/lib.rs diff --git a/como_domain/src/projects/mod.rs b/crates/como_domain/src/projects/mod.rs similarity index 100% rename from como_domain/src/projects/mod.rs rename to crates/como_domain/src/projects/mod.rs diff --git a/como_domain/src/projects/mutation.rs b/crates/como_domain/src/projects/mutation.rs similarity index 100% rename from como_domain/src/projects/mutation.rs rename to crates/como_domain/src/projects/mutation.rs diff --git a/como_domain/src/projects/queries.rs b/crates/como_domain/src/projects/queries.rs similarity index 100% rename from como_domain/src/projects/queries.rs rename to crates/como_domain/src/projects/queries.rs diff --git a/como_domain/src/projects/requests.rs b/crates/como_domain/src/projects/requests.rs similarity index 100% rename from como_domain/src/projects/requests.rs rename to crates/como_domain/src/projects/requests.rs diff --git a/como_domain/src/projects/responses.rs b/crates/como_domain/src/projects/responses.rs similarity index 100% rename from como_domain/src/projects/responses.rs rename to crates/como_domain/src/projects/responses.rs diff --git a/como_domain/src/users/mod.rs b/crates/como_domain/src/users/mod.rs similarity index 100% rename from como_domain/src/users/mod.rs rename to crates/como_domain/src/users/mod.rs diff --git a/como_domain/src/users/requests.rs b/crates/como_domain/src/users/requests.rs similarity index 100% rename from como_domain/src/users/requests.rs rename to crates/como_domain/src/users/requests.rs diff --git a/como_domain/src/users/responses.rs b/crates/como_domain/src/users/responses.rs similarity index 100% rename from como_domain/src/users/responses.rs rename to crates/como_domain/src/users/responses.rs diff --git a/como_gql/Cargo.toml b/crates/como_gql/Cargo.toml similarity index 100% rename from como_gql/Cargo.toml rename to crates/como_gql/Cargo.toml diff --git a/como_gql/src/graphql.rs b/crates/como_gql/src/graphql.rs similarity index 100% rename from como_gql/src/graphql.rs rename to crates/como_gql/src/graphql.rs diff --git a/como_gql/src/items.rs b/crates/como_gql/src/items.rs similarity index 100% rename from como_gql/src/items.rs rename to crates/como_gql/src/items.rs diff --git a/como_gql/src/lib.rs b/crates/como_gql/src/lib.rs similarity index 100% rename from como_gql/src/lib.rs rename to crates/como_gql/src/lib.rs diff --git a/como_gql/src/projects.rs b/crates/como_gql/src/projects.rs similarity index 100% rename from como_gql/src/projects.rs rename to crates/como_gql/src/projects.rs diff --git a/como_infrastructure/.sqlx/.gitkeep b/crates/como_infrastructure/.sqlx/.gitkeep similarity index 100% rename from como_infrastructure/.sqlx/.gitkeep rename to crates/como_infrastructure/.sqlx/.gitkeep diff --git a/como_infrastructure/Cargo.toml b/crates/como_infrastructure/Cargo.toml similarity index 100% rename from como_infrastructure/Cargo.toml rename to crates/como_infrastructure/Cargo.toml diff --git a/como_infrastructure/build.rs b/crates/como_infrastructure/build.rs similarity index 100% rename from como_infrastructure/build.rs rename to crates/como_infrastructure/build.rs diff --git a/como_infrastructure/migrations/20220808220223_initial_migration.sql b/crates/como_infrastructure/migrations/20220808220223_initial_migration.sql similarity index 100% rename from como_infrastructure/migrations/20220808220223_initial_migration.sql rename to crates/como_infrastructure/migrations/20220808220223_initial_migration.sql diff --git a/como_infrastructure/migrations/20230528154039_with-project.sql b/crates/como_infrastructure/migrations/20230528154039_with-project.sql similarity index 100% rename from como_infrastructure/migrations/20230528154039_with-project.sql rename to crates/como_infrastructure/migrations/20230528154039_with-project.sql diff --git a/como_infrastructure/migrations/20230603152353_items.sql b/crates/como_infrastructure/migrations/20230603152353_items.sql similarity index 100% rename from como_infrastructure/migrations/20230603152353_items.sql rename to crates/como_infrastructure/migrations/20230603152353_items.sql diff --git a/como_infrastructure/migrations/20230604084033_alter_state_string.sql b/crates/como_infrastructure/migrations/20230604084033_alter_state_string.sql similarity index 100% rename from como_infrastructure/migrations/20230604084033_alter_state_string.sql rename to crates/como_infrastructure/migrations/20230604084033_alter_state_string.sql diff --git a/como_infrastructure/sqlx-data.json b/crates/como_infrastructure/sqlx-data.json similarity index 100% rename from como_infrastructure/sqlx-data.json rename to crates/como_infrastructure/sqlx-data.json diff --git a/como_infrastructure/src/configs/mod.rs b/crates/como_infrastructure/src/configs/mod.rs similarity index 100% rename from como_infrastructure/src/configs/mod.rs rename to crates/como_infrastructure/src/configs/mod.rs diff --git a/como_infrastructure/src/database/mod.rs b/crates/como_infrastructure/src/database/mod.rs similarity index 100% rename from como_infrastructure/src/database/mod.rs rename to crates/como_infrastructure/src/database/mod.rs diff --git a/como_infrastructure/src/lib.rs b/crates/como_infrastructure/src/lib.rs similarity index 100% rename from como_infrastructure/src/lib.rs rename to crates/como_infrastructure/src/lib.rs diff --git a/como_infrastructure/src/register.rs b/crates/como_infrastructure/src/register.rs similarity index 100% rename from como_infrastructure/src/register.rs rename to crates/como_infrastructure/src/register.rs diff --git a/como_infrastructure/src/repositories/mod.rs b/crates/como_infrastructure/src/repositories/mod.rs similarity index 100% rename from como_infrastructure/src/repositories/mod.rs rename to crates/como_infrastructure/src/repositories/mod.rs diff --git a/como_infrastructure/src/services/item_service.rs b/crates/como_infrastructure/src/services/item_service.rs similarity index 100% rename from como_infrastructure/src/services/item_service.rs rename to crates/como_infrastructure/src/services/item_service.rs diff --git a/como_infrastructure/src/services/mod.rs b/crates/como_infrastructure/src/services/mod.rs similarity index 100% rename from como_infrastructure/src/services/mod.rs rename to crates/como_infrastructure/src/services/mod.rs diff --git a/como_infrastructure/src/services/project_service.rs b/crates/como_infrastructure/src/services/project_service.rs similarity index 100% rename from como_infrastructure/src/services/project_service.rs rename to crates/como_infrastructure/src/services/project_service.rs diff --git a/como_infrastructure/src/services/user_service.rs b/crates/como_infrastructure/src/services/user_service.rs similarity index 100% rename from como_infrastructure/src/services/user_service.rs rename to crates/como_infrastructure/src/services/user_service.rs diff --git a/scripts/run_como.sh b/scripts/run_como.sh index 9f4384b..d6881a0 100755 --- a/scripts/run_como.sh +++ b/scripts/run_como.sh @@ -2,4 +2,4 @@ set -e -(cd como_bin; cargo watch -x run) +(cd crates/como_bin; cargo watch -x run)