From ec65830c6dcbf829149d7c9a132f1b9066364dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 00:10:01 +0200
Subject: [PATCH 01/10] OS2UOL-129: Removed title for user homepage field

---
 components/views/userView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/views/userView.vue b/components/views/userView.vue
index ec50775..a1614a2 100644
--- a/components/views/userView.vue
+++ b/components/views/userView.vue
@@ -136,7 +136,7 @@ const practicalInfoData = computed(() => {
                   class="user__link"
                   target="_blank"
                   :to="data?.field_homepage?.url"
-                  >{{ data?.field_homepage?.title }}</NuxtLink
+                  >{{ data?.field_homepage?.url }}</NuxtLink
                 >
               </div>
             </div>

From 2b16c72ef9f34feebcae011a0e9f8e0313703834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 00:10:24 +0200
Subject: [PATCH 02/10] OS2UOL-129: Added error handling SiteTracking.vue

---
 components/globals/SiteTracking.vue | 36 +++++++++++++++--------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/components/globals/SiteTracking.vue b/components/globals/SiteTracking.vue
index 8dd7089..5d55494 100644
--- a/components/globals/SiteTracking.vue
+++ b/components/globals/SiteTracking.vue
@@ -14,23 +14,25 @@ if (settingsDataStore.settingsData === null) {
   settingsDataStore.setSettingsData(data.value.settings);
 }
 
-const scriptSrcFull = ref(data.value?.settings.site_tracking_script.trim());
-
-const extractScriptSrc = (scriptString: string) => {
-  const srcMatch = scriptString.match(/src=['"]?([^'"> ]+)['"]?/i);
-  return srcMatch ? srcMatch[1] : '';
-};
-
-let scriptSrc = extractScriptSrc(scriptSrcFull.value);
-
-useHead({
-  script: [
-    {
-      src: scriptSrc,
-      async: true,
-    },
-  ],
-});
+if (data.value?.settings.site_tracking_script !== null) {
+  const scriptSrcFull = ref(data.value?.settings.site_tracking_script.trim());
+
+  const extractScriptSrc = (scriptString: string) => {
+    const srcMatch = scriptString.match(/src=['"]?([^'"> ]+)['"]?/i);
+    return srcMatch ? srcMatch[1] : '';
+  };
+
+  let scriptSrc = extractScriptSrc(scriptSrcFull.value);
+
+  useHead({
+    script: [
+      {
+        src: scriptSrc,
+        async: true,
+      },
+    ],
+  });
+}
 </script>
 
 <template></template>

From 6cde67f661619f2c4e89c347572741877e0cfc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 00:23:31 +0200
Subject: [PATCH 03/10] OS2UOL-129: Added fields 'Brancher' and 'Muligheder' to
 PracticalInformation data

---
 components/views/userView.vue | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/components/views/userView.vue b/components/views/userView.vue
index a1614a2..3eab1f3 100644
--- a/components/views/userView.vue
+++ b/components/views/userView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { scrollTo } from '~/utils/scrollTo';
+import { filterGroups } from '~/utils/dataFilter';
 
 const props = defineProps({
   data: {
@@ -18,7 +19,7 @@ useHead({
 console.log('userView.vue', props.data);
 
 const practicalInfoData = computed(() => {
-  return [
+  const data = [
     {
       group: [
         {
@@ -27,8 +28,26 @@ const practicalInfoData = computed(() => {
         },
       ],
     },
+    {
+      group: [
+        {
+          title: 'Branche',
+          content: props.data?.field_brancher,
+        },
+      ],
+    },
+    {
+      group: [
+        {
+          title: 'Muligheder',
+          content: props.data?.field_posibilities,
+        },
+      ],
+    },
   ];
+  return filterGroups(data);
 });
+
 </script>
 
 <template>

From cace7df396769b46ab0092cff8cb1fc73e973425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 00:34:56 +0200
Subject: [PATCH 04/10] OS2UOL-129: Added missing headings for content sections

---
 components/views/userView.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/views/userView.vue b/components/views/userView.vue
index 3eab1f3..daf06f2 100644
--- a/components/views/userView.vue
+++ b/components/views/userView.vue
@@ -92,6 +92,7 @@ const practicalInfoData = computed(() => {
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-7 col-xl-6">
           <div v-if="data.field_presentation">
+            <h2>Velkommen til {{ props.data?.field_name }}</h2>
             <BaseRte :content="data.field_presentation" />
           </div>
 
@@ -99,10 +100,12 @@ const practicalInfoData = computed(() => {
             class="user__paragraph-item"
             v-if="data.field_educational_profile"
           >
+            <h3>Pædagogisk profil</h3>
             <BaseRte :content="data.field_educational_profile" />
           </div>
 
           <div class="user__paragraph-item" v-if="data.field_intro">
+            <h4>Entré</h4>
             <BaseRte :content="data.field_intro" />
           </div>
         </div>

From 04a5b9d02ecaf5b922fef25d8e111f4a641bfb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 00:49:13 +0200
Subject: [PATCH 05/10] OS2UOL-129: Removed contact person title, hours, email
 and phone if no data

---
 components/view-components/KontaktProvider.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/view-components/KontaktProvider.vue b/components/view-components/KontaktProvider.vue
index 729cf38..1b97ce0 100644
--- a/components/view-components/KontaktProvider.vue
+++ b/components/view-components/KontaktProvider.vue
@@ -19,11 +19,11 @@ const props = defineProps({
       >
         <div class="contact__heading-wrapper">
           <div class="contact__person-heading">
-            <h4>
-              {{ person?.field_title }} -
+            <h4 v-if="person?.field_title || person?.field_name">
+              {{ person?.field_title ? person?.field_title + ' - ' : '' }}
               {{ person?.field_name }}
             </h4>
-            <div class="contact__contact-hours">
+            <div class="contact__contact-hours" v-if="person?.field_office_availability_text">
               Træffetid:
               {{ person?.field_office_availability_text }}
             </div>
@@ -31,6 +31,7 @@ const props = defineProps({
 
           <div class="contact__button-wrapper">
             <a
+              v-if="person?.field_email"
               :href="'mailto:' + person?.field_email"
               class="button button--primary contact__button"
             >
@@ -38,6 +39,7 @@ const props = defineProps({
               {{ person?.field_email }}
             </a>
             <a
+              v-if="person?.field_phone"
               :href="'tel:' + person?.field_phone"
               class="button button--primary contact__button"
             >

From 9554882e97eeb1096e96b3559cf04b164a455233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 01:10:18 +0200
Subject: [PATCH 06/10] OS2UOL-129: Added user type to KontaktProvider.vue
 template to show the right heading

---
 components/view-components/KontaktProvider.vue | 7 ++++++-
 components/views/userView.vue                  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/view-components/KontaktProvider.vue b/components/view-components/KontaktProvider.vue
index 1b97ce0..e838a57 100644
--- a/components/view-components/KontaktProvider.vue
+++ b/components/view-components/KontaktProvider.vue
@@ -5,12 +5,17 @@ const props = defineProps({
     required: false,
     default: null,
   },
+  type: {
+    type: String,
+    required: false,
+    default: '',
+  },
 });
 </script>
 
 <template>
   <div class="contact">
-    <h3 class="contact__title">Kontakt udbyder</h3>
+    <h3 class="contact__title">Kontakt {{ props.type }}</h3>
     <div class="contact__item-container">
       <div
         class="contact__item-section"
diff --git a/components/views/userView.vue b/components/views/userView.vue
index daf06f2..d3bcc1d 100644
--- a/components/views/userView.vue
+++ b/components/views/userView.vue
@@ -212,7 +212,7 @@ const practicalInfoData = computed(() => {
           v-if="data?.field_contact?.length > 0"
         >
           <div class="user__contact">
-            <KontaktProvider :data="data?.field_contact" />
+            <KontaktProvider :data="data?.field_contact" :type="props.data.roles?.includes('corporation') ? 'virksomhed' : props.data.roles?.includes('course_provider') ? 'udbyder' : ''" />
           </div>
         </div>
 

From c65c412aa1e02b5a6aa8821c5c7f303cf7a69f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 01:29:15 +0200
Subject: [PATCH 07/10] OS2UOL-129: Added user profile data to
 PracticalInformation and styling of profile PracticalInformation data

---
 .../view-components/PracticalInformation.vue  | 63 +++++++++++++------
 components/views/userView.vue                 | 45 +++++++++++--
 2 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/components/view-components/PracticalInformation.vue b/components/view-components/PracticalInformation.vue
index 42037d3..4fda4aa 100644
--- a/components/view-components/PracticalInformation.vue
+++ b/components/view-components/PracticalInformation.vue
@@ -76,29 +76,16 @@ const props = defineProps({
 
         <!-- User Profile element -->
         <div v-else-if="item.type === 'user_profile'">
-          <div class="practical-information__item-container">
-            <div class="practical-information__item-heading">
+          <div class="practical-information__item-container practical-information__item-container--profile">
+            <div class="practical-information__item-heading practical-information__item-heading--profile">
               {{ item.title }}
             </div>
-          </div>
 
-          <div class="practical-information__user-profile-content-wrapper">
-            <slot></slot>
-          </div>
-
-          <div class="practical-information__user-profile-button">
-            <BaseButton
-              v-if="props.userProfilePage?.hasContactsData"
-              :button-data="{
-                title: props.userProfilePage.roles?.includes('corporation')
-                  ? 'Kontakt virksomhed'
-                  : props.userProfilePage.roles?.includes('course_provider')
-                    ? 'Kontakt udbyder'
-                    : '',
-              }"
-              @click="scrollTo('contact__section')"
-              class="button button--secondary button--secondary--ghost"
-            />
+            <div class="practical-information__item-value practical-information__item-value--profile">
+              <div v-for="(content, index) in item.content" :key="index">
+                <div v-html="content"></div>
+              </div>
+            </div>
           </div>
         </div>
 
@@ -207,6 +194,20 @@ const props = defineProps({
       </div>
     </div>
     <!-- Practical information data for loop END -->
+    <div class="practical-information__user-profile-button">
+      <BaseButton
+        v-if="props.userProfilePage?.hasContactsData"
+        :button-data="{
+          title: props.userProfilePage.roles?.includes('corporation')
+            ? 'Kontakt virksomhed'
+            : props.userProfilePage.roles?.includes('course_provider')
+              ? 'Kontakt udbyder'
+              : '',
+        }"
+        @click="scrollTo('contact__section')"
+        class="button button--secondary button--secondary--ghost"
+      />
+    </div>
   </div>
 </template>
 
@@ -232,12 +233,21 @@ const props = defineProps({
     width: 50%;
     font-weight: 700;
     font-family: var(--heading-font-family);
+
+    &--profile {
+      width: 100%;
+      margin-bottom: 4px;
+    }
   }
 
   &__item-container {
     padding-top: 12px;
     display: flex;
     justify-content: space-between;
+
+    &--profile {
+      flex-direction: column;
+    }
   }
 
   &__item-value {
@@ -248,6 +258,10 @@ const props = defineProps({
     overflow-wrap: break-word;
     hyphens: auto;
 
+    &--profile {
+      width: 100%;
+    }
+
     &--link {
       color: var(--color-primary);
       border-bottom: 1px solid transparent;
@@ -371,5 +385,14 @@ const props = defineProps({
   &__user-provider-logo {
     margin-bottom: 22px;
   }
+
+  :deep(a) {
+    color: var(--color-primary);
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
 }
 </style>
diff --git a/components/views/userView.vue b/components/views/userView.vue
index d3bcc1d..48702bc 100644
--- a/components/views/userView.vue
+++ b/components/views/userView.vue
@@ -31,7 +31,45 @@ const practicalInfoData = computed(() => {
     {
       group: [
         {
-          title: 'Branche',
+          type: 'user_profile',
+          title: props.data?.field_name,
+          content: [
+            props.data?.field_view_on_map == 'show_vendor_address' &&
+            props.data?.provider
+              ? props.data?.provider.field_location_name
+              : props.data?.field_location_name,
+            props.data?.field_view_on_map == 'show_vendor_address' &&
+            props.data?.provider
+              ? props.data?.provider.field_location_street
+              : props.data?.field_location_street,
+            props.data?.field_view_on_map == 'show_vendor_address' &&
+            props.data?.provider
+              ? props.data?.provider.field_location_zipcode +
+                ' ' +
+                props.data?.provider.field_location_city
+              : props.data?.field_location_zipcode +
+                ' ' +
+                props.data?.field_location_city,
+          ],
+          description: props.data?.field_location_description
+            ? props.data?.field_location_description
+            : '',
+        },
+        {
+          type: 'user_profile',
+          content: [
+            props.data?.field_phone ? '<a href="tel:' + props.data?.field_phone + '">' + props.data?.field_phone + '</a>' : '',
+            props.data?.field_mail ? '<a href="mailto:' + props.data?.field_mail + '">' + props.data?.field_mail + '</a>' : '',
+            props.data?.field_homepage?.url ? '<a href="' + props.data?.field_homepage?.url + '" target="_blank">' + props.data?.field_homepage?.url + '</a>' : '',
+          ]
+        },
+      ],
+    },
+    {
+      group: [
+        {
+          type: 'user_profile',
+          title: 'Brancher',
           content: props.data?.field_brancher,
         },
       ],
@@ -39,6 +77,7 @@ const practicalInfoData = computed(() => {
     {
       group: [
         {
+          type: 'user_profile',
           title: 'Muligheder',
           content: props.data?.field_posibilities,
         },
@@ -396,9 +435,5 @@ const practicalInfoData = computed(() => {
   :deep(svg) {
     font-size: 24px;
   }
-
-  :deep(.practical-information__item-heading) {
-    width: 100%;
-  }
 }
 </style>

From e3b2e4e04ced448d169b85e10230c5dc9868f210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 01:31:10 +0200
Subject: [PATCH 08/10] OS2UOL-129: Adjusted PracticalInformation link color

---
 components/view-components/PracticalInformation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/view-components/PracticalInformation.vue b/components/view-components/PracticalInformation.vue
index 4fda4aa..21cd116 100644
--- a/components/view-components/PracticalInformation.vue
+++ b/components/view-components/PracticalInformation.vue
@@ -386,7 +386,7 @@ const props = defineProps({
     margin-bottom: 22px;
   }
 
-  :deep(a) {
+  :deep(a:not(.button)) {
     color: var(--color-primary);
     text-decoration: none;
 

From d3d73e4c105d58e9f9c75cd6b1364f07724d64c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 01:32:27 +0200
Subject: [PATCH 09/10] OS2UOL-129: Added profile data loop empty check

---
 components/view-components/PracticalInformation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/view-components/PracticalInformation.vue b/components/view-components/PracticalInformation.vue
index 21cd116..062adfa 100644
--- a/components/view-components/PracticalInformation.vue
+++ b/components/view-components/PracticalInformation.vue
@@ -83,7 +83,7 @@ const props = defineProps({
 
             <div class="practical-information__item-value practical-information__item-value--profile">
               <div v-for="(content, index) in item.content" :key="index">
-                <div v-html="content"></div>
+                <div v-if="content" v-html="content"></div>
               </div>
             </div>
           </div>

From 3e3942473267c708298f3260fa386d8761704a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Due=20Bonde?= <sdb@novicell.dk>
Date: Tue, 2 Jul 2024 01:43:16 +0200
Subject: [PATCH 10/10] OS2UOL-129: Changed additional user info markup and
 styling and added empty checks

---
 components/views/userView.vue | 76 ++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/components/views/userView.vue b/components/views/userView.vue
index 48702bc..e559c4f 100644
--- a/components/views/userView.vue
+++ b/components/views/userView.vue
@@ -256,45 +256,45 @@ const practicalInfoData = computed(() => {
         </div>
 
         <!-- Section information -->
-        <div class="col-xs-12 col-sm-12 col-md-5 user__section-user-info">
-          <div class="user__info-title">
-            <h2>Yderligere information om udbyder</h2>
+        <div class="user__section-user-info" v-if="data?.field_other_info_description || data?.field_other_info?.length > 0">
+          <div class="col-xs-12 col-sm-12 col-md-5">
+            <div class="user__info-title">
+              <h2>Yderligere information om udbyder</h2>
+            </div>
           </div>
-        </div>
 
-        <div
-          class="col-xs-12 col-sm-12 col-md-5 col-md-offset-1 user__section-user-info"
-        >
-          <div class="user__info-description">
-            <div v-html="data?.field_other_info_description"></div>
+          <div class="col-xs-12 col-sm-12 col-md-5 col-md-offset-1">
+            <div class="user__info-description">
+              <div v-if="data?.field_other_info_description" v-html="data?.field_other_info_description"></div>
 
-            <div
-              class="user__info-description--buttons"
-              v-if="data?.field_other_info?.length > 0"
-            >
               <div
-                class="user__info-description--button-item"
-                v-for="button in data?.field_other_info"
-                :key="button"
+                class="user__info-description--buttons"
+                v-if="data?.field_other_info?.length > 0"
               >
-                <NuxtLink
-                  class="user__info-description__button-item__link button button--primary button--primary--ghost"
-                  :to="
-                    button?.field_file
-                      ? button?.field_file
-                      : button?.field_link?.url
-                  "
-                  aria-label="Download link"
+                <div
+                  class="user__info-description--button-item"
+                  v-for="button in data?.field_other_info"
+                  :key="button"
                 >
-                  <span class="user__info-description--button-item__link-text">
-                    {{ button?.field_link?.title }}
-                  </span>
-                  <NuxtIcon
-                    class="user__info-description--button-item__icon"
-                    name="arrow-right"
-                    filled
-                  />
-                </NuxtLink>
+                  <NuxtLink
+                    class="user__info-description__button-item__link button button--primary button--primary--ghost"
+                    :to="
+                      button?.field_file
+                        ? button?.field_file
+                        : button?.field_link?.url
+                    "
+                    aria-label="Download link"
+                  >
+                    <span class="user__info-description--button-item__link-text">
+                      {{ button?.field_link?.title }}
+                    </span>
+                    <NuxtIcon
+                      class="user__info-description--button-item__icon"
+                      name="arrow-right"
+                      filled
+                    />
+                  </NuxtLink>
+                </div>
               </div>
             </div>
           </div>
@@ -373,6 +373,7 @@ const practicalInfoData = computed(() => {
 
   &__second-section {
     padding-top: 48px @(--md) 96px;
+    padding-bottom: 48px @(--md) 96px;
   }
 
   &__divider {
@@ -403,9 +404,12 @@ const practicalInfoData = computed(() => {
   }
 
   &__section-user-info {
-    :not(:first-child) {
-      margin-bottom: 48px @(--md) 96px;
-    }
+    display: flex;
+    flex-direction: row;
+    flex-grow: 0;
+    flex-shrink: 1;
+    flex-wrap: wrap;
+    width: 100%;
   }
 
   &__info-description {