Skip to content

Commit 0100a77

Browse files
abia-jahangirabia-jahangir
committed
Add hackathon link section and style updates
changed text format Update getStaticProp var name from event to upcomingEvent updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates changes working on hackathon link finally done ?? title almost done done ??? put 'hack the change' in one line Add hackathon link section and style updates git rebase --continue changed text format Fix event tile styles to ensure responsiveness across devices updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates Update getStaticProp var name from event to upcomingEvent updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates Add upcoming event component for images that display through Contentful Update getStaticProp var name from event to upcomingEvent Fix event tile styles to ensure responsiveness across devices Added ScubaSeas Project updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates changed styling to constant rebasing hackathon link Add hackathon link section and style updates Update getStaticProp var name from event to upcomingEvent updates fixed eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates git rebase --continue changed text format Fix event tile styles to ensure responsiveness across devices updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates Update getStaticProp var name from event to upcomingEvent updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates Add upcoming event component for images that display through Contentful Fix event tile styles to ensure responsiveness across devices updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates Update getStaticProp var name from event to upcomingEvent updates fixed eslint errors fixing eslint errors fixed eslint errors updates put 'hack the change' in one line Add hackathon link section and style updates git rebase --continue changed text format Fix event tile styles to ensure responsiveness across devices updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates Add hackathon link section and style updates Update getStaticProp var name from event to upcomingEvent updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates put 'hack the change' in one line Add hackathon link section and style updates set Node 18.16.1 for ESLint workflow Update getStaticProp var name from event to upcomingEvent Fix event tile styles to ensure responsiveness across devices Added ScubaSeas Project updates fixed eslint errors fixing eslint errors fixing eslint errors fixed eslint errors updates put 'hack the change' in one line fixing eslint errors changed styling to constant
1 parent 08020c6 commit 0100a77

10 files changed

+112
-23
lines changed

‎components/AlumniHighlights.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Image from 'next/image';
2+
23
import Heading from './Heading';
34
import AlumniCarousel from './AlumniCarousel';
45
import { UnderlineTypes } from '../utils/underlineType';

‎components/HackathonLink.jsx

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import Heading from './Heading';
2+
import { UnderlineTypes } from '../utils/underlineType';
3+
import TextSection from './TextSection';
4+
import Link from 'next/link';
5+
6+
const HACKATHON_TITLE = "text-center flex flex-wrap items-baseline gap-x-2 gap-y-2 pb-8 text-white justify-center text-4xl font-semibold ml-2 mx-auto sm:text-5xl md:text-5xl lg:text-5xl sm:mx-20 md:mx-auto lg:mx-auto";
7+
8+
const HackathonLink = () => {
9+
return (
10+
<div className="flex flex-col items-center bg-orange z-0 pb-12 md:pb-16 lg:pb-20">
11+
<div className="flex items-baseline space-x-4 pt-16 px-10 md:px-24 lg:px-48">
12+
<div className={HACKATHON_TITLE}>
13+
<span>Join</span>
14+
<span>the</span>
15+
<span>Change</span>
16+
<span>at our</span>
17+
<div className='text-center justify-center flex flex-wrap gap-x-2'>
18+
<Heading classes='!text-4xl sm:!text-5xl md:!text-5xl lg:!text-5xl' underlineType={UnderlineTypes.PURPLE_SHORT_UNDERLINE} className="!py-0">
19+
<span>Hackathon: </span>
20+
</Heading>
21+
<span>Hack the Change</span>
22+
</div>
23+
24+
</div>
25+
</div>
26+
27+
<TextSection classes="text-white text-center justify-center pb-5 z-10 px-10 md:px-24 lg:px-48 md:py-4">
28+
Dive into collaborative innovation with Code the Change YYC&apos;s hackathons! Designed to empower
29+
student developers and create real-world impact, our hackathons offer an exciting opportunity
30+
to learn, build, and connect. Whether you&apos;re solving pressing challenges or sharpening your
31+
skills, there&apos;s a place for everyone.
32+
</TextSection>
33+
<TextSection classes="text-white text-center justify-center pb-5 z-10 px-10 md:px-24 lg:px-48 md:py-4 font-medium">
34+
Explore upcoming events, resources, and more at: {' '}
35+
</TextSection>
36+
<TextSection classes="text-white text-center justify-center pb-10 z-20 px-10 md:px-24 lg:px-48 md:py-4">
37+
<Link
38+
href="https://hackthechangeyyc.ca"
39+
target="_blank"
40+
rel="noopener noreferrer"
41+
className="text-blue font-semibold underline">
42+
<span>hackthechangeyyc.ca</span>
43+
</Link>
44+
</TextSection>
45+
</div>
46+
);
47+
};
48+
49+
export default HackathonLink;

‎components/HackathonTimeline.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const HackathonTimeline = () => {
6969
{hackathons.map((hackathon, index) => (
7070
<HackathonSection hackathon={hackathon} key={index} index={index} />
7171
))}
72+
7273
</div>
7374
</div>
7475
);

‎components/Heading.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const WHITE_SINGLE_LINE_DIR = '/svgs/white_long_underline.svg';
1010
const WHITE_CURLY_LINE_DIR = '/svgs/white_alumni_underline.svg';
1111
const BEIGE_SHORT_UNDERLINE_DIR = '/svgs/beige_underline.svg';
1212

