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() { author() {
return this.hasAuthor return this.hasAuthor
? this.post.author.User ? this.post.author
: { : {
name: 'Anonymus' name: 'Anonymus'
} }

View File

@ -64,7 +64,6 @@ export default gql(`
image image
createdAt createdAt
author { author {
User {
id id
avatar avatar
name name
@ -72,5 +71,4 @@ export default gql(`
} }
} }
} }
}
`) `)

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'
} }
}, },

View File

@ -86,7 +86,6 @@ export default {
slug slug
image image
author { author {
User {
id id
avatar avatar
slug slug
@ -101,7 +100,6 @@ export default {
icon icon
} }
} }
}
commentsCount commentsCount
categories { categories {
id id

View File

@ -120,7 +120,6 @@ export default {
slug slug
image image
author { author {
User {
id id
slug slug
name name
@ -135,7 +134,6 @@ export default {
icon icon
} }
} }
}
tags { tags {
name name
} }
@ -146,7 +144,6 @@ export default {
createdAt createdAt
deleted deleted
author { author {
User {
id id
slug slug
name name
@ -162,7 +159,6 @@ export default {
} }
} }
} }
}
categories { categories {
id id
name name

View File

@ -79,7 +79,6 @@ export default {
shoutedCount shoutedCount
commentsCount commentsCount
author { author {
User {
id id
name name
slug slug
@ -94,7 +93,6 @@ export default {
} }
} }
} }
}
shoutedCount shoutedCount
} }
} }