From a3b1e525dc8956436d0a6ce543232ba1ccbd59fb Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Mon, 2 Dec 2024 19:17:58 +0300
Subject: [PATCH 01/17] Added UserActions.jsx and changed usertable

---
 .../UserProfilesTable/UserActions.jsx         | 92 +++++++++++++++++++
 .../AdminPage/UserProfilesTable/UserTable.jsx | 11 ++-
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx

diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
new file mode 100644
index 00000000..41d9c9ad
--- /dev/null
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { Dropdown, Modal, Button, message } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+
+function UserActions({ user, onActionComplete }) {
+    const handleActionClick = (action) => {
+        switch (action) {
+            case 'sendMessage':
+                showSendMessageModal();
+                break;
+            case 'viewProfile':
+                viewProfile();
+                break;
+            case 'blockUser':
+                confirmBlockUser();
+                break;
+            default:
+                console.error('Unknown action:', action);
+        }
+    };
+
+    const showSendMessageModal = () => {
+        let messageContent = '';
+        Modal.confirm({
+            title: `Надіслати листа користувачу ${user.name} ${user.surname}`,
+            content: (
+                <textarea
+                    rows="4"
+                    placeholder="Введіть ваше повідомлення..."
+                    onChange={(e) => (messageContent = e.target.value)}
+                    style={{ width: '100%' }}
+                />
+            ),
+            onOk: async () => {
+                try {
+                    console.log(`Message to ${user.id}: ${messageContent}`);
+                    message.success('Повідомлення успішно надіслано (імітація)');
+                    if (onActionComplete) onActionComplete();
+                } catch (error) {
+                    message.error('Не вдалося надіслати повідомлення. Спробуйте ще раз.');
+                }
+            },
+        });
+    };
+
+    const viewProfile = () => {
+        window.location.href = `/admin/users/${user.id}`;
+    };
+
+    const confirmBlockUser = () => {
+        Modal.confirm({
+            title: 'Підтвердити блокування користувача',
+            icon: <ExclamationCircleOutlined />,
+            content: `Ви впевнені, що хочете заблокувати користувача ${user.name} ${user.surname}?`,
+            onOk: async () => {
+                try {
+                    console.log(`Blocked user: ${user.id}`);
+                    message.success('Користувач успішно заблокований (імітація)');
+                    if (onActionComplete) onActionComplete();
+                } catch (error) {
+                    message.error('Не вдалося заблокувати користувача. Спробуйте пізніше.');
+                }
+            },
+        });
+    };
+
+    const menuItems = [
+        {
+            key: 'sendMessage',
+            label: 'Надіслати листа',
+            onClick: () => handleActionClick('sendMessage'),
+        },
+        {
+            key: 'viewProfile',
+            label: 'Переглянути профіль',
+            onClick: () => handleActionClick('viewProfile'),
+        },
+        {
+            key: 'blockUser',
+            label: 'Заблокувати користувача',
+            onClick: () => handleActionClick('blockUser'),
+        },
+    ];
+
+    return (
+        <Dropdown menu={{ items: menuItems }} trigger={['click']}>
+            <Button>Обрати</Button>
+        </Dropdown>
+    );
+}
+
+export default UserActions;
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx
index 389670d3..e82bc005 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx
@@ -2,10 +2,11 @@ import { useState, useEffect } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import Highlighter from 'react-highlight-words';
 import axios from 'axios';
-import useSWR from 'swr';
+import useSWR, { mutate }from 'swr';
 import { Table, Tag, Tooltip, Pagination, Input, Button, Space } from 'antd';
 import { CaretUpOutlined, CaretDownOutlined, SearchOutlined } from '@ant-design/icons';
 import css from './UserTable.module.scss';
+import UserActions from './UserActions';
 
 
 const LENGTH_EMAIL = 14;
@@ -238,6 +239,14 @@ function UserTable() {
             title: 'Дії',
             dataIndex: 'actions',
             key: 'actions',
+            render: (_, user) => (
+                <UserActions
+                    user={user}
+                    onActionComplete={() => {
+                        mutate(url);
+                    }}
+                />
+            ),
         },
     ];
 

From 75ee56a302d91066a2950a7aa62ed707f02949ea Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Mon, 2 Dec 2024 20:09:13 +0300
Subject: [PATCH 02/17] Added backend functionality for sending messages

---
 .../admin_message_template.html               | 39 +++++++++++++++++
 BackEnd/administration/urls.py                |  2 +
 BackEnd/administration/views.py               | 42 ++++++++++++++++++-
 .../administration/send_email_notification.py | 35 ++++++++++++++++
 4 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 BackEnd/administration/templates/administration/admin_message_template.html
 create mode 100644 BackEnd/utils/administration/send_email_notification.py

diff --git a/BackEnd/administration/templates/administration/admin_message_template.html b/BackEnd/administration/templates/administration/admin_message_template.html
new file mode 100644
index 00000000..b87c2496
--- /dev/null
+++ b/BackEnd/administration/templates/administration/admin_message_template.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="uk">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Нове повідомлення</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            color: black;
+        }
+        .email-container {
+            padding: 20px;
+        }
+        .email-footer {
+            margin-top: 20px;
+            font-size: 12px;
+            color: gray;
+        }
+        img {
+            max-width: 150px;
+        }
+    </style>
+</head>
+<body>
+    <div class="email-container">
+        <img src="{{ logo_url }}" alt="CRAFTMERGE" />
+        <p>Доброго дня, {{ user_name }}!</p>
+        <p>Ви отримали нове повідомлення:</p>
+        <p><b>Категорія:</b> {{ category }}</p>
+        <p><b>Повідомлення:</b></p>
+        <p>{{ message }}</p>
+        <div class="email-footer">
+            <p>З повагою,</p>
+            <p>Команда CraftMerge</p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/BackEnd/administration/urls.py b/BackEnd/administration/urls.py
index d860830c..d60a3516 100644
--- a/BackEnd/administration/urls.py
+++ b/BackEnd/administration/urls.py
@@ -10,6 +10,7 @@
     ModerationEmailView,
     FeedbackView,
     CreateAdminUserView,
+    SendMessageView,
 )
 
 app_name = "administration"
@@ -28,4 +29,5 @@
     path("contacts/", ContactsView.as_view(), name="contacts"),
     path("feedback/", FeedbackView.as_view(), name="feedback"),
     path("admin_create/", CreateAdminUserView.as_view(), name="admin-create"),
+    path("users/<pk>/send_message/", SendMessageView.as_view(), name="send-message"),
 ]
diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index 7f137a5b..ef55d7e5 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -11,6 +11,7 @@
     RetrieveUpdateDestroyAPIView,
     RetrieveUpdateAPIView,
     CreateAPIView,
+    get_object_or_404,
 )
 
 from administration.serializers import AdminRegistrationSerializer
@@ -29,7 +30,7 @@
 from profiles.models import Profile
 from .permissions import IsStaffUser, IsStaffUserOrReadOnly, IsSuperUser
 from .serializers import FeedbackSerializer
-from utils.administration.send_email_feedback import send_email_feedback
+from utils.administration.send_email_feedback import send_email_feedback, send_email_to_user
 
 from django_filters.rest_framework import DjangoFilterBackend
 from .filters import UsersFilter
@@ -199,3 +200,42 @@ def perform_create(self, serializer):
         category = serializer.validated_data["category"]
 
         send_email_feedback(email, message, category)
+
+class SendMessageView(CreateAPIView):
+    """
+    API endpoint for sending a custom email message to a specific user.
+
+    This view allows administrators to send a message to a user's registered email.
+    It validates the request payload, retrieves the user based on the provided ID, 
+    and sends the email using the specified category and message content.
+    """
+    permission_classes = [IsStaffUser]
+    serializer_class = FeedbackSerializer
+
+    def get_queryset(self):
+        """
+        Returns the base queryset of users.
+
+        This method is used to fetch the list of users, which is 
+        then filtered to find the specific user by their primary key (ID).
+        """
+        return CustomUser.objects.all()
+
+    def perform_create(self, serializer):
+        """
+        Handles the email sending logic after successful validation.
+
+        This method is executed after the request data has been validated 
+        by the serializer. It retrieves the user, validates their existence, 
+        and sends the email with the provided category and message content.
+
+        Parameters:
+            serializer (FeedbackSerializer): The serializer instance containing
+            the validated data from the request.
+        """
+        user = get_object_or_404(self.get_queryset(), pk=self.kwargs.get("pk"))
+
+        category = serializer.validated_data["category"]
+        message_content = serializer.validated_data["message"]
+
+        send_email_to_user(user=user, category=category, message_content=message_content)
diff --git a/BackEnd/utils/administration/send_email_notification.py b/BackEnd/utils/administration/send_email_notification.py
new file mode 100644
index 00000000..4746bd2b
--- /dev/null
+++ b/BackEnd/utils/administration/send_email_notification.py
@@ -0,0 +1,35 @@
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import render_to_string
+from django.conf import settings
+
+EMAIL_CONTENT_SUBTYPE = "html"
+PROTOCOL = "http"
+
+
+def send_email_to_user(user, category, message_content, template_name="administration/user_message_template.html"):
+    """
+    Надсилає лист користувачу з використанням HTML-шаблону.
+    
+    :param user: Об'єкт користувача (CustomUser)
+    :param subject: Тема листа
+    :param message_content: Текст повідомлення
+    :param template_name: Шлях до HTML-шаблону (за замовчуванням: user_message_template.html)
+    """
+
+    context = {
+        "user_name": f"{user.name} {user.surname}",
+        "message": message_content,
+        "category": category,
+        "logo_url": f"{PROTOCOL}://178.212.110.52/craftMerge-logo.png",
+    }
+
+    email_body = render_to_string(template_name, context)
+
+    email = EmailMultiAlternatives(
+        category=category,
+        body=email_body,
+        from_email=settings.EMAIL_HOST_USER,
+        to=[user.email],
+    )
+    email.content_subtype = EMAIL_CONTENT_SUBTYPE
+    email.send(fail_silently=False)

