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 remote-tracking branch 'origin/master' into travis-ci-build

Browse Source
This commit is contained in:
Grzegorz Leoniec 2018-11-24 10:35:46 +01:00
commit ff41f0a0bf
6 changed files with 53 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/Author.vue
View File

@ -136,7 +136,7 @@ export default {
}, },
author() { author() {
return this.hasAuthor return this.hasAuthor
? this.post.author.User ? this.post.author
: { : {
name: 'Anonymus' name: 'Anonymus'
} }

8
graphql/UserProfileQuery.js
View File

@ -64,11 +64,9 @@ export default gql(`
image image
createdAt createdAt
author { author {
User { id
id avatar
avatar name
name
}
} }
} }
} }

13
nuxt.config.js
View File

@ -1,14 +1,13 @@
const pkg = require('./package') const pkg = require('./package')
const envWhitelist = [ const envWhitelist = ['NODE_ENV', 'BACKEND_URL', 'MAINTENANCE']
'NODE_ENV', const dev = process.env.NODE_ENV !== 'production'
'BACKEND_URL',
'MAINTENANCE'
]
module.exports = { module.exports = {
mode: 'universal', mode: 'universal',
dev: dev,
debug: dev ? 'nuxt:*,app' : null,
transition: { transition: {
name: 'slide-up', name: 'slide-up',
mode: 'out-in' mode: 'out-in'
@ -129,7 +128,7 @@ module.exports = {
// }, // },
// required // required
clientConfigs: { clientConfigs: {
default: '~/plugins/apollo-config.js', default: '~/plugins/apollo-config.js'
} }
}, },

24
pages/index.vue
View File

@ -86,20 +86,18 @@ export default {
slug slug
image image
author { author {
User { id
avatar
slug
name
contributionsCount
shoutedCount
commentsCount
followedByCount
badges {
id id
avatar key
slug icon
name
contributionsCount
shoutedCount
commentsCount
followedByCount
badges {
id
key
icon
}
} }
} }
commentsCount commentsCount

48
pages/post/_slug/index.vue
View File

@ -120,20 +120,18 @@ export default {
slug slug
image image
author { author {
User { id
slug
name
avatar
shoutedCount
contributionsCount
commentsCount
followedByCount
badges {
id id
slug key
name icon
avatar
shoutedCount
contributionsCount
commentsCount
followedByCount
badges {
id
key
icon
}
} }
} }
tags { tags {
@ -146,20 +144,18 @@ export default {
createdAt createdAt
deleted deleted
author { author {
User { id
slug
name
avatar
shoutedCount
contributionsCount
commentsCount
followedByCount
badges {
id id
slug key
name icon
avatar
shoutedCount
contributionsCount
commentsCount
followedByCount
badges {
id
key
icon
}
} }
} }
} }

22
pages/post/_slug/more-info.vue
View File

@ -79,19 +79,17 @@ export default {
shoutedCount shoutedCount
commentsCount commentsCount
author { author {
User { id
name
slug
avatar
contributionsCount
followedByCount
commentsCount
badges {
id id
name key
slug icon
avatar
contributionsCount
followedByCount
commentsCount
badges {
id
key
icon
}
} }
} }
} }