1 files changed, 36 insertions, 27 deletions

diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs
index 91cfc5c..0dee68a 100644
--- a/src/controllers/users_controller.rs
+++ b/src/controllers/users_controller.rs
@@ -1,23 +1,32 @@
-use rocket;
-use rocket::request::Form;
-use rocket::response::{Flash, Redirect};
-use utils;
+use rocket::{
+    response::{Flash, Redirect},
+    request::{FlashMessage, Form},
+    Route
+};
+use models::{
+    NewUser,
+    User
+};
+use utils::{
+    DbConn,
+    Page
+};
 
 #[derive(BartDisplay)]
 #[template = "templates/users.html"]
 pub struct UsersTemplate {
-    users: Vec<::models::User>
+    users: Vec<User>
 }
 
 implement_responder_for!(UsersTemplate);
 
 #[get("/", format = "text/html")]
-fn index(flash: Option<rocket::request::FlashMessage>, conn: utils::DbConn) -> utils::Page<UsersTemplate> {
-    utils::Page {
+fn index(flash: Option<FlashMessage>, conn: DbConn) -> Page<UsersTemplate> {
+    Page {
         title: String::from("Users"),
         flash: flash,
         content: UsersTemplate {
-            users: ::models::User::all(conn).unwrap()
+            users: User::all(conn).unwrap()
         }
     }
 }
@@ -25,25 +34,25 @@ fn index(flash: Option<rocket::request::FlashMessage>, conn: utils::DbConn) -> u
 #[derive(BartDisplay)]
 #[template = "templates/edit_user.html"]
 pub struct EditUserTemplate {
-    user: ::models::User
+    user: User
 }
 
 implement_responder_for!(EditUserTemplate);
 
 #[get("/<id>/edit")]
-fn edit(id: i32, conn: utils::DbConn) -> utils::Page<EditUserTemplate> {
-    utils::Page {
+fn edit(id: i32, conn: DbConn) -> Page<EditUserTemplate> {
+    Page {
         title: String::from("Edit users"),
         flash: None,
         content: EditUserTemplate {
-            user: ::models::User::by_id(id, &conn).unwrap()
+            user: User::by_id(id, &conn).unwrap()
         }
     }
 }
 
 #[get("/<id>/delete")]
-fn delete(id: i32, route: &rocket::Route, conn: utils::DbConn) -> Flash<Redirect> {
-    match ::models::User::delete(id, conn) {
+fn delete(id: i32, route: &Route, conn: DbConn) -> Flash<Redirect> {
+    match User::delete(id, conn) {
         Ok(user) => Flash::success(
             Redirect::to(route.base.path()),
             format!("User {} was successfully deleted.", user.username)
@@ -58,14 +67,14 @@ fn delete(id: i32, route: &rocket::Route, conn: utils::DbConn) -> Flash<Redirect
 #[derive(BartDisplay)]
 #[template = "templates/new_user.html"]
 pub struct NewUserTemplate {
-    user: ::models::NewUser
+    user: NewUser
 }
 
 implement_responder_for!(NewUserTemplate);
 
 #[get("/new", format = "text/html")]
-fn new(flash: Option<rocket::request::FlashMessage>) -> utils::Page<NewUserTemplate> {
-    utils::Page {
+fn new(flash: Option<FlashMessage>) -> Page<NewUserTemplate> {
+    Page {
         title: String::from("New user"),
         flash: flash,
         content: NewUserTemplate {
@@ -84,12 +93,12 @@ struct RegisterUserForm {
 }
 
 impl RegisterUserForm {
-    fn new_user(&self) -> Result<::models::NewUser, &'static str> {
+    fn new_user(&self) -> Result<NewUser, &'static str> {
         if self.password != self.password_confirm {
             Err("Passwords don't match")
         }
         else {
-            Ok(::models::NewUser {
+            Ok(NewUser {
                 username: self.username.clone(),
                 realname: self.realname.clone(),
                 email: self.email.clone(),
@@ -98,12 +107,12 @@ impl RegisterUserForm {
         }
     }
 
-    fn attrs(&self) -> Result<::models::User, &'static str> {
+    fn attrs(&self) -> Result<User, &'static str> {
         if self.password != self.password_confirm {
             Err("Passwords don't match")
         }
         else {
-            Ok(::models::User {
+            Ok(User {
                 id: Default::default(),
                 username: self.username.clone(),
                 realname: self.realname.clone(),
@@ -115,10 +124,10 @@ impl RegisterUserForm {
 }
 
 #[post("/create", data="<user>")]
-fn create(user: Form<RegisterUserForm>, route: &rocket::Route, conn: utils::DbConn) -> Flash<Redirect> {
+fn create(user: Form<RegisterUserForm>, route: &Route, conn: DbConn) -> Flash<Redirect> {
     match user.get().new_user() {
         Ok(new_user) => {
-            match ::models::User::create(&new_user, conn) {
+            match User::create(&new_user, conn) {
                 Ok(_) => Flash::success(Redirect::to(route.base.path()), "User successfully created!"),
                 Err(_) => Flash::error(Redirect::to("/"), "Could not create user!")
             }
@@ -128,10 +137,10 @@ fn create(user: Form<RegisterUserForm>, route: &rocket::Route, conn: utils::DbCo
 }
 
 #[post("/<id>/update", data="<user_form>")]
-fn update(id: i32, user_form: Form<RegisterUserForm>, route: &rocket::Route, conn: utils::DbConn) -> Flash<Redirect> {
+fn update(id: i32, user_form: Form<RegisterUserForm>, route: &Route, conn: DbConn) -> Flash<Redirect> {
     match user_form.get().attrs() {
         Ok(attrs) => {
-            if let Ok(mut user) = ::models::User::by_id(id, &conn) {
+            if let Ok(mut user) = User::by_id(id, &conn) {
                 if user.username != attrs.username {
                     user.username = attrs.username.clone();
                 }
@@ -144,7 +153,7 @@ fn update(id: i32, user_form: Form<RegisterUserForm>, route: &rocket::Route, con
                 if !attrs.password.is_empty() && user.password != attrs.password {
                     user.password = attrs.password.clone();
                 }
-                match ::models::User::update(&user, &conn) {
+                match User::update(&user, &conn) {
                     Ok(user) => Flash::success(
                         Redirect::to(route.base.path()),
                         format!("User {} updated successfully", user.username)
@@ -170,6 +179,6 @@ fn update(id: i32, user_form: Form<RegisterUserForm>, route: &rocket::Route, con
     }
 }
 
-pub fn routes() -> Vec<rocket::Route> {
+pub fn routes() -> Vec<Route> {
     routes![index, new, create, edit, update, delete]
 }