Sort emails most recent on admin page (#117)

* updated URL * updated env name * added alert after sending email * sort email by added time * added indication while adding and sending email
Vero-Ventures · May 29, 2024 · b482829 · b482829
1 parent 2ab3a71
commit b482829
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/app/admin/page.js b/src/app/admin/page.js
@@ -20,27 +20,25 @@ export default function Home() {
         const userData = await response.json();
         if (userData.data && userData.data.admin === true) {
           setUser(userData);
-          console.log('User is admin');
         } else {
-          console.log('User is not admin');
           setUnauthorized(true);
           setTimeout(() => {
             window.location.href = '/';
-          }, 3000); // Redirect after 3 seconds
+          }, 2000); // Redirect after 2 seconds
         }
       } else {
         console.error('Failed to fetch user:', response.statusText);
         setUnauthorized(true);
         setTimeout(() => {
           window.location.href = '/';
-        }, 3000); // Redirect after 3 seconds
+        }, 2000); // Redirect after 2 seconds
       }
     } catch (error) {
       console.error('Error fetching user:', error);
       setUnauthorized(true);
       setTimeout(() => {
         window.location.href = '/';
-      }, 3000); // Redirect after 3 seconds
+      }, 2000); // Redirect after 2 seconds
     } finally {
       setLoading(false);
     }
@@ -67,7 +65,7 @@ export default function Home() {
 
   const updateEmails = (emailObj, isAdd) => {
     if (isAdd) {
-      setEmails(prevEmails => [...prevEmails, emailObj]);
+      setEmails(prevEmails => [emailObj, ...prevEmails]);
     } else if (!isAdd) {
       const updatedEmails = emails.filter(
         existingEmail => existingEmail.email !== emailObj.email

diff --git a/src/app/api/contact-stat/route.js b/src/app/api/contact-stat/route.js
@@ -11,7 +11,7 @@ export async function GET() {
       mongoose.models['contact-stats'] ||
       mongoose.model('contact-stats', contactStat);
 
-    const contactStats = await ContactStat.find();
+    const contactStats = await ContactStat.find().sort({ _id: -1 });
 
     return NextResponse.json({ contactStats }, { status: 200 });
   } catch (error) {

diff --git a/src/components/component/addEmailModal.jsx b/src/components/component/addEmailModal.jsx
@@ -32,6 +32,8 @@ const CloseButton = ({ onClick }) => (
 export function AddEmailModal({ open, onClose, updateEmails }) {
   const [email, setEmail] = useState('');
   const [emailsAdded, setEmailsAdded] = useState(1);
+  const [isAdding, setIsAdding] = useState(false);
+  const [isAddingAndSending, setIsAddingAndSending] = useState(false);
 
   // Reset email state when the modal is opened
   useEffect(() => {
@@ -47,6 +49,9 @@ export function AddEmailModal({ open, onClose, updateEmails }) {
   };
 
   const handleAddEmail = async () => {
+    // Set isAdding to true to indicate that the email is being added
+    setIsAdding(true);
+
     try {
       if (!validateEmail(email)) {
         alert('Please enter a valid email address');
@@ -55,6 +60,7 @@ export function AddEmailModal({ open, onClose, updateEmails }) {
       // Call the addEmailObjects function with an array of length 1 containing the email object
       const emailsAdded = await emailHandler.addEmailObjects([
         { email, sent: false },
+        //indicate to UI that email is being added
       ]);
       setEmailsAdded(emailsAdded);
       setEmail('');
@@ -64,10 +70,15 @@ export function AddEmailModal({ open, onClose, updateEmails }) {
       updateEmails({ email, sent: false }, isAdd);
     } catch (error) {
       console.error('Error adding email objects:', error);
+    } finally {
+      // Set isAdding to false after adding the email
+      setIsAdding(false);
     }
   };
 
   const handleAddAndSendEmail = async () => {
+    setIsAddingAndSending(true);
+
     try {
       if (!validateEmail(email)) {
         alert('Please enter a valid email address');
@@ -83,6 +94,8 @@ export function AddEmailModal({ open, onClose, updateEmails }) {
       updateEmails({ email, sent: true }, isAdd);
     } catch (error) {
       console.error('Error adding email objects:', error);
+    } finally {
+      setIsAddingAndSending(false);
     }
   };
 
@@ -109,9 +122,11 @@ export function AddEmailModal({ open, onClose, updateEmails }) {
             />
           </div>
           <div className="flex gap-2">
-            <Button onClick={handleAddEmail}>Add Email</Button>
+            <Button onClick={handleAddEmail}>
+              {isAdding ? 'Adding...' : 'Add Email'}
+            </Button>
             <Button variant="outline" onClick={handleAddAndSendEmail}>
-              Add and Send Email
+              {isAddingAndSending ? 'Sending...' : 'Add and Send Email'}
             </Button>
           </div>
           {/* Display warning/notification field if emailsAdded is less than 1 */}