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

OK, this is the real final PR, I promise. #27

Merged
merged 2 commits into from
Oct 17, 2024
Merged

OK, this is the real final PR, I promise. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e193d8b
refactor(apps): elab - change what's new on main nav to info.
johnnycrich Oct 16, 2024
b7d29f9
refactor(apps): elab - revert to what's new on main nav.
johnnycrich Oct 17, 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
110 changes: 34 additions & 76 deletions apps/elab/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ const Header = ({ theme = Theme.none }: Props): JSX.Element => {
};
const aboutLinks = (
<>
<NavLink href="/testimonials" label="Testimonials" />
<NavLink href="/about/about-the-lab" label="About the Lab" />
<NavLink href="/about/mission-values" label="Mission & Values" />
<NavLink href="/about/our-approach" label="Our Approach" />
Expand Down Expand Up @@ -367,11 +368,6 @@ const Header = ({ theme = Theme.none }: Props): JSX.Element => {
label: 'About',
links: aboutLinks,
},
{
label: 'Testimonials',
link: '/testimonials',
// links: siiLinks,
},
{
label: 'Social Impact Initiatives',
links: siiLinks,
Expand Down Expand Up @@ -653,16 +649,6 @@ const Header = ({ theme = Theme.none }: Props): JSX.Element => {
</motion.div>
</motion.div>

<Link
href="/testimonials"
// className="block w-56 text-center relative z-10"
className="block w-40 text-center relative z-10"
>
<span className={`w-24 border-teal ${navHeaderClass}`}>
Testimonials
</span>
</Link>

<motion.div
className="group relative mr-8"
onMouseEnter={() => {
Expand Down Expand Up @@ -730,9 +716,9 @@ const Header = ({ theme = Theme.none }: Props): JSX.Element => {
className="block w-36 text-center relative z-10"
>
<span
className={`w-[86px] border-yellow ${navHeaderClass}`}
className={`w-[87px] border-yellow ${navHeaderClass}`}
>
What’s New
What's New
</span>
</Link>
<motion.div
Expand Down Expand Up @@ -779,65 +765,37 @@ const Header = ({ theme = Theme.none }: Props): JSX.Element => {
<h2 className="uppercase">Main Menu</h2>
{MobileNavSections.map((section, i) => (
<>
{section.links ? (
<motion.header
className="text-2xl font-light mt-3 origin-left"
animate={{
opacity: 1,
y: 0,
transition: {
duration: 0.1,
delay: 0.1 * (i + 1),
ease: [0.04, 0.62, 0.23, 0.98],
},
}}
initial={{ opacity: 0, y: '-40%' }}
exit={{ opacity: 0, y: '-11%' }}
whileTap={{
scale: 1.034,
transition: {
ease: cubicBezier(0.075, 0.82, 0.165, 1.0),
duration: 0.3,
},
}}
onClick={() =>
setExpanded(
expanded.flatMap((v, eI) => {
return expanded[i] ? false : eI === i;
})
)
}
>
{section.label}
</motion.header>
) : (
<motion.div
className="text-2xl font-light mt-3 origin-left"
animate={{
opacity: 1,
y: 0,
transition: {
duration: 0.1,
delay: 0.1 * (i + 1),
ease: [0.04, 0.62, 0.23, 0.98],
},
}}
initial={{ opacity: 0, y: '-40%' }}
exit={{ opacity: 0, y: '-11%' }}
whileTap={{
scale: 1.034,
transition: {
ease: cubicBezier(0.075, 0.82, 0.165, 1.0),
duration: 0.3,
},
}}
>
<NavLink
href={section.link}
label={section.label}
/>
</motion.div>
)}
<motion.header
className="text-2xl font-light mt-3 origin-left"
animate={{
opacity: 1,
y: 0,
transition: {
duration: 0.1,
delay: 0.1 * (i + 1),
ease: [0.04, 0.62, 0.23, 0.98],
},
}}
initial={{ opacity: 0, y: '-40%' }}
exit={{ opacity: 0, y: '-11%' }}
whileTap={{
scale: 1.034,
transition: {
ease: cubicBezier(0.075, 0.82, 0.165, 1.0),
duration: 0.3,
},
}}
onClick={() =>
setExpanded(
expanded.flatMap((v, eI) => {
return expanded[i] ? false : eI === i;
})
)
}
>
{section.label}
</motion.header>

<AnimatePresence mode="wait">
{expanded[i] && (
<motion.section
Expand Down
11 changes: 9 additions & 2 deletions apps/elab/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const Layout = ({
max: { opacity: 1, height: 'auto' },
}}
transition={{ duration: 0.55, opacity: { duration: 0.2 } }}
className="text-gray-600 text-base px-3 md:px-0"
className="text-gray-600 text-base px-3 md:pr-3 md:pl-0"
>
The Engagement Lab at Emerson College has closed its doors.{' '}
<Link
Expand All @@ -112,7 +112,14 @@ const Layout = ({
>
Read the report
</Link>{' '}
detailing the ELab’s final chapter, or{' '}
detailing the ELab’s final chapter,{' '}
<Link
href="/testimonials"
className="text-red font-bold border-b-2 hover:border-b-0"
>
read testimonials
</Link>
&nbsp;from our extended community, or{' '}
<a
href="#"
onClick={() => store?.toggleFullBanner(!store?.fullBanner)}
Expand Down
Loading