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

Update property name to be more descriptive

Browse Source 
- I wanted to trigger a build, since we had issues with our build server
today. I think this naming is more in the direction we want to go,
though. Maybe it could be makeShoutsPublic as @alina-beck used for the
translation keys... what do you think @kachulio
This commit is contained in:
mattwr18 2019-11-12 21:19:52 +01:00
parent 6e3bd19267
commit feb65a6c9c
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/models/User.js
View File

@ -127,7 +127,7 @@ module.exports = {
type: 'boolean', type: 'boolean',
default: false, default: false,
}, },
allowShouts: { showShoutsPublicly: {
type: 'boolean', type: 'boolean',
default: false, default: false,
}, },

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

@ -177,7 +177,7 @@ export default {
'termsAndConditionsAgreedVersion', 'termsAndConditionsAgreedVersion',
'termsAndConditionsAgreedAt', 'termsAndConditionsAgreedAt',
'allowEmbedIframes', 'allowEmbedIframes',
'allowShouts', 'showShoutsPublicly',
], ],
boolean: { boolean: {
followedByCurrentUser: followedByCurrentUser:

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

@ -28,7 +28,7 @@ type User {
termsAndConditionsAgreedAt: String termsAndConditionsAgreedAt: String
allowEmbedIframes: Boolean allowEmbedIframes: Boolean
allowShouts: Boolean showShoutsPublicly: Boolean
locale: String locale: String
friends: [User]! @relation(name: "FRIENDS", direction: "BOTH") friends: [User]! @relation(name: "FRIENDS", direction: "BOTH")
friendsCount: Int! @cypher(statement: "MATCH (this)<-[: FRIENDS]->(r: User) RETURN COUNT(DISTINCT r)") friendsCount: Int! @cypher(statement: "MATCH (this)<-[: FRIENDS]->(r: User) RETURN COUNT(DISTINCT r)")
@ -171,7 +171,7 @@ type Mutation {
termsAndConditionsAgreedVersion: String termsAndConditionsAgreedVersion: String
termsAndConditionsAgreedAt: String termsAndConditionsAgreedAt: String
allowEmbedIframes: Boolean allowEmbedIframes: Boolean
allowShouts: Boolean showShoutsPublicly: Boolean
locale: String locale: String
): User ): User

2
backend/src/seed/factories/users.js
View File

@ -17,7 +17,7 @@ export default function create() {
termsAndConditionsAgreedVersion: '0.0.1', termsAndConditionsAgreedVersion: '0.0.1',
termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z', termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
allowEmbedIframes: false, allowEmbedIframes: false,
allowShouts: false, showShoutsPublicly: false,
locale: 'en', locale: 'en',
} }
defaults.slug = slugify(defaults.name, { lower: true }) defaults.slug = slugify(defaults.name, { lower: true })

8
webapp/graphql/User.js
View File

@ -146,12 +146,12 @@ export const allowEmbedIframesMutation = () => {
` `
} }
export const allowShoutsMutation = () => { export const showShoutsPubliclyMutation = () => {
return gql` return gql`
mutation($id: ID!, $allowShouts: Boolean) { mutation($id: ID!, $showShoutsPublicly: Boolean) {
UpdateUser(id: $id, allowShouts: $allowShouts) { UpdateUser(id: $id, showShoutsPublicly: $showShoutsPublicly) {
id id
allowShouts showShoutsPublicly
} }
} }
` `

2
webapp/store/auth.js
View File

@ -87,7 +87,7 @@ export const actions = {
contributionsCount contributionsCount
commentedCount commentedCount
allowEmbedIframes allowEmbedIframes
allowShouts showShoutsPublicly
termsAndConditionsAgreedVersion termsAndConditionsAgreedVersion
socialMedia { socialMedia {
id id