From 2f83058eb6b8ca0349d879e83ce2d2280d076f47 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Mon, 2 Dec 2024 21:06:39 +0300
Subject: [PATCH 03/17] Fixed bugs and tested sending message

---
 BackEnd/administration/views.py               | 12 +++-
 .../administration/send_email_notification.py | 20 +++---
 .../UserProfilesTable/UserActions.jsx         | 65 +++++++++++++++----
 .../UserProfilesTable/UserActions.module.css  |  8 +++
 4 files changed, 81 insertions(+), 24 deletions(-)
 create mode 100644 FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css

diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index ef55d7e5..f13c0fef 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -30,7 +30,8 @@
 from profiles.models import Profile
 from .permissions import IsStaffUser, IsStaffUserOrReadOnly, IsSuperUser
 from .serializers import FeedbackSerializer
-from utils.administration.send_email_feedback import send_email_feedback, send_email_to_user
+from utils.administration.send_email_feedback import send_email_feedback
+from utils.administration.send_email_notification import send_email_to_user
 
 from django_filters.rest_framework import DjangoFilterBackend
 from .filters import UsersFilter
@@ -234,8 +235,13 @@ def perform_create(self, serializer):
             the validated data from the request.
         """
         user = get_object_or_404(self.get_queryset(), pk=self.kwargs.get("pk"))
-
+        email = serializer.validated_data["email"] 
         category = serializer.validated_data["category"]
         message_content = serializer.validated_data["message"]
 
-        send_email_to_user(user=user, category=category, message_content=message_content)
+        send_email_to_user(
+            user=user,
+            category=category,
+            message_content=message_content,
+            email=email,
+        ) 
\ No newline at end of file
diff --git a/BackEnd/utils/administration/send_email_notification.py b/BackEnd/utils/administration/send_email_notification.py
index 4746bd2b..395fd582 100644
--- a/BackEnd/utils/administration/send_email_notification.py
+++ b/BackEnd/utils/administration/send_email_notification.py
@@ -5,17 +5,16 @@
 EMAIL_CONTENT_SUBTYPE = "html"
 PROTOCOL = "http"
 
-
-def send_email_to_user(user, category, message_content, template_name="administration/user_message_template.html"):
+def send_email_to_user(user, category, message_content, email=None, template_name="administration/admin_message_template.html"):
     """
-    Надсилає лист користувачу з використанням HTML-шаблону.
+    Sends an email message to the user using the specified template.
     
