Skip to content

Commit 372995b

Browse files
loreinaloreina
authored
Release/1.0.0 (#17)
* 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 * Version bump to 1.0.0
1 parent 3d95f11 commit 372995b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+15279
-2
lines changed

‎.github/pull_request_template.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
### Tickets:
2+
3+
- HCK-
4+
5+
### List of changes:
6+
7+
-
8+
9+
### Type of change:
10+
11+
Please delete options that aren't relevant.
12+
13+
- [ ] Bug fix (non-breaking change which fixes an issue)
14+
- [ ] New feature (non-breaking change which adds functionality)
15+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
16+
- [ ] This change requires a documentation update
17+
18+
### How did you do this?
19+
20+
### Why are you choosing this approach?
21+
22+
### Questions for code reviewers?
23+
24+
### PR Checklist:
25+
26+
- [ ] Merged `develop` branch (before testing)
27+
- [ ] Linted my code locally
28+
- [ ] Tested all links in project relevant browsers
29+
- [ ] Tested all links on different screen sizes
30+
- [ ] Referenced all useful info (issues, tasks, etc)

‎.gitignore

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
8+
#package-lock
9+
package-lock.json
10+
11+
# Runtime data
12+
pids
13+
*.pid
14+
*.seed
15+
*.pid.lock
16+
17+
# Directory for instrumented libs generated by jscoverage/JSCover
18+
lib-cov
19+
20+
# Coverage directory used by tools like istanbul
21+
coverage
22+
23+
# nyc test coverage
24+
.nyc_output
25+
26+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
27+
.grunt
28+
29+
# Bower dependency directory (https://bower.io/)
30+
bower_components
31+
32+
# node-waf configuration
33+
.lock-wscript
34+
35+
# Compiled binary addons (http://nodejs.org/api/addons.html)
36+
build/Release
37+
38+
# Dependency directories
39+
node_modules/
40+
jspm_packages/
41+
42+
# Typescript v1 declaration files
43+
typings/
44+
45+
# Optional npm cache directory
46+
.npm
47+
48+
# Optional eslint cache
49+
.eslintcache
50+
51+
# Optional REPL history
52+
.node_repl_history
53+
54+
# Output of 'npm pack'
55+
*.tgz
56+
57+
# dotenv environment variables file
58+
.env
59+
60+
# gatsby files
61+
.cache/
62+
public
63+
64+
# Mac files
65+
.DS_Store
66+
67+
# Yarn
68+
yarn-error.log
69+
.pnp/
70+
.pnp.js
71+
# Yarn Integrity file
72+
.yarn-integrity

‎.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.cache
2+
package.json
3+
package-lock.json
4+
public

‎.prettierrc

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"endOfLine": "lf",
3+
"semi": false,
4+
"singleQuote": false,
5+
"tabWidth": 2,
6+
"trailingComma": "es5"
7+
}

