Skip to content

Commit

Permalink
Merge pull request #388 from nwplus/nwhacks2024-linting-fixes
Browse files Browse the repository at this point in the history
Linting fixes for nwHacks 2024
  • Loading branch information
meleongg authored Nov 21, 2023
2 parents 5d4989f + 155c0ec commit bd958df
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 107 deletions.
188 changes: 93 additions & 95 deletions src/components/Hero.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import CarAndMap from '../assets/images/CarAndMap.svg'
import CarScenery from '../assets/images/CarScenery.svg'
import RamBodyImage from '../assets/images/RamBody.svg'
import RamHeadImage from '../assets/images/RamHead.svg'
import Button from './Button'
import LivepeerImage from '../assets/images/Livepeer.svg'

const HeroContainer = styled.div`
position: relative;
Expand Down Expand Up @@ -137,32 +135,32 @@ const Description = styled.p`
letter-spacing: 0em;
`

const ActionsContainer = styled.div`
margin-left: 10vw;
position: relative;
padding-top: 1rem;
display: flex;
flex-direction: column;
gap: 1rem;
align-items: flex-start;
@media (max-width: ${TABLET}) {
display: flex;
flex-direction: column;
margin: auto;
padding-top: 20px;
width: 50%;
align-items: center;
}
${p => p.theme.mediaQueries.mobile} {
padding-top: 0.5rem;
margin-top: 0;
font-size: 10px;
margin-bottom: 0;
gap: 1rem;
}
`
// const ActionsContainer = styled.div`
// margin-left: 10vw;
// position: relative;
// padding-top: 1rem;
// display: flex;
// flex-direction: column;
// gap: 1rem;
// align-items: flex-start;

// @media (max-width: ${TABLET}) {
// display: flex;
// flex-direction: column;
// margin: auto;
// padding-top: 20px;
// width: 50%;
// align-items: center;
// }

// ${p => p.theme.mediaQueries.mobile} {
// padding-top: 0.5rem;
// margin-top: 0;
// font-size: 10px;
// margin-bottom: 0;
// gap: 1rem;
// }
// `

const ZeroHeightContainer = styled.div`
height: 0;
Expand Down Expand Up @@ -250,73 +248,73 @@ const TitleContainer = styled.div`
}
`

const LivepeerContainer = styled.div`
display: flex;
flex-direction: column;
font-size: 1rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
${p => p.theme.mediaQueries.mobile} {
padding-bottom: 0;
padding-left: 0;
flex-direction: row;
gap: 0.47rem;
}
`

const PoweredBy = styled.div`
font-size: 1.25rem;
font-weight: 600;
`

const Livepeer = styled.img`
margin-left: -0.5rem;
${p => p.theme.mediaQueries.mobile} {
width: 85px;
}
`

const ButtonsContainer = styled.div`
display: flex;
gap: 1rem;
align-items: center;
${p => p.theme.mediaQueries.mobile} {
flex-direction: column;
gap: 0rem;
}
`

const VolunteerLink = styled.a`
position: relative;
color: #969dfb;
text-decoration: none;
font-weight: 600;
font-size: 1.1rem;
letter-spacing: -0.2px;
transition: color 0.13s linear;
&:after {
content: ' ';
position: absolute;
bottom: -2px;
left: 0;
width: 100%;
height: 2px;
background-color: #969dfb;
transition: background 0.13s linear;
}
&:hover {
color: #9ad4de;
&:after {
background-color: #9ad4de;
}
}
`
// const LivepeerContainer = styled.div`
// display: flex;
// flex-direction: column;
// font-size: 1rem;
// padding-bottom: 0.5rem;
// padding-left: 0.5rem;

// ${p => p.theme.mediaQueries.mobile} {
// padding-bottom: 0;
// padding-left: 0;
// flex-direction: row;
// gap: 0.47rem;
// }
// `

// const PoweredBy = styled.div`
// font-size: 1.25rem;
// font-weight: 600;
// `

// const Livepeer = styled.img`
// margin-left: -0.5rem;

// ${p => p.theme.mediaQueries.mobile} {
// width: 85px;
// }
// `

// const ButtonsContainer = styled.div`
// display: flex;
// gap: 1rem;
// align-items: center;

// ${p => p.theme.mediaQueries.mobile} {
// flex-direction: column;
// gap: 0rem;
// }
// `

// const VolunteerLink = styled.a`
// position: relative;
// color: #969dfb;
// text-decoration: none;
// font-weight: 600;
// font-size: 1.1rem;
// letter-spacing: -0.2px;
// transition: color 0.13s linear;

// &:after {
// content: ' ';
// position: absolute;
// bottom: -2px;
// left: 0;
// width: 100%;
// height: 2px;
// background-color: #969dfb;
// transition: background 0.13s linear;
// }