-    :param user: Об'єкт користувача (CustomUser)
-    :param subject: Тема листа
-    :param message_content: Текст повідомлення
-    :param template_name: Шлях до HTML-шаблону (за замовчуванням: user_message_template.html)
+    :param user: The user object (CustomUser)
+    :param category: The email category
+    :param message_content: The message content
+    :param email: (Optional) The recipient's email
+    :param template_name: The path to the HTML template
     """
-
     context = {
         "user_name": f"{user.name} {user.surname}",
         "message": message_content,
@@ -24,12 +23,13 @@ def send_email_to_user(user, category, message_content, template_name="administr
     }
 
     email_body = render_to_string(template_name, context)
+    recipient_email = email if email else user.email
 
     email = EmailMultiAlternatives(
-        category=category,
+        subject=category,
         body=email_body,
         from_email=settings.EMAIL_HOST_USER,
-        to=[user.email],
+        to=[recipient_email],
     )
     email.content_subtype = EMAIL_CONTENT_SUBTYPE
     email.send(fail_silently=False)
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index 41d9c9ad..3edeae7c 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -1,8 +1,13 @@
-import React from 'react';
-import { Dropdown, Modal, Button, message } from 'antd';
+import React, { useState } from 'react';
+import { Dropdown, Modal, Button, message, Select, Input } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
+import axios from 'axios';
+import PropTypes from 'prop-types';
+import styles from './UserActions.module.css';
 
 function UserActions({ user, onActionComplete }) {
+    const [selectedCategory, setSelectedCategory] = useState('Інше');
+
     const handleActionClick = (action) => {
         switch (action) {
             case 'sendMessage':
@@ -24,20 +29,48 @@ function UserActions({ user, onActionComplete }) {
         Modal.confirm({
             title: `Надіслати листа користувачу ${user.name} ${user.surname}`,
             content: (
-                <textarea
-                    rows="4"
-                    placeholder="Введіть ваше повідомлення..."
-                    onChange={(e) => (messageContent = e.target.value)}
-                    style={{ width: '100%' }}
-                />
+                <>
+                    <Input
+                        value={user.email}
+                        readOnly
+                        className={styles.userActionsInput}
+                    />
+                    <Select
+                        defaultValue="Інше"
+                        className={styles.userActionsSelect}
+                        onChange={(value) => setSelectedCategory(value)}
+                        options={[
+                            { value: 'Технічне питання', label: 'Технічне питання' },
+                            { value: 'Рекомендації', label: 'Рекомендації' },
+                            { value: 'Питання', label: 'Питання' },
+                            { value: 'Інше', label: 'Інше' },
+                        ]}
+                    />
+                    <Input.TextArea
+                        rows={4}
+                        placeholder="Введіть ваше повідомлення..."
+                        onChange={(e) => (messageContent = e.target.value)}
+                        className={styles.userActionsTextarea}
+                    />
+                </>
             ),
             onOk: async () => {
                 try {
-                    console.log(`Message to ${user.id}: ${messageContent}`);
-                    message.success('Повідомлення успішно надіслано (імітація)');
+                    await axios.post(
+                        `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
+                        {
+                            email: user.email,
+                            category: selectedCategory,
+                            message: messageContent,
+                        }
+                    );
+                    message.success('Повідомлення успішно надіслано');
                     if (onActionComplete) onActionComplete();
                 } catch (error) {
-                    message.error('Не вдалося надіслати повідомлення. Спробуйте ще раз.');
+                    message.error(
+                        error.response?.data?.detail ||
+                        'Не вдалося надіслати повідомлення. Спробуйте ще раз.'
+                    );
                 }
             },
         });
@@ -89,4 +122,14 @@ function UserActions({ user, onActionComplete }) {
     );
 }
 
+UserActions.propTypes = {
+    user: PropTypes.shape({
+        id: PropTypes.number.isRequired,
+        name: PropTypes.string.isRequired,
+        surname: PropTypes.string.isRequired,
+        email: PropTypes.string.isRequired,
+    }).isRequired,
+    onActionComplete: PropTypes.func,
+};
+
 export default UserActions;
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css
new file mode 100644
index 00000000..ba794836
--- /dev/null
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css
@@ -0,0 +1,8 @@
+.userActionsSelect {
+    width: 100%;
+    margin-bottom: 10px;
+}
+
+.userActionsTextarea {
+    width: 100%;
+}

From 21e1b56da8fe24883e2500915467ab89d93df044 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Mon, 2 Dec 2024 22:09:03 +0300
Subject: [PATCH 04/17] Worked with navigation to user detail

---
 .../UserProfilesTable/UserActions.jsx         | 187 +++++++++++-------
 .../UserProfilesTable/UserActions.module.css  |  18 +-
 2 files changed, 132 insertions(+), 73 deletions(-)

diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index 3edeae7c..e031b3f8 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -4,14 +4,38 @@ import { ExclamationCircleOutlined } from '@ant-design/icons';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import styles from './UserActions.module.css';
+import { useNavigate } from 'react-router-dom';
 
 function UserActions({ user, onActionComplete }) {
     const [selectedCategory, setSelectedCategory] = useState('Інше');
+    const [messageContent, setMessageContent] = useState('');
+    const [isSending, setIsSending] = useState(false);
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const [error, setError] = useState('');
+    const navigate = useNavigate();
+
+    const menuItems = [
+        {
+            key: 'sendMessage',
+            label: 'Надіслати листа',
+            onClick: () => handleActionClick('sendMessage'),
+        },
+        {
+            key: 'viewProfile',
+            label: 'Переглянути профіль',
+            onClick: () => handleActionClick('viewProfile'),
+        },
+        {
+            key: 'blockUser',
+            label: 'Заблокувати користувача',
+            onClick: () => handleActionClick('blockUser'),
+        },
+    ];
 
     const handleActionClick = (action) => {
         switch (action) {
             case 'sendMessage':
-                showSendMessageModal();
+                setIsModalVisible(true);
                 break;
             case 'viewProfile':
                 viewProfile();
@@ -24,60 +48,44 @@ function UserActions({ user, onActionComplete }) {
         }
     };
 
-    const showSendMessageModal = () => {
-        let messageContent = '';
-        Modal.confirm({
-            title: `Надіслати листа користувачу ${user.name} ${user.surname}`,
-            content: (
-                <>
-                    <Input
-                        value={user.email}
-                        readOnly
-                        className={styles.userActionsInput}
-                    />
-                    <Select
-                        defaultValue="Інше"
-                        className={styles.userActionsSelect}
-                        onChange={(value) => setSelectedCategory(value)}
-                        options={[
-                            { value: 'Технічне питання', label: 'Технічне питання' },
-                            { value: 'Рекомендації', label: 'Рекомендації' },
-                            { value: 'Питання', label: 'Питання' },
-                            { value: 'Інше', label: 'Інше' },
-                        ]}
-                    />
-                    <Input.TextArea
-                        rows={4}
-                        placeholder="Введіть ваше повідомлення..."
-                        onChange={(e) => (messageContent = e.target.value)}
-                        className={styles.userActionsTextarea}
-                    />
-                </>
-            ),
-            onOk: async () => {
-                try {
-                    await axios.post(
-                        `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
-                        {
-                            email: user.email,
-                            category: selectedCategory,
-                            message: messageContent,
-                        }
-                    );
-                    message.success('Повідомлення успішно надіслано');
-                    if (onActionComplete) onActionComplete();
-                } catch (error) {
-                    message.error(
-                        error.response?.data?.detail ||
-                        'Не вдалося надіслати повідомлення. Спробуйте ще раз.'
-                    );
+    const validateMessage = () => {
+        if (messageContent.trim().length < 10) {
+            setError('Повідомлення має бути не менше 10 символів.');
+            return false;
+        }
+        setError('');
+        return true;
+    };
+
+    const handleSendMessage = async () => {
+        if (!validateMessage()) return;
+
+        try {
+            setIsSending(true);
+            await axios.post(
+                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
+                {
+                    email: user.email,
+                    category: selectedCategory,
+                    message: messageContent.trim(),
                 }
-            },
-        });
+            );
+            message.success('Повідомлення успішно надіслано');
+            setMessageContent('');
+            setIsModalVisible(false);
+            if (onActionComplete) onActionComplete();
+        } catch (error) {
+            message.error(
+                error.response?.data?.detail ||
+                'Не вдалося надіслати повідомлення. Спробуйте ще раз.'
+            );
+        } finally {
+            setIsSending(false);
+        }
     };
 
     const viewProfile = () => {
-        window.location.href = `/admin/users/${user.id}`;
+        navigate(`/users/${user.id}`);
     };
 
     const confirmBlockUser = () => {
@@ -97,28 +105,63 @@ function UserActions({ user, onActionComplete }) {
         });
     };
 
-    const menuItems = [
-        {
-            key: 'sendMessage',
-            label: 'Надіслати листа',
-            onClick: () => handleActionClick('sendMessage'),
-        },
-        {
-            key: 'viewProfile',
-            label: 'Переглянути профіль',
-            onClick: () => handleActionClick('viewProfile'),
-        },
-        {
-            key: 'blockUser',
-            label: 'Заблокувати користувача',
-            onClick: () => handleActionClick('blockUser'),
-        },
-    ];
-
     return (
-        <Dropdown menu={{ items: menuItems }} trigger={['click']}>
-            <Button>Обрати</Button>
-        </Dropdown>
+        <>
+            <Dropdown menu={{ items: menuItems }} trigger={['click']}>
+                <Button>Обрати</Button>
+            </Dropdown>
+            <Modal
+                title={`Надіслати листа користувачу ${user.name} ${user.surname}`}
+                visible={isModalVisible}
+                onCancel={() => {
+                    setIsModalVisible(false);
+                    setError('');
+                    setMessageContent('');
+                }}
+                footer={[
+                    <Button key="cancel" onClick={() => setIsModalVisible(false)}>
+                        Відмінити
+                    </Button>,
+                    <Button
+                        key="send"
+                        type="primary"
+                        loading={isSending}
+                        onClick={handleSendMessage}
+                    >
+                        Відправити
+                    </Button>,
+                ]}
+                width={600}
+            >
+                <div className={styles.userActionsModalContent}>
+                    <Input
+                        value={user.email}
+                        readOnly
+                        className={styles.userActionsInput}
+                        addonBefore="Email"
+                    />
+                    <Select
+                        defaultValue="Інше"
+                        className={styles.userActionsSelect}
+                        onChange={(value) => setSelectedCategory(value)}
+                        options={[
+                            { value: 'Технічне питання', label: 'Технічне питання' },
+                            { value: 'Рекомендації', label: 'Рекомендації' },
+                            { value: 'Питання', label: 'Питання' },
+                            { value: 'Інше', label: 'Інше' },
+                        ]}
+                    />
+                    <Input.TextArea
+                        rows={6}
+                        placeholder="Введіть ваше повідомлення..."
+                        value={messageContent}
+                        onChange={(e) => setMessageContent(e.target.value)}
+                        className={styles.userActionsTextarea}
+                    />
+                    {error && <p className={styles.userActionsError}>{error}</p>}
+                </div>
+            </Modal>
+        </>
     );
 }
 
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css
index ba794836..bf44ba9b 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.module.css
@@ -1,8 +1,24 @@
+.userActionsModalContent {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    width: 100%;
+}
+
+.userActionsInput {
+    width: 100%;
+}
+
 .userActionsSelect {
     width: 100%;
-    margin-bottom: 10px;
 }
 
 .userActionsTextarea {
     width: 100%;
 }
+
+.userActionsError {
+    color: red;
+    font-size: 12px;
+    margin: 0;
+}

From 7a70574b97b443827a215be40615b45f3bf6c244 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 3 Dec 2024 16:35:01 +0300
Subject: [PATCH 05/17] Added backend functionality for blocking users

---
 BackEnd/administration/urls.py                 |  2 ++
 BackEnd/administration/views.py                | 18 ++++++++++++++++--
 .../UserProfilesTable/UserActions.jsx          |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/BackEnd/administration/urls.py b/BackEnd/administration/urls.py
index d60a3516..5fa6fa27 100644
--- a/BackEnd/administration/urls.py
+++ b/BackEnd/administration/urls.py
@@ -11,6 +11,7 @@
     FeedbackView,
     CreateAdminUserView,
     SendMessageView,
+    BlockUserView,
 )
 
 app_name = "administration"
@@ -30,4 +31,5 @@
     path("feedback/", FeedbackView.as_view(), name="feedback"),
     path("admin_create/", CreateAdminUserView.as_view(), name="admin-create"),
     path("users/<pk>/send_message/", SendMessageView.as_view(), name="send-message"),
+    path('users/<pk>/block/', BlockUserView.as_view(), name='block_user'),
 ]
diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index f13c0fef..e5aaff20 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -5,7 +5,7 @@
     OpenApiExample,
     OpenApiResponse,
 )
-
+from rest_framework.views import APIView
 from rest_framework.generics import (
     ListAPIView,
     RetrieveUpdateDestroyAPIView,
@@ -244,4 +244,18 @@ def perform_create(self, serializer):
             category=category,
             message_content=message_content,
             email=email,
-        ) 
\ No newline at end of file
+        ) 
+
+class BlockUserView(APIView):
+    """
+    API endpoint to block an active user.
+
+    This API allows administrators to block active users by setting the `is_active` field to `False`. 
+    Only users with staff privileges can access this endpoint.
+    """
+    permission_classes = [IsStaffUser]
+
+    def patch(self, request, pk):
+        user = get_object_or_404(CustomUser.objects.filter(is_active=True), id=pk)
+        user.is_active = False
+        user.save()
\ No newline at end of file
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index e031b3f8..ea41df7e 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -85,7 +85,7 @@ function UserActions({ user, onActionComplete }) {
     };
 
     const viewProfile = () => {
-        navigate(`/users/${user.id}`);
+        navigate(`/customadmin/users/${user.id}`);
     };
 
     const confirmBlockUser = () => {

From d287e0fe0a309f06d3179676c643b895fbb26267 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 3 Dec 2024 17:31:42 +0300
Subject: [PATCH 06/17] Added frontrnd for blocking users

---
 BackEnd/administration/views.py               | 15 +++++---
 .../UserProfilesTable/UserActions.jsx         | 34 ++++++++++++++-----
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index e5aaff20..92a1cc0d 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -1,4 +1,5 @@
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponse
+from django.core.exceptions import ObjectDoesNotExist
 from django.views import View
 from drf_spectacular.utils import (
     extend_schema,
@@ -256,6 +257,12 @@ class BlockUserView(APIView):
     permission_classes = [IsStaffUser]
 
     def patch(self, request, pk):
-        user = get_object_or_404(CustomUser.objects.filter(is_active=True), id=pk)
-        user.is_active = False
-        user.save()
\ No newline at end of file
+        try:
+            user = CustomUser.objects.get(id=pk)
+            if not user.is_active:
+                return HttpResponse(status=400)
+            user.is_active = False
+            user.save()
+            return HttpResponse(status=204)
+        except ObjectDoesNotExist:
+            return HttpResponse(status=404)
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index ea41df7e..7fda362f 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -87,19 +87,35 @@ function UserActions({ user, onActionComplete }) {
     const viewProfile = () => {
         navigate(`/customadmin/users/${user.id}`);
     };
-
     const confirmBlockUser = () => {
         Modal.confirm({
-            title: 'Підтвердити блокування користувача',
-            icon: <ExclamationCircleOutlined />,
-            content: `Ви впевнені, що хочете заблокувати користувача ${user.name} ${user.surname}?`,
+            title: `Підтвердити блокування користувача ${user.name} ${user.surname}`,
+            icon: <ExclamationCircleOutlined className={styles.userActionsIcon} />,
+            content: (
+                <p className={styles.userActionsModalText}>
+                    Ви впевнені, що хочете заблокувати цього користувача? Ця дія зробить обліковий запис неактивним.
+                </p>
+            ),
+            okText: 'Так',
+            cancelText: 'Відмінити',
             onOk: async () => {
                 try {
-                    console.log(`Blocked user: ${user.id}`);
-                    message.success('Користувач успішно заблокований (імітація)');
-                    if (onActionComplete) onActionComplete();
+                    const response = await axios.patch(
+                        `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/block/`
+                    );
+                    if (response.status === 204) {
+                        message.success('Користувача успішно заблоковано.');
+                        if (onActionComplete) onActionComplete();
+                    }
                 } catch (error) {
-                    message.error('Не вдалося заблокувати користувача. Спробуйте пізніше.');
+                    const status = error.response?.status;
+                    if (status === 400) {
+                        message.error('Користувач вже неактивний. Неможливо заблокувати неактивного користувача.');
+                    } else if (status === 404) {
+                        message.error('Користувача не знайдено.');
+                    } else {
+                        message.error('Сталася помилка. Спробуйте пізніше.');
+                    }
                 }
             },
         });
@@ -112,7 +128,7 @@ function UserActions({ user, onActionComplete }) {
             </Dropdown>
             <Modal
                 title={`Надіслати листа користувачу ${user.name} ${user.surname}`}
-                visible={isModalVisible}
+                open={isModalVisible}
                 onCancel={() => {
                     setIsModalVisible(false);
                     setError('');

From 14f322dd9b9576996d66911173743486c6700f86 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 3 Dec 2024 20:38:56 +0300
Subject: [PATCH 07/17] refactored code

---
 .../UserProfilesTable/UserActions.jsx         | 111 ++++++++++--------
 1 file changed, 64 insertions(+), 47 deletions(-)

diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index 7fda362f..aad7be76 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Dropdown, Modal, Button, message, Select, Input } from 'antd';
+import { Dropdown, Modal, Button, message, Select, Input, Tooltip } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import axios from 'axios';
 import PropTypes from 'prop-types';
@@ -14,20 +14,49 @@ function UserActions({ user, onActionComplete }) {
     const [error, setError] = useState('');
     const navigate = useNavigate();
 
+    const handleApiRequest = async (apiCall, successMessage, errorMessage) => {
+        try {
+            await apiCall();
+            message.success(successMessage);
+        } catch {
+            message.error(errorMessage);
+        }
+    };
+
+    const viewProfile = () => {
+        try {
+            navigate(`/customadmin/users/${user.id}`);
+        } catch (error) {
+            message.error('Не вдалося переглянути профіль. Спробуйте оновити сторінку.');
+        }
+    };
+
     const menuItems = [
         {
             key: 'sendMessage',
-            label: 'Надіслати листа',
+            label: (
+                <Tooltip title="Відправити повідомлення на email">
+                    Надіслати листа
+                </Tooltip>
+            ),
             onClick: () => handleActionClick('sendMessage'),
         },
         {
             key: 'viewProfile',
-            label: 'Переглянути профіль',
+            label: (
+                <Tooltip title="Переглянути детальний профіль користувача">
+                    Переглянути профіль
+                </Tooltip>
+            ),
             onClick: () => handleActionClick('viewProfile'),
         },
         {
             key: 'blockUser',
-            label: 'Заблокувати користувача',
+            label: (
+                <Tooltip title="Заблокувати користувача та обмежити доступ до платформи">
+                    Заблокувати користувача
+                </Tooltip>
+            ),
             onClick: () => handleActionClick('blockUser'),
         },
     ];
@@ -60,34 +89,31 @@ function UserActions({ user, onActionComplete }) {
     const handleSendMessage = async () => {
         if (!validateMessage()) return;
 
-        try {
-            setIsSending(true);
-            await axios.post(
-                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
-                {
-                    email: user.email,
-                    category: selectedCategory,
-                    message: messageContent.trim(),
-                }
-            );
-            message.success('Повідомлення успішно надіслано');
-            setMessageContent('');
-            setIsModalVisible(false);
-            if (onActionComplete) onActionComplete();
-        } catch (error) {
-            message.error(
-                error.response?.data?.detail ||
-                'Не вдалося надіслати повідомлення. Спробуйте ще раз.'
-            );
-        } finally {
-            setIsSending(false);
-        }
+        setIsSending(true);
+        await handleApiRequest(
+            () =>
+                axios.post(
+                    `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
+                    {
+                        email: user.email,
+                        category: selectedCategory,
+                        message: messageContent.trim(),
+                    }
+                ),
+            'Повідомлення успішно надіслано',
+            'Не вдалося надіслати повідомлення. Спробуйте ще раз.'
+        );
+        setIsSending(false);
+        setMessageContent('');
+        setIsModalVisible(false);
+        if (onActionComplete) onActionComplete();
     };
 
-    const viewProfile = () => {
-        navigate(`/customadmin/users/${user.id}`);
-    };
     const confirmBlockUser = () => {
+        if (!user.is_active) {
+            message.warning('Користувач неактивний. Неможливо заблокувати неактивного користувача.');
+            return;
+        }
         Modal.confirm({
             title: `Підтвердити блокування користувача ${user.name} ${user.surname}`,
             icon: <ExclamationCircleOutlined className={styles.userActionsIcon} />,
@@ -99,24 +125,15 @@ function UserActions({ user, onActionComplete }) {
             okText: 'Так',
             cancelText: 'Відмінити',
             onOk: async () => {
-                try {
-                    const response = await axios.patch(
-                        `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/block/`
-                    );
-                    if (response.status === 204) {
-                        message.success('Користувача успішно заблоковано.');
-                        if (onActionComplete) onActionComplete();
-                    }
-                } catch (error) {
-                    const status = error.response?.status;
-                    if (status === 400) {
-                        message.error('Користувач вже неактивний. Неможливо заблокувати неактивного користувача.');
-                    } else if (status === 404) {
-                        message.error('Користувача не знайдено.');
-                    } else {
-                        message.error('Сталася помилка. Спробуйте пізніше.');
-                    }
-                }
+                await handleApiRequest(
+                    () =>
+                        axios.patch(
+                            `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/block/`
+                        ),
+                    'Користувача успішно заблоковано.',
+                    'Сталася помилка. Спробуйте пізніше.'
+                );
+                if (onActionComplete) onActionComplete();
             },
         });
     };

From fbf958a6d1bc1e54e2e279cd3724ecc7ea633ae7 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 3 Dec 2024 20:47:13 +0300
Subject: [PATCH 08/17] refactored code

---
 .../UserProfilesTable/UserActions.jsx         | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index aad7be76..afe8d3be 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -109,33 +109,40 @@ function UserActions({ user, onActionComplete }) {
         if (onActionComplete) onActionComplete();
     };
 
-    const confirmBlockUser = () => {
-        if (!user.is_active) {
-            message.warning('Користувач неактивний. Неможливо заблокувати неактивного користувача.');
-            return;
+    const confirmBlockUser = async () => {
+        try {
+            const { data } = await axios.get(
+                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/`
+            );
+            if (!data.is_active) {
+                message.warning('Користувач неактивний. Неможливо заблокувати неактивного користувача.');
+                return;
+            }
+            Modal.confirm({
+                title: `Підтвердити блокування користувача ${user.name} ${user.surname}`,
+                icon: <ExclamationCircleOutlined className={styles.userActionsIcon} />,
+                content: (
+                    <p className={styles.userActionsModalText}>
+                        Ви впевнені, що хочете заблокувати цього користувача? Ця дія зробить обліковий запис неактивним.
+                    </p>
+                ),
+                okText: 'Так',
+                cancelText: 'Відмінити',
+                onOk: async () => {
+                    await handleApiRequest(
+                        () =>
+                            axios.patch(
+                                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/block/`
+                            ),
+                        'Користувача успішно заблоковано.',
+                        'Сталася помилка. Спробуйте пізніше.'
+                    );
+                    if (onActionComplete) onActionComplete();
+                },
+            });
+        } catch (error) {
+            message.error('Не вдалося перевірити стан користувача. Спробуйте пізніше.');
         }
-        Modal.confirm({
-            title: `Підтвердити блокування користувача ${user.name} ${user.surname}`,
-            icon: <ExclamationCircleOutlined className={styles.userActionsIcon} />,
-            content: (
-                <p className={styles.userActionsModalText}>
-                    Ви впевнені, що хочете заблокувати цього користувача? Ця дія зробить обліковий запис неактивним.
-                </p>
-            ),
-            okText: 'Так',
-            cancelText: 'Відмінити',
-            onOk: async () => {
-                await handleApiRequest(
-                    () =>
-                        axios.patch(
-                            `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/block/`
-                        ),
-                    'Користувача успішно заблоковано.',
-                    'Сталася помилка. Спробуйте пізніше.'
-                );
-                if (onActionComplete) onActionComplete();
-            },
-        });
     };
 
     return (

From 727e316e1202f6b10fe513eb90376dd2d50041fa Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 3 Dec 2024 21:04:54 +0300
Subject: [PATCH 09/17] added test for blocking user and sending message

---
 .../administration/tests/test_block_user.py   | 33 +++++++++++++
 .../administration/tests/test_send_message.py | 49 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 BackEnd/administration/tests/test_block_user.py
 create mode 100644 BackEnd/administration/tests/test_send_message.py

diff --git a/BackEnd/administration/tests/test_block_user.py b/BackEnd/administration/tests/test_block_user.py
new file mode 100644
index 00000000..4c5d9942
--- /dev/null
+++ b/BackEnd/administration/tests/test_block_user.py
@@ -0,0 +1,33 @@
+from rest_framework import status
+from rest_framework.test import APITestCase
+from authentication.factories import UserFactory
+
+
+class TestBlockUserView(APITestCase):
+    def setUp(self):
+        self.admin = UserFactory(is_staff=True, is_active=True)
+        self.user = UserFactory(is_active=True)
+        self.client.force_authenticate(self.admin)
+        self.url = f"/api/admin/users/{self.user.id}/block/"
+
+    def test_block_user_success(self):
+        response = self.client.patch(self.url)
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+        self.user.refresh_from_db()
+        self.assertFalse(self.user.is_active)
+
+    def test_block_user_already_inactive(self):
+        self.user.is_active = False
+        self.user.save()
+        response = self.client.patch(self.url)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_block_user_not_found(self):
+        url = "/api/admin/users/9999/block/" 
+        response = self.client.patch(url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+    def test_block_user_unauthorized(self):
+        self.client.logout()
+        response = self.client.patch(self.url)
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
diff --git a/BackEnd/administration/tests/test_send_message.py b/BackEnd/administration/tests/test_send_message.py
new file mode 100644
index 00000000..07c98c48
--- /dev/null
+++ b/BackEnd/administration/tests/test_send_message.py
@@ -0,0 +1,49 @@
+from rest_framework import status
+from rest_framework.test import APITestCase
+from authentication.factories import UserFactory
+
+
+class TestSendMessageView(APITestCase):
+    def setUp(self):
+        self.admin = UserFactory(is_staff=True, is_active=True)
+        self.user = UserFactory(is_active=True)
+        self.client.force_authenticate(self.admin)
+        self.url = f"/api/admin/users/{self.user.id}/send_message/"
+
+    def test_send_message_success(self):
+        data = {
+            "email": self.user.email,
+            "category": "Інше",
+            "message": "Valid message for testing.",
+        }
+        response = self.client.post(self.url, data)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+    def test_send_message_invalid_data(self):
+        data = {
+            "email": self.user.email,
+            "category": "Iнше",
+            "message": "Short",
+        }
+        response = self.client.post(self.url, data)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_send_message_unauthorized(self):
+        self.client.logout()
+        data = {
+            "email": self.user.email,
+            "category": "Інше",
+            "message": "Valid message for testing.",
+        }
+        response = self.client.post(self.url, data)
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+
+    def test_send_message_user_not_found(self):
+        url = "/api/admin/users/9999/send_message/"
+        data = {
+            "email": "nonexistent@test.com",
+            "category": "Інше",
+            "message": "Valid message for testing.",
+        }
+        response = self.client.post(url, data)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)

From 5aba80fff38c9f5c7ee62dc4ddd6d02cc2870f26 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Tue, 3 Dec 2024 21:34:49 +0300
Subject: [PATCH 10/17] added Black formatting

---
 .../administration/tests/test_block_user.py    |  2 +-
 BackEnd/administration/urls.py                 |  8 ++++++--
 BackEnd/administration/views.py                | 18 +++++++++++-------
 .../administration/send_email_notification.py  | 11 +++++++++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/BackEnd/administration/tests/test_block_user.py b/BackEnd/administration/tests/test_block_user.py
index 4c5d9942..c2dcdfa1 100644
--- a/BackEnd/administration/tests/test_block_user.py
+++ b/BackEnd/administration/tests/test_block_user.py
@@ -23,7 +23,7 @@ def test_block_user_already_inactive(self):
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     def test_block_user_not_found(self):
-        url = "/api/admin/users/9999/block/" 
+        url = "/api/admin/users/9999/block/"
         response = self.client.patch(url)
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
diff --git a/BackEnd/administration/urls.py b/BackEnd/administration/urls.py
index 5fa6fa27..3ed289b9 100644
--- a/BackEnd/administration/urls.py
+++ b/BackEnd/administration/urls.py
@@ -30,6 +30,10 @@
     path("contacts/", ContactsView.as_view(), name="contacts"),
     path("feedback/", FeedbackView.as_view(), name="feedback"),
     path("admin_create/", CreateAdminUserView.as_view(), name="admin-create"),
-    path("users/<pk>/send_message/", SendMessageView.as_view(), name="send-message"),
-    path('users/<pk>/block/', BlockUserView.as_view(), name='block_user'),
+    path(
+        "users/<pk>/send_message/",
+        SendMessageView.as_view(),
+        name="send-message",
+    ),
+    path("users/<pk>/block/", BlockUserView.as_view(), name="block_user"),
 ]
diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index 92a1cc0d..a3fe516d 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -203,14 +203,16 @@ def perform_create(self, serializer):
 
         send_email_feedback(email, message, category)
 
+
 class SendMessageView(CreateAPIView):
     """
     API endpoint for sending a custom email message to a specific user.
 
     This view allows administrators to send a message to a user's registered email.
