Merge pull request #439 from edmcouncil/438-update-dependencies-in-ge…

…neral Update dependencies in general
edmcouncil · Feb 15, 2024 · 318f5c5 · 318f5c5
2 parents a4b21b2 + d9770c4
commit 318f5c5
Show file tree

Hide file tree

Showing 10 changed files with 3,629 additions and 3,018 deletions.
diff --git a/general/app.vue b/general/app.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <NuxtLoadingIndicator :color="'black'" />
     <NuxtLayout>
       <NuxtPage/>
     </NuxtLayout>

diff --git a/general/components/MobileMenuBox.vue b/general/components/MobileMenuBox.vue
@@ -23,6 +23,7 @@
       :open="showModal"
       :headerClass="noMultiselect ? '' : 'no-shadow'"
       :noFade="true"
+      :id="id"
       fullscreen
       modalClass="mobile-menu-box"
       footerClass="mobile-modal-footer"
@@ -60,7 +61,7 @@
 <script>
 export default {
   name: 'MobileModal',
-  props: ['icon'],
+  props: ['icon', 'id'],
   data() {
     return {
       showModal: false,

diff --git a/general/nuxt.config.ts b/general/nuxt.config.ts
@@ -28,6 +28,9 @@ const DEV_BASE_URL = VUE_BASE_URL.replace(
 );
 
 export default defineNuxtConfig({
+  experimental: {
+    sharedPrerenderData: true
+  },
   vue: {
     runtimeCompiler: true,
   },

diff --git a/general/package-lock.json b/general/package-lock.json
diff --git a/general/package.json b/general/package.json
@@ -35,7 +35,7 @@
     "@types/markdown-it": "^13.0.2",
     "@types/node": "^18.17.3",
     "markdown-it": "^13.0.2",
-    "nuxt": "^3.8.0",
+    "nuxt": "^3.10.1",
     "sass": "^1.64.1",
     "typescript": "^5.1.6"
   },

diff --git a/general/pages/ontology/[...resource].vue b/general/pages/ontology/[...resource].vue
@@ -456,6 +456,7 @@
               v-if="hasVersions"
               class="secondary-column__versions secondary-column__versions--mobile"
               :icon="'icon-clock'"
+              :id="'modal-mobile-versions'"
             >
               <template v-slot:label> Select version </template>
               <template v-slot:multiselect>
@@ -543,6 +544,7 @@
             <MobileMenuBox
               class="secondary-column__tree secondary-column__tree--mobile"
               :icon="'icon-directory'"
+              :id="'modal-mobile-modules'"
             >
               <template v-slot:label>
                 Browse {{ ontologyNameUppercase }} domains
@@ -564,6 +566,7 @@
 
             <MobileMenuBox
               :icon="'icon-search'"
+              :id="'modal-mobile-search'"
               class="search-box search-box--mobile"
               ref="mobileSearchbox"
             >
@@ -662,6 +665,7 @@
               v-if="searchBox.isAdvancedExpanded"
             >
               <MobileMenuBox
+                :id="'modal-mobile-advanced-search'"
                 class="advanced-search-box advanced-search-box--mobile card"
               >
                 <template v-slot:label> Search by properties </template>

diff --git a/general/pages/release-notes.vue b/general/pages/release-notes.vue
@@ -180,7 +180,9 @@ export default {
   },
   computed: {
     ...mapState(useConfigurationStore, {
-      ontologyNameUppercase: store => store.config.ontpubFamily.toUpperCase(),
+      ontologyNameUppercase: store => {
+        return store.config.ontpubFamily.toUpperCase()
+      },
     }),
   },
 };

diff --git a/general/plugins/initialize-stores.server.ts b/general/plugins/initialize-stores.server.ts
@@ -9,4 +9,4 @@ export default defineNuxtPlugin(async (nuxtApp: any) => {
 
   await configurationStore.initialize(runtimeConfig);
   await contentStore.initialize(runtimeConfig);
-})
+});
diff --git a/general/plugins/router.ts b/general/plugins/router.ts
@@ -3,5 +3,5 @@ import { defineNuxtPlugin } from '#app'
 export default defineNuxtPlugin((nuxtApp: any) => {
   nuxtApp.$router.options.scrollBehavior = () => {
     return { top: 0 }
-  }
-})
+  };
+});
diff --git a/general/plugins/use-bootstrap.client.ts b/general/plugins/use-bootstrap.client.ts
@@ -1,5 +1,5 @@
 import * as bootstrap from 'bootstrap';
 
 export default defineNuxtPlugin(nuxtApp => {
-  nuxtApp.provide('bootstrap', bootstrap)
-})
+  nuxtApp.provide('bootstrap', bootstrap);
+});