Merge remote-tracking branch 'origin/main'

src/main/resources/templates/adminDashboard.html

@@ -22,10 +22,11 @@
 
 <h2>Email Data</h2> <!--heading for email data section -->
 <!-- Placeholder message when no email data is present -->
-<div th:if="${emailData.empty}"><!--if the email data section is empty -->
+
+<div th:if="${emailData == null or #lists.isEmpty(emailData)}"><!--if the email data section is empty -->
     <p style="text-align: center; font-style: italic;">No queries at present</p> <!--message tells admin table is empty -->
 </div>
-<table border="1" th:if="${!emailData.empty}"> <!-- Render the table only if email data is not empty -->
+<table border="1" th:if="${emailData != null and not #lists.isEmpty(emailData)}"> <!-- Render the table only if email data is not empty -->
     <thead>
     <tr>
         <th>ID</th> <!--column heading for ID-->
@@ -51,10 +52,10 @@
 
 <h2>Phone Numbers</h2> <!--heading for phone number section -->
 <!-- Placeholder message when no phone numbers are present -->
-<div th:if="${phoneNumbers.empty}"><!--if phoneNumbersd table is empty -->
+<div th:if="${phoneNumbers == null}"><!--if phoneNumbersd table is empty -->
     <p style="text-align: center; font-style: italic;">No phone call requests at present</p> <!--message tells admin table is empty -->
 </div>
-<table border="1" th:if="${!phoneNumbers.empty}"> <!-- render the table only if phone numbers data is not empty -->
+<table border="1" th:if="${phoneNumbers != null}"> <!-- render the table only if phone numbers data is not empty -->
     <thead>
     <tr>
         <th>ID</th> <!--column heading for ID-->