-    It validates the request payload, retrieves the user based on the provided ID, 
+    It validates the request payload, retrieves the user based on the provided ID,
     and sends the email using the specified category and message content.
     """
+
     permission_classes = [IsStaffUser]
     serializer_class = FeedbackSerializer
 
@@ -218,7 +220,7 @@ def get_queryset(self):
         """
         Returns the base queryset of users.
 
-        This method is used to fetch the list of users, which is 
+        This method is used to fetch the list of users, which is
         then filtered to find the specific user by their primary key (ID).
         """
         return CustomUser.objects.all()
@@ -227,8 +229,8 @@ def perform_create(self, serializer):
         """
         Handles the email sending logic after successful validation.
 
-        This method is executed after the request data has been validated 
-        by the serializer. It retrieves the user, validates their existence, 
+        This method is executed after the request data has been validated
+        by the serializer. It retrieves the user, validates their existence,
         and sends the email with the provided category and message content.
 
         Parameters:
@@ -236,7 +238,7 @@ def perform_create(self, serializer):
             the validated data from the request.
         """
         user = get_object_or_404(self.get_queryset(), pk=self.kwargs.get("pk"))
-        email = serializer.validated_data["email"] 
+        email = serializer.validated_data["email"]
         category = serializer.validated_data["category"]
         message_content = serializer.validated_data["message"]
 
@@ -245,15 +247,17 @@ def perform_create(self, serializer):
             category=category,
             message_content=message_content,
             email=email,
-        ) 
+        )
+
 
 class BlockUserView(APIView):
     """
     API endpoint to block an active user.
 
