Skip to content

Commit

Permalink
Explorer-1: change edubeta to edu (reworked) (#690)
Browse files Browse the repository at this point in the history
* change edubeta to edu

* merging in latest main
  • Loading branch information
stephiescastle authored Nov 7, 2024
1 parent ae71ffb commit d264e07
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="ml-2 pl-3 xl:ml-3 xl:pl-5 border-l border-white border-opacity-30 z-20">
<BaseLink
class="text-white font-bold text-2xl xl:text-3xl"
to="/edubeta/"
to="/edu/"
link-class="py-2"
variant="none"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/components/NavMobile/NavMobile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
>
<BaseLink
class="text-white font-bold text-xl pl-px"
to="/edubeta/"
to="/edu/"
variant="none"
>
Education</BaseLink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const clearSearch = () => {
const submitSearch = () => {
emit('submitForm')
router.push({
path: themeStore.isEdu ? '/edubeta/search/' : '/search',
path: themeStore.isEdu ? '/edu/search/' : '/search',
query: { query: searchQuery.value }
})
}
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/templates/edu/PageEduHome/PageEduHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const image = computed(() => {
})
const submitSearch = () => {
router.push({ path: '/edubeta/resources/', query: { query: searchQuery.value } })
router.push({ path: '/edu/resources/', query: { query: searchQuery.value } })
}
</script>
<template>
Expand Down Expand Up @@ -101,7 +101,7 @@ const submitSearch = () => {
>
<BaseLink
variant="none"
:to="`/edubeta/resources?query=${topic.page?.title}`"
:to="`/edu/resources?query=${topic.page?.title}`"
link-class="text-gray-dark whitespace-nowrap text-sm bg-[#99D1DF] font-extrabold rounded-full inline-block px-3 py-1 text-contrast-none hover:bg-action hover:text-white"
>
{{ topic.page?.title }}
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/utils/isEduExternalLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const isEduExternalLink = (url: string): boolean => {
if (
url &&
(url.startsWith('/edu/') ||
url.startsWith('/edubeta/') ||
url.startsWith('/edu/') ||
url.startsWith('https://www.jpl.nasa.gov/edu/') ||
url.startsWith('https://jpl.nasa.gov/edu/'))
) {
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/utils/mixins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ export const mixinIsActivePath = (itemPath: string): Boolean => {
if (currentPath && path && ancestorPath) {
if (currentPath === path) {
return true
} else if (currentPath.startsWith('/edubeta/events')) {
} else if (currentPath.startsWith('/edu/events')) {
// special treatment since EDU combines News & Events in the main nav
return path.startsWith('/edubeta/news')
return path.startsWith('/edu/news')
} else {
return currentPath.startsWith(ancestorPath)
}
Expand Down

0 comments on commit d264e07

Please sign in to comment.