Merge branch 'develop' into 74-speakers-listing-view

Author: fcamblor

cloud/functions/src/crawlers/crawler-parsers.ts

@@ -64,7 +64,10 @@ export const EVENT_THEME_PARSER = z.object({
       url: z.string(),
       descriptor: z.string().regex(/\d(?:w|x)/)
     })).min(1).optional().nullable().default(null),
-    customGoogleFontFamilies: z.array(z.string()).optional().nullable().default(null),
+    customImportedFonts: z.array(z.object({
+      provider: z.literal('google-fonts'),
+      family: z.string(),
+    })).optional().nullable().default(null),
 })
 
 export const SOCIAL_MEDIA_TYPE = z.union([

mobile/src/models/VoxxrinEvent.ts

@@ -119,6 +119,6 @@ export function toVoxxrinEventTheme(firestoreTheme: EventTheme): VoxxrinEventThe
         },
         headingCustomStyles: firestoreTheme.headingCustomStyles,
         headingSrcSet: firestoreTheme.headingSrcSet,
-        customGoogleFontFamilies: firestoreTheme.customGoogleFontFamilies,
+        customImportedFonts: firestoreTheme.customImportedFonts,
     }
 }

mobile/src/views/event/_BaseEventPages.vue

@@ -1,7 +1,7 @@
 <template>
   <ion-page>
     <event-tabs :tabs="tabs" :spaced-event-id="spacedEventIdRef"></event-tabs>
-    <link v-for="googleFontUrl in confDescriptorRef?.theming.customGoogleFontFamilies || []" :key="googleFontUrl" rel="stylesheet" :href="`https://fonts.googleapis.com/css2?family=${googleFontUrl}&display=swap`" />
+    <link v-for="customFontUrl in customFontUrls" :key="customFontUrl" rel="stylesheet" :href="customFontUrl" />
   </ion-page>
 </template>
 
@@ -12,6 +12,7 @@ import {useSharedConferenceDescriptor} from "@/state/useConferenceDescriptor";
 import {computed, toValue} from "vue";
 import {areFeedbacksEnabled} from "@/models/VoxxrinConferenceDescriptor";
 import {getResolvedEventRootPathFromSpacedEventIdRef, useCurrentSpaceEventIdRef} from "@/services/Spaces";
+import {match} from "ts-pattern";
 
 const spacedEventIdRef = useCurrentSpaceEventIdRef()
 const {conferenceDescriptor: confDescriptorRef} = useSharedConferenceDescriptor(spacedEventIdRef);
@@ -39,6 +40,14 @@ const tabs = computed(() => {
         selectedIcon: '/assets/icons/solid/info-circle.svg',
     }]:[])
 })
+
+const customFontUrls = computed(() => {
+  const confDescriptor = toValue(confDescriptorRef);
+  return (confDescriptor?.theming?.customImportedFonts || []).map(customFontDescriptor => match(customFontDescriptor)
+    .with({ provider: 'google-fonts' }, ({ family }) => `https://fonts.googleapis.com/css2?family=${family}&display=swap`)
+    .exhaustive()
+  )
+})
 </script>
 
 <style lang="scss" scoped>

shared/event-list.firestore.d.ts

@@ -15,7 +15,10 @@ export type EventTheme = {
       banner: string|null,
     }|null,
     headingSrcSet: Array<{ url: string, descriptor: string }>|null,
-    customGoogleFontFamilies: string[]|null
+    customImportedFonts: Array<{
+      provider: 'google-fonts',
+      family: string,
+    }>|null,
 }
 
 export type Day = {