diff --git a/src/App.vue b/src/App.vue
index 63bc9bf1a37c6eb767caf827e11cc85bd191b7e6..4156da51e1c194b89f9858a559c42c71ebb911ba 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,8 +35,9 @@ export default {
             'id': response.data._id,
             'name': response.data.name,
             'role': response.data.role,
-            'pageList': response.data.page_list
+            'pageList': response.page_list
           }
+          console.log(response)
           this.$store.commit('setUser', data)
         }
       })
diff --git a/src/components/pages/PanelAdministrator.vue b/src/components/pages/PanelAdministrator.vue
index eddabfdf71975922e6ffd9db11825b9d8d4c421a..b989c95bef8eb2d440ded07651afbf7f4408357e 100644
--- a/src/components/pages/PanelAdministrator.vue
+++ b/src/components/pages/PanelAdministrator.vue
@@ -8,15 +8,15 @@
             <b-tabs pills vertical card>
               <b-tab title="Entri Komentar" disabled/>
               <b-tab
-                v-for="id in pageList"
-                :key=id
-                v-bind:title="id">
+                v-for="item in pageList"
+                :key=item._id.$oid
+                v-bind:title="item.name">
                 <b-tabs content-class="mt-3">
                   <b-tab title="Belum dibalas" active>
-                    <comments :id="id" replyable/>
+                    <comments :id="item._id.$oid" replyable unreplied/>
                   </b-tab>
                   <b-tab title="Semua">
-                    <comments :id="id" replyable/>
+                    <comments :id="item._id.$oid" replyable/>
                   </b-tab>
                 </b-tabs>
               </b-tab>
@@ -142,7 +142,6 @@ export default {
       this.$router.push({name: 'LandingPage'});
       return
     }
-
     this.totalRows = this.items.length
     this.$store.commit('changed','Jenis Anggaran')
   },
diff --git a/src/components/partials/Comments.vue b/src/components/partials/Comments.vue
index b5f9a3fd1e36547e18bfef82ea79158914ad93a1..e1175d5e8aee716f26998e2da1d426f417c179d3 100644
--- a/src/components/partials/Comments.vue
+++ b/src/components/partials/Comments.vue
@@ -81,6 +81,7 @@ export default {
   props: {
     commentable : Boolean,
     replyable : Boolean,
+    unreplied : Boolean,
     id: String
   },
   components: {
@@ -149,7 +150,13 @@ export default {
           headers: { "Content-Type": "application/json" }
         }
 
-        fetch(`${this.$store.state.baseUrl}/api/comment/get`, fetchData)
+        let url = ""
+        if (this.unreplied)
+          url = `${this.$store.state.baseUrl}/api/comment/get-unreplied`
+        else
+          url = `${this.$store.state.baseUrl}/api/comment/get`
+
+        fetch(url, fetchData)
         .then(response => response.json())
         .then(response => {
           if(response.status === 200) {