Merge pull request #477 from bcc-code/feature/show-interview-link

make InfoMessage clickable
bcc-code · Aug 23, 2024 · e19a5d2 · e19a5d2
2 parents 9f2c131 + 1b54f3e
commit e19a5d2
Show file tree

Hide file tree

Showing 3 changed files with 8,916 additions and 7,060 deletions.
diff --git a/components/DocumentList.vue b/components/DocumentList.vue
@@ -14,9 +14,6 @@ type IDiscoverableGroup = {
   isTileContainer: boolean;
 };
 
-const runtimeConfig = useRuntimeConfig();
-const isElectron = runtimeConfig.public.systemName === "Electron";
-
 const { t } = useI18n();
 
 const props = defineProps<{
@@ -137,21 +134,6 @@ onMounted(() => {
       </ul>
     </template>
     <template v-else-if="props.items">
-      <NuxtLink
-        v-if="
-          props.showMessageToMobileUsers &&
-          device.type !== 'mobile' &&
-          !isElectron
-        "
-        class="col-span-full hidden gap-3 rounded-2xl bg-background-2 p-4 font-medium sm:flex"
-        to="https://bmm-old.brunstad.org?utm_campaign=old-bmm"
-        target="_blank"
-      >
-        <div>
-          <NuxtIcon name="icon.alert" class="text-2xl" />
-        </div>
-        Click here to navigate to the old BMM website.
-      </NuxtLink>
       <NuxtLink
         v-if="props.showMessageToMobileUsers && device.type === 'mobile'"
         class="col-span-full flex gap-3 rounded-2xl bg-background-2 p-4 font-medium md:hidden"
@@ -322,15 +304,29 @@ onMounted(() => {
               v-else-if="item.type === 'recommendation'"
               :item="item"
             />
-            <div
-              v-else-if="item.type === 'InfoMessage'"
-              class="col-span-full flex gap-3 rounded-2xl bg-background-2 p-4 font-medium"
-            >
-              <div>
-                <NuxtIcon name="icon.alert" class="text-2xl" />
+
+            <template v-else-if="item.type === 'InfoMessage'">
+              <NuxtLink
+                v-if="item.link"
+                :to="parseLink(item.link)"
+                :target="isInternalLink(item.link || '') ? '_self' : '_blank'"
+                class="col-span-full flex gap-3 rounded-2xl bg-background-2 p-4 font-medium"
+              >
+                <div>
+                  <NuxtIcon name="icon.alert" class="text-2xl" />
+                </div>
+                {{ item.translatedMessage }}
+              </NuxtLink>
+              <div
+                v-else
+                class="col-span-full flex gap-3 rounded-2xl bg-background-2 p-4 font-medium"
+              >
+                <div>
+                  <NuxtIcon name="icon.alert" class="text-2xl" />
+                </div>
+                {{ item.translatedMessage }}
               </div>
-              {{ item.translatedMessage }}
-            </div>
+            </template>
 
             <li v-else class="col-span-full">
               <div style="background-color: rgba(255, 0, 0, 0.4); color: red">

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bmm-web",
   "author": "BCC Media",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "BCC Media audio player",
   "license": "AGPL-3.0",
   "main": "dist-electron/main.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@auth0/auth0-vue": "^2.3.3",
-    "@bcc-code/bmm-sdk-fetch": "^7.6.0",
+    "@bcc-code/bmm-sdk-fetch": "^8.0.0",
     "@floating-ui/vue": "^1.0.6",
     "@headlessui/vue": "^1.7.19",
     "@microsoft/applicationinsights-web": "^3.0.8",