// &:hover {
// color: #9ad4de;

// &:after {
// background-color: #9ad4de;
// }
// }
// `

const Hero = () => {
const parallax = useParallax({ speed: -15 })
Expand Down
4 changes: 2 additions & 2 deletions src/components/NavigationBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ const NavigationBar = ({ bannerExists }) => {
</a>
<MenuList isMobile={showDropdown} closeDropdown={setShowDropdown} />
{/* Make sure desktop (below) has the same portalOpen value */}
<PortalButton portalOpen={true} />
<PortalButton portalOpen />
</DropDownContentContainer>
<TrustBadge stayAtTop={stayAtTop} />
</>
Expand All @@ -350,7 +350,7 @@ const NavigationBar = ({ bannerExists }) => {
<MenuList />
</NavTextContainer>
{/* Make sure mobile (above) has the same portalOpen value */}
<PortalButton portalOpen={true} />
<PortalButton portalOpen />
</NavGroupContainer>
<HamburgerMenu src="/images/icons/menu.svg" alt="dropdown menu icon" onClick={() => setShowDropdown(true)} />
<TrustBadge stayAtTop={stayAtTop} />
Expand Down
6 changes: 3 additions & 3 deletions src/components/SponsorsGrid.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react'
import { useEffect, useState } from 'react'
import styled from 'styled-components'

const Container = styled.div`
Expand Down Expand Up @@ -45,7 +45,7 @@ const SponsorImg = styled.img`
`

const SponsorsGrid = ({ sponsors }) => {
const emptyTierList = { platinum: [], gold: [], silver: [], bronze: [], Inkind: [] }
const emptyTierList = { platinum: [], gold: [], silver: [], bronze: [], inkind: [] }
const [tierList, setTierList] = useState(emptyTierList)

useEffect(() => {
Expand Down Expand Up @@ -97,7 +97,7 @@ const SponsorsGrid = ({ sponsors }) => {
<ListByTier listOfSponsors={tierList.gold} />
<ListByTier listOfSponsors={tierList.silver} />
<ListByTier listOfSponsors={tierList.bronze} />
<ListByTier listOfSponsors={tierList.Inkind} />
<ListByTier listOfSponsors={tierList.inkind} />
</Container>
)
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Footer from 'src/sections/Footer'
import Countdown from 'src/sections/Countdown'
import About from 'src/sections/About'

import Banner from '../components/Banner'
import NavigationBar from '../components/NavigationBar'
import Hero from '../components/Hero'

Expand Down
2 changes: 1 addition & 1 deletion src/pages/info.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import styled from 'styled-components'
import NavigationBar from '@components/NavigationBar'
import InfoBackground from '@assets/images/InfoBackground.svg'
import { LAPTOP, MOBILE } from '@constants/measurements'
import { LAPTOP } from '@constants/measurements'

const Container = styled.div`
display: flex;
Expand Down
7 changes: 4 additions & 3 deletions src/sections/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@ const About = () => {
<BlurbContainer bias="right">
<BlurbHeader>Join us for an unforgettable experience!</BlurbHeader>
<BlurbText>
We're thrilled to announce that we're once again bringing you an incredible hackathon experience! Last year,
we connected hundreds of the brightest developers, engineers, and designers coming from all over North
America. Whether we're reuniting or meeting you for the first time, we can't wait to see you there!
We{`'`}re thrilled to announce that we{`'`}re once again bringing you an incredible hackathon experience!
Last year, we connected hundreds of the brightest developers, engineers, and designers coming from all over
North America. Whether we{`'`}re reuniting or meeting you for the first time, we can{`'`}t wait to see you
there!
</BlurbText>
</BlurbContainer>
</AboutInner>
Expand Down
2 changes: 1 addition & 1 deletion src/sections/Countdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const Countdown = () => {
return (
<CountdownContainer>
<Keychain ref={parallax.ref} src={KeychainImage} alt="Keychain" />
<UltiAnimation src={UltiAnimationImg} alt="Nugget and Reindeer tossing around a Firsbee"></UltiAnimation>
<UltiAnimation src={UltiAnimationImg} alt="Nugget and Reindeer tossing around a Firsbee" />
<FauxBillboard>
<StyledHeader>Registration closes in:</StyledHeader>
<CountdownGrid>
Expand Down
2 changes: 1 addition & 1 deletion src/sections/FAQ.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const Faq = () => {
</FaqColumn>

<FaqColumn>
{faqData['Logistics'] && <FaqCollection category="Logistics" faqs={faqData['Logistics']} />}
{faqData.Logistics && <FaqCollection category="Logistics" faqs={faqData.Logistics} />}
</FaqColumn>
</FaqGrid>
) : (
Expand Down

0 comments on commit bd958df

Please sign in to comment.