Merge pull request #71 from esciencecenter-digital-skills/issue70_har…

…d-coded-variables Make hardcoded variables configurable from content repo
esciencecenter-digital-skills · Nov 20, 2024 · 8dcde86 · 8dcde86
2 parents 395bd59 + 2acb3cc
commit 8dcde86
Show file tree

Hide file tree

Showing 8 changed files with 3,358 additions and 3,451 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -14,7 +14,7 @@ jobs:
     with:
       content_organization: esciencecenter-digital-skills
       content_repository: NEBULA-content-template
-      content_ref: v1.0.0
+      content_ref: v1.1.0
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
       deploy_to_ghpages: false
diff --git a/.github/workflows/deploy_dummy.yml b/.github/workflows/deploy_dummy.yml
@@ -14,7 +14,7 @@ jobs:
     with:
       content_organization: esciencecenter-digital-skills
       content_repository: NEBULA-content-template
-      content_ref: v1.0.0
+      content_ref: v1.1.0
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
       deploy_to_ghpages: true
diff --git a/assets/nlesc-decorations.js b/assets/nlesc-decorations.js
@@ -27,7 +27,7 @@ function initDecorations (deck) {
   <div id="purple-half-circle-bottom"></div>
   <div id="yellow-strip"></div>
   <div id="yellow-half-strip"></div>
-  <div id="touch-pane"><h3>Let's stay<br>in touch</h3></div>
+  <div id="touch-pane"><h3> </h3></div>
   <div id="empowering"><h3>“Empowering researchers across all disciplines through innovative research software”</h3></div>
   <div id="logo-color"><img src="/${baseUrl}/nlesc_style_files/logo-fc.svg"></div>
   <div id="logo-part-white"><img src="/${baseUrl}/nlesc_style_files/logo-fc-part-white.svg"></div>

diff --git a/assets/style.scss b/assets/style.scss
@@ -14,6 +14,11 @@
   ul, ol, li{
     list-style-type: revert;
   }
+
+  table, th, td{
+    border: 1px solid;
+    padding: 5px;
+  }
 
   p, ul, ol, li{
     a{

diff --git a/components/Banner.vue b/components/Banner.vue
@@ -3,7 +3,7 @@
         <div class="flex flex-1 gap-10 items-center ">
           <NuxtLink :to="`/`">
             <div class="text-2xl leading-6 mx-10 font-bold w-20  hover:text-eScienceBlue active:opacity-50">
-              {{ $config.public.title }}
+              {{ config.title }}
             </div>
           </NuxtLink>
         </div>
@@ -22,17 +22,17 @@
             </ContentList>
 
           </div>
-          <NuxtLink to="https://www.github.com/esciencecenter-digital-skills/research-software-support" target="_blank" class=" pl-10">
-            <img src="/icons/github-mark.svg" alt="Netherlands eScience Center Logo" width="50px" height="50px" class="align-middle">
+          <NuxtLink :to="`https://www.github.com/${config.repoOwner}/${config.repoName}`" target="_blank" class=" pl-10">
+            <img src="/icons/github-mark.svg" alt="GitHub Logo" width="50px" height="50px" class="align-middle">
           </NuxtLink>
-          <NuxtLink to="https://www.esciencecenter.nl" target="_blank" class="px-5">
-            <img src="/nlesc-logo.svg" alt="Netherlands eScience Center Logo" width="200px">
+          <NuxtLink :to="`${config.organizationURL}`" target="_blank" class="px-5">
+            <img :src="`/${config.organizationLogo}`" alt="Organization Logo" width="200px">
           </NuxtLink>
         </div>
 
     </div>
 </template>
 
-<script>
-  export default {}
+<script setup lang="ts">
+  const config = useRuntimeConfig().public
 </script>
diff --git a/components/Footer.vue b/components/Footer.vue
@@ -2,12 +2,12 @@
     <!-- <div class="decoration-slice bg-gentleBlue p-4" /> -->
     <div id="footer" class="bg-eSciencePurple p-2 font-body text-eScienceWhite text-sm text-center z-10">
       <div class="text-center">
-        These materials are developed by the <a href="https://www.esciencecenter.nl">Netherlands eScience Center</a>. Licensed under <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY 4.0</a> unless otherwise noted.
+        These materials are developed by the <NuxtLink :to="`${config.organizationURL}`" target="_blank"> {{ config.organization}}</NuxtLink>. Licensed under <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY 4.0</a> unless otherwise noted.
       </div>
 
     </div>
 </template>
 
-<script>
-export default {}
+<script setup lang="ts">
+  const config = useRuntimeConfig().public
 </script>