diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 03:12:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 03:12:53 +0300 |
| commit | a77c9fccd057514a8b78a10642779f54a22f3f76 (patch) | |
| tree | 5746326ff4e1e25f01af2062454f90bdc3f57d35 /app/assets/javascripts/profile | |
| parent | a88ffaad9f9f321a71657ac0aca4d947f5bc6a5b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/profile')
| -rw-r--r-- | app/assets/javascripts/profile/components/followers_tab.vue | 15 | ||||
| -rw-r--r-- | app/assets/javascripts/profile/components/following_tab.vue | 15 | ||||
| -rw-r--r-- | app/assets/javascripts/profile/index.js | 4 |
3 files changed, 25 insertions, 9 deletions
diff --git a/app/assets/javascripts/profile/components/followers_tab.vue b/app/assets/javascripts/profile/components/followers_tab.vue index 47651c33eb8..5b69f835294 100644 --- a/app/assets/javascripts/profile/components/followers_tab.vue +++ b/app/assets/javascripts/profile/components/followers_tab.vue @@ -1,17 +1,24 @@ <script> -import { GlTab } from '@gitlab/ui'; +import { GlBadge, GlTab } from '@gitlab/ui'; import { s__ } from '~/locale'; export default { i18n: { title: s__('UserProfile|Followers'), }, - components: { GlTab }, + components: { + GlBadge, + GlTab, + }, + inject: ['followers'], }; </script> <template> - <gl-tab :title="$options.i18n.title"> - <!-- placeholder --> + <gl-tab> + <template #title> + <span>{{ $options.i18n.title }}</span> + <gl-badge size="sm" class="gl-ml-2">{{ followers }}</gl-badge> + </template> </gl-tab> </template> diff --git a/app/assets/javascripts/profile/components/following_tab.vue b/app/assets/javascripts/profile/components/following_tab.vue index 6d9631c5e89..d39d15a08f3 100644 --- a/app/assets/javascripts/profile/components/following_tab.vue +++ b/app/assets/javascripts/profile/components/following_tab.vue @@ -1,17 +1,24 @@ <script> -import { GlTab } from '@gitlab/ui'; +import { GlBadge, GlTab } from '@gitlab/ui'; import { s__ } from '~/locale'; export default { i18n: { title: s__('UserProfile|Following'), }, - components: { GlTab }, + components: { + GlBadge, + GlTab, + }, + inject: ['followees'], }; </script> <template> - <gl-tab :title="$options.i18n.title"> - <!-- placeholder --> + <gl-tab> + <template #title> + <span>{{ $options.i18n.title }}</span> + <gl-badge size="sm" class="gl-ml-2">{{ followees }}</gl-badge> + </template> </gl-tab> </template> diff --git a/app/assets/javascripts/profile/index.js b/app/assets/javascripts/profile/index.js index a89331cda96..fe430ccca98 100644 --- a/app/assets/javascripts/profile/index.js +++ b/app/assets/javascripts/profile/index.js @@ -7,11 +7,13 @@ export const initProfileTabs = () => { if (!el) return false; - const { userCalendarPath, utcOffset } = el.dataset; + const { followees, followers, userCalendarPath, utcOffset } = el.dataset; return new Vue({ el, provide: { + followees: parseInt(followers, 10), + followers: parseInt(followees, 10), userCalendarPath, utcOffset, }, |