-    This API allows administrators to block active users by setting the `is_active` field to `False`. 
+    This API allows administrators to block active users by setting the `is_active` field to `False`.
     Only users with staff privileges can access this endpoint.
     """
+
     permission_classes = [IsStaffUser]
 
     def patch(self, request, pk):
diff --git a/BackEnd/utils/administration/send_email_notification.py b/BackEnd/utils/administration/send_email_notification.py
index 395fd582..eaf0a923 100644
--- a/BackEnd/utils/administration/send_email_notification.py
+++ b/BackEnd/utils/administration/send_email_notification.py
@@ -5,10 +5,17 @@
 EMAIL_CONTENT_SUBTYPE = "html"
 PROTOCOL = "http"
 
-def send_email_to_user(user, category, message_content, email=None, template_name="administration/admin_message_template.html"):
+
+def send_email_to_user(
+    user,
+    category,
+    message_content,
+    email=None,
+    template_name="administration/admin_message_template.html",
+):
     """
     Sends an email message to the user using the specified template.
-    
+
     :param user: The user object (CustomUser)
     :param category: The email category
     :param message_content: The message content

From 1096d99bfc5f3f182c45a1e3af2c64643d9b89bc Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Wed, 4 Dec 2024 13:04:05 +0300
Subject: [PATCH 11/17] refactored code

