From 27517e1aee9ef05bf3b9f879fec7c90bfd3e61ad Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Tue, 3 Sep 2019 13:58:44 -0700 Subject: [PATCH] Rename web::interface to web::ui --- src/web/mod.rs | 12 ++++++------ src/web/{interface.rs => ui.rs} | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) rename src/web/{interface.rs => ui.rs} (93%) diff --git a/src/web/mod.rs b/src/web/mod.rs index b1be8f7f..613c2d94 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -1,5 +1,5 @@ mod api; -mod interface; +mod ui; mod util; use std::sync::Arc; @@ -13,11 +13,11 @@ use log::trace; use crate::serve_session::ServeSession; -use self::{api::ApiService, interface::InterfaceService}; +use self::{api::ApiService, ui::UiService}; pub struct RootService { - api: api::ApiService, - interface: interface::InterfaceService, + api: ApiService, + ui: UiService, } impl Service for RootService { @@ -32,7 +32,7 @@ impl Service for RootService { if request.uri().path().starts_with("/api") { self.api.call(request) } else { - self.interface.call(request) + self.ui.call(request) } } } @@ -41,7 +41,7 @@ impl RootService { pub fn new(serve_session: Arc) -> RootService { RootService { api: ApiService::new(Arc::clone(&serve_session)), - interface: InterfaceService::new(Arc::clone(&serve_session)), + ui: UiService::new(Arc::clone(&serve_session)), } } } diff --git a/src/web/interface.rs b/src/web/ui.rs similarity index 93% rename from src/web/interface.rs rename to src/web/ui.rs index 9db7c109..03d0a69f 100644 --- a/src/web/interface.rs +++ b/src/web/ui.rs @@ -10,12 +10,12 @@ use crate::{serve_session::ServeSession, web_interface::SERVER_VERSION}; static HOME_CSS: &str = include_str!("../../assets/index.css"); -pub struct InterfaceService { +pub struct UiService { #[allow(unused)] // TODO: Fill out interface service serve_session: Arc, } -impl Service for InterfaceService { +impl Service for UiService { type ReqBody = Body; type ResBody = Body; type Error = hyper::Error; @@ -36,9 +36,9 @@ impl Service for InterfaceService { } } -impl InterfaceService { - pub fn new(serve_session: Arc) -> InterfaceService { - InterfaceService { serve_session } +impl UiService { + pub fn new(serve_session: Arc) -> UiService { + UiService { serve_session } } fn handle_home(&self) -> Response {