fix rerendering logout button, console page

4 files changed, 28 insertions, 23 deletions

diff --git a/src/api/auth.rs b/src/api/auth.rs
index 54c4e06..253e982 100644
--- a/src/api/auth.rs
+++ b/src/api/auth.rs
@@ -3,7 +3,7 @@ use serde::Deserialize;
 use time::{OffsetDateTime, Duration};
 use tower_cookies::{Cookies, Cookie};
 
-use crate::types::{user::User, response::ResponseCode, session::Session, extract::{Json, AuthorizedUser, Check, CheckResult}};
+use crate::types::{user::User, response::ResponseCode, session::Session, extract::{Json, AuthorizedUser, Check, CheckResult, Log}};
 
 #[derive(Deserialize)]
 struct RegistrationRequet {
@@ -55,7 +55,7 @@ async fn register(cookies: Cookies, Json(body): Json<RegistrationRequet>) -> Res
 
     cookies.add(cookie);
 
-    ResponseCode::Created.msg("Successfully created new user")
+    ResponseCode::Created.text("Successfully created new user")
 }
 
 #[derive(Deserialize)]
@@ -73,11 +73,11 @@ impl Check for LoginRequest {
 async fn login(cookies: Cookies, Json(body): Json<LoginRequest>) -> Response {
     
     let Ok(user) = User::from_email(&body.email) else {
-        return ResponseCode::BadRequest.msg("Email is not registered")
+        return ResponseCode::BadRequest.text("Email is not registered")
     };
 
     if user.password != body.password {
-        return ResponseCode::BadRequest.msg("Password is not correct")
+        return ResponseCode::BadRequest.text("Password is not correct")
     }
 
     let session = match Session::new(user.user_id) {
@@ -96,10 +96,10 @@ async fn login(cookies: Cookies, Json(body): Json<LoginRequest>) -> Response {
 
     cookies.add(cookie);
 
-    ResponseCode::Success.msg("Successfully logged in")
+    ResponseCode::Success.text("Successfully logged in")
 }
 
-async fn logout(cookies: Cookies, AuthorizedUser(user): AuthorizedUser) -> Response {
+async fn logout(cookies: Cookies, AuthorizedUser(user): AuthorizedUser, _: Log) -> Response {
 
     cookies.remove(Cookie::new("auth", ""));
 
@@ -107,7 +107,7 @@ async fn logout(cookies: Cookies, AuthorizedUser(user): AuthorizedUser) -> Respo
         return err
     }
 
-    ResponseCode::Success.msg("Successfully logged out")
+    ResponseCode::Success.text("Successfully logged out")
 }
 
 pub fn router() -> Router {
diff --git a/src/api/pages.rs b/src/api/pages.rs
index 4701795..b2bef82 100644
--- a/src/api/pages.rs
+++ b/src/api/pages.rs
@@ -1,6 +1,6 @@
 use axum::{Router, response::{Response, Redirect, IntoResponse}, routing::get};
 
-use crate::types::{extract::AuthorizedUser, response::ResponseCode};
+use crate::{types::{extract::AuthorizedUser, response::ResponseCode}, console};
 
 async fn root(user: Option<AuthorizedUser>) -> Response {
     if user.is_some() {
@@ -42,8 +42,12 @@ async fn profile(user: Option<AuthorizedUser>) -> Response {
     }
 }
 
+async fn console() -> Response {
+    console::generate().await
+}
+
 async fn wordpress() -> Response {
-    ResponseCode::ImATeapot.msg("Hello i am a teapot owo")
+    ResponseCode::ImATeapot.text("Hello i am a teapot owo")
 }
 
 pub fn router() -> Router {
@@ -53,5 +57,6 @@ pub fn router() -> Router {
     .route("/home", get(home))
     .route("/people", get(people))
     .route("/profile", get(profile))
+    .route("/console", get(console))
     .route("/wp-admin", get(wordpress))
 }
\ No newline at end of file
diff --git a/src/api/posts.rs b/src/api/posts.rs
index 6830c1a..fda1fb1 100644
--- a/src/api/posts.rs
+++ b/src/api/posts.rs
@@ -19,11 +19,11 @@ impl Check for PostCreateRequest {
 async fn create(AuthorizedUser(user): AuthorizedUser, Json(body): Json<PostCreateRequest>) -> Response {
 
     let Ok(post) = Post::new(user.user_id, body.content) else {
-        return ResponseCode::InternalServerError.msg("Failed to create post")
+        return ResponseCode::InternalServerError.text("Failed to create post")
     };
 
     let Ok(json) = serde_json::to_string(&post) else {
-        return ResponseCode::InternalServerError.msg("Failed to create post")
+        return ResponseCode::InternalServerError.text("Failed to create post")
     };
 
     ResponseCode::Created.json(&json)
@@ -43,11 +43,11 @@ impl Check for PostPageRequest {
 async fn page(AuthorizedUser(_user): AuthorizedUser, Json(body): Json<PostPageRequest>) -> Response {
     
     let Ok(posts) = Post::from_post_page(body.page) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch posts")
+        return ResponseCode::InternalServerError.text("Failed to fetch posts")
     };
 
     let Ok(json) = serde_json::to_string(&posts) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch posts")
+        return ResponseCode::InternalServerError.text("Failed to fetch posts")
     };
 
     ResponseCode::Success.json(&json)
@@ -67,11 +67,11 @@ impl Check for UsersPostsRequest {
 async fn user(AuthorizedUser(_user): AuthorizedUser, Json(body): Json<UsersPostsRequest>) -> Response {
     
     let Ok(posts) = Post::from_user_id(body.user_id) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch posts")
+        return ResponseCode::InternalServerError.text("Failed to fetch posts")
     };
 
     let Ok(json) = serde_json::to_string(&posts) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch posts")
+        return ResponseCode::InternalServerError.text("Failed to fetch posts")
     };
 
     ResponseCode::Success.json(&json)
@@ -93,14 +93,14 @@ impl Check for PostCommentRequest {
 async fn comment(AuthorizedUser(user): AuthorizedUser, Json(body): Json<PostCommentRequest>) -> Response {
     
     let Ok(mut post) = Post::from_post_id(body.post_id) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch posts")
+        return ResponseCode::InternalServerError.text("Failed to fetch posts")
     };
 
     if let Err(err) = post.comment(user.user_id, body.content) {
         return err;
     }
 
-    ResponseCode::Success.msg("Successfully commented on post")
+    ResponseCode::Success.text("Successfully commented on post")
 }
 
 #[derive(Deserialize)]
@@ -118,14 +118,14 @@ impl Check for PostLikeRequest {
 async fn like(AuthorizedUser(user): AuthorizedUser, Json(body): Json<PostLikeRequest>) -> Response {
     
     let Ok(mut post) = Post::from_post_id(body.post_id) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch posts")
+        return ResponseCode::InternalServerError.text("Failed to fetch posts")
     };
 
     if let Err(err) = post.like(user.user_id, body.state) {
         return err;
     }
 
-    ResponseCode::Success.msg("Successfully changed like status on post")
+    ResponseCode::Success.text("Successfully changed like status on post")
 }
 
 pub fn router() -> Router {
diff --git a/src/api/users.rs b/src/api/users.rs
index 45ed195..7bea200 100644
--- a/src/api/users.rs
+++ b/src/api/users.rs
@@ -17,7 +17,7 @@ async fn load_batch(AuthorizedUser(_user): AuthorizedUser, Json(body): Json<User
     
     let users = User::from_user_ids(body.ids);
     let Ok(json) = serde_json::to_string(&users) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch users")
+        return ResponseCode::InternalServerError.text("Failed to fetch users")
     };
 
     ResponseCode::Success.json(&json)
@@ -37,11 +37,11 @@ impl Check for UserPageReqiest {
 async fn load_page(AuthorizedUser(_user): AuthorizedUser, Json(body): Json<UserPageReqiest>) -> Response {
     
     let Ok(users) = User::from_user_page(body.page) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch users")
+        return ResponseCode::InternalServerError.text("Failed to fetch users")
     };
 
     let Ok(json) = serde_json::to_string(&users) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch users")
+        return ResponseCode::InternalServerError.text("Failed to fetch users")
     };
 
     ResponseCode::Success.json(&json)
@@ -50,7 +50,7 @@ async fn load_page(AuthorizedUser(_user): AuthorizedUser, Json(body): Json<UserP
 async fn load_self(AuthorizedUser(user): AuthorizedUser) -> Response {
     
     let Ok(json) = serde_json::to_string(&user) else {
-        return ResponseCode::InternalServerError.msg("Failed to fetch user")
+        return ResponseCode::InternalServerError.text("Failed to fetch user")
     };
 
     ResponseCode::Success.json(&json)