Basic giftexchange view funtionality

backend/migrations/20241103140734_secret-gift-exchange.up.sql

@@ -3,11 +3,12 @@ CREATE TABLE
   `gift_exchange` (
     `id` integer not null primary key autoincrement,
     `created_at` INTEGER not null default CURRENT_TIMESTAMP,
-    `created_by` ineger null,
+    `created_by` integer not null default 0,
-    `updated_at` INTEGER null default CURRENT_TIMESTAMP,
+    `updated_at` INTEGER not null default CURRENT_TIMESTAMP,
-    `updated_by` integer null,
+    `updated_by` integer not null default 0,
-    `name` varchar(255) null,
+    `name` varchar(255) not null,
-    `exchange_date` INTEGER null,
+    `exchange_date` INTEGER not null,
+    `status` INTEGER not null default 0,
     unique (`id`)
   );
 
@@ -15,12 +16,12 @@ CREATE TABLE
   `gift_exchange_participants` (
     `id` integer not null primary key autoincrement,
     `created_at` INTEGER not null default CURRENT_TIMESTAMP,
-    `created_by` ineger null,
+    `created_by` integer not null default 0,
-    `updated_at` INTEGER null default CURRENT_TIMESTAMP,
+    `updated_at` INTEGER not null default CURRENT_TIMESTAMP,
-    `updated_by` integer null,
+    `updated_by` integer not null default 0,
     `exchange_id` INTEGER not null,
     `participant_id` INTEGER not null,
-    `gifter_id` INTEGER null,
+    `gifter_id` INTEGER not null,
     unique (`id`)
   );
 

backend/src/main.rs

@@ -2,6 +2,7 @@ use std::net::SocketAddr;
 use axum::{
     middleware, routing::{get, get_service}, Extension, Router
 };
+use secret_gift_exchange::{giftexchange, giftexchanges};
 use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
 use sqlx::migrate::Migrator;
 use tower_http::services::ServeDir;
@@ -13,6 +14,7 @@ mod routes;
 mod user;
 mod wishlist;
 mod email;
+mod secret_gift_exchange;
 
 use error_handling::AppError;
 use middlewares::inject_user_data;
@@ -62,6 +64,8 @@ async fn main() {
         .route("/userwishlist/add/:user_id", get(user_wishlist_add).post(user_wishlist_add_item))
         .route("/userwishlist/bought/:user_id", get(user_wishlist_bought_item))
         .route("/userwishlist/received/:user_id", get(user_wishlist_received_item))
+        .route("/giftexchanges", get(giftexchanges))
+        .route("/giftexchange/:giftexchange_id", get(giftexchange))
         .nest_service("/assets", ServeDir::new("templates/assets")
             .fallback(get_service(ServeDir::new("templates/assets"))))
         .route("/", get(index))

backend/src/secret_gift_exchange.rs

@@ -1,3 +1,20 @@
+use askama::Template;
+use askama_axum::{IntoResponse, Response};
+use axum::{
+    extract::{Path, State},
+    response::Redirect,
+    Extension,
+};
+use axum_extra::response::Html;
+use http::StatusCode;
+use serde::{Deserialize, Serialize};
+use sqlx::{FromRow, SqlitePool};
+
+use crate::{
+    middlewares::is_authorized,
+    user::{get_user_roles_display, UserData},
+};
+
 /// Select participants from user list
 /// create group id for exchange
 /// allow user to only see their recipient but whole list of participants
@@ -37,6 +54,153 @@
 ///
 /// API - select gifters
 
-pub fn select_gifters() {
+struct HtmlTemplate<T>(T);
 
+impl<T> IntoResponse for HtmlTemplate<T>
+where
+    T: Template,
+{
+    fn into_response(self) -> Response {
+        match self.0.render() {
+            Ok(html) => Html(html).into_response(),
+            Err(err) => (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Failed to render template. Error: {}", err),
+            )
+                .into_response(),
+        }
+    }
 }
+
+#[derive(Default, Clone, Debug, Serialize, Deserialize, FromRow)]
+struct GiftExchange {
+    id: i64,
+    created_at: i64,
+    created_by: i64,
+    updated_at: i64,
+    updated_by: i64,
+    name: String,
+    exchange_date: i64,
+    status: i64,
+}
+
+#[derive(Template)]
+#[template(path = "giftexchanges.html")]
+struct GiftExchangesTemplate {
+    logged_in: bool,
+    name: String,
+    user_roles: Vec<crate::user::UserRolesDisplay>,
+    giftexchanges: Vec<GiftExchange>,
+}
+
+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());
+    let logged_in = user_name.is_some();
+    let name = user_name.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_roles,
+            giftexchanges,
+        };
+        HtmlTemplate(template).into_response()
+    } else {
+        Redirect::to("/").into_response()
+    }
+}
+
+#[derive(Default, Clone, Debug, Serialize, Deserialize, FromRow)]
+struct GiftExchangeParticipant {
+    id: i64,
+    created_at: i64,
+    created_by: i64,
+    updated_at: i64,
+    updated_by: i64,
+    exchange_id: i64,
+    participant_id: i64,
+    gifter_id: i64,
+}
+
+#[derive(Template)]
+#[template(path = "giftexchange.html")]
+struct GiftExchangeTemplate {
+    logged_in: bool,
+    name: String,
+    user_roles: Vec<crate::user::UserRolesDisplay>,
+    giftexchange: GiftExchange,
+    participants: Vec<GiftExchangeParticipant>,
+    non_participants: Vec<UserData>,
+}
+
+pub async fn giftexchange(
+    Path(exchange_id): Path<i64>,
+    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());
+    let logged_in = user_name.is_some();
+    let name = user_name.unwrap_or_default();
+    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;
+
+        // Get gift exchange
+        let giftexchange = match sqlx::query_as!(GiftExchange, "SELECT * FROM gift_exchange WHERE id = ?", exchange_id)
+        .fetch_one(&db_pool)
+        .await {
+            Ok(giftexchange) => giftexchange,
+            Err(_) => {
+                GiftExchange::default()
+            }};
+
+        // Get participants
+        let participants = sqlx::query_as::<_, GiftExchangeParticipant>(
+            "SELECT * FROM gift_exchange_participants WHERE exchange_id = ?",
+        )
+        .bind(exchange_id)
+        .fetch_all(&db_pool)
+        .await
+        .unwrap();
+
+        // Get non participants
+        let non_participants = sqlx::query_as::<_, UserData>(
+            "select * from users where users.id not in (select participant_id from gift_exchange_participants where exchange_id = ?)",
+        )
+        .bind(exchange_id)
+        .fetch_all(&db_pool)
+        .await
+        .unwrap();
+
+        let template = GiftExchangeTemplate {
+            logged_in,
+            name,
+            user_roles,
+            giftexchange,
+            participants,
+            non_participants,
+        };
+        HtmlTemplate(template).into_response()
+    } else {
+        Redirect::to("/").into_response()
+    }
+}
+
+pub fn select_gifters() {}
+

