From e620db13852c100a70b8d53cf00ed46bd5222239 Mon Sep 17 00:00:00 2001
From: r0r-5chach <r0r-5chach.xyz@proton.me>
Date: Thu, 6 Jun 2024 19:21:12 +0100
Subject: [PATCH] refactor

---
 src/account.rs     | 35 +++++++++++++++++++++++++++++++++++
 src/api.rs         | 32 --------------------------------
 src/api/account.rs |  8 --------
 src/api/model.rs   |  1 -
 src/auth.rs        |  3 ---
 src/backup.rs      |  1 -
 src/lib.rs         | 11 ++++++++---
 src/model.rs       |  8 ++++++++
 8 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 src/account.rs
 delete mode 100644 src/api.rs
 delete mode 100644 src/api/account.rs
 delete mode 100644 src/api/model.rs
 delete mode 100644 src/auth.rs
 delete mode 100644 src/backup.rs
 create mode 100644 src/model.rs

diff --git a/src/account.rs b/src/account.rs
new file mode 100644
index 0000000..52bb366
--- /dev/null
+++ b/src/account.rs
@@ -0,0 +1,35 @@
+use axum::{
+    Router,
+    routing::{get, post}
+};
+
+pub fn router() -> Router {
+    Router::new()
+        .nest("/:user_id", user_router())
+        .route("/", 
+            post(post_sign_up)
+        )
+}
+
+fn user_router() -> Router {
+    Router::new()
+        .route("/sign-in",
+            get(get_sign_in)
+            .post(post_sign_in)
+        )
+        .route("/backup",
+            post(post_backup)
+        )
+        .route("/restore",
+            get(get_restore)
+        )
+}
+
+pub async fn get_sign_in() {}
+pub async fn post_sign_in() {}
+
+pub async fn post_sign_up() {}
+
+pub async fn post_backup() {}
+
+pub async fn get_restore() {}
diff --git a/src/api.rs b/src/api.rs
deleted file mode 100644
index 61fefd0..0000000
--- a/src/api.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use axum::{
-    Router,
-    routing::{get, post}
-};
-
-mod account;
-mod model;
-
-pub fn api_router() -> Router {
-    Router::new()
-        .nest("/account/:user_id", account_router())
-        .route("/account", 
-            post(account::post_sign_up)
-        )
-        .route("/predict", 
-            get(model::get_predict)
-        )
-}
-
-fn account_router() -> Router {
-    Router::new()
-        .route("/sign-in",
-            get(account::get_sign_in)
-            .post(account::post_sign_in)
-        )
-        .route("/backup",
-            post(account::post_backup)
-        )
-        .route("/restore",
-            get(account::get_restore)
-        )
-}
diff --git a/src/api/account.rs b/src/api/account.rs
deleted file mode 100644
index f98f71d..0000000
--- a/src/api/account.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub async fn get_sign_in() {}
-pub async fn post_sign_in() {}
-
-pub async fn post_sign_up() {}
-
-pub async fn post_backup() {}
-
-pub async fn get_restore() {}
diff --git a/src/api/model.rs b/src/api/model.rs
deleted file mode 100644
index 6b76f61..0000000
--- a/src/api/model.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub async fn get_predict() {}
diff --git a/src/auth.rs b/src/auth.rs
deleted file mode 100644
index ae196ca..0000000
--- a/src/auth.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-//TODO: New User Auth loop
-//TODO: Existing User Auth loop
-//TODO: Hash Function
diff --git a/src/backup.rs b/src/backup.rs
deleted file mode 100644
index a39e158..0000000
--- a/src/backup.rs
+++ /dev/null
@@ -1 +0,0 @@
-//TODO: Logic for backing up an account
diff --git a/src/lib.rs b/src/lib.rs
index a2e4dc5..1de6955 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,9 @@
-pub mod api;
-mod auth;
-mod backup;
+mod account;
 mod db;
+mod model;
+
+pub fn router() -> axum::Router {
+    axum::Router::new()
+        .nest("/account", account::router())
+        .nest("/predict", model::router())
+}
diff --git a/src/model.rs b/src/model.rs
new file mode 100644
index 0000000..7351299
--- /dev/null
+++ b/src/model.rs
@@ -0,0 +1,8 @@
+pub fn router() -> axum::Router {
+    axum::Router::new()
+        .route("/", 
+            axum::routing::post(get_predict)
+        )
+}
+
+async fn get_predict() {}