Fix merge issues

backend/src/main.rs

@@ -53,12 +53,18 @@ async fn main() {
     // build our application with some routes
     let app = Router::new()
         .route("/dashboard", get(dashboard))
-        .route("/cottagecalendar", get(cottagecalendar))
+
+        // User
         .route("/profile", get(profile))
         .route("/useradmin", get(useradmin))
         .route("/users/:user_id", get(user_profile))
         .route("/roles/:user_id/:role_id/add", get(add_user_role))
         .route("/roles/:user_id/:user_role_id/delete", get(delete_user_role))
+
+        // Calendar
+        .route("/cottagecalendar", get(cottagecalendar))
+
+        // Wishlist
         .route("/wishlists", get(wishlists))
         .route("/userwishlist/:user_id", get(user_wishlist))
         .route("/userwishlist/add/:user_id", get(user_wishlist_add).post(user_wishlist_add_item))
@@ -67,8 +73,11 @@ async fn main() {
         .route("/userwishlist/received/:user_id", get(user_wishlist_received_item))
         .route("/userwishlist/delete/:item_id", get(user_wishlist_delete_item))
         .route("/userwishlist/returned/:item_id", get(user_wishlist_returned_item))
-        .route("/giftexchanges", get(giftexchanges))
+
-        .route("/giftexchange/:giftexchange_id", get(giftexchange).post(giftexchange_save))
+        // Secret Gift Exchange - Not ready for public use yet
+        //.route("/giftexchanges", get(giftexchanges))
+        //.route("/giftexchange/:giftexchange_id", get(giftexchange).post(giftexchange_save))
+
         .nest_service("/assets", ServeDir::new("templates/assets")
             .fallback(get_service(ServeDir::new("templates/assets"))))
         .route("/", get(index))

backend/src/routes.rs

@@ -75,7 +75,6 @@ pub async fn index(
     if logged_in {
         // Extract the user data.
         let user = user_data.as_ref().unwrap().clone();
-        let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
         
         if is_authorized("/dashboard", user_data, db_pool).await {
             Redirect::to("/dashboard").into_response()

backend/src/secret_gift_exchange.rs

@@ -92,7 +92,7 @@ struct GiftExchange {
 #[template(path = "giftexchanges.html")]
 struct GiftExchangesTemplate {
     logged_in: bool,
-    name: String,
+    user: UserData,
     user_roles: Vec<crate::user::UserRolesDisplay>,
     giftexchanges: Vec<GiftExchange>,
 }
@@ -101,24 +101,26 @@ pub async fn giftexchanges(
     Extension(user_data): Extension<Option<UserData>>,
     State(db_pool): State<SqlitePool>,
 ) -> impl IntoResponse {
-    let user_name = user_data.as_ref().map(|s| s.name.clone());
+    // Is the user logged in?
-    let logged_in = user_name.is_some();
+    let logged_in = user_data.is_some();
-    let name = user_name.unwrap_or_default();
+
+    if logged_in {
+        // Extract the user data.
+        let user = user_data.as_ref().unwrap().clone();
+        let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
 
         let giftexchanges = sqlx::query_as::<_, GiftExchange>("SELECT * FROM gift_exchange")
             .fetch_all(&db_pool)
             .await
             .unwrap();
 
-    let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
-
         if is_authorized("/giftexchange", user_data, db_pool.clone()).await {
             // Get user roles
             let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
 
             let template = GiftExchangesTemplate {
                 logged_in,
-            name,
+                user,
                 user_roles,
                 giftexchanges,
             };
@@ -126,6 +128,9 @@ pub async fn giftexchanges(
         } else {
             Redirect::to("/").into_response()
         }
+    } else {
+        Redirect::to("/").into_response()
+    }
 }
 
 #[derive(Default, Clone, Debug, Serialize, Deserialize, FromRow)]
@@ -144,7 +149,7 @@ struct GiftExchangeParticipant {
 #[template(path = "giftexchange.html")]
 struct GiftExchangeTemplate {
     logged_in: bool,
-    name: String,
+    user: UserData,
     user_roles: Vec<crate::user::UserRolesDisplay>,
     giftexchange: GiftExchange,
     participants: Vec<UserData>,
@@ -156,9 +161,12 @@ pub async fn giftexchange(
     Extension(user_data): Extension<Option<UserData>>,
     State(db_pool): State<SqlitePool>,
 ) -> impl IntoResponse {
-    let user_name = user_data.as_ref().map(|s| s.name.clone());
+    // Is the user logged in?
-    let logged_in = user_name.is_some();
+    let logged_in = user_data.is_some();
-    let name = user_name.unwrap_or_default();
+
+    if logged_in {
+        // Extract the user data.
+        let user = user_data.as_ref().unwrap().clone();
         let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
 
         if is_authorized("/giftexchange", user_data, db_pool.clone()).await {
@@ -198,7 +206,7 @@ pub async fn giftexchange(
 
             let template = GiftExchangeTemplate {
                 logged_in,
-            name,
+                user,
                 user_roles,
                 giftexchange,
                 participants,
@@ -208,6 +216,9 @@ pub async fn giftexchange(
         } else {
             Redirect::to("/").into_response()
         }
+    } else {
+        Redirect::to("/").into_response()
+    }
 }
 
 #[derive(Deserialize, Debug)]

backend/src/wishlist.rs

@@ -1,12 +1,8 @@
 use askama_axum::{IntoResponse, Response, Template};
 use axum::{
-    
     extract::{Path, State},
-   
     response::Redirect,
-   
     Extension, Form,
-,
 };
 use axum_extra::response::Html;
 use chrono::Utc;
@@ -15,14 +11,11 @@ use serde::Deserialize;
 use sqlx::{Row, SqlitePool};
 
 use crate::{
-    
     middlewares::is_authorized,
-   
     user::{
         get_user_roles_display, get_user_wishlist_item_by_id, get_user_wishlist_items, UserData,
         UserWishlistItem,
     },
-,
 };
 
 struct HtmlTemplate<T>(T);
@@ -210,7 +203,6 @@ pub async fn user_wishlist_add_item(
     State(db_pool): State<SqlitePool>,
     Extension(user_data): Extension<Option<UserData>>,
     Form(item_form): Form<ItemForm>,
-    Form(item_form): Form<ItemForm>,
 ) -> impl IntoResponse {
     if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
         // Insert new item to database
@@ -257,8 +249,6 @@ pub async fn user_wishlist_edit_item(
         let user = user_data.as_ref().unwrap().clone();
         let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
 
-        // Extract the user data.
-
         if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
             // Get user roles
             let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;