init runtime.public ;; cleared up misc errors

advplyr · Oct 17, 2024 · b54882b · b54882b
1 parent 2baf50d
commit b54882b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/client/components/app/ConfigSideNav.vue b/client/components/app/ConfigSideNav.vue
@@ -15,11 +15,11 @@
 
     <div class="w-44 h-12 px-4 border-t bg-bg border-black border-opacity-20 fixed left-0 flex flex-col justify-center" :class="wrapperClass" :style="{ bottom: streamLibraryItem ? '160px' : '0px' }">
       <div class="flex items-center justify-between">
-        <button type="button" class="underline font-mono text-sm" @click="clickChangelog">v{{ $config.version }}</button>
+        <button type="button" class="underline font-mono text-sm" @click="clickChangelog">v{{ $config.public.version }}</button>
 
         <p class="text-xs text-gray-300 italic">{{ Source }}</p>
       </div>
-      <a v-if="hasUpdate" :href="githubTagUrl" target="_blank" class="text-warning text-xs">Latest: {{ $config.version }}</a>
+      <a v-if="hasUpdate" :href="githubTagUrl" target="_blank" class="text-warning text-xs">Latest: {{ $config.public.version }}</a>
     </div>
   </div>
 </template>

diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue
@@ -116,7 +116,7 @@
     </div>
 
     <div class="w-full h-12 px-1 py-2 border-t border-black/20 bg-bg absolute left-0" :style="{ bottom: streamLibraryItem ? '224px' : '65px' }">
-      <p class="underline font-mono text-xs text-center text-gray-300 leading-3 mb-1" @click="clickChangelog">v{{ $config.version }}</p>
+      <p class="underline font-mono text-xs text-center text-gray-300 leading-3 mb-1" @click="clickChangelog">v{{ $config.public.version }}</p>
       <a v-if="hasUpdate" :href="githubTagUrl" target="_blank" class="text-warning text-xxs text-center block leading-3">Update</a>
       <p v-else class="text-xxs text-gray-400 leading-3 text-center italic">{{ Source }}</p>
     </div>

diff --git a/client/components/modals/player/QueueItemRow.vue b/client/components/modals/player/QueueItemRow.vue
@@ -55,7 +55,7 @@ export default {
       return this.item.coverPath
     },
     coverUrl() {
-      if (!this.coverPath) return `${this.$config.routerBasePath}/book_placeholder.jpg`
+      if (!this.coverPath) return `${this.$config.public.routerBasePath}/book_placeholder.jpg`
       return this.$store.getters['globals/getLibraryItemCoverSrcById'](this.libraryItemId)
     },
     bookCoverAspectRatio() {
@@ -99,4 +99,4 @@ export default {
 .queue-item-row-content {
   max-width: calc(100% - 48px - 128px);
 }
-</style>
+</style>
diff --git a/client/nuxt.config.js b/client/nuxt.config.js
@@ -15,9 +15,11 @@ export default defineNuxtConfig({
   },
   telemetry: false,
 
-  publicRuntimeConfig: {
-    version: pkg.version,
-    routerBasePath
+  runtimeConfig: {
+    public: {
+      version: pkg.version,
+      routerBasePath
+    }
   },
 
   // Global page headers: https://go.nuxtjs.dev/config-head

diff --git a/client/pages/config/rss-feeds.vue b/client/pages/config/rss-feeds.vue
@@ -125,7 +125,7 @@ export default {
       return this.$strings.LabelUnknown
     },
     coverUrl(feed) {
-      if (!feed.coverPath) return `${this.$config.routerBasePath}/Logo.png`
+      if (!feed.coverPath) return `${this.$config.public.routerBasePath}/Logo.png`
       return `${feed.feedUrl}/cover`
     },
     async loadFeeds() {

diff --git a/client/plugins/init.client.js b/client/plugins/init.client.js
@@ -181,5 +181,5 @@ export default ({ app, store }, inject) => {
   inject('eventBus', new Vue())
   inject('isDev', process.env.NODE_ENV !== 'production')
 
-  store.commit('setRouterBasePath', app.$config.routerBasePath)
+  store.commit('setRouterBasePath', app.$config.public.routerBasePath)
 }