Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3 #54

Merged
merged 8 commits into from
Jan 1, 2024
Merged

V3 #54

Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .cargo/config.example.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Cargo config file.
# See: https://doc.rust-lang.org/cargo/reference/config.html

# Environments variables set for all `cargo ...` commands.
[env]

# Scope down tracing, to filter out external lib tracing.
RUST_LOG="web_server=debug,lib_core=debug,lib_auth=debug,lib_utils=debug"

# -- Service Environment Variables
# IMPORTANT:
# For cargo commands only.
# For deployed env, should be managed by container
# (e.g., Kubernetes).

## -- Secrets
# Keys and passwords below are for localhost dev ONLY.
# e.g., "welcome" type of passwords.
# i.e., Encryption not needed.

SERVICE_DB_URL="postgres://app_user:dev_only_pwd@localhost/app_db"

SERVICE_PWD_KEY=""

SERVICE_TOKEN_KEY=""
SERVICE_TOKEN_DURATION_SEC="1800" # 30 minutes

## -- ConfigMap

# This will be relative to Cargo.toml
# In deployed images, probably use absolute path.
SERVICE_WEB_FOLDER="web-folder/"
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@
**.DS_Store
**to/
**data
.vscode
.vscode

## Ignore File for backend service
.cargo/config.toml

69 changes: 62 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,65 @@
#[package]
#name = "orca"
#version = "0.1.0"
#edition = "2021"
#
## See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[workspace]
members=["cerium", "api", "engine", "entity", "migration"]
default-members=["cerium"]
name = "orca"
members=[
"crates/libs/cerium",
"crates/libs/entity",
"crates/libs/migration",
"crates/services/engine",
"crates/services/api",
]

[workspace.package]
authors = [ "Vasanth Kumar <mail@itsparser.in>" ]
edition = "2021"
version = "0.1.0"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/orca/"
homepage = "https://github.com/orcaci/orca"
repository = "https://github.com/orcaci/orca"
rust-version = "1.74.1"
exclude = [".github/**"]


[workspace.dependencies]
cerium = { path = "crates/libs/cerium", default-features = true }
entity = { path = "crates/libs/entity", default-features = true }
migration = { path = "crates/libs/migration", default-features = true }
engine = { path = "crates/services/engine", default-features = true }
api = { path = "crates/services/api", default-features = true }

thiserror = "1.0.31"
jsonwebtoken = "8"
serde = { version = "1.0.147"}
serde_json = "1.0.87"
chrono = { version = "0.4.31"}
tracing = "0.1.37"
tracing-subscriber = "0.3.16"
uuid = { version = "1.6.1", features = ["serde", "v4"] }

sea-query = "0.30.5"
sea-orm = { version = "0.12.3", features = [
"macros",
"debug-print",
"runtime-async-std-native-tls",
"sqlx-postgres",
] }
sea-orm-migration = {version = "0.12.3", features = ["sqlx-postgres"]}

axum = "0.7.1"
axum-extra = "0.8.0"
tokio = { version = "1.34.0", features = ["full"] }
tower = "0.4.13"
tower-http = { version = "0.5.0", default-features = true, features = ["uuid", "cors", "trace", "compression-br", "catch-panic", "request-id"] }

config = "0.13.3"

dotenv = "0.15.0"
futures = "0.3.29"
futures-util = "0.3.29"
rust_decimal = "1.14.3"
cross-test = "0.1.6"

[patch.crates-io]
sea-orm = { git="https://github.com/itsparser/sea-orm", branch = "master" }
90 changes: 0 additions & 90 deletions api/src/route/app/datatable.rs

This file was deleted.

6 changes: 0 additions & 6 deletions api/src/utils/mod.rs

This file was deleted.

2 changes: 0 additions & 2 deletions cerium/src/client/mod.rs

This file was deleted.

41 changes: 0 additions & 41 deletions cerium/src/config.rs

This file was deleted.

5 changes: 0 additions & 5 deletions cerium/src/error/mod.rs

This file was deleted.

95 changes: 0 additions & 95 deletions cerium/src/error/web.rs

This file was deleted.

10 changes: 0 additions & 10 deletions cerium/src/utils/uuid.rs

This file was deleted.

1 change: 1 addition & 0 deletions config/default.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
debug = false

[connection]
db_backend = "Postgres"
database="postgres://jukbbjhs:T16p5KyqgrrERxCaZRP_nlxgGOFXvRhM@otto.db.elephantsql.com:5432/jukbbjhs"
selenium="http://34.72.113.188:4444/wd/hub"

Expand Down
Loading
Loading