Skip to content

Commit

Permalink
Merge pull request #28 from cuhacking/launch-registration
Browse files Browse the repository at this point in the history
Update website for registration launch
  • Loading branch information
Wal Wal authored Dec 22, 2020
2 parents a1cf651 + 0684e21 commit 0f5a0d3
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 24 deletions.
8 changes: 4 additions & 4 deletions src/components/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,14 @@ const Footer = () => (
</SocialDiv>
</ContactPrompt>
<NavMenu>
<NavButton
{/* <NavButton
to='/'
activeStyle={{
color: 'var(--purple)'
}}
>
Home
</NavButton>
</NavButton> */}
{/* <NavButton
to='/about'
activeStyle={{
Expand All @@ -274,14 +274,14 @@ const Footer = () => (
>
About
</NavButton> */}
<NavButton
{/* <NavButton
to='/events'
activeStyle={{
color: 'var(--purple)'
}}
>
Events
</NavButton>
</NavButton> */}
{/* <NavButton
to='/blog'
activeStyle={{
Expand Down
14 changes: 7 additions & 7 deletions src/components/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ const Header = (props: { fixed: boolean }) => {
<Link to='/'>
<StyledLogo />
</Link>
<MenuButton isOpen={isOpen} onClick={() => setOpen(!isOpen)} />
{/* <MenuButton isOpen={isOpen} onClick={() => setOpen(!isOpen)} /> */}
<ButtonDiv>
<NavButton
{/* <NavButton
to='/'
activeStyle={{
color: 'var(--purple)'
Expand All @@ -135,7 +135,7 @@ const Header = (props: { fixed: boolean }) => {
}}
>
Events
</NavButton>
</NavButton> */}
{/* <NavButton
to='/about'
activeStyle={{
Expand All @@ -155,7 +155,7 @@ const Header = (props: { fixed: boolean }) => {
</NavButton> */}
</ButtonDiv>
</NavBar>
<NavMenu>
{/* <NavMenu>
<NavButton
to='/'
activeStyle={{
Expand All @@ -172,7 +172,7 @@ const Header = (props: { fixed: boolean }) => {
>
Events
</NavButton>
{/* <NavButton
<NavButton
to='/about'
activeStyle={{
color: 'var(--purple)'
Expand All @@ -187,8 +187,8 @@ const Header = (props: { fixed: boolean }) => {
}}
>
Blog
</NavButton> */}
</NavMenu>
</NavButton>
</NavMenu> */}
</StyledHeader>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/pageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const PageLayout = ({ children }: { children: React.ReactNode }) => {
return (
<div id='faux-root'>
<Header fixed={false} />
<Header fixed={true} />
{/* <Header fixed={true} /> */}
<Main>{children}</Main>
<Footer />
</div>
Expand Down
21 changes: 9 additions & 12 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,7 @@ const IndexPage = () => {
<br />
January 29–31.
</p>
{/* <Button link='/about'>Learn More</Button> */}
<Button external link='https://discord.gg/TGvYPnD'>
Join Our Discord Server
</Button>
<Button link='https://2021.cuhacking.com/'>Event Page</Button>
</TextContainer>
</Splash>
</SplashContainer>
Expand Down Expand Up @@ -215,9 +212,9 @@ const IndexPage = () => {
<h1>Our Community & Events</h1>
<p>
The cuHacking community has be growing ever since our first
hackathon in 2017. Now we have grown even larger
than just an annual event — we hack all year round! Join the community to tag along on our
adventures.
hackathon in 2017. Now we have grown even larger than just an
annual event — we hack all year round! Join the community to tag
along on our adventures.
</p>
<Button external link='https://discord.gg/TGvYPnD'>
Join Our Discord Server
Expand All @@ -229,14 +226,14 @@ const IndexPage = () => {
<DialogueDiv>
<h1>What about the hackathon?</h1>
<p>
This year, <strong>cuHacking 2021 is going virtual! </strong>
We'll be hosting the event through our website and Discord server from
January 29 to 31.
This year, <strong>cuHacking 2021 is going virtual! </strong>
We'll be hosting the event through our website and Discord server
from January 29 to 31.
<br />
<br />
Registration windows will be announced in the coming days.
Registration is open! Don't wait.
</p>
{/* <Button link='/about'>Read More</Button> */}
<Button link='https://2021.cuhacking.com/'>Register Now!</Button>
</DialogueDiv>
</QuestionDiv>
</QuestionsContainer>
Expand Down

0 comments on commit 0f5a0d3

Please sign in to comment.