13-
const Heading = ({ classes, underlineType = UnderlineTypes.GREEN_SHORT_UNDERLINE, children }) => {
13+
const Heading = ({ classes, underlineType = UnderlineTypes.GREEN_SHORT_UNDERLINE, className = '', children }) => {
1414
const getUnderline = () => {
1515
switch (underlineType) {
1616
case UnderlineTypes.GREEN_LONG_UNDERLINE:
@@ -29,7 +29,7 @@ const Heading = ({ classes, underlineType = UnderlineTypes.GREEN_SHORT_UNDERLINE
2929
};
3030

3131
return (
32-
<div className={HEADING_CONTAINER}>
32+
<div className={`${HEADING_CONTAINER} ${className}`}>
3333
<h1 className={`${classes} text-5xl font-semibold`}>{children}</h1>
3434
{underlineType !== 'None' && <img src={getUnderline()} alt="" />}
3535
</div>

‎data/hackathons.js

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import Hackathon2024 from '../public/images/events/hackathons/htc2024.jpg';
2+
import Hackathon2023 from '../public/images/events/hackathons/htc2023.jpg';
3+
import Hackathon2022 from '../public/images/events/hackathons/htc2022.JPG';
4+
import Hackathon2021 from '../public/images/events/hackathons/htc2021.png';
5+
import Hackathon2019 from '../public/images/events/hackathons/htc2019.jpg';
6+
7+
export const HACKATHONS = [
8+
{
9+
title: '2024 Hackathon',
10+
year: '2024',
11+
img: Hackathon2024,
12+
topic: 'Justice, Peace, and Inclusion',
13+
blurb: 'A hybrid hackathon that focussed on how we could leverage technology to provide access to justice for all and promote peace and inclusion in society!'
14+
},
15+
{
16+
title: '2023 Hackathon',
17+
year: '2023',
18+
img: Hackathon2023,
19+
topic: 'Sustainability',
20+
blurb: 'Our second biggest hybrid Canada-wide hackathon where students came together to develop solutions along the theme of promoting education and sustainable living!'
21+
},
22+
{
23+
title: '2022 Hackathon',
24+
year: '2022',
25+
img: Hackathon2022,
26+
topic: 'Education, inequality, and sustainable living',
27+
blurb: 'Our biggest hackathon to date! It saw students from all over Canada come up with innovative solutions.'
28+
},
29+
{
30+
title: '2021 Hackathon',
31+
year: '2021',
32+
img: Hackathon2021,
33+
topic: 'Health and Wellness',
34+
blurb: 'Due to COVID, this hackathon was held online, but still had an impressive turnout.'
35+
},
36+
{
37+
title: '2019 Hackathon',
38+
year: '2019',
39+
img: Hackathon2019,
40+
topic: 'Climate Action',
41+
blurb: 'Our first ever hackathon! Shout out to Benevity for letting us hold it there.'
42+
},
43+
44+
];
45+
46+
47+

‎data/projects.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ export const projects = [
5252
{
5353
logo: ScubaSeas,
5454
name: 'ScubaSeas',
55-
appStoreLink: 'https://apps.apple.com/us/app/scuba-seasons/id6450968950',
56-
playStoreLink: 'https://play.google.com/store/apps/details?id=com.freem11.divegomobile',
57-
githubLink: 'https://github.com/Freem11/divego',
5855
descriptions: [
5956
'Open source mobile app that helps divers map out the entire ocean',
6057
'Mobile App Developers needed to contribute to the open source project',

‎package.json

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,15 @@
2727
},
2828
"devDependencies": {
2929
"autoprefixer": "^10.4.7",
30-
"eslint": "8.20.0",
30+
"eslint": "^8.20.0",
3131
"eslint-config-next": "12.2.3",
32+
"eslint-config-prettier": "^10.0.2",
33+
"eslint-plugin-prettier": "^5.2.3",
3234
"postcss": "^8.4.14",
35+
"prettier": "^3.5.2",
3336
"tailwindcss": "^3.3.6"
3437
},
3538
"engines": {
3639
"node": "^18.16.1"
37-
},
38-
"description": "First, run the development server:",
39-
"main": "next.config.js",
40-
"repository": {
41-
"type": "git",
42-
"url": "git+https://github.com/Code-the-Change-YYC/code-the-change-yyc-site.git"
43-
},
44-
"keywords": [],
45-
"author": "",
46-
"license": "ISC",
47-
"bugs": {
48-
"url": "https://github.com/Code-the-Change-YYC/code-the-change-yyc-site/issues"
49-
},
50-
"homepage": "https://github.com/Code-the-Change-YYC/code-the-change-yyc-site#readme"
40+
}
5141
}

‎pages/events/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import PastEventsCarousel from '../../components/PastEventsCarousel';
33
import EventsBanner from '../../components/EventsBanner';
44
import UpcomingEvents from '../../components/UpcomingEvents';
55
import { fetchContent } from '../../api/apiRoot';
6+
import HackathonLink from '../../components/HackathonLink';
7+
8+
69

710
export async function getStaticProps() {
811
const upcomingEvent = await fetchContent('upcomingEvents');
@@ -17,6 +20,7 @@ const Events = ({ upcomingEvent, pastEvent }) => {
1720
<EventsBanner />
1821
<UpcomingEvents upcomingEvent={upcomingEvent} />
1922
<HackathonTimeline />
23+
<HackathonLink />
2024
<PastEventsCarousel pastEvent={pastEvent} />
2125
</div>
2226
);

‎postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ module.exports = {
33
tailwindcss: {},
44
autoprefixer: {},
55
},
6-
}
6+
};

‎tailwind.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ module.exports = {
1111
},
1212
colors: {
1313
'lilac': '#A689FF',
14-
'white': '#FFFFFF',
15-
'orange': '#FF6B54',
14+
'white': '#FFFFFF',
15+
'orange': '#FF6B54',
1616
},
1717
},
1818
plugins: [require('tailwind-scrollbar-hide')],

0 commit comments

Comments
 (0)