backend/src/wishlist.rs

@@ -1,12 +1,19 @@
 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 chrono::Utc;
 use http::StatusCode;
 use serde::Deserialize;
-use sqlx::{SqlitePool, Row};
+use sqlx::{Row, SqlitePool};
 
-use crate::{middlewares::is_authorized, user::{get_user_roles_display, get_user_wishlist_items, UserData, UserWishlistItem}};
+use crate::{
+    middlewares::is_authorized,
+    user::{get_user_roles_display, get_user_wishlist_items, UserData, UserWishlistItem},
+};
 
 struct HtmlTemplate<T>(T);
 
@@ -48,17 +55,17 @@ pub async fn wishlists(
         .await
         .unwrap();
 
-        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();
 
-        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,
+            name,
-                users,
+            users,
-                user_roles,
+            user_roles,
         };
         HtmlTemplate(template).into_response()
     } else {
@@ -97,11 +104,11 @@ pub async fn user_wishlist(
         .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
+        // Get user wishlist
         let user_wishlist_items = get_user_wishlist_items(user_id, &db_pool.clone()).await;
 
         // Is viewed and viewing user the same (my wishlist)?
@@ -151,10 +158,10 @@ pub async fn user_wishlist_add(
     let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
 
     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;
 
         // Create the wishlist template.
@@ -181,7 +188,7 @@ pub async fn user_wishlist_add_item(
     Path(user_id): Path<i64>,
     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
@@ -209,12 +216,12 @@ pub async fn user_wishlist_add_item(
 pub async fn user_wishlist_bought_item(
     Path(user_id): Path<i64>,
     State(db_pool): State<SqlitePool>,
-    Extension(user_data): Extension<Option<UserData>>
+    Extension(user_data): Extension<Option<UserData>>,
 ) -> impl IntoResponse {
     if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
         // Update item to purchased
         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)
             .execute(&db_pool)
             .await
@@ -222,7 +229,7 @@ pub async fn user_wishlist_bought_item(
 
         // Redirect to user wishlist
         // 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)
             .fetch_one(&db_pool)
             .await
@@ -239,14 +246,14 @@ pub async fn user_wishlist_bought_item(
 pub async fn user_wishlist_received_item(
     Path(user_id): Path<i64>,
     State(db_pool): State<SqlitePool>,
-    Extension(user_data): Extension<Option<UserData>>
+    Extension(user_data): Extension<Option<UserData>>,
 ) -> impl IntoResponse {
     if is_authorized("/wishlist", user_data.clone(), db_pool.clone()).await {
         // Update item received time
         let now = Utc::now().timestamp();
 
         sqlx::query("update wishlist_items set received_at = ? where id = ?")
-            .bind(now)// Received now
+            .bind(now) // Received now
             .bind(user_id)
             .execute(&db_pool)
             .await

backend/templates/authorized.html

@@ -9,6 +9,7 @@
                 <li><a href="/dashboard">Web links</a></li>
                 <li><a href="/cottagecalendar">Cottage Calendar</a></li>
                 <li><a href="/wishlists">Wish lists</a></li>
+                <li><a href="/giftexchanges">Gift Exchanges</a></li>
             </ul>
             {% for user_role in user_roles %}
                 {% if user_role.role_name == "admin" %}

backend/templates/base.html

@@ -8,10 +8,14 @@
   <link rel="icon" type="image/x-icon" href="/assets/favicon.png">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="">
-  <meta name="author" content="">
+  <meta name="author" content="Chris Jean-Marie">
 
   <!-- Bootstrap CSS -->
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
+    integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.css">
+</head>
 
 <body>
   <div class="container-fluid">
@@ -51,7 +55,11 @@
   </div>
 
   <!-- Bootstrap JS Bundle with Popper -->
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+    crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.js"></script>
 </body>
 
 </html>

backend/templates/giftexchange.html

@@ -0,0 +1,52 @@
+{% extends "authorized.html" %}
+{% block title %}Gift Exchange{% endblock %}
+{% block center %}
+<div class="row">
+    <div class="btn-toolbar" role="toolbar">
+        <a role="button" class="btn btn-primary" href="/giftexchange/{{ giftexchange.id }}">Save</a>
+    </div>
+</div>
+<div class="row">
+    Exchange Name: <input id="name" name="name" type="text" value="{{ giftexchange.name }}" required>
+</div>
+<div class="row">
+    <div class="col">
+        <table class="table table-striped table-bordered">
+            <thead>
+                <tr>
+                    <th data-sortable="true" data-field="name"scope="col">Name</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for participant in non_participants %}
+                <tr>
+                    <td>{{ participant.name }}</a></td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <div class="col">
+        <div class="btn-group-vertical" role="group">
+            <button type="button" class="btn btn-primary">Add</button>
+            <button type="button" class="btn btn-primary">Remove</button>
+        </div>
+    </div>
+    <div class="col">
+        <table class="table table-striped table-bordered">
+            <thead>
+                <tr>
+                    <th data-sortable="true" data-field="name" scope="col">Name</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for participant in participants %}
+                <tr>
+                    <td>{{ participant.participant_id }}</a></td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+{% endblock center %}

backend/templates/giftexchanges.html

@@ -0,0 +1,29 @@
+{% extends "authorized.html" %}
+{% block title %}Gift Exchanges{% endblock %}
+{% block center %}
+<div class="row">
+    <div class="btn-toolbar" role="toolbar">
+        <a role="button" class="btn btn-primary" href="/giftexchange/0">Add</a>
+    </div>
+</div>
+<div class="row">
+    <table data-toggle="table" class="table table-striped table-bordered">
+        <thead>
+            <tr>
+                <th data-sortable="true" data-field="name" scope="col">Name</th>
+                <th data-sortable="true" data-field="exchange_date" scope="col">Date</th>
+                <th data-field="status" scope="col">Status</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for giftexchange in giftexchanges %}
+            <tr>
+                <td><a href="/giftexchange/{{ giftexchange.id }}">{{ giftexchange.name }}</a></td>
+                <td>{{ giftexchange.exchange_date }}</td>
+                <td>{{ giftexchange.status }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endblock center %}

backend/templates/useradmin.html

@@ -2,11 +2,11 @@
 {% block title %}User Administration{% endblock %}
 {% block center %}
 <h1>Users</h1>
-<table class="table table-striped table-bordered">
+<table data-toggle="table" class="table table-striped table-bordered">
     <thead>
         <tr>
-            <th scope="col">Name</th>
+            <th data-sortable="true" data-field="name" scope="col">Name</th>
-            <th scope="col">email</th>
+            <th data-sortable="true" data-field="email" scope="col">email</th>
         </tr>
     </thead>
     <tbody>

backend/templates/userwishlist.html

@@ -12,11 +12,11 @@
 <a href="/userwishlist/add/{{ user.id }}">Add</a>
 {% endif %}
 <div class="table-responsive overflow-auto">
-<table class="table table-striped table-bordered">
+<table data-toggle="table" class="table table-striped table-bordered">
     <thead>
         <tr>
-            <th scope="col">Item</th>
+            <th data-sortable="true" data-field="item" scope="col">Item</th>
-            <th scope="col">State</th>
+            <th data-sortable="true" data-field="state" scope="col">State</th>
             <th scope="col">Action</th>
         </tr>
     </thead>

backend/templates/userwishlists.html

@@ -2,11 +2,11 @@
 {% block title %}Wish Lists{% endblock %}
 {% block center %}
 <h1>Wishlists</h1>
-<table class="table table-striped table-bordered">
+<table data-toggle="table" class="table table-striped table-bordered">
     <thead>
         <tr>
-            <th scope="col">Name</th>
+            <th data-sortable="true" data-field="name" scope="col">Name</th>
-            <th scope="col">email</th>
+            <th data-sortable="true" data-field="email" scope="col">email</th>
         </tr>
     </thead>
     <tbody>