ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1282 from Human-Connection/count_from_0_to_0_by_default

Browse Source 
Get rid of property warnings
This commit is contained in:
mattwr18 2019-08-19 10:06:09 +02:00 committed by GitHub
commit 90fa70e83d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/CountTo.vue
View File

@ -20,7 +20,7 @@ export default {
}, },
props: { props: {
startVal: { type: Number, default: 0 }, startVal: { type: Number, default: 0 },
endVal: { type: Number, required: true }, endVal: { type: Number, default: 0 },
duration: { type: Number, default: 3000 }, duration: { type: Number, default: 3000 },
autoplay: { type: Boolean, default: true }, autoplay: { type: Boolean, default: true },
separator: { type: String, default: '.' }, separator: { type: String, default: '.' },

10
webapp/components/User/index.vue
View File

@ -50,7 +50,11 @@
<ds-flex style="margin-top: -10px"> <ds-flex style="margin-top: -10px">
<ds-flex-item class="ds-tab-nav-item"> <ds-flex-item class="ds-tab-nav-item">
<ds-space margin="small"> <ds-space margin="small">
<ds-number :count="fanCount" :label="$t('profile.followers')" size="x-large" /> <ds-number
:count="user.followedByCount"
:label="$t('profile.followers')"
size="x-large"
/>
</ds-space> </ds-space>
</ds-flex-item> </ds-flex-item>
<ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active"> <ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active">
@ -121,10 +125,6 @@ export default {
itsMe() { itsMe() {
return this.user.slug === this.$store.getters['auth/user'].slug return this.user.slug === this.$store.getters['auth/user'].slug
}, },
fanCount() {
let count = Number(this.user.followedByCount) || 0
return count
},
userLink() { userLink() {
const { id, slug } = this.user const { id, slug } = this.user
if (!(id && slug)) return '' if (!(id && slug)) return ''

18
webapp/pages/admin/index.vue
View File

@ -7,7 +7,7 @@
<ds-space margin="small"> <ds-space margin="small">
<ds-number :count="0" :label="$t('admin.dashboard.users')" size="x-large" uppercase> <ds-number :count="0" :label="$t('admin.dashboard.users')" size="x-large" uppercase>
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countUsers || 0" /> <hc-count-to :end-val="statistics.countUsers" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -16,7 +16,7 @@
<ds-space margin="small"> <ds-space margin="small">
<ds-number :count="0" :label="$t('admin.dashboard.posts')" size="x-large" uppercase> <ds-number :count="0" :label="$t('admin.dashboard.posts')" size="x-large" uppercase>
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countPosts || 0" /> <hc-count-to :end-val="statistics.countPosts" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -30,7 +30,7 @@
uppercase uppercase
> >
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countComments || 0" /> <hc-count-to :end-val="statistics.countComments" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -44,7 +44,7 @@
uppercase uppercase
> >
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countNotifications || 0" /> <hc-count-to :end-val="statistics.countNotifications" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -58,7 +58,7 @@
uppercase uppercase
> >
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countOrganizations || 0" /> <hc-count-to :end-val="statistics.countOrganizations" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -72,7 +72,7 @@
uppercase uppercase
> >
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countProjects || 0" /> <hc-count-to :end-val="statistics.countProjects" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -81,7 +81,7 @@
<ds-space margin="small"> <ds-space margin="small">
<ds-number :count="0" :label="$t('admin.dashboard.invites')" size="x-large" uppercase> <ds-number :count="0" :label="$t('admin.dashboard.invites')" size="x-large" uppercase>
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countInvites || 0" /> <hc-count-to :end-val="statistics.countInvites" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -90,7 +90,7 @@
<ds-space margin="small"> <ds-space margin="small">
<ds-number :count="0" :label="$t('admin.dashboard.follows')" size="x-large" uppercase> <ds-number :count="0" :label="$t('admin.dashboard.follows')" size="x-large" uppercase>
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countFollows || 0" /> <hc-count-to :end-val="statistics.countFollows" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>
@ -99,7 +99,7 @@
<ds-space margin="small"> <ds-space margin="small">
<ds-number :count="0" :label="$t('admin.dashboard.shouts')" size="x-large" uppercase> <ds-number :count="0" :label="$t('admin.dashboard.shouts')" size="x-large" uppercase>
<no-ssr slot="count"> <no-ssr slot="count">
<hc-count-to :end-val="statistics.countShouts || 0" /> <hc-count-to :end-val="statistics.countShouts" />
</no-ssr> </no-ssr>
</ds-number> </ds-number>
</ds-space> </ds-space>

8
webapp/pages/profile/_id/_slug.vue
View File

@ -43,14 +43,14 @@
<ds-flex-item> <ds-flex-item>
<no-ssr> <no-ssr>
<ds-number :label="$t('profile.followers')"> <ds-number :label="$t('profile.followers')">
<hc-count-to slot="count" :end-val="followedByCount" /> <hc-count-to slot="count" :end-val="user.followedByCount" />
</ds-number> </ds-number>
</no-ssr> </no-ssr>
</ds-flex-item> </ds-flex-item>
<ds-flex-item> <ds-flex-item>
<no-ssr> <no-ssr>
<ds-number :label="$t('profile.following')"> <ds-number :label="$t('profile.following')">
<hc-count-to slot="count" :end-val="Number(user.followingCount) || 0" /> <hc-count-to slot="count" :end-val="user.followingCount" />
</ds-number> </ds-number>
</no-ssr> </no-ssr>
</ds-flex-item> </ds-flex-item>
@ -309,10 +309,6 @@ export default {
myProfile() { myProfile() {
return this.$route.params.id === this.$store.getters['auth/user'].id return this.$route.params.id === this.$store.getters['auth/user'].id
}, },
followedByCount() {
let count = Number(this.user.followedByCount) || 0
return count
},
user() { user() {
return this.User ? this.User[0] : {} return this.User ? this.User[0] : {}
}, },