From a090b2d96afcab3df3e3ce6bfb214cfaf98856d6 Mon Sep 17 00:00:00 2001
From: Stephanie Smith <stephiescastle@users.noreply.github.com>
Date: Thu, 19 Sep 2024 18:20:58 -0700
Subject: [PATCH] fix: search tweaks, prelaunch cleanup (#629)

* ensuring edu search form goes to edu search

* removing placeholder related content on PageEduNewsDetail

* dynamic underline in NavDesktopTopHat
---
 .../src/components/NavDesktop/NavDesktopTopHat.vue | 14 ++++++++++++--
 .../src/components/NavSearchForm/NavSearchForm.vue |  7 ++++++-
 .../edu/PageEduNewsDetail/PageEduNewsDetail.vue    | 13 -------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/vue/src/components/NavDesktop/NavDesktopTopHat.vue b/packages/vue/src/components/NavDesktop/NavDesktopTopHat.vue
index 042a902d..a5ade7d1 100644
--- a/packages/vue/src/components/NavDesktop/NavDesktopTopHat.vue
+++ b/packages/vue/src/components/NavDesktop/NavDesktopTopHat.vue
@@ -16,8 +16,13 @@
           :class="{ '-ml-3': index === 0 }"
         >
           <span
-            class="can-hover:group-hover:border-jpl-red-light inline-block py-2 border-b-2"
-            :class="index === 0 ? 'border-jpl-red-light' : 'border-transparent'"
+            class="can-hover:group-hover:border-jpl-red inline-block py-2 border-b-2"
+            :class="
+              (getLinkText(item) === 'JPL' && !themeStore.isEdu) ||
+              (getLinkText(item) === 'Education' && themeStore.isEdu)
+                ? 'border-jpl-red'
+                : 'border-transparent'
+            "
           >
             {{ getLinkText(item) }}
           </span>
@@ -29,6 +34,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import { mixinGetRouterLink, mixinGetLinkText } from './../../utils/mixins'
+import { mapStores } from 'pinia'
+import { useThemeStore } from './../../store/theme'
 import BaseLink from './../BaseLink/BaseLink.vue'
 import type { LinkObject } from './../../utils/mixins'
 import type { PropType } from 'vue'
@@ -51,6 +58,9 @@ export default defineComponent({
     getLinkText(link: LinkObject): string | undefined {
       return mixinGetLinkText(link)
     }
+  },
+  computed: {
+    ...mapStores(useThemeStore)
   }
 })
 </script>
diff --git a/packages/vue/src/components/NavSearchForm/NavSearchForm.vue b/packages/vue/src/components/NavSearchForm/NavSearchForm.vue
index 1a352e8c..fa73a7eb 100644
--- a/packages/vue/src/components/NavSearchForm/NavSearchForm.vue
+++ b/packages/vue/src/components/NavSearchForm/NavSearchForm.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
+import { useThemeStore } from '../../store/theme'
 import SearchInput from './../SearchInput/SearchInput.vue'
 const router = useRouter()
+const themeStore = useThemeStore()
 
 interface NavSearchFormProps {
   mobile?: boolean
@@ -20,7 +22,10 @@ const clearSearch = () => {
 }
 const submitSearch = () => {
   emit('submitForm')
-  router.push({ path: '/search', query: { query: searchQuery.value } })
+  router.push({
+    path: themeStore.isEdu ? '/edu/search/' : '/search',
+    query: { query: searchQuery.value }
+  })
 }
 </script>
 <template>
diff --git a/packages/vue/src/templates/edu/PageEduNewsDetail/PageEduNewsDetail.vue b/packages/vue/src/templates/edu/PageEduNewsDetail/PageEduNewsDetail.vue
index dfffc7f4..f252effd 100644
--- a/packages/vue/src/templates/edu/PageEduNewsDetail/PageEduNewsDetail.vue
+++ b/packages/vue/src/templates/edu/PageEduNewsDetail/PageEduNewsDetail.vue
@@ -160,18 +160,5 @@ defineExpose({
     >
       <AboutTheAuthor :authors="data.authors" />
     </LayoutHelper>
-
-    <div class="bg-stars bg-primary-darker">
-      <div class="py-10 text-center text-white">
-        <strong>Related News goes here</strong>
-      </div>
-      <!-- extras -->
-      <!-- <BlockLinkCarousel
-        item-type="cards"
-        class="mt-24"
-        heading="Explore more"
-        :items="data.getRelatedOrLatestNews"
-      /> -->
-    </div>
   </div>
 </template>