commit cb18954ef2dde477dcf8719ce95dbc27ceb7b061
parent 2821711ed30d656231e58939cab2e4e7ae01d470
Author: Sergio Benitez <sb@sergio.bz>
Date: Fri, 24 Aug 2018 14:00:36 -0700
Use 'StaticFiles' in todo example.
Diffstat:
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/examples/todo/Cargo.toml b/examples/todo/Cargo.toml
@@ -19,4 +19,4 @@ rand = "0.5"
[dependencies.rocket_contrib]
path = "../../contrib/lib"
default_features = false
-features = ["tera_templates", "diesel_sqlite_pool"]
+features = ["tera_templates", "diesel_sqlite_pool", "static_files"]
diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs
@@ -6,15 +6,13 @@
#[macro_use] extern crate serde_derive;
extern crate rocket_contrib;
-mod static_files;
mod task;
#[cfg(test)] mod tests;
use rocket::Rocket;
use rocket::request::{Form, FlashMessage};
use rocket::response::{Flash, Redirect};
-use rocket_contrib::Template;
-use rocket_contrib::databases::database;
+use rocket_contrib::{Template, databases::database, static_files::StaticFiles};
use diesel::SqliteConnection;
use task::{Task, Todo};
@@ -76,7 +74,8 @@ fn index(msg: Option<FlashMessage>, conn: DbConn) -> Template {
fn rocket() -> (Rocket, Option<DbConn>) {
let rocket = rocket::ignite()
.attach(DbConn::fairing())
- .mount("/", routes![index, static_files::all])
+ .mount("/", StaticFiles::from("static/"))
+ .mount("/", routes![index])
.mount("/todo", routes![new, toggle, delete])
.attach(Template::fairing());
diff --git a/examples/todo/src/static_files.rs b/examples/todo/src/static_files.rs
@@ -1,7 +0,0 @@
-use std::path::{Path, PathBuf};
-use rocket::response::NamedFile;
-
-#[get("/<path..>", rank = 5)]
-fn all(path: PathBuf) -> Option<NamedFile> {
- NamedFile::open(Path::new("static/").join(path)).ok()
-}