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

Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment

Browse Source
This commit is contained in:
Matt Rider 2019-08-19 10:50:46 +02:00
commit caff74e58b
35 changed files with 159 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/schema/resolvers/users.js
View File

@ -151,7 +151,6 @@ export default {
friendsCount: '<-[:FRIENDS]->(related:User)',
followingCount: '-[:FOLLOWS]->(related:User)',
followedByCount: '<-[:FOLLOWS]-(related:User)',
commentsCount: '-[:WROTE]->(r:Comment)',
commentedCount: '-[:WROTE]->(:Comment)-[:COMMENTS]->(related:Post)',
shoutedCount: '-[:SHOUTED]->(related:Post)',
badgesCount: '<-[:REWARDED]-(related:Badge)',

5
backend/src/schema/types/type/Post.gql
View File

@ -29,11 +29,6 @@ type Post {
categories: [Category]! @relation(name: "CATEGORIZED", direction: "OUT")
comments: [Comment]! @relation(name: "COMMENTS", direction: "IN")
commentsCount: Int!
@cypher(
statement: "MATCH (this)<-[:COMMENTS]-(r:Comment) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)"
)
shoutedBy: [User]! @relation(name: "SHOUTED", direction: "IN")
shoutedCount: Int!
@cypher(

2
backend/src/schema/types/type/User.gql
View File

@ -64,7 +64,6 @@ type User {
)
comments: [Comment]! @relation(name: "WROTE", direction: "OUT")
commentsCount: Int! @cypher(statement: "MATCH (this)-[:WROTE]->(r:Comment) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)")
commentedCount: Int! @cypher(statement: "MATCH (this)-[:WROTE]->(r:Comment)-[:COMMENTS]->(p:Post) WHERE NOT r.deleted = true AND NOT r.disabled = true AND NOT p.deleted = true AND NOT p.disabled = true RETURN COUNT(DISTINCT(p))")
shouted: [Post]! @relation(name: "SHOUTED", direction: "OUT")
@ -143,7 +142,6 @@ type Query {
followedByCount: Int
followedByCurrentUser: Boolean
contributionsCount: Int
commentsCount: Int
commentedCount: Int
shoutedCount: Int
badgesCount: Int

2
cypress/integration/common/steps.js
View File

@ -260,7 +260,7 @@ Then("the first post on the landing page has the title:", title => {
Then(
"the page {string} returns a 404 error with a message:",
(route, message) => {
// TODO: how can we check HTTP codes with cypress?
cy.request({ url: route, failOnStatusCode: false }).its('status').should('eq', 404)
cy.visit(route, { failOnStatusCode: false });
cy.get(".error").should("contain", message);
}

2
webapp/components/Comment.vue
View File

@ -67,7 +67,7 @@ import { mapGetters, mapMutations } from 'vuex'
import HcUser from '~/components/User'
import ContentMenu from '~/components/ContentMenu'
import ContentViewer from '~/components/Editor/ContentViewer'
import HcEditCommentForm from '~/components/comments/EditCommentForm/EditCommentForm'
import HcEditCommentForm from '~/components/EditCommentForm/EditCommentForm'
export default {
data: function() {

2
webapp/components/comments/CommentForm/CommentForm.spec.js → webapp/components/CommentForm/CommentForm.spec.js
View File

@ -1,5 +1,5 @@
import { mount, createLocalVue } from '@vue/test-utils'
import CommentForm from './CommentForm.vue'
import CommentForm from './CommentForm'
import Styleguide from '@human-connection/styleguide'
import Vuex from 'vuex'
import MutationObserver from 'mutation-observer'

13
webapp/components/comments/CommentForm/CommentForm.vue → webapp/components/CommentForm/CommentForm.vue
View File

@ -30,10 +30,10 @@
<script>
import gql from 'graphql-tag'
import HcEditor from '~/components/Editor/Editor'
import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
import CommentMutations from '~/graphql/CommentMutations.js'
import { mapGetters } from 'vuex'
import HcEditor from '~/components/Editor/Editor'
import PostQuery from '~/graphql/PostQuery'
import CommentMutations from '~/graphql/CommentMutations'
export default {
components: {
@ -41,7 +41,6 @@ export default {
},
props: {
post: { type: Object, default: () => {} },
comments: { type: Array, default: () => [] },
},
data() {
return {
@ -76,18 +75,18 @@ export default {
this.disabled = true
this.$apollo
.mutate({
mutation: CommentMutations().CreateComment,
mutation: CommentMutations(this.$i18n).CreateComment,
variables: {
postId: this.post.id,
content: this.form.content,
},
update: (store, { data: { CreateComment } }) => {
const data = store.readQuery({
query: PostCommentsQuery(this.$i18n),
query: PostQuery(this.$i18n),
variables: { slug: this.post.slug },
})
data.Post[0].comments.push(CreateComment)
store.writeQuery({ query: PostCommentsQuery(this.$i18n), data })
store.writeQuery({ query: PostQuery(this.$i18n), data })
},
})
.then(res => {

73
webapp/components/comments/CommentList/CommentList.spec.js → webapp/components/CommentList/CommentList.spec.js
View File

@ -1,5 +1,5 @@
import { config, mount, createLocalVue } from '@vue/test-utils'
import CommentList from '.'
import CommentList from './CommentList'
import Empty from '~/components/Empty'
import Vuex from 'vuex'
import Styleguide from '@human-connection/styleguide'
@ -21,63 +21,52 @@ describe('CommentList.vue', () => {
let store
let wrapper
let propsData
let data
propsData = {
post: {
id: 1,
},
}
store = new Vuex.Store({
getters: {
'auth/user': () => {
return {}
},
},
})
mocks = {
$t: jest.fn(),
$filters: {
truncate: a => a,
},
$apollo: {
queries: {
Post: {
refetch: jest.fn(),
},
},
},
}
data = () => {
return {
comments: [],
}
}
describe('shallowMount', () => {
beforeEach(() => {
propsData = {
post: {
id: 1,
comments: [{ id: 'comment134', contentExcerpt: 'this is a comment' }],
},
}
store = new Vuex.Store({
getters: {
'auth/user': () => {
return {}
},
},
})
mocks = {
$t: jest.fn(),
$filters: {
truncate: a => a,
},
$apollo: {
queries: {
Post: {
refetch: jest.fn(),
},
},
},
}
})
const Wrapper = () => {
return mount(CommentList, {
store,
mocks,
localVue,
propsData,
data,
})
}
beforeEach(() => {
wrapper = Wrapper()
wrapper.setData({
comments: [
{
id: 'c1',
contentExcerpt: 'this is a comment',
},
],
})
})
it('displays a message icon when there are no comments to display', () => {
propsData.post.comments = []
expect(Wrapper().findAll(Empty)).toHaveLength(1)
})

35
webapp/components/comments/CommentList/index.vue → webapp/components/CommentList/CommentList.vue
View File

@ -4,25 +4,25 @@
<span>
<ds-icon name="comments" />
<ds-tag
v-if="comments"
v-if="post.comments.length"
style="margin-top: -4px; margin-left: -12px; position: absolute;"
color="primary"
size="small"
round
>
{{ comments.length }}
{{ post.comments.length }}
</ds-tag>
&nbsp; Comments
</span>
</h3>
<ds-space margin-bottom="large" />
<div v-if="comments && comments.length" id="comments" class="comments">
<div v-if="post.comments && post.comments.length" id="comments" class="comments">
<comment
v-for="(comment, index) in comments"
v-for="(comment, index) in post.comments"
:key="comment.id"
:comment="comment"
:post="post"
@deleteComment="comments.splice(index, 1)"
@deleteComment="post.comments.splice(index, 1)"
/>
</div>
<hc-empty v-else name="empty" icon="messages" />
@ -31,7 +31,6 @@
<script>
import Comment from '~/components/Comment.vue'
import HcEmpty from '~/components/Empty.vue'
import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
export default {
components: {
@ -41,29 +40,5 @@ export default {
props: {
post: { type: Object, default: () => {} },
},
data() {
return {
comments: [],
}
},
watch: {
Post(post) {
const [first] = post
this.comments = (first && first.comments) || []
},
},
apollo: {
Post: {
query() {
return PostCommentsQuery(this.$i18n)
},
variables() {
return {
slug: this.post.slug,
}
},
fetchPolicy: 'cache-and-network',
},
},
}
</script>

2
webapp/components/CountTo.vue
View File

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

2
webapp/components/DeleteData/DeleteData.spec.js
View File

@ -48,7 +48,7 @@ describe('DeleteData.vue', () => {
}
getters = {
'auth/user': () => {
return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentsCount: 3 }
return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentedCount: 3 }
},
}
actions = { 'auth/logout': jest.fn() }

6
webapp/components/DeleteData/DeleteData.vue
View File

@ -30,12 +30,12 @@
}}
</label>
<ds-space margin-bottom="small" />
<label v-if="currentUser.commentsCount" class="checkbox-container">
<label v-if="currentUser.commentedCount" class="checkbox-container">
<input type="checkbox" v-model="deleteComments" />
<span class="checkmark"></span>
{{
$t('settings.deleteUserAccount.commentsCount', {
count: currentUser.commentsCount,
$t('settings.deleteUserAccount.commentedCount', {
count: currentUser.commentedCount,
})
}}
</label>

0
webapp/components/comments/EditCommentForm/EditCommentForm.vue → webapp/components/EditCommentForm/EditCommentForm.vue
View File

4
webapp/components/PostCard/PostCard.story.js
View File

@ -24,7 +24,7 @@ const post = {
deleted: false,
contributionsCount: 25,
shoutedCount: 5,
commentsCount: 39,
commentedCount: 39,
followedByCount: 2,
followedByCurrentUser: true,
location: null,
@ -38,7 +38,7 @@ const post = {
],
__typename: 'User',
},
commentsCount: 12,
commentedCount: 12,
categories: [],
shoutedCount: 421,
__typename: 'Post',

4
webapp/components/PostCard/index.vue
View File

@ -48,9 +48,9 @@
</span>
&nbsp;
<!-- Comments Count -->
<span :style="{ opacity: post.commentsCount ? 1 : 0.5 }">
<span :style="{ opacity: post.commentedCount ? 1 : 0.5 }">
<ds-icon name="comments" />
<small>{{ post.commentsCount }}</small>
<small>{{ post.commentedCount }}</small>
</span>
<!-- Menu -->
<content-menu

2
webapp/components/SearchInput.spec.js
View File

@ -122,7 +122,7 @@ describe('SearchInput.vue', () => {
name: 'Trick',
slug: 'trick',
},
commentsCount: 0,
commentedCount: 0,
createdAt: '2019-03-13T11:00:20.835Z',
id: 'p10',
label: 'Eos aut illo omnis quis eaque et iure aut.',

2
webapp/components/SearchInput.vue
View File

@ -46,7 +46,7 @@
<ds-flex-item>
<ds-text size="small" color="softer" class="search-meta">
<span style="text-align: right;">
<b>{{ option.commentsCount }}</b>
<b>{{ option.commentedCount }}</b>
<ds-icon name="comments" />
</span>
<span style="width: 36px; display: inline-block; text-align: right;">

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

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

32
webapp/graphql/CommentMutations.js
View File

@ -1,6 +1,6 @@
import gql from 'graphql-tag'
export default () => {
export default i18n => {
return {
CreateComment: gql`
mutation($postId: ID!, $content: String!) {
@ -8,15 +8,26 @@ export default () => {
id
contentExcerpt
content
createdAt
disabled
deleted
author {
id
slug
name
avatar
disabled
deleted
shoutedCount
contributionsCount
commentedCount
followedByCount
followedByCurrentUser
badges {
id
icon
}
}
createdAt
deleted
disabled
}
}
`,
@ -24,8 +35,19 @@ export default () => {
mutation($content: String!, $id: ID!) {
UpdateComment(content: $content, id: $id) {
id
content
contentExcerpt
content
createdAt
disabled
deleted
author {
id
slug
name
avatar
disabled
deleted
}
}
}
`,

2
webapp/graphql/CommentQuery.js
View File

@ -17,7 +17,7 @@ export default app => {
deleted
shoutedCount
contributionsCount
commentsCount
commentedCount
followedByCount
followedByCurrentUser
location {

39
webapp/graphql/PostCommentsQuery.js
View File

@ -1,39 +0,0 @@
import gql from 'graphql-tag'
export default i18n => {
const lang = i18n.locale().toUpperCase()
return gql(`
query Post($slug: String!) {
Post(slug: $slug) {
comments(orderBy: createdAt_asc) {
id
contentExcerpt
content
createdAt
disabled
deleted
author {
id
slug
name
avatar
disabled
deleted
shoutedCount
contributionsCount
commentsCount
followedByCount
followedByCurrentUser
location {
name: name${lang}
}
badges {
id
icon
}
}
}
}
}
`)
}

11
webapp/graphql/PostQuery.js
View File

@ -22,7 +22,7 @@ export default i18n => {
deleted
shoutedCount
contributionsCount
commentsCount
commentedCount
followedByCount
followedByCurrentUser
location {
@ -36,10 +36,10 @@ export default i18n => {
tags {
id
}
commentsCount
comments(orderBy: createdAt_desc) {
comments(orderBy: createdAt_asc) {
id
contentExcerpt
content
createdAt
disabled
deleted
@ -52,7 +52,7 @@ export default i18n => {
deleted
shoutedCount
contributionsCount
commentsCount
commentedCount
followedByCount
followedByCurrentUser
location {
@ -99,7 +99,7 @@ export const filterPosts = i18n => {
deleted
contributionsCount
shoutedCount
commentsCount
commentedCount
followedByCount
followedByCurrentUser
location {
@ -110,7 +110,6 @@ export const filterPosts = i18n => {
icon
}
}
commentsCount
categories {
id
name

38
webapp/graphql/UserProfile/Post.js
View File

@ -1,38 +0,0 @@
import gql from 'graphql-tag'
export default i18n => {
const lang = i18n.locale().toUpperCase()
return gql(`
query Post($filter: _PostFilter, $first: Int, $offset: Int) {
Post(filter: $filter, first: $first, offset: $offset, orderBy: createdAt_desc) {
id
slug
title
contentExcerpt
shoutedCount
commentsCount
deleted
image
createdAt
disabled
deleted
categories {
id
name
icon
}
author {
id
slug
avatar
name
disabled
deleted
location {
name: name${lang}
}
}
}
}
`)
}

36
webapp/graphql/settings/BlockedUsers.js
View File

@ -1,7 +1,7 @@
import gql from 'graphql-tag'
export const BlockedUsers = () => {
return gql(`
return gql`
{
blockedUsers {
id
@ -13,27 +13,31 @@ export const BlockedUsers = () => {
deleted
}
}
`)
`
}
export const Block = () => {
return gql(`mutation($id:ID!) {
block(id: $id) {
id
name
isBlocked
followedByCurrentUser
return gql`
mutation($id: ID!) {
block(id: $id) {
id
name
isBlocked
followedByCurrentUser
}
}
}`)
`
}
export const Unblock = () => {
return gql(`mutation($id:ID!) {
unblock(id: $id) {
id
name
isBlocked
followedByCurrentUser
return gql`
mutation($id: ID!) {
unblock(id: $id) {
id
name
isBlocked
followedByCurrentUser
}
}
}`)
`
}

2
webapp/locales/de.json
View File

@ -171,7 +171,7 @@
"deleteUserAccount": {
"name": "Daten löschen",
"contributionsCount": "Meine {count} Beiträge löschen",
"commentsCount": "Meine {count} Kommentare löschen",
"commentedCount": "Meine {count} Kommentare löschen",
"accountDescription": "Sei dir bewusst, dass deine Beiträge und Kommentare für unsere Community wichtig sind. Wenn du sie trotzdem löschen möchtest, musst du sie unten markieren.",
"accountWarning": "Dein Konto, deine Beiträge oder Kommentare kannst du nach dem Löschen <b>WEDER VERWALTEN NOCH WIEDERHERSTELLEN!</b>",
"success": "Konto erfolgreich gelöscht!",

2
webapp/locales/en.json
View File

@ -171,7 +171,7 @@
"deleteUserAccount": {
"name": "Delete data",
"contributionsCount": "Delete my {count} posts",
"commentsCount": "Delete my {count} comments",
"commentedCount": "Delete my {count} comments",
"accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
"accountWarning": "You <b>CAN'T MANAGE</b> and <b>CAN'T RECOVER</b> your Account, Posts, or Comments after deleting your account!",
"success": "Account successfully deleted!",

2
webapp/locales/pl.json
View File

@ -121,7 +121,7 @@
"deleteUserAccount": {
"name": "Usuń dane",
"contributionsCount": "Usuń {count} moich postów",
"commentsCount": "Usuń {count} moich komentarzy",
"commentedCount": "Usuń {count} moich komentarzy",
"accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
"accountWarning": "Po usunięcie Twojego konta, nie możesz <b>ZARZĄDZAĆ</b> ani <b>ODZYSKAĆ</b> danych, wpisów oraz komentarzy!",
"success": "Konto zostało usunięte",

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

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

2
webapp/pages/index.vue
View File

@ -96,7 +96,7 @@ export default {
label: this.$t('sorting.commented'),
value: 'Commented',
icons: 'comment',
order: 'commentsCount_desc',
order: 'commentedCount_desc',
},
],
}

43
webapp/pages/post/_id/_slug/index.vue
View File

@ -81,10 +81,10 @@ import HcTag from '~/components/Tag'
import ContentMenu from '~/components/ContentMenu'
import HcUser from '~/components/User'
import HcShoutButton from '~/components/ShoutButton.vue'
import HcCommentForm from '~/components/comments/CommentForm/CommentForm'
import HcCommentList from '~/components/comments/CommentList'
import HcCommentForm from '~/components/CommentForm/CommentForm'
import HcCommentList from '~/components/CommentList/CommentList'
import { postMenuModalsData, deletePostMutation } from '~/components/utils/PostHelpers'
import PostQuery from '~/graphql/PostQuery.js'
import PostQuery from '~/graphql/PostQuery'
import HcEmotions from '~/components/Emotions/Emotions'
export default {
@ -122,29 +122,6 @@ export default {
this.title = this.post.title
},
},
async asyncData(context) {
const {
params,
error,
app: { apolloProvider, $i18n },
} = context
const client = apolloProvider.defaultClient
const query = PostQuery($i18n)
const variables = { slug: params.slug }
const {
data: { Post },
} = await client.query({ query, variables })
if (Post.length <= 0) {
// TODO: custom 404 error page with translations
const message = 'This post could not be found'
return error({ statusCode: 404, message })
}
const [post] = Post
return {
post,
title: post.title,
}
},
mounted() {
setTimeout(() => {
// NOTE: quick fix for jumping flexbox implementation
@ -175,6 +152,19 @@ export default {
}
},
},
apollo: {
Post: {
query() {
return PostQuery(this.$i18n)
},
variables() {
return {
slug: this.$route.params.slug,
}
},
fetchPolicy: 'cache-and-network',
},
},
}
</script>
@ -187,7 +177,6 @@ export default {
}
.post-card {
// max-width: 800px;
margin: auto;
.comments {

4
webapp/pages/post/_id/_slug/more-info.vue
View File

@ -91,7 +91,7 @@ export default {
slug
contentExcerpt
shoutedCount
commentsCount
commentedCount
categories {
id
name
@ -105,7 +105,7 @@ export default {
contributionsCount
followedByCount
followedByCurrentUser
commentsCount
commentedCount
location {
name: name${this.$i18n.locale().toUpperCase()}
}

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

@ -43,14 +43,14 @@
<ds-flex-item>
<no-ssr>
<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>
</no-ssr>
</ds-flex-item>
<ds-flex-item>
<no-ssr>
<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>
</no-ssr>
</ds-flex-item>
@ -254,9 +254,9 @@ import HcEmpty from '~/components/Empty.vue'
import ContentMenu from '~/components/ContentMenu'
import HcUpload from '~/components/Upload'
import HcAvatar from '~/components/Avatar/Avatar.vue'
import PostQuery from '~/graphql/UserProfile/Post.js'
import UserQuery from '~/graphql/User.js'
import { Block, Unblock } from '~/graphql/settings/BlockedUsers.js'
import { filterPosts } from '~/graphql/PostQuery'
import UserQuery from '~/graphql/User'
import { Block, Unblock } from '~/graphql/settings/BlockedUsers'
const tabToFilterMapping = ({ tab, id }) => {
return {
@ -309,10 +309,6 @@ export default {
myProfile() {
return this.$route.params.id === this.$store.getters['auth/user'].id
},
followedByCount() {
let count = Number(this.user.followedByCount) || 0
return count
},
user() {
return this.User ? this.User[0] : {}
},
@ -401,7 +397,7 @@ export default {
apollo: {
Post: {
query() {
return PostQuery(this.$i18n)
return filterPosts(this.$i18n)
},
variables() {
return {

4
webapp/store/auth.js
View File

@ -70,7 +70,7 @@ export const actions = {
data: { currentUser },
} = await client.query({
query: gql`
{
query {
currentUser {
id
name
@ -81,7 +81,7 @@ export const actions = {
about
locationName
contributionsCount
commentsCount
commentedCount
socialMedia {
id
url

3
webapp/store/posts.js
View File

@ -88,7 +88,7 @@ export const actions = {
deleted
contributionsCount
shoutedCount
commentsCount
commentedCount
followedByCount
followedByCurrentUser
location {
@ -99,7 +99,6 @@ export const actions = {
icon
}
}
commentsCount
categories {
id
name

7
webapp/store/search.js
View File

@ -45,15 +45,14 @@ export const actions = {
commit('SET_QUICK_PENDING', true)
await this.app.apolloProvider.defaultClient
.query({
query: gql(`
query: gql`
query findPosts($query: String!) {
findPosts(query: $query, limit: 10) {
id
slug
label: title
value: title,
value: title
shoutedCount
commentsCount
createdAt
author {
id
@ -62,7 +61,7 @@ export const actions = {
}
}
}
`),
`,
variables: {
query: value.replace(/\s/g, '~ ') + '~',
},