Skip to content

Housekeeping update dependencies and fix isActive functions #341

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

Open
wants to merge 5 commits into
base: 2023-dev
Choose a base branch
from
Open

Housekeeping update dependencies and fix isActive functions #341

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
1d5719b
yarn upgrade
eduarmreyes Mar 13, 2023
b15dc3a
upgrade dependencies and upgrade gatsby
eduarmreyes Mar 13, 2023
d96953e
fix about active link
eduarmreyes Mar 13, 2023
6ad7cc2
fix schedule isActiveHandler
eduarmreyes Mar 13, 2023
dfd2498
remove console logs
eduarmreyes Mar 13, 2023
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
1 change: 0 additions & 1 deletion gatsby-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ module.exports = {
},
plugins: [
'gatsby-plugin-postcss',
'gatsby-plugin-react-helmet',
'gatsby-transformer-json',
{
resolve: 'gatsby-source-filesystem',
Expand Down
29 changes: 14 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@
"@heroicons/react": "^1.0.5",
"autoprefixer": "^10.4.2",
"classnames": "^2.2.5",
"gatsby": "^3.0.0",
"gatsby-cli": "^3.0.0",
"gatsby-link": "^3.0.0",
"gatsby-plugin-google-analytics": "^3.0.0",
"gatsby-plugin-netlify": "^3.0.0",
"gatsby-plugin-postcss": "4.14.0",
"gatsby-plugin-react-helmet": "^3.0.0",
"gatsby-plugin-sass": "^3.0.0",
"gatsby-source-filesystem": "^3.0.0",
"gatsby-transformer-json": "^3.0.0",
"gatsby": "^5.0.0",
"gatsby-cli": "^5.0.0",
"gatsby-link": "^5.0.0",
"gatsby-plugin-google-analytics": "^5.0.0",
"gatsby-plugin-netlify": "^5.0.0",
"gatsby-plugin-postcss": "^6.0.0",
"gatsby-plugin-sass": "^6.0.0",
"gatsby-source-filesystem": "^5.0.0",
"gatsby-transformer-json": "^5.0.0",
"history": "^4.10.1",
"lodash": "^4.17.15",
"postcss": "^8.4.5",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-helmet": "^5.2.1",
"react-responsive": "^8.0.1",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-helmet": "^6.0.0",
"react-responsive": "^9.0.0",
"react-reveal": "1.2.2",
"react-router-dom": "^5.1.2",
"react-router-dom": "^6.0.0",
"react-scroll": "^1.7.15"
},
"keywords": [
Expand Down
21 changes: 9 additions & 12 deletions src/components/About/Nav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ const AboutNav = ({ items, aboutPath }) => (
...item,
className: 'about-content-nav-item',
activeLinkClassName: 'about-content-nav-item-is-active',
isActiveHandler: () => {
return (
item.href === getLocationPathname() ||
(getLocationPathname() === aboutPath &&
item.href === '/about/topic-tables')
)
},
isActiveHandler: () =>
item.href === getLocationPathname() ||
(getLocationPathname() === aboutPath &&
item.href === '/about/topic-tables/'),
}))}
/>
</div>
Expand All @@ -26,7 +23,7 @@ AboutNav.defaultProps = {
items: [
{
text: 'Topic Tables',
href: '/about/topic-tables',
href: '/about/topic-tables/',
},
{
// text: 'Ask React Team',
Expand All @@ -36,11 +33,11 @@ AboutNav.defaultProps = {
// href: '/about/unconference'
// }, {
text: 'Venue and Hotel',
href: '/about/venue-and-hotel',
href: '/about/venue-and-hotel/',
},
{
text: 'Jobs',
href: '/about/jobs',
href: '/about/jobs/',
// }, {
// text: 'City Guide',
// href: '/about/city-guide'
Expand All @@ -50,10 +47,10 @@ AboutNav.defaultProps = {
},
{
text: 'FAQ',
href: '/about/faq',
href: '/about/faq/',
},
],
aboutPath: '/about',
aboutPath: '/about/',
}

export default AboutNav
6 changes: 3 additions & 3 deletions src/components/About/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import AboutNav from './Nav'
import AboutSectionWrapper from './Section/Wrapper'
import './index.css'

const AboutComponent = ({ sectionId , subRouteId }) => (
<section className='section-about'>
const AboutComponent = ({ sectionId, subRouteId }) => (
<section className="section-about">
<AboutBanner />
<AboutNav />
<section className='section-content section-about-content'>
<section className="section-content section-about-content">
<AboutSectionWrapper sectionId={sectionId} subRouteId={subRouteId} />
</section>
</section>
Expand Down
2 changes: 1 addition & 1 deletion src/components/LeftNav/menu-items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const menuItems = [
},
{
name: 'Schedule',
page: '/schedule/day-1',
page: '/schedule',
},
{
name: 'Workshops',
Expand Down
11 changes: 6 additions & 5 deletions src/components/Schedule/Nav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ const ScheduleNav = ({ items }) => (
...item,
className: 'schedule-content-nav-item',
activeLinkClassName: 'schedule-content-nav-item-is-active',
isActiveHandler: () => {
return item.href === `${getLocationPathname()}${getLocationHash()}`
},
isActiveHandler: () =>
(item.id === 'day1' &&
`${getLocationPathname()}${getLocationHash()}` === '/schedule/') ||
item.href === `${getLocationPathname()}${getLocationHash()}`,
}))}
showDivider={true}
dividerClassName="schedule-content-nav-divider"
Expand All @@ -25,12 +26,12 @@ ScheduleNav.defaultProps = {
{
id: 'day1',
text: 'May 2',
href: '/schedule/day-1',
href: '/schedule/day-1/',
},
{
id: 'day2',
text: 'May 3',
href: '/schedule/day-2',
href: '/schedule/day-2/',
},
// {
// id: 'day3',
Expand Down
Loading