Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
869b425b
Commit
869b425b
authored
Apr 22, 2021
by
Yogi
Committed by
Olena Horal-Koretska
Apr 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move badge to vue component in project badges
parent
9d9b902a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/javascripts/badges/components/badge_list.vue
app/assets/javascripts/badges/components/badge_list.vue
+3
-2
changelogs/unreleased/gl-badge-badges.yml
changelogs/unreleased/gl-badge-badges.yml
+5
-0
No files found.
app/assets/javascripts/badges/components/badge_list.vue
View file @
869b425b
<
script
>
<
script
>
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlBadge
}
from
'
@gitlab/ui
'
;
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
import
{
GROUP_BADGE
}
from
'
../constants
'
;
import
{
GROUP_BADGE
}
from
'
../constants
'
;
import
BadgeListRow
from
'
./badge_list_row.vue
'
;
import
BadgeListRow
from
'
./badge_list_row.vue
'
;
...
@@ -9,6 +9,7 @@ export default {
...
@@ -9,6 +9,7 @@ export default {
components
:
{
components
:
{
BadgeListRow
,
BadgeListRow
,
GlLoadingIcon
,
GlLoadingIcon
,
GlBadge
,
},
},
computed
:
{
computed
:
{
...
mapState
([
'
badges
'
,
'
isLoading
'
,
'
kind
'
]),
...
mapState
([
'
badges
'
,
'
isLoading
'
,
'
kind
'
]),
...
@@ -26,7 +27,7 @@ export default {
...
@@ -26,7 +27,7 @@ export default {
<div
class=
"card"
>
<div
class=
"card"
>
<div
class=
"card-header"
>
<div
class=
"card-header"
>
{{
s__
(
'
Badges|Your badges
'
)
}}
{{
s__
(
'
Badges|Your badges
'
)
}}
<
span
v-show=
"!isLoading"
class=
"badge badge-pill"
>
{{
badges
.
length
}}
</span
>
<
gl-badge
v-show=
"!isLoading"
size=
"sm"
>
{{
badges
.
length
}}
</gl-badge
>
</div>
</div>
<gl-loading-icon
v-show=
"isLoading"
size=
"lg"
class=
"card-body"
/>
<gl-loading-icon
v-show=
"isLoading"
size=
"lg"
class=
"card-body"
/>
<div
v-if=
"hasNoBadges"
class=
"card-body"
>
<div
v-if=
"hasNoBadges"
class=
"card-body"
>
...
...
changelogs/unreleased/gl-badge-badges.yml
0 → 100644
View file @
869b425b
---
title
:
Move badge to vue component in project badges
merge_request
:
58045
author
:
Yogi (@yo)
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment