Tsumanu/oswilno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile issues - bad versions

Browse Source
This commit is contained in:
eraden 2023-07-27 22:54:55 +02:00
parent 99a7f1c362
commit b3a56558f2
6 changed files with 49 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

730
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
crates/migration/Cargo.toml
View File

@ -12,7 +12,7 @@ path = "src/lib.rs"
async-std = { version = "1", features = ["attributes", "tokio1"] }
tokio = { version = "1.29.1", features = ["full"] }
oswilno-contract = { path = "../oswilno-contract" }
sea-orm = { version = "0.11.3", features = ["runtime-actix-rustls", "sqlx-postgres", "postgres-array", "sqlx"] }
sea-orm = { version = "0.11", features = ["runtime-actix-rustls", "sqlx-postgres", "postgres-array", "sqlx"] }
[dependencies.sea-orm-migration]
version = "0.11.0"

2
crates/oswilno-contract/Cargo.toml
View File

@ -9,7 +9,7 @@ actix-admin = "0.5.0"
actix-rt = { version = "2.8.0", features = [] }
chrono = "0.4.26"
regex = "1.9.1"
sea-orm = { version = "0.11.3", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres", "macros", "sqlx"] }
sea-orm = { version = "0.11", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres", "macros", "sqlx"] }
serde = { version = "1.0.175", features = ["derive"] }
tera = "1.19.0"
uuid = { version = "1.4.1", features = ["v4"] }

2
crates/oswilno-parking-space/Cargo.toml
View File

@ -10,6 +10,6 @@ actix-web = "4.3.1"
askama = { version = "0.12.0", features = ["serde", "with-actix-web", "comrak", "mime"] }
tokio = { version = "1.29.1", features = ["full"] }
oswilno-contract = { path = "../oswilno-contract" }
sea-orm = { version = "0.12.1", features = ["runtime-actix-rustls", "sqlx", "sqlx-postgres"] }
sea-orm = { version = "0.11.1", features = ["runtime-actix-rustls", "sqlx", "sqlx-postgres", "debug-print"] }
serde = { version = "1.0.176", features = ["derive"] }
serde_json = "1.0.104"

8
crates/oswilno-parking-space/src/lib.rs
View File

@ -7,13 +7,11 @@ pub fn mount(config: &mut ServiceConfig) {
#[get("/ps")]
async fn all_parking_spaces(db: Data<sea_orm::DatabaseConnection>) -> HttpResponse {
use oswilno_contract::prelude::*;
use oswilno_contract::*;
use parking_spaces::*;
use sea_orm::*;
use oswilno_contract::parking_spaces;
use sea_orm::prelude::*;
let db = db.into_inner();
let spaces: Vec<Model> = Entity::find().all(&*db).await.unwrap();
let spaces = parking_spaces::Entity::find().all(&*db).await.unwrap();
HttpResponse::Ok().json(spaces)
}

2
crates/oswilno-server/Cargo.toml
View File

@ -13,7 +13,7 @@ futures = { version = "0.3.28", features = ["futures-executor"] }
oswilno-config = { path = "../oswilno-config" }
oswilno-parking-space = { path = "../oswilno-parking-space" }
oswilno-admin = { path = "../oswilno-admin" }
sea-orm = { version = "0.11.3", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres"] }
sea-orm = { version = "0.11", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres"] }
serde = { version = "1.0.175", features = ["derive"] }
serde_json = "1.0.103"
tokio = { version = "1.29.1", features = ["full"] }