summaryrefslogtreecommitdiff
path: root/src/cli.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/cli.rs')
-rw-r--r--src/cli.rs16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/cli.rs b/src/cli.rs
index 0880020..191e331 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,12 +1,14 @@
use std::io;
use std::str::FromStr;
-use axum::{routing::get, Router};
+use axum::Router;
use clap::Parser;
use sqlx::sqlite::{SqliteConnectOptions, SqlitePool, SqlitePoolOptions};
use tokio::net;
-pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
+use crate::{error::BoxedError, index, login};
+
+pub type Result<T> = std::result::Result<T, BoxedError>;
#[derive(Parser)]
pub struct Args {
@@ -26,7 +28,7 @@ impl Args {
sqlx::migrate!().run(&pool).await?;
- let app = Router::new().route("/", get(hello)).with_state(pool);
+ let app = routers().with_state(pool);
let listener = self.listener().await?;
let started_msg = started_msg(&listener)?;
@@ -58,11 +60,11 @@ impl Args {
}
}
+fn routers() -> Router<SqlitePool> {
+ index::router().merge(login::router())
+}
+
fn started_msg(listener: &net::TcpListener) -> io::Result<String> {
let local_addr = listener.local_addr()?;
Ok(format!("listening on http://{local_addr}/"))
}
-
-async fn hello() -> &'static str {
- "Hello, world"
-}