Skip to content

Commit 2f7f025

Browse files
loreinaalinastarkoveucarryoteashaduzzamaneisabelledelmundo
authored
Release/1.7.0 (#70)
* Add gatsby starter * Add github templates * #2 - Feature/styled components (#5) * add configs for styled component * sponsor styled components * 404 styled components * index styled components * waiver style component * add new sponsor style component * nav style component * coc style component * privacy style component * variable style components * SEO and Favicon (#4) * Fix Variables Usage + Change Components Names to Capital Case (#7) * add configs for styled component * sponsor styled components * 404 styled components * index styled components * try fixing code * Work collab with Iz and Harsh to finish react template * waiver style component * add new sponsor style component * nav style component * coc style component * privacy style component * variable style components * small tests and changes * fixed variables in stylecomponents * fix camel case compinents name to capital * Delete package-lock.json * Feature/7 landing page blueprint (#6) * add configs for styled component * sponsor styled components * 404 styled components * index styled components * try fixing code * Work collab with Iz and Harsh to finish react template * small tests and changes * Delete package-lock.json * Update site metadata * Fix index import order * Update yarn lockfile * Change PR template and add contributing guide (#8) * Remove bug report template * Change PR template * Update readme * Create contributing guide * Add PR naming convention * Update PR naming convention * Add contributing to readme * Fix indents in PR template * Update PR checklist * commit package-lock.json * add package-lock.json to .gitignore * Added nav/footer and index.css (#9) * Feature/9 about (#10) * Added nav/footer and index.css * Restyled about section * Changed functions in nav.js * Fixed typo * Add setup documentation to README (#13) * Add setup to README * Change branch naming conventions to include ticket number * Change gatsby-cli command to yarn * Add sponsorship section (#14) * add configs for styled component * sponsor styled components * 404 styled components * index styled components * try fixing code * Work collab with Iz and Harsh to finish react template * small tests and changes * fix pull requests issues * rearrange the order of the imports in the index/style/pages * fix error page * updated padding space between image and text * Add sponsor button * Create clickable button * Change button text * Format code * Change button dimensions * Switch to padding * Fix template from code linting * Remove random file * Add top margin to sponsor button * Add sponsor copy * Change about and logo pngs to svg (#12) * Add hero section (#11) * add images for hero * add configs for gatsby & package.json * new style components for index and signupForms * use svg image instead of png * add hero sections * add sass stylesheets for mailchimp form * change top position of foreground * fix top of both foreground and buildings * add Brown font * change hero text * remove grey background * Add brown font * fix css for mobile layout * change subheading text align * small css fix * css for mobile * add text + more css * Add placeholder copy from mchacks6 (#15) * Add about copy * Fix temp hero styling * Add release documentation (#16) * Add Netlify config file * Update netlify config to yarn * Add release documentation * Update README * Add scripts (#19) * Format code * Remove unused gatsby files * Update scripts * Update contributing guide * Add code of conduct * Add scripts to README * Add folder structure to README * Add scrolling function (#20) * Add scrolling function * Format code * Change title of site (#21) * Change title of site * Update src/pages/index.js Co-Authored-By: Loreina Chew <[email protected]> * Update src/pages/index.js Co-Authored-By: Loreina Chew <[email protected]> * Add hamburger menu and mobile style changes (#22) * Add hamburger styles * Fix mobile padding to be unscrollable * Make navbar sticky * Fix mobile styles * Make footer icons bigger * Change email input font and styling * Change hamburger styling * Update email input placeholder * Update single line comment * Fix martlet navbar size * Move email input placeholder back to center * Delete zlib import * Fix styles and address review comments * Jank fix to center mobile menu * Fix tap highlight blue overlay * Format code * Fix merge * Move footer into its own style file * Change sponsor redirect to source code (#23) * Remove redirect from netlify config file * Add gatsby netlify plugin * Add redirect to gatsby node config * Format code * Fix gatsby compiler warnings (#24) * Remove style import from 404 * Remove imports from index page * Remove extra color variables in index styles * Remove extra color variables in sign up form * Format code * Add changelog (#26) * Add changelog * Add changelog documentation to contributing * Format code * Add links to version tags * Add tags documentation to contributing * Update PR template to include releases (#27) * Move pr template to /docs * Update template to include release as type of change * Remove option to delete types of change * Update README * Refactor components structure (#28) * Move fonts to assets folder * Move images to assets folder * Edit images file path to assets folder * Update logo file and path * Edit favicon filename * Create designs folder nested in images folder * Rename hero images * Delete unused hero images * Update filesystem images path * Add temporary duplicate variable file * Move About section styling to individual jsx files * Refactor footer section * Move 404 to /components * Delete unused page styles * Delete sponsor page * Adjust footer page import order: react, external imports, component imports, image imports * Refactor nav section styles * Refactor hero section * Move SEO section to components folder * scrollToRef -> scrollTo so it matches mailTo * Change About section wrapper to container * Refactor sponsors section * Delete variables file in styles folder * Rename LinksWrapper to Links * Rename nav containers * Update folder structure in readme * Fix sponsor scroll (#32) * Change scroll offset value * Format code * Add hero illustrations (#31) * Add illustrations for background * Add cord, fix mobile illustrations * Add UFO, planet, hotair balloon * Edit media queries * Fix * Update HeroStyles.jsx * Commit * Update sponsorship package (#34) * Update changelog * Bump version to 1.2.1 * Update sponsor pdf * Revert "Update changelog" This reverts commit 609ce28. * Revert "Bump version to 1.2.1" This reverts commit 04776b3. * Modify changelog format (#36) * add keep a changelog description * update 1.2.1 * update 1.2.0 * update 1.1.1 * update 1.1.0 * update 1.0.1 * update 1.0.0 * add unreleased section * fix spacing * update changelog * update PR template * update contributing doc * format code * modify docs * update docs * Fix email signup form (#37) * remove z-index for bg styles * add z-index to hero styles * change floating styles z-index * update changelog * Add 404 page (#38) * update global css * create actual 404 page * delete outdated styling * add not found svg * fix compiler warning * add 404 page styling * rename NotFound to 404 * update button * jank fix to 404 wrapper for “sticky” footer * format code * update changelog * Add privacy policy and code of conduct pages (#40) * Add privacy policy and code of conduct pages * Fix padding for footer to be whole screen on mobile * Change page names to match naming conventions * Fix padding for text for mobile view * Fix indentation * Fix padding for mobile view * Fix font size for headers * Add logo file for API emails (#41) * Add logo version used in API emails * update changelog * Added Privacy Policy and Code of Conduct to pages (#43) * Add privacy policy and code of conduct pages * Fix padding for footer to be whole screen on mobile * Change page names to match naming conventions * Fix padding for text for mobile view * Fix indentation * Fix padding for mobile view * Fix font size for headers * Add content for privacy policy page * Add code of conduct content * Add mailto links * Update change log * Fix responsive layout * Change link colours * Add links to privacy policy * Update link colours * Remove footer links * Code of Conduct and Privacy Policy footer links (#44) * Add privacy policy and code of conduct pages * Fix padding for footer to be whole screen on mobile * Change page names to match naming conventions * Fix padding for text for mobile view * Fix indentation * Fix padding for mobile view * Fix font size for headers * Add content for privacy policy page * Add code of conduct content * Add mailto links * Update change log * Fix responsive layout * Change link colours * Add links to privacy policy * Update link colours * Remove footer links * Add footer links * Fix favicon (#45) * change favicon * update changelog * Add apply button to hero (#46) * comment out sign up form in hero * add apply button to hero * update changelog * Add MLH badge (#48) * add mlh badge img file * add mlh badge components * add mlh logo to nav * update changelog * make mlh badge non-sticky to navbar * fix scroll * Add google analytics (#50) * add google analytics plugin * add google analytics config * update changelog * Fix compiler warnings and resolve dependencies (#49) * fix compiler warning * format code * update changelog * update gatsby to latest version * update changelog * Refactor js to jsx files (#52) * refactor components * refactor pages * update changelog * Fix typo in privacy page (#54) * fix typo * update changelog * Feature/218 promo (#53) * add promo page redirect * update changelog * Add travel policy page (#56) * add travel policy page * add travel policy content * update changelog * format code * add modified dates * update changelog * Update travel policy (#58) * update travel policy * update changelog * add minor liability waiver * add waiver redirect * add waiver redirect * Add sponsor info package (#61) * update p tag font * add bold text colour * add sponsor info page * update changelog * update changelog * add spacing * update changelog * update schedule * update sponsor info copy * update travel policy * update travel policy * Logos (#66) * Added stickermule logo right about footer * yarn format * update changelog Co-authored-by: Loreina Chew <[email protected]> * Logos (#68) * Added stickermule logo right about footer * yarn format * Added sticker mule link to logo * update changelog Co-authored-by: Loreina Chew <[email protected]> * Implement faq section (#65) * Implement faq section * Format code * Update changelog * Update answer font to Hind * update changelog * bump version to 1.7.0 Co-authored-by: Haylee Luu <[email protected]> Co-authored-by: Carrie Rong <[email protected]> Co-authored-by: Enan Ashaduzzaman <[email protected]> Co-authored-by: Isabelle del Mundo <[email protected]> Co-authored-by: Max <[email protected]> Co-authored-by: Logan Ralston <[email protected]>
1 parent 883d3c4 commit 2f7f025

File tree

9 files changed

+184
-2
lines changed

9 files changed

+184
-2
lines changed

docs/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.7.0](https://github.com/hackmcgill/mchacks7/tree/1.7.0) - 2020-01-25
9+
10+
### Added
11+
12+
- Implement FAQ section
13+
- Add link to FAQ section to navbar
14+
815
## [1.6.4](https://github.com/hackmcgill/mchacks7/tree/1.6.4) - 2020-01-23
916

1017
### Fixed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mchacks7",
33
"private": true,
44
"description": "McHacks website",
5-
"version": "1.6.4",
5+
"version": "1.7.0",
66
"author": "HackMcGill @hackmcgill",
77
"dependencies": {
88
"@fortawesome/fontawesome-svg-core": "^1.2.25",

src/components/FAQ/Container.jsx

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
import styled from "styled-components"
2+
import * as styleVars from "../variable"
3+
4+
export const Container = styled.div`
5+
max-width: 720px;
6+
text-align: center;
7+
margin: auto;
8+
margin-bottom: 100px;
9+
10+
h2 {
11+
color: ${styleVars.colorHackRed};
12+
font-size: 3rem;
13+
font-weight: 400;
14+
}
15+
16+
.QuestionBox {
17+
border: 1px solid ${styleVars.hackBlack10};
18+
padding: 24px 30px;
19+
border-radius: 10px;
20+
text-align: left;
21+
font-size: 1.2em;
22+
cursor: pointer;
23+
transition: background 0.5s ease;
24+
margin-bottom: 20px;
25+
margin-left: 20px;
26+
margin-right: 20px;
27+
box-sizing: border-box;
28+
29+
.questionRow {
30+
display: flex;
31+
32+
.question {
33+
color: ${styleVars.hackBlack80};
34+
border-bottom: 3px solid ${styleVars.hackWhite};
35+
margin-bottom: -3px;
36+
transition: border 0.5s ease;
37+
}
38+
39+
.spacer {
40+
flex: 1;
41+
}
42+
43+
.expandButton > img {
44+
opacity: 30%;
45+
position: relative;
46+
top: 3px;
47+
transition: opacity 0.5s ease, transform 0.3s ease;
48+
}
49+
}
50+
51+
.answer {
52+
color: ${styleVars.hackBlack60};
53+
margin-top: 10px;
54+
font-size: 0.9em;
55+
display: none;
56+
font-family: "Hind Siliguri", sans-serif;
57+
}
58+
59+
&.expanded {
60+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.18);
61+
62+
.answer {
63+
display: block;
64+
}
65+
66+
.expandButton > img {
67+
transform: rotate(-180deg);
68+
}
69+
70+
.question {
71+
border-color: ${styleVars.hackWhite} !important;
72+
}
73+
}
74+
75+
&:hover {
76+
.question {
77+
border-color: ${styleVars.colorHackYellow};
78+
}
79+
80+
.expandButton > img {
81+
opacity: 90%;
82+
}
83+
}
84+
}
85+
`
86+
87+
export default Container

src/components/FAQ/FAQ.jsx

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import React from "react"
2+
3+
import Container from "./Container"
4+
import Question from "./Question"
5+
6+
const FAQ = ({ scrollRef }) => (
7+
<Container ref={scrollRef}>
8+
<h2>Frequently Asked Questions</h2>
9+
10+
<Question
11+
question="What is a hackathon?"
12+
answer="A hackathon is social coding event where programmers, designers and developers collaborate to solve a problem."
13+
/>
14+
15+
<Question
16+
question="Who can participate? Are there any prerequisites or required skills?"
17+
answer="Anyone is welcome to participate in this event. While experience coding and programming is a huge plus, teams will also need people with strong presentation skills and brilliant ideas."
18+
/>
19+
20+
<Question
21+
question="Do I need a team?"
22+
answer="While you do have the option of working alone, McHacks is a team event so working with others is encouraged. There are a few ways to find teammates: You can pick your team from people you already know, or meet them at group formation session during the hackathon."
23+
/>
24+
25+
<Question
26+
question="Is there anything that I need to prep?"
27+
answer="Other than finding fellow brilliant minds with complementary skills to team up with, there is nothing that you need to prepare in advance."
28+
/>
29+
30+
<Question
31+
question="How much does it cost?"
32+
answer="Nothing! Thanks to our amazing sponsors, McHacks is completely free for our hackers."
33+
/>
34+
35+
<Question
36+
question="Will there be prizes?"
37+
answer="Absolutely. Prizes will be announced closer to McHacks, usually on the day of."
38+
/>
39+
40+
<Question
41+
question="How can I get to McHacks?"
42+
answer="We will be sending buses to nearby universities and cities. To reserve a seat on a bus or to find out if a bus will be stopping near you, check out the travel page on our hacker dashboard. Travel reimbursements will be reviewed on a case-by-case basis and decisions for reimbursement amount will be released on our hacker dashboard."
43+
/>
44+
45+
<Question
46+
question="Where will I sleep?"
47+
answer="There will be a spot for you to catch some ZZZ’s, but we recommend that you bring a sleeping bag or anything else you need in order to sleep well!"
48+
/>
49+
</Container>
50+
)
51+
52+
export default FAQ

src/components/FAQ/Question.jsx

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React, { useState } from "react"
2+
3+
import ArrowDown from "./arrow_down.svg"
4+
5+
const Question = ({ question, answer }) => {
6+
const [expanded, setExpanded] = useState(false)
7+
8+
return (
9+
<div
10+
className={"QuestionBox " + (expanded ? "expanded" : "")}
11+
onClick={() => setExpanded(!expanded)}
12+
>
13+
<div class="questionRow">
14+
<div className="question">{question}</div>
15+
<div className="spacer"></div>
16+
<div className="expandButton">
17+
<img src={ArrowDown} />
18+
</div>
19+
</div>
20+
<div className="answer">{answer}</div>
21+
</div>
22+
)
23+
}
24+
25+
export default Question

src/components/FAQ/arrow_down.svg

+1
Loading

src/components/Nav/Nav.jsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@ import MobileMenu from "./MobileMenu"
1212

1313
import Logo from "../../assets/images/logos/mchacks-martlet.svg"
1414

15-
const Nav = ({ scrollToAbout = () => {}, scrollToSponsor = () => {} }) => {
15+
const Nav = ({
16+
scrollToAbout = () => {},
17+
scrollToSponsor = () => {},
18+
scrollToFaq = () => {},
19+
}) => {
1620
const NavItems = () => (
1721
<>
1822
<NavLink onClick={scrollToAbout}>About</NavLink>
1923
<NavLink onClick={scrollToSponsor}>Sponsor</NavLink>
24+
<NavLink onClick={scrollToFaq}>FAQ</NavLink>
2025
<NavLink href="https://2019.mchacks.ca" target="_blank">
2126
2019
2227
</NavLink>

src/components/variable.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
export const colorHackRed = "#f2463a"
33
export const colorHackRedMed = "#f56f65"
44
export const colorHackRedLight = "#f89790"
5+
export const colorHackYellow = "#ffd081"
56
export const hackBlack = "#202020"
67
export const hackBlack80 = "#4d4d4d"
78
export const hackBlack70 = "#636363"

src/pages/index.jsx

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Nav from "../components/Nav/Nav"
55
import Hero from "../components/Hero/Hero"
66
import About from "../components/About/About"
77
import Sponsor from "../components/Sponsor/Sponsor"
8+
import FAQ from "../components/FAQ/FAQ"
89
import Logos from "../components/Logos/Logos"
910
import Footer from "../components/Footer/Footer"
1011
import Bg from "../components/Bg/Bg"
@@ -19,19 +20,22 @@ const scrollTo = ref => {
1920
const IndexPage = () => {
2021
const aboutRef = useRef(null)
2122
const sponsorRef = useRef(null)
23+
const faqRef = useRef(null)
2224

2325
return (
2426
<div>
2527
<SEO />
2628
<Nav
2729
scrollToAbout={() => scrollTo(aboutRef)}
2830
scrollToSponsor={() => scrollTo(sponsorRef)}
31+
scrollToFaq={() => scrollTo(faqRef)}
2932
/>
3033
<Bg>
3134
<Hero />
3235
<About scrollRef={aboutRef} />
3336
</Bg>
3437
<Sponsor scrollRef={sponsorRef} />
38+
<FAQ scrollRef={faqRef} />
3539
<Logos />
3640
<Footer />
3741
</div>

0 commit comments

Comments
 (0)