Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify hardcoded edu paths to edubeta #630

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Modify hardcoded edu paths to edubeta #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24fc49
changing /edu paths to /edubeta
stephiescastle Sep 18, 2024
4a7c8bf
Merge branch 'main' into poc/alt-path
stephiescastle Sep 19, 2024
81385c7
Merge branch 'main' into poc/alt-path
stephiescastle Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/vue/src/components/NavDesktopEdu/NavDesktopEdu.vue
View file
Open in desktop
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="/edu/"
to="/edubeta/"
link-class="py-2"
variant="none"
>
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/templates/edu/PageEduHome/PageEduHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const image = computed(() => {
})

const submitSearch = () => {
router.push({ path: '/edu/resources/', query: { query: searchQuery.value } })
router.push({ path: '/edubeta/resources/', query: { query: searchQuery.value } })
}
</script>
<template>
Expand Down Expand Up @@ -101,7 +101,7 @@ const submitSearch = () => {
>
<BaseLink
variant="none"
:to="`/edu/resources?query=${topic.page?.title}`"
:to="`/edubeta/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
4 changes: 2 additions & 2 deletions packages/vue/src/utils/mixins.ts
View file
Open in desktop
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('/edu/events')) {
} else if (currentPath.startsWith('/edubeta/events')) {
// special treatment since EDU combines News & Events in the main nav
return path.startsWith('/edu/news')
return path.startsWith('/edubeta/news')
} else {
return currentPath.startsWith(ancestorPath)
}
Expand Down
Loading