caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #384 from Gabriel-Paulucci/master

Browse Source 
Fix rocket version
This commit is contained in:
Chris Tsang 2021-12-15 13:53:30 +08:00 committed by GitHub
commit 67a601ecca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/rocket_example/Cargo.toml
View File

@ -12,10 +12,10 @@ async-stream = { version = "^0.3" }
async-trait = { version = "0.1" } async-trait = { version = "0.1" }
futures = { version = "^0.3" } futures = { version = "^0.3" }
futures-util = { version = "^0.3" } futures-util = { version = "^0.3" }
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", features = [ rocket = { version = "0.5.0-rc.1", features = [
"json", "json",
] } ] }
rocket_dyn_templates = { git = "https://github.com/SergioBenitez/Rocket.git", features = [ rocket_dyn_templates = { version = "0.1.0-rc.1", features = [
"tera", "tera",
] } ] }
serde_json = { version = "^1" } serde_json = { version = "^1" }

29
examples/rocket_example/src/main.rs
View File

@ -7,7 +7,8 @@ use rocket::fs::{relative, FileServer};
use rocket::request::FlashMessage; use rocket::request::FlashMessage;
use rocket::response::{Flash, Redirect}; use rocket::response::{Flash, Redirect};
use rocket::{Build, Request, Rocket}; use rocket::{Build, Request, Rocket};
use rocket_dyn_templates::{context, Template}; use rocket_dyn_templates::Template;
use serde_json::json;
use sea_orm::{entity::*, query::*}; use sea_orm::{entity::*, query::*};
use sea_orm_rocket::{Connection, Database}; use sea_orm_rocket::{Connection, Database};
@ -107,13 +108,13 @@ async fn list(
Template::render( Template::render(
"index", "index",
context! { json! ({
page: page, "page": page,
posts_per_page: posts_per_page, "posts_per_page": posts_per_page,
num_pages: num_pages, "num_pages": num_pages,
posts: posts, "posts": posts,
flash: flash.map(FlashMessage::into_inner), "flash": flash.map(FlashMessage::into_inner),
}, })
) )
} }
@ -128,9 +129,9 @@ async fn edit(conn: Connection<'_, Db>, id: i32) -> Template {
Template::render( Template::render(
"edit", "edit",
context! { json! ({
post: post, "post": post,
}, })
) )
} }
@ -157,9 +158,9 @@ async fn destroy(conn: Connection<'_, Db>) -> Result<(), rocket::response::Debug
pub fn not_found(req: &Request<'_>) -> Template { pub fn not_found(req: &Request<'_>) -> Template {
Template::render( Template::render(
"error/404", "error/404",
context! { json! ({
uri: req.uri() "uri": req.uri()
}, })
) )
} }

2
sea-orm-rocket/codegen/Cargo.toml
View File

@ -17,6 +17,6 @@ devise = "0.3"
quote = "1" quote = "1"
[dev-dependencies] [dev-dependencies]
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", default-features = false } rocket = { version = "0.5.0-rc.1", default-features = false }
trybuild = "1.0" trybuild = "1.0"
version_check = "0.9" version_check = "0.9"

3
sea-orm-rocket/lib/Cargo.toml
View File

@ -13,7 +13,6 @@ edition = "2021"
all-features = true all-features = true
[dependencies.rocket] [dependencies.rocket]
git = "https://github.com/SergioBenitez/Rocket.git"
version = "0.5.0-rc.1" version = "0.5.0-rc.1"
default-features = false default-features = false
@ -22,6 +21,6 @@ path = "../codegen"
version = "0.1.0-rc" version = "0.1.0-rc"
[dev-dependencies.rocket] [dev-dependencies.rocket]
git = "https://github.com/SergioBenitez/Rocket.git" version = "0.5.0-rc.1"
default-features = false default-features = false
features = ["json"] features = ["json"]