From 72ca947cf6092e7d9719e0780ab37e3f498b99b0 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Fri, 19 Apr 2024 16:53:08 -0700
Subject: [PATCH] rename routes to namespace them.

---
 src/lib.rs                               | 13 ++++++++-----
 src/watches/handlers.rs                  |  7 +------
 templates/add_new_watch_page.html        |  9 +++++----
 templates/elements/add_watch_button.html |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 69953cb..fb41110 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -79,14 +79,17 @@ pub async fn app(db_pool: sqlx::SqlitePool) -> IntoMakeService<axum::Router> {
         .route("/watches", get(get_watches))
         .route("/watch", get(get_watch))
         .route("/watch/:watch", get(get_watch))
-        .route("/watch/status/:watch", get(get_watch_status))
-        .route("/quest/edit", post(edit_watch_quest))
-        .route("/title-search", get(get_search_watch))
-        .route("/add", get(get_add_new_watch).post(post_add_new_watch))
         .route(
-            "/add/watch",
+            "/watch/add",
+            get(get_add_new_watch).post(post_add_new_watch),
+        )
+        .route("/watch/status/:watch", get(get_watch_status))
+        .route(
+            "/quest/add",
             get(get_search_watch).post(post_add_watch_quest),
         )
+        .route("/quest/edit", post(edit_watch_quest))
+        .route("/title-search", get(get_search_watch))
         .fallback(handle_slash_redir)
         .layer(middleware::from_fn_with_state(
             db_pool.clone(),
diff --git a/src/watches/handlers.rs b/src/watches/handlers.rs
index d7b13cf..799ab67 100644
--- a/src/watches/handlers.rs
+++ b/src/watches/handlers.rs
@@ -231,12 +231,7 @@ pub async fn edit_watch_quest(
                 .into_response(),
         )
     } else {
-        // todo: return editerror that prompts a login
-        let resp = Redirect::to("/login");
-        let mut resp = resp.into_response();
-        resp.headers_mut()
-            .insert("HX-Redirect", HeaderValue::from_str("/login").unwrap());
-        Ok(resp.into_response())
+        Err(EditErrorKind::NotSignedIn.into())
     }
 }
 
diff --git a/templates/add_new_watch_page.html b/templates/add_new_watch_page.html
index 323521c..77b7953 100644
--- a/templates/add_new_watch_page.html
+++ b/templates/add_new_watch_page.html
@@ -10,7 +10,7 @@
 {% if user.is_some() %}
 
 <div class="add-watch">
-    <form action="/add" enctype="application/x-www-form-urlencoded" method="post">
+    <form action="/watch/add" enctype="application/x-www-form-urlencoded" method="post">
         <label for="title">Title</label>
         <input type="text" name="title" id="title"></br>
 
@@ -34,7 +34,7 @@
         <input type="checkbox" name="watched_already" id="is-watched" value="true" default="false"></br>
 
         <label for="md-url">Metadata URL (TMDB, OMDB, IMDb, etc.)</label>
-        <input type="text" name="metadata_url" id="md-url"></br>        
+        <input type="text" name="metadata_url" id="md-url"></br>
 
         <input type="submit" value="Let's go!">
     </form>
@@ -45,8 +45,9 @@
 {% else %}
 
 <div class="add-watch">
-    <span class="not-logged-in">Oh dang, you need to <a href="/login">login</a> or <a href="/signup">signup</a> to add something to watch!</span>
-    
+    <span class="not-logged-in">Oh dang, you need to <a href="/login">login</a> or <a href="/signup">signup</a> to add
+        something to watch!</span>
+
 </div>
 
 {% endif %}
diff --git a/templates/elements/add_watch_button.html b/templates/elements/add_watch_button.html
index 5c86c62..96c1b45 100644
--- a/templates/elements/add_watch_button.html
+++ b/templates/elements/add_watch_button.html
@@ -55,7 +55,7 @@
 {% when None %}
 
 <form id="add-watch-{{self.watch}}">
-    <button hx-post="/add/watch" hx-target="#add-watch-{{self.watch}}" hx-trigger="click"
+    <button hx-post="/quest/add" hx-target="#add-watch-{{self.watch}}" hx-trigger="click"
         hx-swap="outerHTML">add</button>
     <select name="public" id="add-public-watch">
         <option value="true">public</option>