---
 BackEnd/administration/serializers.py | 24 +++++++++++++++++++++
 BackEnd/administration/views.py       | 30 ++++++---------------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/BackEnd/administration/serializers.py b/BackEnd/administration/serializers.py
index 24cda9be..91c5d1d2 100644
--- a/BackEnd/administration/serializers.py
+++ b/BackEnd/administration/serializers.py
@@ -213,3 +213,27 @@ class FeedbackSerializer(serializers.Serializer):
         required=True,
         error_messages={"required": "Please select a category."},
     )
+
+
+class BlockUserSerializer(serializers.ModelSerializer):
+    """
+    Serializer for blocking a user by setting the `is_active` field to `False`.
+    """
+
+    class Meta:
+        model = CustomUser
+        fields = ["id", "is_active", "email", "name", "surname"]
+        read_only_fields = ["id", "email", "name", "surname"]
+
+    def update(self, instance, validated_data):
+        """
+        Custom update method to ensure `is_active` can only be set to `False`.
+        """
+        if not instance.is_active:
+            raise serializers.ValidationError(
+                "User is already inactive. Cannot block an inactive user."
+            )
+
+        instance.is_active = False
+        instance.save()
+        return instance
diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index a3fe516d..87347a6c 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -12,7 +12,6 @@
     RetrieveUpdateDestroyAPIView,
     RetrieveUpdateAPIView,
     CreateAPIView,
-    get_object_or_404,
 )
 
 from administration.serializers import AdminRegistrationSerializer
@@ -30,7 +29,7 @@
 from authentication.models import CustomUser
 from profiles.models import Profile
 from .permissions import IsStaffUser, IsStaffUserOrReadOnly, IsSuperUser
-from .serializers import FeedbackSerializer
+from .serializers import FeedbackSerializer, BlockUserSerializer
 from utils.administration.send_email_feedback import send_email_feedback
 from utils.administration.send_email_notification import send_email_to_user
 
@@ -213,18 +212,10 @@ class SendMessageView(CreateAPIView):
     and sends the email using the specified category and message content.
     """
 
+    queryset = CustomUser.objects.all()
     permission_classes = [IsStaffUser]
     serializer_class = FeedbackSerializer
 
-    def get_queryset(self):
-        """
-        Returns the base queryset of users.
-
-        This method is used to fetch the list of users, which is
-        then filtered to find the specific user by their primary key (ID).
-        """
-        return CustomUser.objects.all()
-
     def perform_create(self, serializer):
         """
         Handles the email sending logic after successful validation.
@@ -237,7 +228,7 @@ def perform_create(self, serializer):
             serializer (FeedbackSerializer): The serializer instance containing
             the validated data from the request.
         """
-        user = get_object_or_404(self.get_queryset(), pk=self.kwargs.get("pk"))
+        user = self.get_object()
         email = serializer.validated_data["email"]
         category = serializer.validated_data["category"]
         message_content = serializer.validated_data["message"]
@@ -250,7 +241,7 @@ def perform_create(self, serializer):
         )
 
 
-class BlockUserView(APIView):
+class BlockUserView(RetrieveUpdateAPIView):
     """
     API endpoint to block an active user.
 
