Added null checks

sbsev · Nov 11, 2023 · aac3360 · aac3360
1 parent 6f611ed
commit aac3360
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/src/lib/Footer.svelte b/src/lib/Footer.svelte
@@ -5,7 +5,7 @@
   import { microcopy } from './stores'
   import type { Link } from './types'
 
-  const icon_map: Record<string, string> = $microcopy?.icons?.pages?.footer
+  const icon_map: Record<string, string> = $microcopy?.icons?.pages?.footer ?? []
 
   export let links: Link[]
   export let social: Record<keyof typeof icon_map, string>

diff --git a/src/lib/Map.svelte b/src/lib/Map.svelte
@@ -8,6 +8,7 @@
 
   export let map: mapboxgl.Map | null = null
   export let markers: MapMarker[] = []
+  // Default values are the german options
   export const { lng, lat, zoom, minZoom, maxZoom } = $microcopy?.map?.location ?? [
     10, 51.3, 5.05, 4, 10,
   ]

diff --git a/src/lib/Nav.svelte b/src/lib/Nav.svelte
@@ -9,7 +9,7 @@
   export let nav: NavLink[]
   export let mobile: boolean
 
-  const icon_map: Record<string, string> = $microcopy?.icons?.pages?.nav
+  const icon_map: Record<string, string> = $microcopy?.icons?.pages?.nav ?? {}
 
   let isOpen = false
   let activeSubNav = -1

diff --git a/src/lib/TagList.svelte b/src/lib/TagList.svelte
@@ -17,7 +17,7 @@
 
   const tagOccurrences = Object.entries(tagCounter) as [string, number][]
 
-  const icons: Record<string, string> = $microcopy?.icons?.tags?.blog
+  const icons: Record<string, string> = $microcopy?.icons?.tags?.blog ?? {}
   let open = false
   let viewWidth: number
   const style = `height: 18pt; margin-right: 5pt;`

diff --git a/src/lib/ThemeSwitcher.svelte b/src/lib/ThemeSwitcher.svelte
@@ -9,7 +9,7 @@
     system: `dark`,
   } as const
 
-  const color_mode_icons = $microcopy?.icons?.global?.theme
+  const color_mode_icons = $microcopy?.icons?.global?.theme ?? {}
 
   function set_color_mode() {
     const next = next_color_mode[$colorMode]

diff --git a/src/routes/faq/+page.svelte b/src/routes/faq/+page.svelte
@@ -7,7 +7,7 @@
 
   export let data
 
-  const icons: Record<string, string> = $microcopy?.icons?.tags?.faq
+  const icons: Record<string, string> = $microcopy?.icons?.tags?.faq ?? {}
 
   let active_tag = `Alle`
   const email = `info@${$microcopy?.location?.url}`

diff --git a/src/routes/lernmaterial/+page.svelte b/src/routes/lernmaterial/+page.svelte
@@ -7,7 +7,7 @@
 
   export let data
 
-  const icon_map: Record<string, string> = $microcopy?.icons?.tags?.faq
+  const icon_map: Record<string, string> = $microcopy?.icons?.tags?.faq ?? {}
 
   let active_tag = `Alle`
   const email = `it@${$microcopy?.location?.url}`