From 61e81ca894d456bb82d3be5865ba57d93c7fc9a5 Mon Sep 17 00:00:00 2001
From: Per Stark <perstark.se@gmail.com>
Date: Thu, 26 Dec 2024 23:05:14 +0100
Subject: [PATCH] feat signout and reactivity

---
 src/bin/server.rs                 |  2 ++
 src/server/routes/html/index.rs   |  8 +++++---
 src/server/routes/html/mod.rs     |  1 +
 src/server/routes/html/signout.rs | 18 ++++++++++++++++++
 templates/auth/signup_form.html   |  3 +--
 templates/body_base.html          | 16 ++++++----------
 templates/head_base.html          |  3 ++-
 7 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 src/server/routes/html/signout.rs

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 15290be..0c95877 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -26,6 +26,7 @@ use zettle_db::{
             html::{
                 index::index_handler,
                 search_result::search_result_handler,
+                signout::sign_out_user,
                 signup::{process_signup_and_show_verification, show_signup_form},
             },
         },
@@ -147,6 +148,7 @@ fn html_routes(
     Router::new()
         .route("/", get(index_handler))
         .route("/search", get(search_result_handler))
+        .route("/signout", get(sign_out_user))
         .route(
             "/signup",
             get(show_signup_form).post(process_signup_and_show_verification),
diff --git a/src/server/routes/html/index.rs b/src/server/routes/html/index.rs
index d1bd6d0..dc5e108 100644
--- a/src/server/routes/html/index.rs
+++ b/src/server/routes/html/index.rs
@@ -13,6 +13,7 @@ use crate::{
 
 page_data!(IndexData, "index.html", {
     queue_length: u32,
+    user: Option<User>
 });
 
 pub async fn index_handler(
@@ -21,11 +22,12 @@ pub async fn index_handler(
 ) -> Result<Html<String>, ApiError> {
     info!("Displaying index page");
 
-    info!("{:?}", auth.current_user);
-
     let queue_length = state.rabbitmq_consumer.get_queue_length().await?;
 
-    let data = IndexData { queue_length };
+    let data = IndexData {
+        queue_length,
+        user: auth.current_user,
+    };
 
     let output = render_template(IndexData::template_name(), data, state.templates)?;
 
diff --git a/src/server/routes/html/mod.rs b/src/server/routes/html/mod.rs
index c3f8712..a409ff9 100644
--- a/src/server/routes/html/mod.rs
+++ b/src/server/routes/html/mod.rs
@@ -6,6 +6,7 @@ use minijinja_autoreload::AutoReloader;
 pub mod index;
 pub mod search_result;
 pub mod signin;
+pub mod signout;
 pub mod signup;
 
 pub trait PageData {
diff --git a/src/server/routes/html/signout.rs b/src/server/routes/html/signout.rs
new file mode 100644
index 0000000..4bbc35b
--- /dev/null
+++ b/src/server/routes/html/signout.rs
@@ -0,0 +1,18 @@
+use axum::response::{IntoResponse, Redirect};
+use axum_session_auth::AuthSession;
+use axum_session_surreal::SessionSurrealPool;
+use surrealdb::{engine::any::Any, Surreal};
+
+use crate::{error::ApiError, storage::types::user::User};
+
+pub async fn sign_out_user(
+    auth: AuthSession<User, String, SessionSurrealPool<Any>, Surreal<Any>>,
+) -> Result<impl IntoResponse, ApiError> {
+    if !auth.is_authenticated() {
+        return Ok(Redirect::to("/").into_response());
+    }
+
+    auth.logout_user();
+
+    Ok(Redirect::to("/").into_response())
+}
diff --git a/templates/auth/signup_form.html b/templates/auth/signup_form.html
index 855e5e8..0145ed4 100644
--- a/templates/auth/signup_form.html
+++ b/templates/auth/signup_form.html
@@ -15,8 +15,7 @@
         <label class="label">
           <span class="label-text">Email</span>
         </label>
-        <input type="email" name="email" placeholder="Enter your email" class="input input-bordered w-full" required
-          pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}$" />
+        <input type="email" name="email" placeholder="Enter your email" class="input input-bordered w-full" required />
       </div>
 
       <div class="form-control">
diff --git a/templates/body_base.html b/templates/body_base.html
index edd12e8..7617ce4 100644
--- a/templates/body_base.html
+++ b/templates/body_base.html
@@ -5,21 +5,17 @@
 <body class="min-h-screen">
   <nav class="navbar bg-base-200">
     <div class="flex-1">
-      <a class="btn text-xl border-transparent btn-outline btn-primary" href="/">minnet</a>
+      <a class="btn text-xl border-transparent btn-outline btn-primary" href="/">Minne</a>
     </div>
     <div class="flex-none">
       <ul class="menu menu-horizontal px-1">
+        {% if user %}
+        <li><a hx-boost="true" href="/account">Account</a></li>
+        <li><a hx-boost="true" href="/signout">Sign out</a></li>
+        {% else %}
         <li><a hx-boost="true" href="/signin">Login</a></li>
         <li><a hx-boost="true" href="/signup">Sign up</a></li>
-        <li>
-          <details>
-            <summary>Parent</summary>
-            <ul class="bg-base-100 rounded-t-none p-2">
-              <li><a>Link 1</a></li>
-              <li><a>Link 2</a></li>
-            </ul>
-          </details>
-        </li>
+        {% endif %}
       </ul>
     </div>
   </nav>
diff --git a/templates/head_base.html b/templates/head_base.html
index d00b90e..fc71f55 100644
--- a/templates/head_base.html
+++ b/templates/head_base.html
@@ -4,10 +4,11 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>{% block title %}minnet{% endblock %}</title>
+  <title>{% block title %}Minne{% endblock %}</title>
   <script src="assets/htmx.min.js"></script>
   <link rel="stylesheet" href="assets/style.css">
   <link rel="manifest" href="/assets/manifest.json">
+
   <!-- Optional but recommended for iOS support -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <link rel="apple-touch-icon" href="/assets/icons/icon-192x192.png">