@@ -258,15 +249,6 @@ class BlockUserView(APIView):
     Only users with staff privileges can access this endpoint.
     """
 
+    queryset = CustomUser.objects.all()
+    serializer_class = BlockUserSerializer
     permission_classes = [IsStaffUser]
-
-    def patch(self, request, pk):
-        try:
-            user = CustomUser.objects.get(id=pk)
-            if not user.is_active:
-                return HttpResponse(status=400)
-            user.is_active = False
-            user.save()
-            return HttpResponse(status=204)
-        except ObjectDoesNotExist:
-            return HttpResponse(status=404)

From 613f127d227e32795f689f982eb845b9ac6aeef2 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Wed, 4 Dec 2024 13:09:28 +0300
Subject: [PATCH 12/17] changed tests for blocking users

---
 BackEnd/administration/tests/test_block_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BackEnd/administration/tests/test_block_user.py b/BackEnd/administration/tests/test_block_user.py
index c2dcdfa1..7abb74c1 100644
--- a/BackEnd/administration/tests/test_block_user.py
+++ b/BackEnd/administration/tests/test_block_user.py
@@ -12,7 +12,7 @@ def setUp(self):
 
     def test_block_user_success(self):
         response = self.client.patch(self.url)
-        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.user.refresh_from_db()
         self.assertFalse(self.user.is_active)
 

From a56d8bf585eee86c7effd5511aee5158b6acb1a1 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Wed, 4 Dec 2024 15:50:26 +0300
Subject: [PATCH 13/17] deleted functionality for blocking users

---
 BackEnd/administration/serializers.py         | 24 ---------
 .../administration/tests/test_block_user.py   | 33 -------------
 BackEnd/administration/urls.py                |  2 -
 BackEnd/administration/views.py               | 19 +------
 .../UserProfilesTable/UserActions.jsx         | 49 -------------------
 5 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 BackEnd/administration/tests/test_block_user.py

diff --git a/BackEnd/administration/serializers.py b/BackEnd/administration/serializers.py
index 91c5d1d2..24cda9be 100644
--- a/BackEnd/administration/serializers.py
+++ b/BackEnd/administration/serializers.py
@@ -213,27 +213,3 @@ class FeedbackSerializer(serializers.Serializer):
         required=True,
         error_messages={"required": "Please select a category."},
     )
-
-
-class BlockUserSerializer(serializers.ModelSerializer):
-    """
-    Serializer for blocking a user by setting the `is_active` field to `False`.
-    """
-
-    class Meta:
-        model = CustomUser
-        fields = ["id", "is_active", "email", "name", "surname"]
-        read_only_fields = ["id", "email", "name", "surname"]
-
-    def update(self, instance, validated_data):
-        """
-        Custom update method to ensure `is_active` can only be set to `False`.
-        """
-        if not instance.is_active:
-            raise serializers.ValidationError(
-                "User is already inactive. Cannot block an inactive user."
-            )
-
-        instance.is_active = False
-        instance.save()
-        return instance
diff --git a/BackEnd/administration/tests/test_block_user.py b/BackEnd/administration/tests/test_block_user.py
deleted file mode 100644
index 7abb74c1..00000000
--- a/BackEnd/administration/tests/test_block_user.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from rest_framework import status
-from rest_framework.test import APITestCase
-from authentication.factories import UserFactory
-
-
-class TestBlockUserView(APITestCase):
-    def setUp(self):
-        self.admin = UserFactory(is_staff=True, is_active=True)
-        self.user = UserFactory(is_active=True)
-        self.client.force_authenticate(self.admin)
-        self.url = f"/api/admin/users/{self.user.id}/block/"
-
-    def test_block_user_success(self):
-        response = self.client.patch(self.url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.user.refresh_from_db()
-        self.assertFalse(self.user.is_active)
-
-    def test_block_user_already_inactive(self):
-        self.user.is_active = False
-        self.user.save()
-        response = self.client.patch(self.url)
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_block_user_not_found(self):
-        url = "/api/admin/users/9999/block/"
-        response = self.client.patch(url)
-        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-
-    def test_block_user_unauthorized(self):
-        self.client.logout()
-        response = self.client.patch(self.url)
-        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
diff --git a/BackEnd/administration/urls.py b/BackEnd/administration/urls.py
index 3ed289b9..b71b9695 100644
--- a/BackEnd/administration/urls.py
+++ b/BackEnd/administration/urls.py
@@ -11,7 +11,6 @@
     FeedbackView,
     CreateAdminUserView,
     SendMessageView,
-    BlockUserView,
 )
 
 app_name = "administration"
@@ -35,5 +34,4 @@
         SendMessageView.as_view(),
         name="send-message",
     ),
-    path("users/<pk>/block/", BlockUserView.as_view(), name="block_user"),
 ]
diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index 87347a6c..daf14299 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -1,12 +1,10 @@
-from django.http import JsonResponse, HttpResponse
-from django.core.exceptions import ObjectDoesNotExist
+from django.http import JsonResponse
 from django.views import View
 from drf_spectacular.utils import (
     extend_schema,
     OpenApiExample,
     OpenApiResponse,
 )
-from rest_framework.views import APIView
 from rest_framework.generics import (
     ListAPIView,
     RetrieveUpdateDestroyAPIView,
@@ -29,7 +27,7 @@
 from authentication.models import CustomUser
 from profiles.models import Profile
 from .permissions import IsStaffUser, IsStaffUserOrReadOnly, IsSuperUser
-from .serializers import FeedbackSerializer, BlockUserSerializer
+from .serializers import FeedbackSerializer
 from utils.administration.send_email_feedback import send_email_feedback
 from utils.administration.send_email_notification import send_email_to_user
 
@@ -239,16 +237,3 @@ def perform_create(self, serializer):
             message_content=message_content,
             email=email,
         )
-
-
-class BlockUserView(RetrieveUpdateAPIView):
-    """
-    API endpoint to block an active user.
-
-    This API allows administrators to block active users by setting the `is_active` field to `False`.
-    Only users with staff privileges can access this endpoint.
-    """
-
-    queryset = CustomUser.objects.all()
-    serializer_class = BlockUserSerializer
-    permission_classes = [IsStaffUser]
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index afe8d3be..2eab4784 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import { Dropdown, Modal, Button, message, Select, Input, Tooltip } from 'antd';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import styles from './UserActions.module.css';
@@ -50,15 +49,6 @@ function UserActions({ user, onActionComplete }) {
             ),
             onClick: () => handleActionClick('viewProfile'),
         },
-        {
-            key: 'blockUser',
-            label: (
-                <Tooltip title="Заблокувати користувача та обмежити доступ до платформи">
-                    Заблокувати користувача
-                </Tooltip>
-            ),
-            onClick: () => handleActionClick('blockUser'),
-        },
     ];
 
     const handleActionClick = (action) => {
@@ -69,9 +59,6 @@ function UserActions({ user, onActionComplete }) {
             case 'viewProfile':
                 viewProfile();
                 break;
-            case 'blockUser':
-                confirmBlockUser();
-                break;
             default:
                 console.error('Unknown action:', action);
         }
@@ -109,42 +96,6 @@ function UserActions({ user, onActionComplete }) {
         if (onActionComplete) onActionComplete();
     };
 
-    const confirmBlockUser = async () => {
-        try {
-            const { data } = await axios.get(
-                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/`
-            );
-            if (!data.is_active) {
-                message.warning('Користувач неактивний. Неможливо заблокувати неактивного користувача.');
-                return;
-            }
-            Modal.confirm({
-                title: `Підтвердити блокування користувача ${user.name} ${user.surname}`,
-                icon: <ExclamationCircleOutlined className={styles.userActionsIcon} />,
-                content: (
-                    <p className={styles.userActionsModalText}>
-                        Ви впевнені, що хочете заблокувати цього користувача? Ця дія зробить обліковий запис неактивним.
-                    </p>
-                ),
-                okText: 'Так',
-                cancelText: 'Відмінити',
-                onOk: async () => {
-                    await handleApiRequest(
-                        () =>
-                            axios.patch(
-                                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/block/`
-                            ),
-                        'Користувача успішно заблоковано.',
-                        'Сталася помилка. Спробуйте пізніше.'
-                    );
-                    if (onActionComplete) onActionComplete();
-                },
-            });
-        } catch (error) {
-            message.error('Не вдалося перевірити стан користувача. Спробуйте пізніше.');
-        }
-    };
-
     return (
         <>
             <Dropdown menu={{ items: menuItems }} trigger={['click']}>

From 78ea90a489f06c91f201ffe00731b54fadabee5f Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Thu, 5 Dec 2024 19:35:52 +0300
Subject: [PATCH 14/17] refactored code in accordance with the comments

---
 .../admin_message_template.html               | 20 ++--
 BackEnd/administration/views.py               |  1 +
 .../administration/send_email_notification.py |  7 +-
 .../UserProfilesTable/UserActions.jsx         | 92 ++++++++-----------
 4 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/BackEnd/administration/templates/administration/admin_message_template.html b/BackEnd/administration/templates/administration/admin_message_template.html
index b87c2496..9235b2d4 100644
--- a/BackEnd/administration/templates/administration/admin_message_template.html
+++ b/BackEnd/administration/templates/administration/admin_message_template.html
@@ -11,6 +11,9 @@
         }
         .email-container {
             padding: 20px;
+            border: 1px solid #ddd;
+            border-radius: 5px;
+            background-color: #f9f9f9;
         }
         .email-footer {
             margin-top: 20px;
@@ -20,16 +23,21 @@
         img {
             max-width: 150px;
         }
+        .email-body {
+            margin-bottom: 20px;
+        }
     </style>
 </head>
 <body>
     <div class="email-container">
-        <img src="{{ logo_url }}" alt="CRAFTMERGE" />
-        <p>Доброго дня, {{ user_name }}!</p>
-        <p>Ви отримали нове повідомлення:</p>
-        <p><b>Категорія:</b> {{ category }}</p>
-        <p><b>Повідомлення:</b></p>
-        <p>{{ message }}</p>
+        <img src="{{ logo_url }}" alt="CraftMerge Logo" />
+        <div class="email-body">
+            <p>Доброго дня, {{ user_name }}!</p>
+            <p>Ви отримали нове повідомлення:</p>
+            <p><b>Категорія:</b> {{ category }}</p>
+            <p><b>Повідомлення:</b></p>
+            <p>{{ message }}</p>
+        </div>
         <div class="email-footer">
             <p>З повагою,</p>
             <p>Команда CraftMerge</p>
diff --git a/BackEnd/administration/views.py b/BackEnd/administration/views.py
index daf14299..52db67f0 100644
--- a/BackEnd/administration/views.py
+++ b/BackEnd/administration/views.py
@@ -236,4 +236,5 @@ def perform_create(self, serializer):
             category=category,
             message_content=message_content,
             email=email,
+            sender_name="Адміністратор CraftMerge",
         )
diff --git a/BackEnd/utils/administration/send_email_notification.py b/BackEnd/utils/administration/send_email_notification.py
index eaf0a923..8f81426e 100644
--- a/BackEnd/utils/administration/send_email_notification.py
+++ b/BackEnd/utils/administration/send_email_notification.py
@@ -11,6 +11,7 @@ def send_email_to_user(
     category,
     message_content,
     email=None,
+    sender_name="Адміністратор CraftMerge",
     template_name="administration/admin_message_template.html",
 ):
     """
