diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue index 888c167e9..25ed62f68 100644 --- a/webapp/components/CommentList/CommentList.vue +++ b/webapp/components/CommentList/CommentList.vue @@ -1,19 +1,9 @@ - - diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue index 2a3637f41..bfa78e709 100644 --- a/webapp/components/DropdownFilter/DropdownFilter.vue +++ b/webapp/components/DropdownFilter/DropdownFilter.vue @@ -25,7 +25,7 @@ class="dropdown-menu-item" :route="item.route" :parents="item.parents" - @click.stop.prevent="filterNotifications(item.route, toggleMenu)" + @click.stop.prevent="filter(item.route, toggleMenu)" > {{ item.route.label }} @@ -44,8 +44,8 @@ export default { filterOptions: { type: Array, default: () => [] }, }, methods: { - filterNotifications(option, toggleMenu) { - this.$emit('filterNotifications', option) + filter(option, toggleMenu) { + this.$emit('filter', option) toggleMenu() }, }, diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue index d7a9274ed..4158027b3 100644 --- a/webapp/components/User/User.vue +++ b/webapp/components/User/User.vue @@ -27,7 +27,7 @@ - + diff --git a/webapp/components/_new/generic/CounterIcon/CounterIcon.vue b/webapp/components/_new/generic/CounterIcon/CounterIcon.vue new file mode 100644 index 000000000..23dcc0795 --- /dev/null +++ b/webapp/components/_new/generic/CounterIcon/CounterIcon.vue @@ -0,0 +1,29 @@ + + + diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 41d7b7f30..aa180b64e 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -500,6 +500,13 @@ "reasonCategory": "Category", "reasonDescription": "Description", "submitter": "Reported by", + "filterLabel": { + "all": "All", + "unreviewed": "Unreviewed", + "reviewed": "Reviewed", + "closed": "Closed" + }, + "moreDetails": "Report Details", "decideModal": { "submit": "Confirm decision", "cancel": "Cancel", diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue index bb08a15a1..35abcaff7 100644 --- a/webapp/pages/moderation/index.vue +++ b/webapp/pages/moderation/index.vue @@ -1,12 +1,9 @@