diff --git a/.gitignore b/.gitignore index 78bbb51..c099ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ frontend/themes/clippable/static/js/index.js frontend/public/ frontend/themes/clippable/static/js/category.js frontend/themes/clippable/static/js/collection.js +api/static/js/index.js diff --git a/Cargo.lock b/Cargo.lock index 468306b..72cefa2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -258,7 +258,6 @@ version = "0.1.0" dependencies = [ "base64 0.13.0", "rocket 0.5.0-rc.1", - "rocket_contrib", "rocket_dyn_templates", "serde", "tokio", @@ -1495,6 +1494,7 @@ dependencies = [ "rocket_codegen 0.5.0-rc.1", "rocket_http 0.5.0-rc.1", "serde", + "serde_json", "state 0.5.2", "tempfile", "time 0.2.27", diff --git a/Cargo.toml b/Cargo.toml index 86344bc..cc6cb79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ base64 = "0.13.0" clap = "2.33.3" # For the backend server we just use rocket -rocket = "0.5.0-rc.1" +rocket = { version = "0.5.0-rc.1", features = [ "json" ] } tokio = "1.0" [dependencies.rocket_contrib] diff --git a/api/Cargo.toml b/api/Cargo.toml index 1c528cf..04bf1c9 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -6,16 +6,12 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rocket = "0.5.0-rc.1" +rocket = { version = "0.5.0-rc.1", features = [ "json" ] } tokio = "1.0" serde = { version = "1.0", features = [ "derive" ] } base64 = "0.13.0" -[dependencies.rocket_contrib] -version = "0.4.10" -default-features = false -features = ["serve", "json"] [dependencies.rocket_dyn_templates] version = "0.1.0-rc.1" -features = ["tera"] \ No newline at end of file +features = ["tera"]