@@ -20,20 +21,24 @@ def send_email_to_user(
     :param category: The email category
     :param message_content: The message content
     :param email: (Optional) The recipient's email
+    :param sender_name: Name of the sender
     :param template_name: The path to the HTML template
     """
     context = {
         "user_name": f"{user.name} {user.surname}",
         "message": message_content,
         "category": category,
+        "sender_name": sender_name,
         "logo_url": f"{PROTOCOL}://178.212.110.52/craftMerge-logo.png",
     }
 
     email_body = render_to_string(template_name, context)
     recipient_email = email if email else user.email
 
+    subject = f"{sender_name} - {category}"
+
     email = EmailMultiAlternatives(
-        subject=category,
+        subject=subject,
         body=email_body,
         from_email=settings.EMAIL_HOST_USER,
         to=[recipient_email],
diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index 2eab4784..17e64539 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -1,5 +1,7 @@
 import React, { useState } from 'react';
-import { Dropdown, Modal, Button, message, Select, Input, Tooltip } from 'antd';
+import { Dropdown, Modal, Button, Select, Input, Tooltip } from 'antd';
+import { toast } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import styles from './UserActions.module.css';
@@ -13,12 +15,36 @@ function UserActions({ user, onActionComplete }) {
     const [error, setError] = useState('');
     const navigate = useNavigate();
 
-    const handleApiRequest = async (apiCall, successMessage, errorMessage) => {
+    const validateMessage = () => {
+        if (messageContent.trim().length < 10) {
+            setError('Повідомлення має бути не менше 10 символів.');
+            return false;
+        }
+        setError('');
+        return true;
+    };
+
+    const handleSendMessage = async () => {
+        if (!validateMessage()) return;
+
+        setIsSending(true);
         try {
-            await apiCall();
-            message.success(successMessage);
+            await axios.post(
+                `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
+                {
+                    email: user.email,
+                    category: selectedCategory,
+                    message: messageContent.trim(),
+                }
+            );
+            toast.success('Повідомлення успішно надіслано');
+            setMessageContent('');
+            setIsModalVisible(false);
+            if (onActionComplete) onActionComplete();
         } catch {
-            message.error(errorMessage);
+            toast.error('Не вдалося надіслати повідомлення. Спробуйте ще раз.');
+        } finally {
+            setIsSending(false);
         }
     };
 
@@ -26,7 +52,7 @@ function UserActions({ user, onActionComplete }) {
         try {
             navigate(`/customadmin/users/${user.id}`);
         } catch (error) {
-            message.error('Не вдалося переглянути профіль. Спробуйте оновити сторінку.');
+            toast.error('Не вдалося переглянути профіль. Спробуйте оновити сторінку.');
         }
     };
 
@@ -38,7 +64,7 @@ function UserActions({ user, onActionComplete }) {
                     Надіслати листа
                 </Tooltip>
             ),
-            onClick: () => handleActionClick('sendMessage'),
+            onClick: () => setIsModalVisible(true),
         },
         {
             key: 'viewProfile',
@@ -47,55 +73,10 @@ function UserActions({ user, onActionComplete }) {
                     Переглянути профіль
                 </Tooltip>
             ),
-            onClick: () => handleActionClick('viewProfile'),
+            onClick: viewProfile,
         },
     ];
 
-    const handleActionClick = (action) => {
-        switch (action) {
-            case 'sendMessage':
-                setIsModalVisible(true);
-                break;
-            case 'viewProfile':
-                viewProfile();
-                break;
-            default:
-                console.error('Unknown action:', action);
-        }
-    };
-
-    const validateMessage = () => {
-        if (messageContent.trim().length < 10) {
-            setError('Повідомлення має бути не менше 10 символів.');
-            return false;
-        }
-        setError('');
-        return true;
-    };
-
-    const handleSendMessage = async () => {
-        if (!validateMessage()) return;
-
-        setIsSending(true);
-        await handleApiRequest(
-            () =>
-                axios.post(
-                    `${process.env.REACT_APP_BASE_API_URL}/api/admin/users/${user.id}/send_message/`,
-                    {
-                        email: user.email,
-                        category: selectedCategory,
-                        message: messageContent.trim(),
-                    }
-                ),
-            'Повідомлення успішно надіслано',
-            'Не вдалося надіслати повідомлення. Спробуйте ще раз.'
-        );
-        setIsSending(false);
-        setMessageContent('');
-        setIsModalVisible(false);
-        if (onActionComplete) onActionComplete();
-    };
-
     return (
         <>
             <Dropdown menu={{ items: menuItems }} trigger={['click']}>
@@ -146,7 +127,10 @@ function UserActions({ user, onActionComplete }) {
                         rows={6}
                         placeholder="Введіть ваше повідомлення..."
                         value={messageContent}
-                        onChange={(e) => setMessageContent(e.target.value)}
+                        onChange={(e) => {
+                            setMessageContent(e.target.value);
+                            validateMessage();
+                        }}
                         className={styles.userActionsTextarea}
                     />
                     {error && <p className={styles.userActionsError}>{error}</p>}

From de52f6d78bacf6499e8dc73a0d23df02eefdac16 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Thu, 5 Dec 2024 21:11:45 +0300
Subject: [PATCH 15/17] added craftMerge-logo.png

---
 FrontEnd/public/craftMerge-logo.png | Bin 0 -> 12110 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 FrontEnd/public/craftMerge-logo.png

diff --git a/FrontEnd/public/craftMerge-logo.png b/FrontEnd/public/craftMerge-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..842d972f0a588d2fde6ceee39499cd8fd8a1991f
GIT binary patch
literal 12110
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
F{||r!oPGcR

literal 0
HcmV?d00001


From 593e2111d73ce937a6df046b6552647b8d355db0 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Thu, 5 Dec 2024 21:21:09 +0300
Subject: [PATCH 16/17] fixed issue

---
 .../AdminPage/UserProfilesTable/UserActions.jsx  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
index 17e64539..56db1e9a 100644
--- a/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
+++ b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserActions.jsx
@@ -15,17 +15,18 @@ function UserActions({ user, onActionComplete }) {
     const [error, setError] = useState('');
     const navigate = useNavigate();
 
-    const validateMessage = () => {
-        if (messageContent.trim().length < 10) {
+    const validateMessage = (message) => {
+        if (message.trim().length >= 10) {
+            setError('');
+            return true;
+        } else {
             setError('Повідомлення має бути не менше 10 символів.');
             return false;
         }
-        setError('');
-        return true;
     };
 
     const handleSendMessage = async () => {
-        if (!validateMessage()) return;
+        if (!validateMessage(messageContent)) return;
 
         setIsSending(true);
         try {
@@ -128,8 +129,9 @@ function UserActions({ user, onActionComplete }) {
                         placeholder="Введіть ваше повідомлення..."
                         value={messageContent}
                         onChange={(e) => {
-                            setMessageContent(e.target.value);
-                            validateMessage();
+                            const input = e.target.value;
+                            setMessageContent(input);
+                            validateMessage(input);
                         }}
                         className={styles.userActionsTextarea}
                     />

From 0e6475f08eac0d623123641027fcb14d5bce1806 Mon Sep 17 00:00:00 2001
From: Leonid Chelakhov <leonidchelahov@gmail.com>
Date: Fri, 6 Dec 2024 14:26:23 +0300
Subject: [PATCH 17/17] improved test_send_message: added functional tests

---
 .../administration/tests/test_send_message.py | 60 +++++++++++++++++++
 .../administration/send_email_notification.py | 11 ++++
 2 files changed, 71 insertions(+)

diff --git a/BackEnd/administration/tests/test_send_message.py b/BackEnd/administration/tests/test_send_message.py
index 07c98c48..eb3784b9 100644
--- a/BackEnd/administration/tests/test_send_message.py
+++ b/BackEnd/administration/tests/test_send_message.py
@@ -1,6 +1,9 @@
+from django.core import mail
+from django.conf import settings
 from rest_framework import status
 from rest_framework.test import APITestCase
 from authentication.factories import UserFactory
+from utils.administration.send_email_notification import send_email_to_user
 
 
 class TestSendMessageView(APITestCase):
@@ -47,3 +50,60 @@ def test_send_message_user_not_found(self):
         }
         response = self.client.post(url, data)
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+
+class TestSendEmailFunctionality(APITestCase):
+    def setUp(self):
+        self.user = UserFactory(
+            name="Test", surname="User", email="test_user@example.com"
+        )
+
+    def send_email(self, category, message_content, email=None):
+        email = email if email else self.user.email
+        return send_email_to_user(
+            user=self.user,
+            category=category,
+            message_content=message_content,
+            email=email,
+        )
+
+    def test_send_email_success(self):
+        self.send_email(
+            category="Інше",
+            message_content="This is a test message.",
+            email="test_user@example.com",
+        )
+
+        self.assertEqual(len(mail.outbox), 1)
+        email = mail.outbox[0]
+        self.assertEqual(email.subject, "Адміністратор CraftMerge - Інше")
+        self.assertIn("This is a test message.", email.body)
+        self.assertEqual(email.to, ["test_user@example.com"])
+        self.assertEqual(email.from_email, settings.EMAIL_HOST_USER)
+
+    def test_send_email_empty_message(self):
+        with self.assertRaises(ValueError) as e:
+            self.send_email(
+                category="Інше",
+                message_content="",
+                email="test_user@example.com",
+            )
+        self.assertEqual(str(e.exception), "Message content cannot be empty.")
+
+    def test_send_email_invalid_email(self):
+        with self.assertRaises(ValueError) as e:
+            self.send_email(
+                category="Інше",
+                message_content="Test message",
+                email="invalid_email",
+            )
+        self.assertEqual(str(e.exception), "Invalid email address.")
+
+    def test_send_email_missing_category(self):
+        with self.assertRaises(ValueError) as e:
+            self.send_email(
+                category="",
+                message_content="Test message",
+                email="test_user@example.com",
+            )
+        self.assertEqual(str(e.exception), "Category is required.")
diff --git a/BackEnd/utils/administration/send_email_notification.py b/BackEnd/utils/administration/send_email_notification.py
index 8f81426e..003c881b 100644
--- a/BackEnd/utils/administration/send_email_notification.py
+++ b/BackEnd/utils/administration/send_email_notification.py
@@ -1,6 +1,8 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.conf import settings
+from django.core.validators import validate_email
+from django.core.exceptions import ValidationError
 
 EMAIL_CONTENT_SUBTYPE = "html"
 PROTOCOL = "http"
@@ -24,6 +26,15 @@ def send_email_to_user(
     :param sender_name: Name of the sender
     :param template_name: The path to the HTML template
     """
+    if not category:
+        raise ValueError("Category is required.")
+    if not message_content.strip():
+        raise ValueError("Message content cannot be empty.")
+    try:
+        validate_email(email or user.email)
+    except ValidationError:
+        raise ValueError("Invalid email address.")
+
     context = {
         "user_name": f"{user.name} {user.surname}",
         "message": message_content,