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

fix: instructor avatar on post pages and mobile menu click outside logic #1499

Merged
merged 5 commits into from
Feb 13, 2025
+138 −146
Merged

fix: instructor avatar on post pages and mobile menu click outside logic #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15ea90e
fix: instructor avatar on post pages and mobile menu click outside logic
vojtaholik Jan 3, 2025
e6b8f16
fix: instructor avatar on post pages and mobile menu click outside logic
vojtaholik Jan 3, 2025
733f879
fix: update post schema
zacjones93 Jan 3, 2025
937ab60
Merge branch 'main' into vh/fix/instructor-avatar-on-post-page-and-mo…
vojtaholik Feb 13, 2025
d5ceb65
fix: remove unnecessary mobile navigation router effect
vojtaholik Feb 13, 2025
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
6 changes: 1 addition & 5 deletions next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ const appUrl = process.env.NEXT_PUBLIC_AUTH_DOMAIN
const IMAGE_HOST_DOMAINS = compact([
{
protocol: 'https',
hostname: `d2eip9sf3oo6c2.cloudfront.net`,
},
{
protocol: 'https',
hostname: `dcv19h61vib2d.cloudfront.net`,
hostname: `*.cloudfront.net`,
},
{
protocol: 'https',
Expand Down
264 changes: 126 additions & 138 deletions src/components/app/header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
import SaleHeaderBanner from '@/components/cta/sale/header-banner'
import analytics from '@/utils/analytics'
import {twMerge} from 'tailwind-merge'
import {useClickAway} from 'react-use'
import {ChevronDown} from 'lucide-react'
import clsx from 'clsx'
import {cn} from '@/ui/utils'
Expand Down Expand Up @@ -334,9 +333,9 @@ const Header: FunctionComponent<React.PropsWithChildren<unknown>> = () => {
pathname !== '/forever' && <LifetimeSaleHeaderBanner />}
<nav
aria-label="header"
className="relative h-12 text-sm border-b border-gray-200 dark:bg-gray-900 dark:border-gray-800 print:hidden dark:text-white text-gray-1000"
className="h-12 text-sm border-b border-gray-200 dark:bg-gray-900 dark:border-gray-800 print:hidden dark:text-white text-gray-1000"
>
<div className="container flex items-center justify-between w-full h-full relative">
<div className="container flex items-center justify-between w-full h-full">
<div className="flex h-full relative z-50">
<Logo />
<div className="hidden items-center h-full md:flex">
Expand Down Expand Up @@ -565,12 +564,6 @@ const MobileNavigation = () => {
),
)

const mobileNavRef = React.useRef(null)

useClickAway(mobileNavRef, () => {
setOpen(false)
})

return (
<>
<div className="inline-flex items-center gap-4 relative z-50 lg:hidden h-full -mr-3">
Expand All @@ -591,143 +584,138 @@ const MobileNavigation = () => {
</button>
</div>
{isOpen ? (
<div
ref={mobileNavRef}
className="absolute pt-12 top-0 w-full shadow-xl dark:bg-gray-900 border-b dark:border-white/5 border-white/40 bg-white z-40 left-0 lg:hidden block flex-col"
>
<div className="bg-blue-600 flex w-full items-center justify-center gap-2 p-2">
{navLinks?.slice(1, navLinks.length)?.map((item) =>
item.href ? (
<NextLink
className="flex items-center justify-center aspect-square flex-col p-4 rounded dark:bg-gray-900 bg-white w-full h-full gap-2 text-base"
href={item.href}
key={item.name}
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
item.href,
)
}
>
{item.image &&
item.image({className: 'w-6 h-6 text-blue-500'})}
{item.name}
</NextLink>
) : null,
)}
</div>
<SearchBar className="px-2" />
<div className="flex flex-col h-full justify-between">
<div className="flex flex-col w-full text-base">
<MobileTopicsList />
{!isEmpty(viewer) && (
<div className="flex flex-col w-full">
<FeedbackInput
user={viewer}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Feedback
</FeedbackInput>
<Link href={`/user/membership`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'membership',
'/user/membership',
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Membership
</a>
</Link>
{showTeamNavLink && <Team />}
<Link href={`/user/profile`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'profile',
'/user/profile',
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Profile
</a>
</Link>
<Link href={`/user/activity`}>
<a
onClick={() =>
<>
<div className="absolute top-12 w-full shadow-xl dark:bg-gray-900 border-b dark:border-white/5 border-white/40 bg-white z-50 left-0 lg:hidden block flex-col">
<SearchBar className="px-2 border-b" />
<div className="flex flex-col h-full justify-between">
<div className="flex flex-col w-full text-base">
{navLinks.slice(1, navLinks.length).map((item) =>
item.href ? (
<NextLink
key={item.name}
href={item.href}
onClick={() => {
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'activity',
'/user/activity',
item.href,
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
}}
className="flex justify-between font-medium items-center px-5 py-4 w-full"
>
Activity
</a>
</Link>
<Link href={`/bookmarks`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'bookmarks',
'/bookmarks',
)
}
{item.name}
</NextLink>
) : null,
)}
<MobileTopicsList />
{!isEmpty(viewer) && (
<div className="flex flex-col w-full">
<FeedbackInput
user={viewer}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Bookmarks
</a>
</Link>
<Link href={`/logout`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'logout',
'mobile header',
'logout',
)
}
className="flex text-base items-center justify-start px-5 py-4 font-semibold transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth"
>
Log Out
</a>
</Link>
</div>
)}
<div>
{showEnrollNow && (
<Link href={`/pricing`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'pricing',
'/pricing',
)
}
className="flex text-base font-medium items-center justify-start px-5 py-4 transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth bg-blue-500"
>
Enroll Now
</a>
</Link>
Feedback
</FeedbackInput>
<Link href={`/user/membership`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'membership',
'/user/membership',
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Membership
</a>
</Link>
{showTeamNavLink && <Team />}
<Link href={`/user/profile`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'profile',
'/user/profile',
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Profile
</a>
</Link>
<Link href={`/user/activity`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'activity',
'/user/activity',
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Activity
</a>
</Link>
<Link href={`/bookmarks`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'bookmarks',
'/bookmarks',
)
}
className="flex items-center justify-start px-5 py-4 font-medium transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth border-b border-gray-200 border-opacity-40 dark:border-opacity-5"
>
Bookmarks
</a>
</Link>
<Link href={`/logout`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'logout',
'mobile header',
'logout',
)
}
className="flex text-base items-center justify-start px-5 py-4 font-semibold transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth"
>
Log Out
</a>
</Link>
</div>
)}
<div>
{showEnrollNow && (
<Link href={`/pricing`}>
<a
onClick={() =>
analytics.events.activityInternalLinkClick(
'page',
'mobile header',
'pricing',
'/pricing',
)
}
className="flex text-base text-white font-medium items-center justify-start px-5 py-4 transition-all duration-150 ease-in-out rounded-sm hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth bg-blue-500"
>
Enroll Now
</a>
</Link>
)}
</div>
</div>
</div>
</div>
</div>
</>
) : null}
</>
)
Expand All @@ -737,7 +725,7 @@ const MobileTopicsList = () => {
return (
<Accordion
type="multiple"
className="font-medium border-y border-gray-200 dark:border-opacity-10 border-opacity-40 w-full "
className="font-medium border-y border-gray-200/40 dark:border-gray-800 w-full"
>
<AccordionItem value="topics">
<AccordionTrigger className="flex justify-between items-center px-5 py-4 w-full">
Expand All @@ -747,7 +735,7 @@ const MobileTopicsList = () => {
aria-hidden="true"
/>
</AccordionTrigger>
<AccordionContent className="dark:bg-gray-700 bg-gray-100 w-full transition overflow-hidden data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down">
<AccordionContent className="dark:bg-gray-900 bg-gray-100 w-full transition overflow-hidden data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down">
<div className="py-2 flex flex-col w-full">
{navLinks[0]?.items?.map((item) => (
<a
Expand Down Expand Up @@ -788,7 +776,7 @@ const MobileTopicsList = () => {
'/topics',
)
}}
className="flex items-center w-full px-5 py-3 font-medium leading-tight transition duration-150 ease-in-out rounded-sm lg:col-span-2 lg:px-5 sm:px-3 group hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth justify-between border-t border-gray-100"
className="flex items-center w-full px-5 py-3 font-medium leading-tight transition duration-150 ease-in-out rounded-sm lg:col-span-2 lg:px-5 sm:px-3 group hover:bg-gray-100 dark:hover:bg-gray-900 dark:hover:bg-opacity-40 hover:shadow-smooth justify-between border-t dark:border-gray-800 border-gray-100"
>
Browse all topics{' '}
<span
Expand Down
2 changes: 1 addition & 1 deletion src/components/icons/tip-icons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const Icons = {
),
Email: () => (
<>
<g clip-path="url(#a)">
<g clipPath="url(#a)">
<path
fill="none"
stroke="currentColor"
Expand Down
10 changes: 9 additions & 1 deletion src/pages/[post].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,15 @@ function InstructorProfile({
}) {
const content = (
<div className="flex flex-shrink-0 items-center">
{instructor?.avatar_url ? null : <Eggo className="mr-1 sm:w-10 w-8" />}
{instructor?.avatar_url ? (
<Image
src={instructor.avatar_url}
width={40}
height={40}
alt={instructor.full_name}
className="rounded-full"
/>
) : null}
<div className="ml-2 flex flex-col justify-center">
<span className="text-gray-700 dark:text-gray-400 text-sm leading-tighter">
Instructor
Expand Down
2 changes: 1 addition & 1 deletion src/pages/discord/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const DiscordLogo: React.FC<React.PropsWithChildren<{className?: string}>> = ({
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g clip-path="url(#clip0)">
<g clipPath="url(#clip0)">
<path
d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z"
fill="currentColor"
Expand Down