chris
/
jean-marie
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add functions for delete and return to wishlists

This commit is contained in:
Chris Jean-Marie 2024-11-25 15:02:21 +00:00
parent 8bc418ebb2
commit 3ba76fdb39
5 changed files with 349 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main.rs
View File

@ -19,7 +19,7 @@ use middlewares::inject_user_data;
use google_oauth::{login, logout, google_auth_return}; use google_oauth::{login, logout, google_auth_return};
use routes::{about, contact, cottagecalendar, dashboard, index, profile, user_profile, useradmin}; use routes::{about, contact, cottagecalendar, dashboard, index, profile, user_profile, useradmin};
use user::{add_user_role, delete_user_role, UserData}; use user::{add_user_role, delete_user_role, UserData};
use wishlist::{user_wishlist, user_wishlist_add, user_wishlist_add_item, user_wishlist_bought_item, user_wishlist_edit_item, user_wishlist_received_item, user_wishlist_save_item, wishlists}; use wishlist::{user_wishlist, user_wishlist_add, user_wishlist_add_item, user_wishlist_bought_item, user_wishlist_delete_item, user_wishlist_edit_item, user_wishlist_received_item, user_wishlist_returned_item, user_wishlist_save_item, wishlists};
//use email::send_emails; //use email::send_emails;
#[derive(Clone)] #[derive(Clone)]
@ -63,6 +63,8 @@ async fn main() {
.route("/userwishlist/edit/:item_id", get(user_wishlist_edit_item).post(user_wishlist_save_item)) .route("/userwishlist/edit/:item_id", get(user_wishlist_edit_item).post(user_wishlist_save_item))
.route("/userwishlist/bought/:user_id", get(user_wishlist_bought_item)) .route("/userwishlist/bought/:user_id", get(user_wishlist_bought_item))
.route("/userwishlist/received/:user_id", get(user_wishlist_received_item)) .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))
.nest_service("/assets", ServeDir::new("templates/assets") .nest_service("/assets", ServeDir::new("templates/assets")
.fallback(get_service(ServeDir::new("templates/assets")))) .fallback(get_service(ServeDir::new("templates/assets"))))
.route("/", get(index)) .route("/", get(index))

212
backend/src/routes.rs
View File

