Skip to content

Commit

Permalink
Merge pull request #181 from unihackhq/issue/2025-update
Browse files Browse the repository at this point in the history
Issue/2025 update
  • Loading branch information
terencehuynh authored Dec 2, 2024
2 parents c0414fe + 9c95603 commit e340284
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 75 deletions.
30 changes: 15 additions & 15 deletions components/footer/footer.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,27 @@
@import '../../styles/typography/typography.scss';

.footer {
@include page-margin;
background-color: $footer_color;
padding-top: $base * 4;
padding-bottom: $base * 10;
padding: $base * 4;
border-radius: 4px;
margin-bottom: $base * 8;

&-content {
@include page-margin;
display: flex;
flex-direction: column-reverse;
font-size: 14px;
font-size: 12px;

@include sm {
flex-direction: row;
}
}

&-acknowledgement {
@include page-margin;

p {
@include body;
color: $white;
margin: 0 0 $base * 4;
font-weight: 500;
font-size: 14px;
padding: 0 0 $base * 4;
border-bottom: 1px solid $footer_border;
}
}

Expand All @@ -48,7 +45,7 @@
.copyright {
p {
font-weight: normal;
font-size: 14px;
font-size: 12px;
color: $footer_text;
margin-top: 0;
margin-bottom: 0;
Expand Down Expand Up @@ -80,7 +77,6 @@
li {
display: inline-block;
margin-right: $base * 2;

&:last-child {
margin-right: 0;
}
Expand All @@ -99,7 +95,7 @@
text-decoration: none;

&:hover {
color: white;
text-decoration: underline;
}
}
}
Expand All @@ -117,9 +113,13 @@
ul {
margin: 0 0 $base * 2;

li {
margin-right: $base * 3;
}

a {
width: 24px;
height: 24px;
width: 16px;
height: 16px;
display: block;
}
}
Expand Down
2 changes: 1 addition & 1 deletion components/footer/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const Footer = () => (
</Text>
</div>
<div className={styles['footer-content']}>
<Logo baseColor="#343E46" topColor="#343E46" />
<Logo baseColor="#c0c0c0" topColor="#c0c0c0" />
<div className={styles['footer-info']}>
<ul>
<li>
Expand Down
1 change: 0 additions & 1 deletion layouts/page/page.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
font-family: $fonts;
display: flex;
flex-direction: column;
height: 100vh;

.main-content {
flex: 1 0 auto;
Expand Down
38 changes: 13 additions & 25 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,40 @@ import React from 'react';
import Head from 'next/head';
import styles from './index.module.scss';
import Page from '@layouts/page/page';
import BrandHero from '@sections/brand-hero/stream-hero';
import { JoinDiscord } from '@sections/homepage/discord';
import Prizes from '@sections/homepage/prizes/prizes';
import Sponsors from '@sections/event-info/sponsors/sponsors';

import { prizes } from '@content/events/2024/prizes.json';
import sponsors from '@content/events/2024/sponsors.json';
import BrandHero from '@sections/brand-hero/brand-hero';
import HomeCard from '@components/home-card';

import faqsImage from '../public/images/homepage/faqs.png';
import inspirationImage from '../public/images/homepage/past.png';
import sponsorshipImage from '../public/images/homepage/sponsorship-small.png';

const Index = () => (
<Page headerless>
<Head>
<title>UNIHACK 2024 - March 1-3, 2024</title>
<title>UNIHACK 2025 - 14-16 March 2025 - The Imagination Hackathon</title>
<meta
property="og:title"
content={`UNIHACK 2024 - Coming Soon - March 1-3, 2024`}
content={`UNIHACK 2025 - The Imagination Hackathon - 14-16 March 2025`}
key="title"
/>
</Head>
<BrandHero />
<div className={styles.homepage}>
<div className={styles.grid}>

<HomeCard
image={faqsImage}
title={
<>We run Australia's largest university student hackathon</>
}
placeholderColor="pacific"
buttonLink="https://docs.google.com/forms/d/e/1FAIpQLScWRbp9lMacf0Xjul2y2kgLvgsTYqDo1BlrDWBkEAac0UrY0w/viewform"
buttonText="Join the team today"
/>
<HomeCard
image={inspirationImage}
title={<>Interested to see what this year's participants built?</>}
title={<>Want to see what won last year?</>}
placeholderColor="purple"
buttonLink="https://unihack2024.devpost.com/"
buttonText="Visit DevPost!"
buttonText="Visit 2024 DevPost!"
/>
<HomeCard
image={sponsorshipImage}
title={<>Interested in partnering?</>}
placeholderColor="midori"
buttonLink="/sponsorship"
buttonText="Sponsor UNIHACK 2025"
/>
</div>
<JoinDiscord />
<Prizes data={prizes} />
<Sponsors data={sponsors} />
</div>
</Page>
);
Expand Down
Binary file added public/images/homepage/sponsorship-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 10 additions & 6 deletions sections/brand-hero/brand-hero.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

.brand-hero,
.stream-hero {
background-color: $electric-blue;
padding-bottom: 70px;
background-color: black;

@media (min-width: 1400px) {
margin: 0 100px;
border-radius: 0px 0px 4px 4px;
}

&-content {
@include page-margin;
Expand All @@ -21,9 +25,9 @@
}

h1 {
mask: url('../../public/images/events/2024-logo.svg') center center no-repeat;
mask: url('../../public/images/unihack.svg') center center no-repeat;
mask-size: contain;
background-color: white;
background-color: $white;
height: 60px;
text-indent: -999em;
display: block;
Expand All @@ -37,7 +41,7 @@

p {
margin: 0;
color: white;
color: $white;
}

p.title {
Expand Down Expand Up @@ -133,4 +137,4 @@
&-content {
height: 600px;
}
}
}
24 changes: 5 additions & 19 deletions sections/brand-hero/brand-hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,20 @@ const BrandHero = () => (
<section className={styles['brand-hero']}>
<div className={styles['brand-hero-content']}>
<Stack size="small">
<h1>UNIHACK 2024</h1>
<h1>UNIHACK 2025 - 14-16 March, 2025</h1>
<Text className={styles.title}>
<span>Get ready for UNIHACK 2024!</span>
<span>We're back for 2025!</span>
</Text>
<Text className={styles.subtitle}>
The competition starts at 6PM (Sydney time) on March 1.
The Imagination Hackathon returns on March 14 - 16.
</Text>
<div className={styles.actions}>
<ButtonLink
type="primary"
theme="transparent"
href="https://manage.unihack.net/signup"
href="https://docs.google.com/forms/d/1sXlbyscxc3SPwm9_1Z_4RvBd2AgpTrsbLkEfdqIOPNQ"
>
Register Now
</ButtonLink>
<ButtonLink
type="primary"
theme="transparent"
href="https://manage.unihack.net"
>
Manage My Team
</ButtonLink>
<ButtonLink
type="primary"
theme="transparent"
href="https://merch.unihack.net"
>
Buy Stickers + T-Shirt
Pre-register
</ButtonLink>
</div>
</Stack>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

.sponsor-prompt {
background: $primary;
margin-bottom: $base * -4;

&-container {
@include page-margin;
Expand Down
6 changes: 3 additions & 3 deletions styles/colours.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $silver: #e4e6e9;
$bronze: #ffe4c2;

// Footer colours
$footer_color: #191e22;
$footer_color: #ebeff4;
$footer_border: #2b333b;
$footer_text: #4e5d6a;
$footer_link: #687c8d;
$footer_text: #909fac;
$footer_link: #6e8090;
8 changes: 4 additions & 4 deletions styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ $floatingShadow: 0px 2px 4px rgba(0, 0, 0, 0.13);

@mixin page-margin {
@include xsm {
width: calc(100% - 32px);
max-width: calc(100% - 32px);
margin-left: $base * 2;
margin-right: $base * 2;
}

@include sm {
width: calc(100% - 48px);
max-width: calc(100% - 48px);
margin-left: $base * 3;
margin-right: $base * 3;
}

@include lg {
width: 970px;
max-width: 970px;
margin-left: auto;
margin-right: auto;
}

@include xl {
width: 1100px;
max-width: 1100px;
}
}

Expand Down

0 comments on commit e340284

Please sign in to comment.