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 branch 'master' into add-db-migrate-up-command-to-docu

Browse Source
This commit is contained in:
Hannes Heine 2023-02-28 13:06:48 +01:00 committed by GitHub
commit 6be8c8eeb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/db/factories.js
View File

@ -65,7 +65,6 @@ Factory.define('basicUser')
name: faker.name.findName, name: faker.name.findName,
password: '1234', password: '1234',
role: 'user', role: 'user',
about: faker.lorem.paragraph,
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,
@ -82,12 +81,28 @@ Factory.define('basicUser')
Factory.define('userWithoutEmailAddress') Factory.define('userWithoutEmailAddress')
.extend('basicUser') .extend('basicUser')
.option('about', faker.lorem.paragraph)
.after(async (buildObject, options) => {
return neode.create('User', buildObject)
})
Factory.define('userWithAboutNull')
.extend('basicUser')
.option('about', null)
.after(async (buildObject, options) => {
return neode.create('User', buildObject)
})
Factory.define('userWithAboutEmpty')
.extend('basicUser')
.option('about', '')
.after(async (buildObject, options) => { .after(async (buildObject, options) => {
return neode.create('User', buildObject) return neode.create('User', buildObject)
}) })
Factory.define('user') Factory.define('user')
.extend('basicUser') .extend('basicUser')
.option('about', faker.lorem.paragraph)
.option('email', faker.internet.exampleEmail) .option('email', faker.internet.exampleEmail)
.option('avatar', () => .option('avatar', () =>
Factory.build('image', { Factory.build('image', {

6
webapp/pages/map.vue
View File

@ -337,7 +337,7 @@ export default {
id: user.id, id: user.id,
slug: user.slug, slug: user.slug,
name: user.name, name: user.name,
about: user.about, about: user.about ? user.about : undefined,
}, },
geometry: { geometry: {
type: 'Point', type: 'Point',
@ -358,7 +358,7 @@ export default {
id: group.id, id: group.id,
slug: group.slug, slug: group.slug,
name: group.name, name: group.name,
about: group.about, about: group.about ? group.about : undefined,
}, },
geometry: { geometry: {
type: 'Point', type: 'Point',
@ -378,7 +378,7 @@ export default {
id: this.currentUser.id, id: this.currentUser.id,
slug: this.currentUser.slug, slug: this.currentUser.slug,
name: this.currentUser.name, name: this.currentUser.name,
about: this.currentUser.about, about: this.currentUser.about ? this.currentUser.about : undefined,
}, },
geometry: { geometry: {
type: 'Point', type: 'Point',