Merge pull request #74 from SpeciesFileGroup/development

Use base_url for logo and add default config

src/components/Layout/LayoutHeader.vue

@@ -12,7 +12,7 @@
         <img
           v-if="header_logo_url"
           class="mr-3 h-10"
-          :src="header_logo_url"
+          :src="logoUrl"
           :alt="header_logo_text"
         />
         <span>
@@ -52,6 +52,12 @@
 <script setup>
 import SwitchTheme from '../SwitchTheme.vue'
 import NavbarMobile from '../Navbar/NavbarMobile.vue'
+import { isValidUrl } from '@/utils/url'
 
-const { header_links, header_logo_text, header_logo_url } = __APP_ENV__
+const { header_links, header_logo_text, header_logo_url, base_url } =
+  __APP_ENV__
+
+const logoUrl = isValidUrl(header_logo_url)
+  ? header_logo_url
+  : base_url + header_logo_url
 </script>

src/constants/defaultConfig.js

@@ -0,0 +1,7 @@
+export default {
+  base_url: '/',
+  hash_mode: false,
+  map_tile_server: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+  map_tile_attribution:
+    '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+}

src/utils/loadConfiguration.js

@@ -1,10 +1,13 @@
 import fs from 'fs'
 import yaml from 'js-yaml'
 import glob from 'glob'
+import defaultConfig from '../constants/defaultConfig'
 
-export const loadConfiguration = appPath => {
+export const loadConfiguration = (appPath) => {
   const filePaths = glob.sync(appPath + '/config/*.yml', {})
-  const jsonConfig = filePaths.map(filepath => yaml.load(fs.readFileSync(filepath, 'utf8')))
+  const jsonConfig = filePaths.map((filepath) =>
+    yaml.load(fs.readFileSync(filepath, 'utf8'))
+  )
 
-  return Object.assign({}, ...jsonConfig)
+  return Object.assign({}, defaultConfig, ...jsonConfig)
 }

src/utils/url.js

@@ -0,0 +1,8 @@
+export function isValidUrl(string) {
+  try {
+    new URL(string)
+    return true
+  } catch (err) {
+    return false
+  }
+}