Public activity series

karrot-dev · Jan 16, 2024 · d206f30 · d206f30
1 parent 47cff45
commit d206f30
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 6 deletions.
diff --git a/src/activities/api/activitySeries.js b/src/activities/api/activitySeries.js
@@ -1,9 +1,10 @@
 import axios from '@/base/api/axios'
+import { toFormData } from '@/utils/utils'
 
 export default {
 
   async create (series) {
-    return convert((await axios.post('/api/activity-series/', serialize(series))).data)
+    return convert((await axios.post('/api/activity-series/', await toFormData(serialize(series)))).data)
   },
 
   async get (seriesId) {
@@ -16,7 +17,7 @@ export default {
 
   async save (series) {
     const { id } = series
-    return convert((await axios.patch(`/api/activity-series/${id}/`, serialize(series))).data)
+    return convert((await axios.patch(`/api/activity-series/${id}/`, await toFormData(serialize(series)))).data)
   },
 
   async checkSave (series) {

diff --git a/src/activities/components/ActivityItem.vue b/src/activities/components/ActivityItem.vue
@@ -437,7 +437,7 @@ const icsUrl = computed(() => {
   return absoluteURL(`/api/activities/${activity.value.id}/ics/`)
 })
 const bannerImageURL = computed(() => {
-  return activity.value?.bannerImageUrls?.fullSize
+  return activity.value?.bannerImageUrls?.fullSize ?? activity.value?.seriesBannerImageUrls?.fullSize
 })
 
 function join () {

diff --git a/src/activities/components/ActivitySeriesEdit.vue b/src/activities/components/ActivitySeriesEdit.vue
@@ -290,6 +290,49 @@
         @maybe-save="maybeSave"
       />
 
+      <QField
+        borderless
+        hide-bottom-space
+      >
+        <QToggle
+          v-model="edit.isPublic"
+          :label="$t('CREATEACTIVITY.MAKE_IT_PUBLIC')"
+        />
+      </QField>
+
+      <QField
+        v-if="edit.isPublic"
+        borderless
+        stack-label
+        bottom-slots
+        :label="$t('CREATEACTIVITY.BANNER_IMAGE')"
+      >
+        <template #hint>
+          <i18n-t
+            scope="global"
+            keypath="CREATEACTIVITY.BANNER_IMAGE_TIP"
+          >
+            <template #website>
+              <a
+                rel="noopener nofollow noreferrer"
+                class="fas-after fa-after-external-link"
+                target="_blank"
+                href="https://www.pexels.com/search/banner/?orientation=landscape"
+              >pexels.com</a>
+            </template>
+          </i18n-t>
+        </template>
+        <ChooseImage
+          v-model="edit.bannerImage"
+          :image-url="value.bannerImageUrls?.fullSize"
+          :aspect-ratio="26/9"
+          width="100%"
+          :title="$t('CREATEACTIVITY.BANNER_IMAGE')"
+          :dialog-title="$t('CREATEACTIVITY.SELECT_BANNER_IMAGE')"
+          class="q-mt-sm"
+        />
+      </QField>
+
       <div
         v-if="hasNonFieldError"
         class="text-negative"
@@ -386,12 +429,14 @@ import statusMixin from '@/utils/mixins/statusMixin'
 
 import ConfirmUserChangesDialog from '@/activities/components/ConfirmUserChangesDialog.vue'
 import ParticipantTypesEdit from '@/activities/components/ParticipantTypesEdit.vue'
+import ChooseImage from '@/utils/components/ChooseImage.vue'
 import MarkdownInput from '@/utils/components/MarkdownInput.vue'
 
 const ActivityItem = defineAsyncComponent(() => import('@/activities/components/ActivityItem.vue'))
 
 export default {
   components: {
+    ChooseImage,
     ActivityItem,
     QTime,
     QField,

diff --git a/src/activities/pages/PublicActivity.vue b/src/activities/pages/PublicActivity.vue
@@ -207,7 +207,7 @@ const activityType = computed(() => publicActivity.value?.activityType)
 const place = computed(() => publicActivity.value?.place)
 const group = computed(() => place.value?.group)
 
-const bannerImageURL = computed(() => publicActivity.value?.bannerImageUrls?.fullSize)
+const bannerImageURL = computed(() => publicActivity.value?.bannerImageUrls?.fullSize ?? publicActivity.value?.seriesBannerImageUrls?.fullSize)
 const groupImageURL = computed(() => group.value?.photoUrls?.[200])
 
 const icsUrl = computed(() => {

diff --git a/src/groupInfo/pages/GroupPreview.vue b/src/groupInfo/pages/GroupPreview.vue
@@ -182,8 +182,8 @@
                 @click="$router.push({ name: 'publicActivity', params: { activityPublicId: publicActivity.publicId } })"
               >
                 <QImg
-                  v-if="publicActivity.bannerImageUrls?.fullSize"
-                  :src="publicActivity.bannerImageUrls.fullSize"
+                  v-if="getBannerImageUrl(publicActivity)"
+                  :src="getBannerImageUrl(publicActivity)"
                   class="full-width"
                   style="max-height: 80px;"
                 />
@@ -294,6 +294,10 @@ const {
 
 const application = computed(() => applications.value.find(a => a.group === unref(groupPreviewId)))
 
+function getBannerImageUrl (publicActivity) {
+  return publicActivity?.bannerImageUrls?.fullSize ?? publicActivity?.seriesBannerImageUrls?.fullSize
+}
+
 async function withdraw () {
   Dialog.create({
     title: t('JOINGROUP.WITHDRAW_CONFIRMATION_HEADER'),