diff --git a/src/components/confirm_modal/generic_confirm.js b/src/components/confirm_modal/generic_confirm.js
index a964a9805..53b41e83e 100644
--- a/src/components/confirm_modal/generic_confirm.js
+++ b/src/components/confirm_modal/generic_confirm.js
@@ -6,6 +6,9 @@ export default {
title: {
type: String
},
+ message: {
+ type: String
+ },
cancelText: {
type: String
},
diff --git a/src/components/confirm_modal/generic_confirm.vue b/src/components/confirm_modal/generic_confirm.vue
index 794a15490..d223d6ea9 100644
--- a/src/components/confirm_modal/generic_confirm.vue
+++ b/src/components/confirm_modal/generic_confirm.vue
@@ -6,7 +6,11 @@
:confirm-text="confirmText"
@accepted="doGeneric"
@cancelled="hide"
- />
+ >
+
+
+
+
diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index 5d2c49b3c..48686babb 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -20,6 +20,7 @@
class="list-empty-content faint"
>
+
diff --git a/src/components/page_list/page_list.js b/src/components/page_list/page_list.js
index 5a28a847d..4e1184844 100644
--- a/src/components/page_list/page_list.js
+++ b/src/components/page_list/page_list.js
@@ -59,6 +59,7 @@ const PageList = {
loadMore () {
if (!this.isLoading && this.canLoadMore) {
this.isLoading = true
+ console.log("is loading = true")
this.fetchPage(this.$store, {
page: this.pageIndex++,
pageSize: this.pageSize
diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue
index 5c239d8d6..c3f97782c 100644
--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@@ -68,6 +68,9 @@
+
+
+
diff --git a/src/components/settings_modal/admin_tabs/admin_card.js b/src/components/settings_modal/admin_tabs/admin_card.js
index a773b7bb4..c733223f5 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.js
+++ b/src/components/settings_modal/admin_tabs/admin_card.js
@@ -5,6 +5,7 @@ import AdminStatusCard from 'src/components/settings_modal/admin_tabs/admin_stat
import Modal from 'src/components/modal/modal.vue'
import Popover from 'src/components/popover/popover.vue'
import GenericConfirm from 'src/components/confirm_modal/generic_confirm.vue'
+import Select from 'src/components/select/select.vue'
const AdminCard = {
props: {
@@ -45,6 +46,9 @@ const AdminCard = {
justApproved: false,
justConfirmed: false,
justDeleted: false,
+ showDirect: false,
+ showReblogs: false,
+ timelineSorting: "des"
}
},
computed: {
@@ -128,7 +132,8 @@ const AdminCard = {
AdminStatusCard,
Modal,
Popover,
- GenericConfirm
+ GenericConfirm,
+ Select
},
methods: {
/**
@@ -219,8 +224,16 @@ const AdminCard = {
*/
async fetchStatuses (store, opts) {
const u = this.$store.getters.findUser(this.userDetails.id)
- const res = store.dispatch('adminListStatuses', { user: u, opts: { pageSize: opts.pageSize, godmode: true, withReblogs: true}})
- return res.then(r => r.activities)
+ const res = store.dispatch('adminListStatuses', { user: u, opts: { pageSize: opts.pageSize, godmode: this.showDirect, withReblogs: this.showReblogs}})
+ return res.then(r => {
+ const a = r.activities
+ console.log(this.timelineSorting)
+ if (this.timelineSorting === 'des') {
+ return [...a].sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+ } else if (this.timelineSorting === 'asc') {
+ return [...a].sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
+ } else return []
+ })
},
confirmAction (box) {
this.$refs[box].show()
diff --git a/src/components/settings_modal/admin_tabs/admin_card.vue b/src/components/settings_modal/admin_tabs/admin_card.vue
index cab2d2bec..37e00a1be 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.vue
+++ b/src/components/settings_modal/admin_tabs/admin_card.vue
@@ -211,6 +211,48 @@
@backdrop-clicked="() => { detailsExpanded = false }"
>
+
+ -
+ {{ $t('admin_dash.users.details.id') }}
+
+ -
+ {{ $t('admin_dash.users.details.actor_type') }}
+
+ -
+ {{ $t('admin_dash.users.details.tags') }}
+
+ -
+ {{ $t('admin_dash.users.details.roles') }}
+
+ -
+ {{ $t('admin_dash.users.details.account_type') }}
+
+ -
+ {{ $t('admin_dash.users.details.status') }}
+
+ -
+ {{ user.id }}
+
+ -
+ {{ $t('admin_dash.users.details.actor_types.' + user.actor_type.toLowerCase()) }}
+
+ -
+ {{ user.tags }}
+
+ -
+ {{ $t('admin_dash.users.details.admin') }}
+ ,
+ {{ $t('admin_dash.users.details.moderator') }}
+
+ -
+ {{ $t('admin_dash.users.details.local') }}
+ {{ $t('admin_dash.users.details.remote') }}
+
+ -
+ {{ $t('admin_dash.users.details.active') }}
+ {{ $t('admin_dash.users.details.inactive') }}
+
+
- add options to sort statuses
+ this.$refs.timelineList.reset()"
+ >
+ {{ $t('admin_dash.users.filters.show_direct') }}
+
+ this.$refs.timelineList.reset()"
+ >
+ {{ $t('admin_dash.users.filters.show_reblogs') }}
+
+
- {{ $t('admin_dash.user.title_actions') }}
+ {{ $t('admin_dash.users.actions.button.title') }}
+ wrap