‎CONTRIBUTING.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Contributing
2+
3+
## Branches
4+
5+
- Create a new branch from `develop`
6+
- Name branches like `feature/ticket#-short-description` or `bug/ticket#-short-description`, i.e. `feature/9-styling`
7+
8+
## Commits
9+
10+
- Use imperative form when writing commit messages, i.e. "Fix margins in..."
11+
- Use sentence case (capitalize the first letter)
12+
- Try to communicate what the change does without having to look at the source code
13+
14+
## Pull Requests
15+
16+
- Name the PR with a summary of proposed changes
17+
- Complete the entire PR template
18+
- Satisfy the PR checklist before asking for review
19+
- Set `develop` as the base branch unless it's a release (then set base to `master`)
20+
- Squash commits to merge
21+
22+
## Releases
23+
24+
- Create a new branch from `develop` to merge into `master`
25+
- Name the branch like `release/version-number`, i.e. `release/1.4.0`
26+
- For version numbers, we follow [semantic versioning](https://semver.org/) with MAJOR.MINOR.PATCH.
27+
- Create a pull request to merge the release branch into `master`
28+
- Satisfy the entire PR template with a good description for reference
29+
- Add a release tag in the [releases tab](https://github.com/hackmcgill/mchacks7/releases).

‎LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 gatsbyjs
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

‎README.md

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1-
# mchacks7
2-
McHacks 7 static website
1+
# [McHacks 7](https://2020.mchacks.ca)
2+
3+
This repository contains the code behind the static site of McHacks 7.
4+
5+
[![Netlify Status](https://api.netlify.com/api/v1/badges/29fc0619-7608-47de-8105-727d647ba4aa/deploy-status)](https://app.netlify.com/sites/mchacks7/deploys)
6+
7+
## Setup
8+
9+
1. Make sure you have [node](https://nodejs.org/en/) and [yarn](https://yarnpkg.com/lang/en/) installed.
10+
2. Run `yarn global add gatsby-cli` to install Gatsby CLI locally.
11+
3. Run `yarn` to install dependencies.
12+
4. Run `gatsby develop` to start dev server! 🚀
13+
14+
## Contributing
15+
16+
See our [contributing guide](https://github.com/hackmcgill/mchacks7/blob/develop/CONTRIBUTING.md).

‎gatsby-browser.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import "./src/styles/index.css"

‎gatsby-config.js

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
module.exports = {
2+
siteMetadata: {
3+
title: `McHacks`,
4+
description: `Dream, develop, and deploy at McHacks, Canada's favourite hackathon hosted annually at McGill University.`,
5+
author: `@hackmcgill`,
6+
},
7+
plugins: [
8+
`gatsby-plugin-sass`,
9+
`gatsby-plugin-styled-components`,
10+
`gatsby-plugin-react-helmet`,
11+
{
12+
resolve: `gatsby-source-filesystem`,
13+
options: {
14+
name: `images`,
15+
path: `${__dirname}/src/images`,
16+
},
17+
},
18+
`gatsby-transformer-sharp`,
19+
`gatsby-plugin-sharp`,
20+
{
21+
resolve: `gatsby-plugin-manifest`,
22+
options: {
23+
name: `mchacks`,
24+
short_name: `mchacks`,
25+
start_url: `/`,
26+
background_color: `#ffffff`,
27+
theme_color: `#ffffff`,
28+
display: `minimal-ui`,
29+
icon: `src/images/icon.png`,
30+
},
31+
},
32+
// this (optional) plugin enables Progressive Web App + Offline functionality
33+
// To learn more, visit: https://gatsby.dev/offline
34+
// `gatsby-plugin-offline`,
35+
],
36+
}

‎gatsby-node.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* Implement Gatsby's Node APIs in this file.
3+
*
4+
* See: https://www.gatsbyjs.org/docs/node-apis/
5+
*/
6+
7+
// You can delete this file if you're not using it

‎gatsby-ssr.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* Implement Gatsby's SSR (Server Side Rendering) APIs in this file.
3+
*
4+
* See: https://www.gatsbyjs.org/docs/ssr-apis/
5+
*/
6+
7+
// You can delete this file if you're not using it

‎netlify.toml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[build]
2+
publish = "public"
3+
command = "yarn build"
4+
[build.environment]
5+
YARN_VERSION = "1.19.0"

‎package.json

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"name": "mchacks7",
3+
"private": true,
4+
"description": "McHacks website",
5+
"version": "1.0.0",
6+
"author": "HackMcGill @hackmcgill",
7+
"dependencies": {
8+
"@fortawesome/fontawesome-svg-core": "^1.2.25",
9+
"@fortawesome/free-brands-svg-icons": "^5.11.2",
10+
"@fortawesome/free-solid-svg-icons": "^5.11.2",
11+
"@fortawesome/react-fontawesome": "^0.1.7",
12+
"babel-plugin-styled-components": "^1.10.6",
13+
"gatsby": "^2.15.28",
14+
"gatsby-image": "^2.2.23",
15+
"gatsby-plugin-manifest": "^2.2.20",
16+
"gatsby-plugin-offline": "^3.0.11",
17+
"gatsby-plugin-react-helmet": "^3.1.10",
18+
"gatsby-plugin-sass": "^2.1.20",
19+
"gatsby-plugin-sharp": "^2.2.27",
20+
"gatsby-plugin-styled-components": "^3.1.8",
21+
"gatsby-source-filesystem": "^2.1.28",
22+
"gatsby-transformer-sharp": "^2.2.19",
23+
"node-sass": "^4.12.0",
24+
"prop-types": "^15.7.2",
25+
"react": "^16.10.1",
26+
"react-dom": "^16.10.1",
27+
"react-hamburger-menu": "^1.1.1",
28+
"react-helmet": "^5.2.1",
29+
"styled-components": "^4.4.0"
30+
},
31+
"devDependencies": {
32+
"prettier": "^1.18.2"
33+
},
34+
"keywords": [
35+
"gatsby"
36+
],
37+
"license": "MIT",
38+
"scripts": {
39+
"build": "gatsby build",
40+
"develop": "gatsby develop",
41+
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
42+
"start": "npm run develop",
43+
"serve": "gatsby serve",
44+
"test": "echo \"Write tests! -> https://gatsby.dev/unit-testing \""
45+
},
46+
"repository": {
47+
"type": "git",
48+
"url": "https://github.com/gatsbyjs/gatsby-starter-default"
49+
},
50+
"bugs": {
51+
"url": "https://github.com/gatsbyjs/gatsby/issues"
52+
}
53+
}

‎src/components/about.js

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import React from "react"
2+
3+
import AboutImg from "../images/about.svg"
4+
import * as Styles from "../styles/components/index.js"
5+
6+
const About = () => (
7+
<Styles.About>
8+
<Styles.AboutContent>
9+
<Styles.AboutText>
10+
<h2>Behind Canada’s original collegiate hackathon</h2>
11+
<p>
12+
McHacks isn't your typical hackathon, and our hackers aren't either!
13+
For 24 hours, over 500 of the boldest young minds in North America
14+
come together for a weekend of beginner-to-pro workshops, decked-out
15+
hardware, delicious food, and some epic hacking.
16+
<br />
17+
<br />
18+
Whether you're writing your first line of code, playing around with
19+
APIs, or building the next blockchain, McHacks has everything setup
20+
for your next big hack. We hope you'll join us this winter as we jump
21+
into another round of Canada's favourite hackathon!
22+
</p>
23+
</Styles.AboutText>
24+
<Styles.AboutImg src={AboutImg} />
25+
</Styles.AboutContent>
26+
</Styles.About>
27+
)
28+
29+
export default About

‎src/components/footer.js

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import React from "react"
2+
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
3+
import { faEnvelope } from "@fortawesome/free-solid-svg-icons"
4+
import {
5+
faTwitter,
6+
faFacebookSquare,
7+
faInstagram,
8+
} from "@fortawesome/free-brands-svg-icons"
9+
10+
import * as Styles from "../styles/components/nav.js"
11+
12+
const Footer = () => (
13+
<Styles.Footer>
14+
<Styles.FooterLinks>
15+
{/* TODO
16+
<Styles.FooterLink>
17+
Code of Conduct
18+
</Styles.FooterLink>
19+
<Styles.FooterLink>
20+
Press Kit
21+
</Styles.FooterLink>
22+
<Styles.FooterLink>
23+
Privacy Policy
24+
</Styles.FooterLink>
25+
*/}
26+
</Styles.FooterLinks>
27+
28+
<Styles.FooterLinksSocial>
29+
<Styles.FooterLinkSocial></Styles.FooterLinkSocial>
30+
<Styles.FooterLinkSocial
31+
href="mailto:[email protected]?Subject=Hello!"
32+
target="_blank"
33+
>
34+
<FontAwesomeIcon icon={faEnvelope} />
35+
</Styles.FooterLinkSocial>
36+
<Styles.FooterLinkSocial href="https://fb.com/mcgillhacks">
37+
<FontAwesomeIcon icon={faFacebookSquare} />
38+
</Styles.FooterLinkSocial>
39+
<Styles.FooterLinkSocial href="https://twitter.com/mcgillhacks">
40+
<FontAwesomeIcon icon={faTwitter} />
41+
</Styles.FooterLinkSocial>
42+
<Styles.FooterLinkSocial href="https://instagram.com/mcgillhacks">
43+
<FontAwesomeIcon icon={faInstagram} />
44+
</Styles.FooterLinkSocial>
45+
</Styles.FooterLinksSocial>
46+
</Styles.Footer>
47+
)
48+
49+
export default Footer

0 commit comments

Comments
 (0)