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 #6045 #6267, resolve conflicts, fix save image

Browse Source
This commit is contained in:
ogerly 2023-05-17 11:01:49 +02:00
parent b4275f44cb
commit ff559e71db
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/ContributionForm/ContributionForm.vue
View File

@ -263,7 +263,7 @@ export default {
return [] return []
}, },
}, },
eventStart: { required: !this.creatEvent }, eventStart: { required: !!this.creatEvent },
eventVenue: { required: !!this.creatEvent, min: 3, max: 100 }, eventVenue: { required: !!this.creatEvent, min: 3, max: 100 },
eventLocationName: { required: !!this.creatEvent, min: 3, max: 100 }, eventLocationName: { required: !!this.creatEvent, min: 3, max: 100 },
}, },

3
webapp/components/PostTeaser/PostTeaser.vue
View File

@ -11,6 +11,7 @@
}" }"
:highlight="isPinned" :highlight="isPinned"
> >
<!-- {{ post }} -->
<template v-if="post.image" #heroImage> <template v-if="post.image" #heroImage>
<img :src="post.image | proxyApiUrl" class="image" /> <img :src="post.image | proxyApiUrl" class="image" />
</template> </template>
@ -188,7 +189,7 @@ export default {
if (this.post.eventEnd) { if (this.post.eventEnd) {
const eventStart = format(new Date(this.post.eventStart), 'dd.MM.') const eventStart = format(new Date(this.post.eventStart), 'dd.MM.')
const eventEnd = format(new Date(this.post.eventEnd), 'dd.MM.yyyy') const eventEnd = format(new Date(this.post.eventEnd), 'dd.MM.yyyy')
return eventStart + ' - ' + eventEnd return `${eventStart} - ${eventEnd}`
} else { } else {
return format(new Date(this.post.eventStart), 'dd.MM.yyyy') return format(new Date(this.post.eventStart), 'dd.MM.yyyy')
} }

8
webapp/graphql/PostMutations.js
View File

@ -9,6 +9,7 @@ export default () => {
$slug: String $slug: String
$content: String! $content: String!
$categoryIds: [ID] $categoryIds: [ID]
$image: ImageInput
$groupId: ID $groupId: ID
$postType: PostType $postType: PostType
$eventInput: _EventInput $eventInput: _EventInput
@ -19,6 +20,7 @@ export default () => {
slug: $slug slug: $slug
content: $content content: $content
categoryIds: $categoryIds categoryIds: $categoryIds
image: $image
groupId: $groupId groupId: $groupId
postType: $postType postType: $postType
eventInput: $eventInput eventInput: $eventInput
@ -27,6 +29,12 @@ export default () => {
slug slug
title title
content content
contentExcerpt
language
image {
url
sensitive
}
disabled disabled
deleted deleted
postType postType

2
webapp/pages/post/create.vue
View File

@ -29,7 +29,7 @@
fullwidth fullwidth
size="x-large" size="x-large"
v-if="creatEvent" v-if="creatEvent"
hover="false" hover
style="background-color: #ff000000; color: whitesmoke" style="background-color: #ff000000; color: whitesmoke"
> >
{{ $t('post.createNewEvent.title') }} {{ $t('post.createNewEvent.title') }}