Fixed export bugs on contact and discussion pages

package.json

@@ -13,6 +13,7 @@
     "@testing-library/user-event": "^12.8.3",
     "babel-eslint": "^10.1.0",
     "bootstrap": "^4.6.0",
+    "export-to-csv": "^0.2.1",
     "firebase": "^8.3.0",
     "jquery": "^3.6.0",
     "json-2-csv": "^3.10.2",

src/components/pages/contacts/ContactsCsv.js

@@ -1,28 +1,26 @@
-import { json2csvAsync } from "json-2-csv";
-import firebase from "firebase/app";
-import "firebase/storage";
+/*eslint-disable*/
+import { ExportToCsv } from "export-to-csv";
 
 async function generateCSV(users) {
   // Create CSV String
-  users.sort((a, b) => a.name.localeCompare(b.name));
+  const filteredUsers = users.map(user => {
+    let obj = Object.assign({}, user);
+    delete obj.id;
+    delete obj.accountStatus;
+    return obj
+  });
+
+  filteredUsers.sort((a, b) => a.name.localeCompare(b.name));
+
   const options = {
-    keys: [
-      { field: "name", title: "Name" },
-      { field: "email", title: "Email" },
-      { field: "phone", title: "Phone" },
-      { field: "validated", title: "Validated" },
-    ],
+    headers: [ "Email", "Name", "Phone Number", "Is Admin", "Is Valid"],
+    showLabels: true,
+    showTitle: true,
+    title: "List Of Contacts",
   };
-  const usersCSV = await json2csvAsync(users, options);
-
-  // Create CSV File
-  const storageRef = firebase.storage().ref();
-  const contactsCsvRef = storageRef.child("contacts.csv");
-  await contactsCsvRef.putString(usersCSV);
 
-  // Download CSV File
-  const ContactsURL = await contactsCsvRef.getDownloadURL();
-  window.open(ContactsURL);
+  const csvExporter = new ExportToCsv(options);
+  csvExporter.generateCsv(filteredUsers);
 }
 
 export default generateCSV;

src/components/pages/discussion/DiscussionCSV.js

@@ -1,37 +1,41 @@
 /* eslint-disable */
-import { json2csvAsync } from "json-2-csv";
-import firebase from "firebase/app";
-import "firebase/storage";
+import { ExportToCsv } from "export-to-csv";
 
 async function generateCSV(posts, title) {
   // Create CSV String
+  const filteredPosts = posts.map(user => {
+    let obj = Object.assign({}, user);
+    obj.username = obj.user.name;
+    delete obj.user;
+    delete obj.userRef;
+    delete obj.messageId;
+    return obj
+  });
+
   const dateOptions = { month: "short", day: "numeric" };
   const timeOptions = { hour: "numeric", minute: "numeric", hour12: true };
-  posts.forEach((post) => {
+  filteredPosts.forEach((post) => {
     const x = post.timeSent.toDate();
     const formattedDate = `${x.toLocaleDateString(
       undefined,
       dateOptions
     )} at ${x.toLocaleTimeString(undefined, timeOptions)}`;
     post.timeSent = formattedDate;
   });
+
   const options = {
-    keys: [
-      { field: "user.name", title: "Name" },
-      { field: "message", title: "Message" },
-      { field: "timeSent", title: "time sent" },
-    ],
+    headers: [ "Message", "Time Sent", "Name"],
+    showLabels: true,
+    showTitle: true,
+    title: "Discussion Log",
   };
-  const postsCSV = await json2csvAsync(posts, options);
 
-  // Create CSV File
-  const storageRef = firebase.storage().ref();
-  const discussionCsvRef = storageRef.child(title + "Discussion.csv");
-  await discussionCsvRef.putString(postsCSV);
+  const csvExporter = new ExportToCsv(options);
 
-  // Download CSV File
-  const discussionURL = await discussionCsvRef.getDownloadURL();
-  window.open(discussionURL);
+  console.log(filteredPosts);
+  if(filteredPosts.length != 0){
+    csvExporter.generateCsv(filteredPosts);
+  }
 }
 
 export default generateCSV;

src/components/pages/schedule/calendar/newCalendar.jsx

@@ -130,8 +130,6 @@ export default function NewCalendar() {
   //     eventClick={(info) => handleClick(info)}
   //   />
   // );
-
-
   // const updateMedia = () => {
   //   if (window.innerWidth > 900) {
   //     ReactDOM.render(