diff --git a/src/views/reports/components/ModerateUserDropdown.vue b/src/views/reports/components/ModerateUserDropdown.vue
new file mode 100644
index 00000000..141b2afe
--- /dev/null
+++ b/src/views/reports/components/ModerateUserDropdown.vue
@@ -0,0 +1,86 @@
+
+
+ {{ $t('reports.moderateUser') }}
+
+
+
+
+ {{ report.account.deactivated ? $t('users.activateAccount') : $t('users.deactivateAccount') }}
+
+
+ {{ $t('users.deleteAccount') }}
+
+
+ {{ $t('users.forceNsfw') }}
+
+
+
+ {{ $t('users.stripMedia') }}
+
+
+
+ {{ $t('users.forceUnlisted') }}
+
+
+
+ {{ $t('users.sandbox') }}
+
+
+
+ {{ $t('users.disableRemoteSubscription') }}
+
+
+
+ {{ $t('users.disableAnySubscription') }}
+
+
+
+
+
+
+
diff --git a/src/views/reports/components/TimelineItem.vue b/src/views/reports/components/Report.vue
similarity index 57%
rename from src/views/reports/components/TimelineItem.vue
rename to src/views/reports/components/Report.vue
index 771298aa..6d07aded 100644
--- a/src/views/reports/components/TimelineItem.vue
+++ b/src/views/reports/components/Report.vue
@@ -16,60 +16,7 @@
{{ $t('reports.close') }}
-
- {{ $t('reports.moderateUser') }}
-
-
- {{ report.account.deactivated ? $t('users.activateAccount') : $t('users.deactivateAccount') }}
-
-
- {{ $t('users.deleteAccount') }}
-
-
- {{ $t('users.forceNsfw') }}
-
-
-
- {{ $t('users.stripMedia') }}
-
-
-
- {{ $t('users.forceUnlisted') }}
-
-
-
- {{ $t('users.sandbox') }}
-
-
-
- {{ $t('users.disableRemoteSubscription') }}
-
-
-
- {{ $t('users.disableAnySubscription') }}
-
-
-
-
+
@@ -112,10 +59,11 @@
@@ -56,9 +87,14 @@ export default {
padding: 0px;
}
.filter-container {
+ display: flex;
+ flex-direction: column;
margin: 22px 15px 22px 15px;
padding-bottom: 0
}
+ .group-reports-checkbox {
+ margin-top: 10px;
+ }
h1 {
margin: 22px 0 0 15px;
}
@@ -78,9 +114,13 @@ only screen and (max-width: 760px),
.filter-container {
margin: 0 10px
}
- .timeline {
- margin: 20px 20px 20px 18px
- }
+ }
+ #app > div > div.main-container > section > div > div.block > ul {
+ margin: 45px 45px 5px 19px;
+ }
+ .reports-pagination {
+ margin: 25px 0;
+ text-align: center;
}
}
diff --git a/test/views/reports/timelineItem.test.js b/test/views/reports/timelineItem.test.js
index 6e3b9f01..5582732c 100644
--- a/test/views/reports/timelineItem.test.js
+++ b/test/views/reports/timelineItem.test.js
@@ -1,7 +1,7 @@
import Vuex from 'vuex'
import { mount, createLocalVue, config } from '@vue/test-utils'
import Element from 'element-ui'
-import TimelineItem from '@/views/reports/components/TimelineItem'
+import Report from '@/views/reports/components/Report'
import storeConfig from './store.conf'
import { cloneDeep } from 'lodash'
import flushPromises from 'flush-promises'
@@ -25,7 +25,7 @@ describe('Report in a timeline', () => {
it('changes report state from open to resolved', async (done) => {
const report = store.state.reports.fetchedReports[0]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {
@@ -43,7 +43,7 @@ describe('Report in a timeline', () => {
it('changes report state from open to closed', async (done) => {
const report = store.state.reports.fetchedReports[3]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {
@@ -61,7 +61,7 @@ describe('Report in a timeline', () => {
it('shows statuses', () => {
const report = store.state.reports.fetchedReports[4]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {
@@ -75,7 +75,7 @@ describe('Report in a timeline', () => {
it('adds sensitive flag to a status', async (done) => {
const report = store.state.reports.fetchedReports[4]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {
@@ -93,7 +93,7 @@ describe('Report in a timeline', () => {
it('removes sensitive flag to a status', async (done) => {
const report = store.state.reports.fetchedReports[4]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {
@@ -111,7 +111,7 @@ describe('Report in a timeline', () => {
it('changes status visibility from public to unlisted', async (done) => {
const report = store.state.reports.fetchedReports[4]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {
@@ -129,7 +129,7 @@ describe('Report in a timeline', () => {
it('changes status visibility from unlisted to private', async (done) => {
const report = store.state.reports.fetchedReports[4]
- const wrapper = mount(TimelineItem, {
+ const wrapper = mount(Report, {
store,
localVue,
propsData: {