Merge remote-tracking branch 'origin/master' into travis-ci-build

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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