From 5bdcaf4298a4ca125af423517800a52efc6b6a74 Mon Sep 17 00:00:00 2001
From: eraden <adrian.wozniak@ita-prog.pl>
Date: Sat, 16 Apr 2022 20:20:59 +0200
Subject: [PATCH] Fix paths

---
 api/assets/index.html           |  2 +-
 api/src/routes/admin/mod.rs     | 23 +++++++++++------------
 api/src/routes/public/api_v1.rs |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/api/assets/index.html b/api/assets/index.html
index 2fa58bd..c35b75b 100644
--- a/api/assets/index.html
+++ b/api/assets/index.html
@@ -38,7 +38,7 @@
         let params = {};
         const method = mthEl.value;
 
-        paramsEl.textContent.split("\n").forEach(s => {
+        paramsEl.value.split("\n").forEach(s => {
             if (!s.length) return;
             let [k, v] = s.split("=");
             params[k] = v;
diff --git a/api/src/routes/admin/mod.rs b/api/src/routes/admin/mod.rs
index 50690d2..bfdceda 100644
--- a/api/src/routes/admin/mod.rs
+++ b/api/src/routes/admin/mod.rs
@@ -61,7 +61,7 @@ pub struct SignInInput {
     password: Password,
 }
 
-#[post("sign-in")]
+#[post("/sign-in")]
 async fn sign_in(
     session: Session,
     db: Data<Addr<Database>>,
@@ -114,7 +114,7 @@ pub enum RegisterError {
 }
 
 // login_required
-#[post("register")]
+#[post("/register")]
 async fn register(
     session: Session,
     Json(input): Json<RegisterInput>,
@@ -166,7 +166,7 @@ async fn register(
     })
 }
 
-#[get("/admin")]
+#[get("")]
 async fn landing() -> Result<HttpResponse> {
     Ok(HttpResponse::NotImplemented()
         .append_header(("Content-Type", "text/html"))
@@ -174,13 +174,12 @@ async fn landing() -> Result<HttpResponse> {
 }
 
 pub fn configure(config: &mut ServiceConfig) {
-    config
-        .service(
-            scope("/admin")
-                .service(sign_in)
-                .service(logout)
-                .service(register)
-                .service(actix_web::web::scope("/api/v1").configure(api_v1::configure)),
-        )
-        .service(landing);
+    config.service(
+        scope("/admin")
+            .service(sign_in)
+            .service(logout)
+            .service(register)
+            .service(landing)
+            .configure(api_v1::configure),
+    );
 }
diff --git a/api/src/routes/public/api_v1.rs b/api/src/routes/public/api_v1.rs
index eaf420a..aae8ac5 100644
--- a/api/src/routes/public/api_v1.rs
+++ b/api/src/routes/public/api_v1.rs
@@ -8,12 +8,12 @@ use crate::public_send_db;
 use crate::routes::admin::Error;
 use crate::routes::Result;
 
-#[get("products")]
+#[get("/products")]
 async fn products(db: Data<Addr<Database>>) -> Result<HttpResponse> {
     public_send_db!(db.into_inner(), database::AllProducts)
 }
 
-#[get("stocks")]
+#[get("/stocks")]
 async fn stocks(db: Data<Addr<Database>>) -> Result<HttpResponse> {
     public_send_db!(db.into_inner(), database::AllStocks)
 }