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
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Sean King
admin-fe
Commits
7cf2878e
Commit
7cf2878e
authored
4 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Render recent statuses on Status show page
parent
5fe5b38c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/views/statuses/show.vue
+61
-1
61 additions, 1 deletion
src/views/statuses/show.vue
with
61 additions
and
1 deletion
src/views/statuses/show.vue
+
61
−
1
View file @
7cf2878e
...
...
@@ -29,6 +29,18 @@
<div
class=
"status-container"
>
<status
:status=
"status"
:account=
"user"
:show-checkbox=
"false"
:godmode=
"showPrivate"
/>
</div>
<div
class=
"recent-statuses-container"
>
<h2
class=
"recent-statuses"
>
{{
$t
(
'
userProfile.recentStatuses
'
)
}}
by
{{
user
.
display_name
}}
</h2>
<el-checkbox
v-model=
"showPrivate"
class=
"show-private-statuses"
@
change=
"onTogglePrivate"
>
{{
$t
(
'
statuses.showPrivateStatuses
'
)
}}
</el-checkbox>
<el-timeline
v-if=
"!statusesLoading"
class=
"statuses"
>
<el-timeline-item
v-for=
"status in statuses"
:key=
"status.id"
>
<status
:status=
"status"
:account=
"status.account"
:show-checkbox=
"false"
:user-id=
"user.id"
:godmode=
"showPrivate"
/>
</el-timeline-item>
<p
v-if=
"statuses.length === 0"
class=
"no-statuses"
>
{{
$t
(
'
userProfile.noStatuses
'
)
}}
</p>
</el-timeline>
</div>
</div>
</
template
>
...
...
@@ -42,7 +54,7 @@ export default {
components
:
{
ModerationDropdown
,
RebootButton
,
Status
},
data
()
{
return
{
showPrivate
:
tru
e
,
showPrivate
:
fals
e
,
resetPasswordDialogOpen
:
false
}
},
...
...
@@ -62,6 +74,12 @@ export default {
status
()
{
return
this
.
$store
.
state
.
status
.
fetchedStatus
},
statuses
()
{
return
this
.
$store
.
state
.
userProfile
.
statuses
},
statusesLoading
()
{
return
this
.
$store
.
state
.
userProfile
.
statusesLoading
},
user
()
{
return
this
.
$store
.
state
.
status
.
fetchedStatus
.
account
}
...
...
@@ -70,11 +88,15 @@ export default {
this
.
$store
.
dispatch
(
'
NeedReboot
'
)
this
.
$store
.
dispatch
(
'
GetNodeInfo
'
)
this
.
$store
.
dispatch
(
'
FetchStatus
'
,
this
.
$route
.
params
.
id
)
this
.
$store
.
dispatch
(
'
FetchUserStatuses
'
,
{
userId
:
this
.
user
.
id
,
godmode
:
this
.
showPrivate
})
},
methods
:
{
accountExists
(
account
,
key
)
{
return
account
[
key
]
},
onTogglePrivate
()
{
this
.
$store
.
dispatch
(
'
FetchUserStatuses
'
,
{
userId
:
this
.
user
.
id
,
godmode
:
this
.
showPrivate
})
},
openResetPasswordDialog
()
{
this
.
resetPasswordDialogOpen
=
true
}
...
...
@@ -87,13 +109,31 @@ export default {
display
:
flex
;
align-items
:
center
;
}
.no-statuses
{
margin-left
:
28px
;
color
:
#606266
;
}
.reboot-button
{
padding
:
10px
;
margin-left
:
6px
;
}
.recent-statuses
{
margin-left
:
28px
;
}
.recent-statuses-container
{
display
:
flex
;
flex-direction
:
column
;
}
.show-private-statuses
{
margin-left
:
28px
;
margin-bottom
:
20px
;
}
.status-container
{
margin
:
0
15px
0
20px
;
}
.statuses
{
padding
:
0
20px
0
0
;
}
.user-page-header
{
display
:
flex
;
justify-content
:
space-between
;
...
...
@@ -113,6 +153,16 @@ export default {
display
:
flex
;
justify-content
:
space-between
;
}
.recent-statuses
{
margin
:
20px
10px
15px
10px
;
}
.recent-statuses-container
{
width
:
100%
;
margin
:
0
10px
;
}
.show-private-statuses
{
margin
:
0
10px
20px
10px
;
}
.user-page-header
{
padding
:
0
;
margin
:
7px
15px
15px
10px
;
...
...
@@ -125,6 +175,16 @@ export default {
}
}
@media
only
screen
and
(
max-width
:
801px
)
and
(
min-width
:
481px
)
{
.recent-statuses
{
margin
:
20px
10px
15px
0
;
}
.recent-statuses-container
{
width
:
97%
;
margin
:
0
20px
;
}
.show-private-statuses
{
margin
:
0
10px
20px
0
;
}
.user-page-header
{
padding
:
0
;
margin
:
7px
15px
20px
20px
;
...
...
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