@ -17,7 +17,6 @@ use crate::{
#[template(path = "profile.html")] #[template(path = "profile.html")]
struct ProfileTemplate { struct ProfileTemplate {
logged_in: bool, logged_in: bool,
name: String,
user: UserData, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
} }
@ -26,7 +25,7 @@ struct ProfileTemplate {
#[template(path = "user.html")] #[template(path = "user.html")]
struct UserProfileTemplate { struct UserProfileTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
profile: UserData, profile: UserData,
profile_roles: Vec<crate::user::UserRolesDisplay>, profile_roles: Vec<crate::user::UserRolesDisplay>,
@ -55,14 +54,14 @@ where
#[template(path = "index.html")] #[template(path = "index.html")]
struct IndexTemplate { struct IndexTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
} }
#[derive(Template)] #[derive(Template)]
#[template(path = "dashboard.html")] #[template(path = "dashboard.html")]
struct DashboardTemplate { struct DashboardTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
} }
@ -70,13 +69,22 @@ pub async fn index(
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
let name = user_data.as_ref().map(|s| s.name.clone()).unwrap_or_default(); // Is the user logged in?
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
if is_authorized("/dashboard", user_data, db_pool).await { if logged_in {
Redirect::to("/dashboard").into_response() // 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()
} else {
let template = IndexTemplate { logged_in, user };
HtmlTemplate(template).into_response()
}
} else { } else {
let template = IndexTemplate { logged_in, name }; let template = IndexTemplate { logged_in, user: UserData::default() };
HtmlTemplate(template).into_response() HtmlTemplate(template).into_response()
} }
} }
@ -85,16 +93,27 @@ pub async fn dashboard(
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default(); // Is the user logged in?
let name = user_data.as_ref().map(|s| s.name.clone()).unwrap_or_default();
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
if is_authorized("/dashboard", user_data, db_pool.clone()).await { if logged_in {
// Get user roles // Extract the user data.
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await; let user = user_data.as_ref().unwrap().clone();
let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
let template = DashboardTemplate { logged_in, name, user_roles }; if is_authorized("/dashboard", user_data, db_pool.clone()).await {
HtmlTemplate(template).into_response() // Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
let template = DashboardTemplate {
logged_in,
user,
user_roles,
};
HtmlTemplate(template).into_response()
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -105,24 +124,22 @@ pub async fn profile(
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
// Extract the user's name from the user data. // Is the user logged in?
let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
let name = user_data.as_ref().map(|s| s.name.clone()).unwrap_or_default();
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
if logged_in { if logged_in {
// Extract the user data. // Extract the user data.
let user = user_data.as_ref().unwrap().clone(); 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("/profile", user_data, db_pool.clone()).await { if is_authorized("/profile", user_data, db_pool.clone()).await {
// Get user roles // Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await; let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
// Create the profile template. // Create the profile template.
let template = ProfileTemplate { let template = ProfileTemplate {
logged_in, logged_in,
name, user,
user: user.clone(),
user_roles, user_roles,
}; };
return HtmlTemplate(template).into_response(); return HtmlTemplate(template).into_response();
@ -139,37 +156,43 @@ pub async fn user_profile(
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
// Extract the user's name from the user data. // Is the user logged in?
let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
let name = user_data.as_ref().map(|s| s.name.clone()).unwrap_or_default();
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
// Extract the user data. if logged_in {
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id) // Extract the user data.
.fetch_one(&db_pool) let user = user_data.as_ref().unwrap().clone();
.await let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
.unwrap();
if is_authorized("/users", user_data, db_pool.clone()).await { // Extract the user data.
// Get logged in user roles let profile = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await; .fetch_one(&db_pool)
.await
.unwrap();
// Get user roles if is_authorized("/users", user_data, db_pool.clone()).await {
let profile_roles = get_user_roles_display(user_id, &db_pool.clone()).await; // Get logged in user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
// Get roles user does not have // Get user roles
let non_profile_roles = get_other_roles_display(user_id, &db_pool.clone()).await; let profile_roles = get_user_roles_display(user_id, &db_pool.clone()).await;
// Create the profile template. // Get roles user does not have
let template = UserProfileTemplate { let non_profile_roles = get_other_roles_display(user_id, &db_pool.clone()).await;
logged_in,
name, // Create the profile template.
user_roles, let template = UserProfileTemplate {
profile: user, logged_in,
profile_roles, user,
non_profile_roles, user_roles,
}; profile,
return HtmlTemplate(template).into_response(); profile_roles,
non_profile_roles,
};
return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -179,37 +202,43 @@ pub async fn user_profile(
#[template(path = "useradmin.html")] #[template(path = "useradmin.html")]
struct UserAdminTemplate { struct UserAdminTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
users: Vec<UserData>,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
users: Vec<UserData>,
} }
pub async fn useradmin( pub async fn useradmin(
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
) -> impl IntoResponse { ) -> 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();
let users = sqlx::query_as::<_, UserData>("SELECT * FROM users") 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 users = sqlx::query_as::<_, UserData>("SELECT * FROM users")
.fetch_all(&db_pool) .fetch_all(&db_pool)
.await .await
.unwrap(); .unwrap();
let user_id = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
if is_authorized("/useradmin", user_data, db_pool.clone()).await { if is_authorized("/useradmin", user_data, db_pool.clone()).await {
// Get user roles // Get user roles
let user_roles = get_user_roles_display(user_id, &db_pool.clone()).await; let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
let template = UserAdminTemplate { let template = UserAdminTemplate {
logged_in, logged_in,
name, user,
users, user_roles,
user_roles, users,
}; };
HtmlTemplate(template).into_response() HtmlTemplate(template).into_response()
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -219,15 +248,17 @@ pub async fn useradmin(
#[template(path = "about.html")] #[template(path = "about.html")]
struct AboutTemplate { struct AboutTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
} }
pub async fn about(Extension(user_data): Extension<Option<UserData>>) -> impl IntoResponse { pub async fn about(Extension(user_data): Extension<Option<UserData>>) -> impl IntoResponse {
let user_name = user_data.map(|s| s.name); // 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();
let template = AboutTemplate { logged_in, name }; // Extract the user data.
let user = user_data.as_ref().unwrap().clone();
let template = AboutTemplate { logged_in, user };
HtmlTemplate(template) HtmlTemplate(template)
} }
@ -235,15 +266,17 @@ pub async fn about(Extension(user_data): Extension<Option<UserData>>) -> impl In
#[template(path = "contactus.html")] #[template(path = "contactus.html")]
struct ContactTemplate { struct ContactTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
} }
pub async fn contact(Extension(user_data): Extension<Option<UserData>>) -> impl IntoResponse { pub async fn contact(Extension(user_data): Extension<Option<UserData>>) -> impl IntoResponse {
let user_name = user_data.map(|s| s.name); // 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();
let template = ContactTemplate { logged_in, name }; // Extract the user data.
let user = user_data.as_ref().unwrap().clone();
let template = ContactTemplate { logged_in, user };
HtmlTemplate(template) HtmlTemplate(template)
} }
@ -251,7 +284,7 @@ pub async fn contact(Extension(user_data): Extension<Option<UserData>>) -> impl
#[template(path = "cottagecalendar.html")] #[template(path = "cottagecalendar.html")]
struct CottageCalendarTemplate { struct CottageCalendarTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
} }
@ -259,18 +292,27 @@ pub async fn cottagecalendar(
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
) -> impl IntoResponse { ) -> 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();
let user_id = user_data.as_ref().map(|s| s.id.clone()).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("/cottagecalendar", user_data, db_pool.clone()).await { if is_authorized("/cottagecalendar", user_data, db_pool.clone()).await {
// Get user roles // Get user roles
let user_roles = get_user_roles_display(user_id, &db_pool.clone()).await; let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
let template = CottageCalendarTemplate { logged_in, name, user_roles }; let template = CottageCalendarTemplate {
HtmlTemplate(template).into_response() logged_in,
user,
user_roles,
};
HtmlTemplate(template).into_response()
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }

273
backend/src/wishlist.rs
View File

@ -1,12 +1,22 @@
use askama_axum::{IntoResponse, Response, Template}; use askama_axum::{IntoResponse, Response, Template};
use axum::{extract::{Path, State}, response::Redirect, Extension, Form}; use axum::{
extract::{Path, State},
response::Redirect,
Extension, Form,
};
use axum_extra::response::Html; use axum_extra::response::Html;
use chrono::Utc; use chrono::Utc;
use http::StatusCode; use http::StatusCode;
use serde::Deserialize; use serde::Deserialize;
use sqlx::{SqlitePool, Row}; 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}}; 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); struct HtmlTemplate<T>(T);
@ -30,7 +40,7 @@ where
#[template(path = "userwishlists.html")] #[template(path = "userwishlists.html")]
struct WishListsTemplate { struct WishListsTemplate {
logged_in: bool, logged_in: bool,
name: String, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
users: Vec<UserData>, users: Vec<UserData>,
} }
@ -39,28 +49,33 @@ pub async fn wishlists(
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
) -> impl IntoResponse { ) -> 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();
let users = sqlx::query_as::<_, UserData>("SELECT * FROM users")
.fetch_all(&db_pool)
.await
.unwrap();
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 userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
let users = sqlx::query_as::<_, UserData>("SELECT * FROM users")
.fetch_all(&db_pool)
.await
.unwrap();
if is_authorized("/userwishlists", user_data, db_pool.clone()).await { if is_authorized("/userwishlists", user_data, db_pool.clone()).await {
// Get user roles // Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await; let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
let template = WishListsTemplate { let template = WishListsTemplate {
logged_in, logged_in,
name, user,
users, users,
user_roles, user_roles,
}; };
HtmlTemplate(template).into_response() HtmlTemplate(template).into_response()
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -70,11 +85,11 @@ pub async fn wishlists(
#[template(path = "userwishlist.html")] #[template(path = "userwishlist.html")]
struct UserWishListTemplate { struct UserWishListTemplate {
logged_in: bool, logged_in: bool,
name: String,
my_wishlist: bool,
user: UserData, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
user_wishlist_items: Vec<crate::user::UserWishlistItem>, my_wishlist: bool,
person: UserData,
person_wishlist_items: Vec<crate::user::UserWishlistItem>,
} }
pub async fn user_wishlist( pub async fn user_wishlist(
@ -82,41 +97,43 @@ pub async fn user_wishlist(
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
// Extract the user's name from the user data. // Is the user logged in?
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
// Extract the user's id from the user data if logged_in {
let user_userid = user_data.as_ref().map(|s| s.id.clone()); // Extract the user data.
let userid = user_userid.unwrap_or_default(); 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. // Extract the user data.
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id) let person = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
.fetch_one(&db_pool) .fetch_one(&db_pool)
.await .await
.unwrap(); .unwrap();
if is_authorized("/wishlist", user_data, db_pool.clone()).await { if is_authorized("/wishlist", user_data, db_pool.clone()).await {
// Get user roles // Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await; let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
// Get user wishlist // Get user wishlist
let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await; let person_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
// Is viewed and viewing user the same (my wishlist)? // Is viewed and viewing user the same (my wishlist)?
let my_wishlist = user_id == userid; let my_wishlist = user_id == userid;
// Create the wishlist template. // Create the wishlist template.
let template = UserWishListTemplate { let template = UserWishListTemplate {
logged_in, logged_in,
name, user,
my_wishlist, user_roles,
user: user, my_wishlist,
user_roles, person,
user_wishlist_items, person_wishlist_items,
}; };
return HtmlTemplate(template).into_response(); return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -126,20 +143,10 @@ pub async fn user_wishlist(
#[template(path = "userwishlistadd.html")] #[template(path = "userwishlistadd.html")]
struct UserWishListAddTemplate { struct UserWishListAddTemplate {
logged_in: bool, logged_in: bool,
name: String,
user: UserData, user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>, user_roles: Vec<crate::user::UserRolesDisplay>,
user_wishlist_items: Vec<crate::user::UserWishlistItem>, person: UserData,
} person_wishlist_items: Vec<crate::user::UserWishlistItem>,
#[derive(Template)]
#[template(path = "userwishlistedit.html")]
struct UserWishListEditTemplate {
logged_in: bool,
name: String,
user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>,
user_wishlist_item: crate::user::UserWishlistItem,
} }
pub async fn user_wishlist_add( pub async fn user_wishlist_add(
@ -147,35 +154,39 @@ pub async fn user_wishlist_add(
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
// Extract the user's name from the user data. // Is the user logged in?
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
// Extract the user data. if logged_in {
let user = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id) // Extract the user data.
.fetch_one(&db_pool) let user = user_data.as_ref().unwrap().clone();
.await let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
.unwrap();
let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default(); // Extract the user data.
let person = sqlx::query_as!(UserData, "SELECT * FROM users WHERE id = ?", user_id)
.fetch_one(&db_pool)
.await
.unwrap();
if is_authorized("/wishlist", user_data, db_pool.clone()).await { if is_authorized("/wishlist", user_data, db_pool.clone()).await {
// Get user roles // Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await; let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
// Get user wishlist items // Get user wishlist items
let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await; let person_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
// Create the wishlist template. // Create the wishlist template.
let template = UserWishListAddTemplate { let template = UserWishListAddTemplate {
logged_in, logged_in,
name, user,
user: user, user_roles,
user_roles, person,
user_wishlist_items, person_wishlist_items,
}; };
return HtmlTemplate(template).into_response(); return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -191,7 +202,7 @@ pub async fn user_wishlist_add_item(
Path(user_id): Path<i64>, Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
Form(item_form): Form<ItemForm> Form(item_form): Form<ItemForm>,
) -> impl IntoResponse { ) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await { if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
// Insert new item to database // Insert new item to database
@ -216,34 +227,49 @@ pub async fn user_wishlist_add_item(
} }
} }
#[derive(Template)]
#[template(path = "userwishlistedit.html")]
struct UserWishListEditTemplate {
logged_in: bool,
user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>,
user_wishlist_item: crate::user::UserWishlistItem,
}
pub async fn user_wishlist_edit_item( pub async fn user_wishlist_edit_item(
Path(item_id): Path<i64>, Path(item_id): Path<i64>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
// Extract the user's name from the user data. // Is the user logged in?
let user_name = user_data.as_ref().map(|s| s.name.clone());
let logged_in = user_data.is_some(); let logged_in = user_data.is_some();
let name = user_name.unwrap_or_default();
let userid = user_data.as_ref().map(|s| s.id.clone()).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("/wishlist", user_data.clone(), db_pool.clone()).await { // Extract the user data.
// Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
// Get user wishlist items if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
let user_wishlist_item = get_user_wishlist_item_by_id(item_id, &db_pool.clone()).await; // Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
// Create the wishlist template. // Get user wishlist items
let template = UserWishListEditTemplate { let user_wishlist_item =
logged_in, get_user_wishlist_item_by_id(item_id, &db_pool.clone()).await;
name,
user: user_data.unwrap(), // Create the wishlist template.
user_roles, let template = UserWishListEditTemplate {
user_wishlist_item, logged_in,
}; user,
return HtmlTemplate(template).into_response(); user_roles,
user_wishlist_item,
};
return HtmlTemplate(template).into_response();
} else {
Redirect::to("/").into_response()
}
} else { } else {
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
@ -253,7 +279,7 @@ pub async fn user_wishlist_save_item(
Path(item_id): Path<i64>, Path(item_id): Path<i64>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>, Extension(user_data): Extension<Option<UserData>>,
Form(item_form): Form<ItemForm> Form(item_form): Form<ItemForm>,
) -> impl IntoResponse { ) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await { if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
// Insert new item to database // Insert new item to database
@ -280,12 +306,12 @@ pub async fn user_wishlist_save_item(
pub async fn user_wishlist_bought_item( pub async fn user_wishlist_bought_item(
Path(user_id): Path<i64>, Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>> Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await { if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
// Update item to purchased // Update item to purchased
sqlx::query("update wishlist_items set purchased_by = ? where id = ?") sqlx::query("update wishlist_items set purchased_by = ? where id = ?")
.bind(user_data.as_ref().unwrap().id)// Created by current user .bind(user_data.as_ref().unwrap().id) // Created by current user
.bind(user_id) .bind(user_id)
.execute(&db_pool) .execute(&db_pool)
.await .await
@ -293,7 +319,7 @@ pub async fn user_wishlist_bought_item(
// Redirect to user wishlist // Redirect to user wishlist
// Extract the user data. // Extract the user data.
let row = sqlx::query( "SELECT user_id FROM wishlist_items WHERE id = ?") let row = sqlx::query("SELECT user_id FROM wishlist_items WHERE id = ?")
.bind(user_id) .bind(user_id)
.fetch_one(&db_pool) .fetch_one(&db_pool)
.await .await
@ -310,14 +336,14 @@ pub async fn user_wishlist_bought_item(
pub async fn user_wishlist_received_item( pub async fn user_wishlist_received_item(
Path(user_id): Path<i64>, Path(user_id): Path<i64>,
State(db_pool): State<SqlitePool>, State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>> Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse { ) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await { if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
// Update item received time // Update item received time
let now = Utc::now().timestamp(); let now = Utc::now().timestamp();
sqlx::query("update wishlist_items set received_at = ? where id = ?") sqlx::query("update wishlist_items set received_at = ? where id = ?")
.bind(now)// Received now .bind(now) // Received now
.bind(user_id) .bind(user_id)
.execute(&db_pool) .execute(&db_pool)
.await .await
@ -331,3 +357,52 @@ pub async fn user_wishlist_received_item(
Redirect::to("/").into_response() Redirect::to("/").into_response()
} }
} }
pub async fn user_wishlist_delete_item(
Path(item_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
sqlx::query("delete from wishlist_items where id = ?")
.bind(item_id)
.execute(&db_pool)
.await
.unwrap();
// Redirect to user wishlist
let userid = user_data.as_ref().unwrap().id;
let redirect_string = format!("/userwishlist/{userid}");
Redirect::to(&redirect_string).into_response()
} else {
Redirect::to("/").into_response()
}
}
pub async fn user_wishlist_returned_item(
Path(item_id): Path<i64>,
State(db_pool): State<SqlitePool>,
Extension(user_data): Extension<Option<UserData>>,
) -> impl IntoResponse {
if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
sqlx::query("update wishlist_items set purchased_by = 0 where id = ?")
.bind(item_id)
.execute(&db_pool)
.await
.unwrap();
// Redirect to user wishlist
// Extract the user data.
let row = sqlx::query("SELECT user_id FROM wishlist_items WHERE id = ?")
.bind(item_id)
.fetch_one(&db_pool)
.await
.unwrap();
let profileid = row.get::<i64, _>("user_id");
let redirect_string = format!("/userwishlist/{profileid}");
Redirect::to(&redirect_string).into_response()
} else {
Redirect::to("/").into_response()
}
}

2
backend/templates/base.html
View File

@ -49,7 +49,7 @@
</li> </li>
{% if logged_in %} {% if logged_in %}
<li class="nav-item"><a class="nav-link" href="/logout">Logout</a></li> <li class="nav-item"><a class="nav-link" href="/logout">Logout</a></li>
<li class="nav-item"><a class="nav-link" href="/profile">{{ name }}</a></li> <li class="nav-item"><a class="nav-link" href="/profile">{{ user.name }}</a></li>
{% else %} {% else %}
<li class="nav-item"><a class="nav-link" href="/login">Login</a></li> <li class="nav-item"><a class="nav-link" href="/login">Login</a></li>
{% endif %} {% endif %}

83
backend/templates/userwishlist.html
View File

@ -1,56 +1,61 @@
{% extends "authorized.html" %} {% extends "authorized.html" %}
{% block title %}User Profile{% endblock %} {% block title %}User Wishlist{% endblock %}
{% block center %} {% block center %}
{% if my_wishlist %} {% if my_wishlist %}
<h1>My Wishlist</h1> <h1>My Wishlist</h1>
{% else %} {% else %}
<h1>{{ user.given_name }} Wishlist</h1> <h1>{{ person.given_name }} Wishlist</h1>
{% endif %} {% endif %}
<br/> <br />
<h2>List</h2> <h2>List</h2>
{% if my_wishlist %} {% if my_wishlist %}
<a href="/userwishlist/add/{{ user.id }}">Add</a> <a href="/userwishlist/add/{{ user.id }}">Add</a>
{% endif %} {% endif %}
<div class="table-responsive overflow-auto"> <div class="table-responsive overflow-auto">
<table class="table table-striped table-bordered"> <table class="table table-striped table-bordered">
<thead> <thead>
<tr> <tr>
<th scope="col">Item</th> <th scope="col">Item</th>
<th scope="col">Link</th> <th scope="col">Link</th>
<th scope="col">State</th> <th scope="col">State</th>
<th scope="col">Action</th> <th scope="col">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for user_wishlist_item in user_wishlist_items %} {% for person_wishlist_item in person_wishlist_items %}
<tr> <tr>
{% if my_wishlist %} {% if my_wishlist %}
<td><a href="/userwishlist/edit/{{ user_wishlist_item.id }}">{{ user_wishlist_item.item }}</a></td> <td><a href="/userwishlist/edit/{{ person_wishlist_item.id }}">{{ person_wishlist_item.item }}</a></td>
{% else %} {% else %}
<td>{{ user_wishlist_item.item }}</td> <td>{{ person_wishlist_item.item }}</td>
{% endif %} {% endif %}
<td><a href="{{ user_wishlist_item.item_url }}">URL</a></td>
{% if user_wishlist_item.received_at > 0 %} <td><a href="{{ person_wishlist_item.item_url }}">URL</a></td>
<td>Got it!</td>
{% else %} {% if person_wishlist_item.received_at > 0 %}
<td>Not yet!</td>
{% endif %}
{% if my_wishlist %}
{% if user_wishlist_item.received_at > 0 %}
<td>Got it!</td> <td>Got it!</td>
{% else %} {% else %}
<td><a href="/userwishlist/received/{{ user_wishlist_item.id }}">Received</a></td> <td>Not yet!</td>
{% endif %} {% endif %}
{% else %}
{% if user_wishlist_item.purchased_by > 0 %} {% if my_wishlist %}
<td>Purchased</td> {% if person_wishlist_item.received_at > 0 %}
<td><a href="/userwishlist/delete/{{ person_wishlist_item.id }}">Delete</a></td>
{% else %}
<td><a href="/userwishlist/received/{{ person_wishlist_item.id }}">Received</a></td>
{% endif %}
{% else %} {% else %}
<td><a href="/userwishlist/bought/{{ user_wishlist_item.id }}">Bought</a></td> {% if person_wishlist_item.purchased_by == user.id %}
<td><a href="/userwishlist/returned/{{ person_wishlist_item.id }}">Return</a></td>
{% else if person_wishlist_item.purchased_by > 0 %}
<td>Purchased</td>
{% else %}
<td><a href="/userwishlist/bought/{{ person_wishlist_item.id }}">Bought</a></td>
{% endif %}
{% endif %} {% endif %}
{% endif %} </tr>
</tr> {% endfor %}
{% endfor %} </tbody>
</tbody> </table>
</table>
</div> </div>
{% endblock center %} {% endblock center %}