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

Hackcamp2023 fixes #373

Merged
merged 7 commits into from
Oct 8, 2023
Merged

Hackcamp2023 fixes #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8a366f
add footer to mobile
alvinkam33 Oct 8, 2023
9dd1e48
add 2022 HC link
alvinkam33 Oct 8, 2023
b95d98c
fix first time stat
alvinkam33 Oct 8, 2023
12bbb5b
connect sponsors cms
alvinkam33 Oct 8, 2023
fed546d
remove sponsor logo svg
alvinkam33 Oct 8, 2023
2b753d3
Changed z-index of Sponsor section to allow for user selectability
meleongg Oct 8, 2023
95d4100
Changed z-index of Sponsor section to allow for user selectability
meleongg Oct 8, 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
7 changes: 0 additions & 7 deletions public/assets/logo/worksafebc.svg
View file
Open in desktop

This file was deleted.

13 changes: 5 additions & 8 deletions src/components/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ const TextContainer = styled.div`
position: absolute;
z-index: 999;
bottom: 22.5vw;

${(p) => p.theme.mediaQueries.mobile} {
bottom: 50vw;
}
`

const SmallText = styled.div`
Expand All @@ -149,14 +153,7 @@ const SmallText = styled.div`
`

const TeamContainer = styled.div`

${(p) => p.theme.mediaQueries.tabletLarge} {
width: 40vw;
}
${(p) => p.theme.mediaQueries.mobile} {
display: none;
}
z-index:4;
z-index: 4;
position: absolute;
left: 0;
bottom: 3vw;
Expand Down
1 change: 1 addition & 0 deletions src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ const MenuList = ({ isMobile, closeDropdown }) => (
<MenuItem name='Events' href='/#events' isAnchor isMobile={isMobile} closeDropdown={closeDropdown} />
<MenuItem name='FAQ' href='/#faq' isAnchor isMobile={isMobile} closeDropdown={closeDropdown} />
<MenuItem name='Sponsors' href='/#sponsors' isMobile={isMobile} closeDropdown={closeDropdown} />
<MenuItem name='2022' href='https://hackcamp2022.nwplus.io/' target='_blank' isMobile={isMobile} closeDropdown={closeDropdown} />
</>
)

Expand Down
2 changes: 1 addition & 1 deletion src/components/Stats.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export default function Stats () {
Gender Minority
</StatBottom>
<StatBottom>
<Number className="num" data-val="64" id="percent">0</Number>
<Number className="num" data-val="76" id="percent">0</Number>
First-Time Hackers
</StatBottom>
</StatsGrid>
Expand Down
4 changes: 4 additions & 0 deletions src/components/Team.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@ const StyledTitle = styled(Header3)`
margin-top: 1em;
color: #E2D6FF;
filter: drop-shadow(0 0 4px #E2D6FF);

${(p) => p.theme.mediaQueries.mobile} {
font-size: 5.5vw;
}
`

const ProfileContent = styled.p`
Expand Down
24 changes: 17 additions & 7 deletions src/sections/Sponsor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ const BgSectionContainer = styled(SectionContainer)`

const StyledTitle = styled(Header2)`
text-align: center;
color: #FFF;
color: #fff;
font-size: 3rem;
padding-top: 33rem;
position: relative;
z-index: 3;

${(p) => p.theme.mediaQueries.mobile} {
${p => p.theme.mediaQueries.mobile} {
font-size: 2em;
padding-top: 12rem;
}
Expand Down Expand Up @@ -91,29 +93,35 @@ const Sponsors = styled.div`
justify-content: center;
align-items: center;
padding-top: 2.5vw;
position: relative;
z-index: 3;
`

const SponsorLogo = styled.img`
width: 37.5vw;
`

const PushinP = styled.p`
color: #FFF;
color: #fff;
text-align: left;
width: 30vw;
min-width: 500px;
margin: 0 auto;
padding-top: 2rem;
max-width: 800px;

${(p) => p.theme.mediaQueries.mobile} {
position: relative;
z-index: 3;

${p => p.theme.mediaQueries.mobile} {
display: none;
}
`

const ButtonContainer = styled.p`
display: flex;
justify-content: center;
position: relative;
z-index: 3;
`

const Skip = styled.div`
Expand All @@ -129,7 +137,7 @@ export default function Sponsor () {
const [sponsors, setSponsors] = useState(null)

useEffect(async () => {
const data = await fireDb.getCollection('HackCamp2022', 'Sponsors')
const data = await fireDb.getCollection('HackCamp2023', 'Sponsors')
if (data) {
setSponsors(data)
}
Expand All @@ -144,7 +152,9 @@ export default function Sponsor () {
Sponsors
</StyledTitle>
<Sponsors>
<SponsorLogo src="assets/logo/worksafebc.svg"/>
{sponsors.map((sponsor) => (
<SponsorLogo src={sponsor.imgURL}/>
))}
</Sponsors>
<PushinP>
Sponsors make this event happen. If you are interested in working with us, joining us or speaking at one of our events, please reach out to us!
Expand Down
Loading