admin view fix

Bostonhacks · Sep 22, 2020 · 203c10c · 203c10c
1 parent c41fc56
commit 203c10c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/firestore.rules b/firestore.rules
@@ -63,8 +63,11 @@ service cloud.firestore {
 		}
 
 		match /admin/{docId} {
-			allow read: if true;
-			allow write: if hasRole("admin");
+			allow get: if true;
+			allow list: if true;
+			allow create: if hasRole("admin");
+			allow update: if hasRole("admin");
+			allow delete: if hasRole("admin");
 		}
 
   }

diff --git a/src/components/common/HackerTable.vue b/src/components/common/HackerTable.vue
@@ -110,15 +110,18 @@
             <v-data-table
               v-model="selected"
               show-select
-              item-key="name"
+              item-key="phone"
               :headers="headers"
               :items="data"
               :items-per-page="5"
               class="elevation-1"
               :search="search"
             >
+              <template v-slot:item.firstName="{ item }">
+                {{ item.firstName + " " + item.lastName }}
+              </template>
               <template v-slot:item.resume[0]="{ item }">
-                <button v-if="item.resume[0]">
+                <button v-if="item.resume">
                   <a :href="item.resume[0]" target="_blank" rel="noreferrer"
                     >Open</a
                   >
@@ -586,7 +589,7 @@ export default {
           text: "Name",
           align: "start",
           sortable: false,
-          value: "name"
+          value: "firstName"
         },
         {
           text: "Phone",

diff --git a/src/components/common/Timeline.vue b/src/components/common/Timeline.vue
@@ -112,10 +112,10 @@ export default {
       var deadlineDoc = await deadlineDb.get();
       var out = deadlineDoc.data();
 
-      if (out.data["startTime"] != null && out.data["startTime"] != null) {
+      if (out["startTime"] != null && out["startTime"] != null) {
         this.firstInput = false;
-        this.start = out.data["startTime"];
-        this.end = out.data["finishTime"];
+        this.start = out["startTime"];
+        this.end = out["finishTime"];
       }
     },
     async saveDate() {

diff --git a/src/views/Admin.vue b/src/views/Admin.vue
@@ -223,12 +223,7 @@ export default {
             text: "Majors"
           }
         },
-        labels: [
-          "Computer Science",
-          "Electrical Engineering",
-          "Computer Engineering",
-          "Others"
-        ],
+        labels: ["CS", "EE", "CE", "Others"],
         datasets: [
           {
             label: "2020",
@@ -274,7 +269,13 @@ export default {
       }
     },
     async getData() {
-      const applicantStatus = ["Accepted", "Confirmed", "Checked In"];
+      const applicantStatus = [
+        "Started",
+        "Submitted",
+        "Accepted",
+        "Confirmed",
+        "Checked In"
+      ];
       const statusList = [
         "Started",
         "Submitted",
@@ -294,7 +295,7 @@ export default {
       appData.forEach(element => {
         out.push(element.data());
       });
-      const applicants = out.data;
+      const applicants = out;
       this.data = applicants.filter(applicant =>
         applicantStatus.includes(statusList[applicant.status])
       );
@@ -386,9 +387,9 @@ export default {
       volunteerOut.push(element.data());
     });
 
-    this.hackerData = hackOut.data;
-    this.mentorData = mentorOut.data;
-    this.volunteerData = volunteerOut.data;
+    this.hackerData = hackOut;
+    this.mentorData = mentorOut;
+    this.volunteerData = volunteerOut;
     this.hackerCurrentData = this.hackerData;
     this.volunteerCurrentData = this.volunteerData;
     this.mentorCurrentData = this.mentorData;