merge #6045 #6267, resolve conflicts, fix save image

webapp/components/ContributionForm/ContributionForm.vue

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

webapp/components/PostTeaser/PostTeaser.vue

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

webapp/graphql/PostMutations.js

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

webapp/pages/post/create.vue

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