diff --git a/src/callers/mod.rs b/src/callers/mod.rs index 542c384..b938401 100644 --- a/src/callers/mod.rs +++ b/src/callers/mod.rs @@ -3,6 +3,8 @@ pub mod queue; pub mod song; pub mod endpoints { + pub const ROOT: &str = "/"; + pub const CREATESONG: &str = "/api/v2/song"; pub const GETSONGS: &str = "/api/v2/song"; pub const GETALLSONGS: &str = "/api/v2/song/all"; @@ -17,3 +19,8 @@ pub mod endpoints { pub mod response { pub const SUCCESSFUL: &str = "SUCCESSFUL"; } + +/// Basic handler that responds with a static string +pub async fn root() -> &'static str { + "Hello, World!" +} diff --git a/src/config/host.rs b/src/config/host.rs new file mode 100644 index 0000000..1fb74e4 --- /dev/null +++ b/src/config/host.rs @@ -0,0 +1,8 @@ + +/// Full hosting address that the application will be broadcasting +pub fn get_full() -> String { + format!("{ADDRESS}:{PORT}") +} + +pub const ADDRESS: &str = "0.0.0.0"; +pub const PORT: &str = "8080"; diff --git a/src/config/mod.rs b/src/config/mod.rs new file mode 100644 index 0000000..5361e40 --- /dev/null +++ b/src/config/mod.rs @@ -0,0 +1 @@ +pub mod host; diff --git a/src/main.rs b/src/main.rs index e028386..e25a950 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ pub mod auth; +pub mod config; pub mod callers; pub mod repo; @@ -41,7 +42,7 @@ async fn main() { // build our application with a route let app = init::app().await; - let listener = tokio::net::TcpListener::bind(get_full()).await.unwrap(); + let listener = tokio::net::TcpListener::bind(config::host::get_full()).await.unwrap(); axum::serve(listener, app).await.unwrap(); } @@ -139,7 +140,7 @@ pub mod init { pub async fn routes() -> axum::Router { axum::Router::new() - .route(crate::ROOT, get(crate::root)) + .route(crate::callers::endpoints::ROOT, get(crate::callers::root)) .route( crate::callers::queue::endpoints::QUEUESONG, post(crate::callers::queue::song::endpoint::queue_song).route_layer( @@ -304,27 +305,7 @@ pub mod init { } } -// TODO: Move elsewhere -fn get_full() -> String { - get_address() + ":" + &get_port() -} -// TODO: Move elsewhere -fn get_address() -> String { - String::from("0.0.0.0") -} -// TODO: Move elsewhere -fn get_port() -> String { - String::from("8000") -} - -// TODO: Move elsewhere -pub const ROOT: &str = "/"; -// TODO: Move elsewhere -// basic handler that responds with a static string -pub async fn root() -> &'static str { - "Hello, World!" -} #[cfg(test)] mod tests {