Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
admin-fe
Commits
7a0180c7
Commit
7a0180c7
authored
5 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Extract statuses into separate file
parent
cf50fb05
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!11
Add ability to read reports
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/lang/en.js
+11
-1
11 additions, 1 deletion
src/lang/en.js
src/views/reports/components/Statuses.vue
+96
-0
96 additions, 0 deletions
src/views/reports/components/Statuses.vue
src/views/reports/components/TimelineItem.vue
+7
-48
7 additions, 48 deletions
src/views/reports/components/TimelineItem.vue
with
114 additions
and
49 deletions
src/lang/en.js
+
11
−
1
View file @
7a0180c7
...
...
@@ -213,7 +213,17 @@ export default {
deleteCompleted
:
'
Delete comleted
'
,
deleteCanceled
:
'
Delete canceled
'
,
noNotes
:
'
No notes to display
'
,
changeState
:
'
Change state
'
changeState
:
'
Change state
'
,
changeScope
:
'
Change scope
'
,
resolve
:
'
Resolve
'
,
reopen
:
'
Reopen
'
,
close
:
'
Close
'
,
addSensitive
:
'
Add Sensitive flag
'
,
removeSensitive
:
'
Remove Sensitive flag
'
,
public
:
'
Make status public
'
,
private
:
'
Make status private
'
,
unlisted
:
'
Make status unlisted
'
,
sensitive
:
'
Sensitive
'
},
reportsFilter
:
{
inputPlaceholder
:
'
Select filter
'
,
...
...
This diff is collapsed.
Click to expand it.
src/views/reports/components/Statuses.vue
0 → 100644
+
96
−
0
View file @
7a0180c7
<
template
>
<el-collapse-item
:title=
"getStatusesTitle(report.statuses)"
>
<el-card
v-for=
"status in report.statuses"
:key=
"status.id"
class=
"status-card"
>
<div
slot=
"header"
>
<div
class=
"status-header"
>
<div
class=
"status-account"
>
<img
:src=
"status.account.avatar"
alt=
"avatar"
class=
"status-avatar-img"
>
<h3
class=
"status-account-name"
>
{{
status
.
account
.
display_name
}}
</h3>
</div>
<div
class=
"status-actions"
>
<el-tag
v-if=
"status.sensitive"
type=
"warning"
size=
"large"
>
{{
$t
(
'
reports.sensitive
'
)
}}
</el-tag>
<el-tag
size=
"large"
>
{{
capitalizeFirstLetter
(
status
.
visibility
)
}}
</el-tag>
<el-dropdown
trigger=
"click"
>
<el-button
plain
size=
"small"
icon=
"el-icon-edit"
>
{{
$t
(
'
reports.changeScope
'
)
}}
<i
class=
"el-icon-arrow-down el-icon--right"
/></el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
v-if=
"!status.sensitive"
>
{{
$t
(
'
reports.addSensitive
'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"status.sensitive"
>
{{
$t
(
'
reports.removeSensitive
'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"status.visibility !== 'public'"
>
{{
$t
(
'
reports.public
'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"status.visibility !== 'private'"
>
{{
$t
(
'
reports.private
'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"status.visibility !== 'unlisted'"
>
{{
$t
(
'
reports.unlisted
'
)
}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<a
:href=
"status.account.url"
target=
"_blank"
class=
"account"
>
@
{{
status
.
account
.
acct
}}
</a>
</div>
<div
class=
"status-body"
>
<span
class=
"status-content"
>
{{
status
.
content
}}
</span>
<a
:href=
"status.url"
target=
"_blank"
class=
"account"
>
{{
parseTimestamp
(
status
.
created_at
)
}}
</a>
</div>
</el-card>
</el-collapse-item>
</
template
>
<
script
>
import
*
as
moment
from
'
moment
'
export
default
{
name
:
'
Statuses
'
,
props
:
{
report
:
{
type
:
Object
,
required
:
true
}
},
methods
:
{
capitalizeFirstLetter
(
str
)
{
return
str
.
charAt
(
0
).
toUpperCase
()
+
str
.
slice
(
1
)
},
getStatusesTitle
(
statuses
)
{
console
.
log
(
this
.
report
)
return
`Reported statuses:
${
statuses
.
length
}
item(s)`
},
parseTimestamp
(
timestamp
)
{
return
moment
(
timestamp
).
format
(
'
YYYY-MM-DD HH:mm
'
)
}
}
}
</
script
>
<
style
rel=
'stylesheet/scss'
lang=
'scss'
>
.account
{
text-decoration
:
underline
;
}
.status-account
{
display
:
flex
;
align-items
:
center
;
}
.status-avatar-img
{
width
:
15px
;
height
:
15px
;
margin-right
:
5px
;
}
.status-account-name
{
margin
:
0
;
}
.status-body
{
display
:
flex
;
flex-direction
:
column
;
}
.status-content
{
font-size
:
15px
;
}
.status-card
{
margin-bottom
:
15px
;
}
.status-header
{
display
:
flex
;
justify-content
:
space-between
;
}
</
style
>
This diff is collapsed.
Click to expand it.
src/views/reports/components/TimelineItem.vue
+
7
−
48
View file @
7a0180c7
...
...
@@ -5,12 +5,12 @@
<h3
class=
"report-title"
>
Report on
{{
report
.
account
.
display_name
}}
</h3>
<div>
<el-tag
:type=
"getStateType(report.state)"
size=
"large"
>
{{
capitalizeFirstLetter
(
report
.
state
)
}}
</el-tag>
<el-dropdown>
<el-dropdown
trigger=
"click"
>
<el-button
plain
size=
"small"
icon=
"el-icon-edit"
>
{{
$t
(
'
reports.changeState
'
)
}}
<i
class=
"el-icon-arrow-down el-icon--right"
/></el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
v-if=
"report.state !== 'resolved'"
@
click.native=
"changeReportState('resolved', report.id)"
>
R
esolve
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'open'"
@
click.native=
"changeReportState('open', report.id)"
>
Reopen
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'closed'"
@
click.native=
"changeReportState('closed', report.id)"
>
Close
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'resolved'"
@
click.native=
"changeReportState('resolved', report.id)"
>
{{
$t
(
'
reports.r
esolve
'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'open'"
@
click.native=
"changeReportState('open', report.id)"
>
{{
$t
(
'
reports.reopen
'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'closed'"
@
click.native=
"changeReportState('closed', report.id)"
>
{{
$t
(
'
reports.close
'
)
}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
...
...
@@ -46,25 +46,7 @@
</div>
<div
v-if=
"report.statuses.length > 0"
class=
"statuses"
>
<el-collapse>
<el-collapse-item
:title=
"getStatusesTitle(report.statuses)"
>
<el-card
v-for=
"status in report.statuses"
:key=
"status.id"
class=
"status-card"
>
<div
slot=
"header"
>
<div
class=
"status-header"
>
<img
:src=
"status.account.avatar"
alt=
"User's avatar"
class=
"status-avatar-img"
>
<h3
class=
"status-account-name"
>
{{
status
.
account
.
display_name
}}
</h3>
</div>
<a
:href=
"status.account.url"
target=
"_blank"
class=
"account"
>
@
{{
status
.
account
.
acct
}}
</a>
</div>
<div
class=
"status-body"
>
<span
class=
"status-content"
>
{{
status
.
content
}}
</span>
<a
:href=
"status.url"
target=
"_blank"
class=
"account"
>
{{
parseTimestamp
(
status
.
created_at
)
}}
</a>
</div>
</el-card>
</el-collapse-item>
<statuses
:report=
"report"
/>
</el-collapse>
</div>
</el-card>
...
...
@@ -74,9 +56,11 @@
<
script
>
import
i18n
from
'
@/lang
'
import
*
as
moment
from
'
moment
'
import
Statuses
from
'
./Statuses
'
export
default
{
name
:
'
TimelineItem
'
,
components
:
{
Statuses
},
props
:
{
report
:
{
type
:
Object
,
...
...
@@ -137,9 +121,6 @@ export default {
return
'
primary
'
}
},
getStatusesTitle
(
statuses
)
{
return
`Reported statuses:
${
statuses
.
length
}
item(s)`
},
parseTimestamp
(
timestamp
)
{
return
moment
(
timestamp
).
format
(
'
YYYY-MM-DD HH:mm
'
)
},
...
...
@@ -230,28 +211,6 @@ export default {
.report-title
{
margin
:
0
;
}
.status-account-name
{
margin
:
0
;
}
.status-avatar-img
{
width
:
15px
;
height
:
15px
;
margin-right
:
5px
;
}
.status-body
{
display
:
flex
;
flex-direction
:
column
;
}
.status-card
{
margin-bottom
:
15px
;
}
.status-content
{
font-size
:
15px
;
}
.status-header
{
display
:
flex
;
align-items
:
center
;
}
.statuses
{
margin-top
:
15px
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment