Skip to content

Commit

Permalink
Release/1.0.0 (#17)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
loreina authored Oct 23, 2019
1 parent 3d95f11 commit 372995b
Show file tree
Hide file tree
Showing 45 changed files with 15,279 additions and 2 deletions.
30 changes: 30 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
### Tickets:

- HCK-

### List of changes:

-

### Type of change:

Please delete options that aren't relevant.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

### How did you do this?

### Why are you choosing this approach?

### Questions for code reviewers?

### PR Checklist:

- [ ] Merged `develop` branch (before testing)
- [ ] Linted my code locally
- [ ] Tested all links in project relevant browsers
- [ ] Tested all links on different screen sizes
- [ ] Referenced all useful info (issues, tasks, etc)
72 changes: 72 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

#package-lock
package-lock.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# dotenv environment variables file
.env

# gatsby files
.cache/
public

# Mac files
.DS_Store

# Yarn
yarn-error.log
.pnp/
.pnp.js
# Yarn Integrity file
.yarn-integrity
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.cache
package.json
package-lock.json
public
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"endOfLine": "lf",
"semi": false,
"singleQuote": false,
"tabWidth": 2,
"trailingComma": "es5"
}
29 changes: 29 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Contributing

## Branches

- Create a new branch from `develop`
- Name branches like `feature/ticket#-short-description` or `bug/ticket#-short-description`, i.e. `feature/9-styling`

## Commits

- Use imperative form when writing commit messages, i.e. "Fix margins in..."
- Use sentence case (capitalize the first letter)
- Try to communicate what the change does without having to look at the source code

## Pull Requests

- Name the PR with a summary of proposed changes
- Complete the entire PR template
- Satisfy the PR checklist before asking for review
- Set `develop` as the base branch unless it's a release (then set base to `master`)
- Squash commits to merge

## Releases

- Create a new branch from `develop` to merge into `master`
- Name the branch like `release/version-number`, i.e. `release/1.4.0`
- For version numbers, we follow [semantic versioning](https://semver.org/) with MAJOR.MINOR.PATCH.
- Create a pull request to merge the release branch into `master`
- Satisfy the entire PR template with a good description for reference
- Add a release tag in the [releases tab](https://github.com/hackmcgill/mchacks7/releases).
22 changes: 22 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015 gatsbyjs

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
# mchacks7
McHacks 7 static website
# [McHacks 7](https://2020.mchacks.ca)

This repository contains the code behind the static site of McHacks 7.

[![Netlify Status](https://api.netlify.com/api/v1/badges/29fc0619-7608-47de-8105-727d647ba4aa/deploy-status)](https://app.netlify.com/sites/mchacks7/deploys)

## Setup

1. Make sure you have [node](https://nodejs.org/en/) and [yarn](https://yarnpkg.com/lang/en/) installed.
2. Run `yarn global add gatsby-cli` to install Gatsby CLI locally.
3. Run `yarn` to install dependencies.
4. Run `gatsby develop` to start dev server! 🚀

## Contributing

See our [contributing guide](https://github.com/hackmcgill/mchacks7/blob/develop/CONTRIBUTING.md).
1 change: 1 addition & 0 deletions gatsby-browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import "./src/styles/index.css"
36 changes: 36 additions & 0 deletions gatsby-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
module.exports = {
siteMetadata: {
title: `McHacks`,
description: `Dream, develop, and deploy at McHacks, Canada's favourite hackathon hosted annually at McGill University.`,
author: `@hackmcgill`,
},
plugins: [
`gatsby-plugin-sass`,
`gatsby-plugin-styled-components`,
`gatsby-plugin-react-helmet`,
{
resolve: `gatsby-source-filesystem`,
options: {
name: `images`,
path: `${__dirname}/src/images`,
},
},
`gatsby-transformer-sharp`,
`gatsby-plugin-sharp`,
{
resolve: `gatsby-plugin-manifest`,
options: {
name: `mchacks`,
short_name: `mchacks`,
start_url: `/`,
background_color: `#ffffff`,
theme_color: `#ffffff`,
display: `minimal-ui`,
icon: `src/images/icon.png`,
},
},
// this (optional) plugin enables Progressive Web App + Offline functionality
// To learn more, visit: https://gatsby.dev/offline
// `gatsby-plugin-offline`,
],
}
7 changes: 7 additions & 0 deletions gatsby-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Implement Gatsby's Node APIs in this file.
*
* See: https://www.gatsbyjs.org/docs/node-apis/
*/

// You can delete this file if you're not using it
7 changes: 7 additions & 0 deletions gatsby-ssr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Implement Gatsby's SSR (Server Side Rendering) APIs in this file.
*
* See: https://www.gatsbyjs.org/docs/ssr-apis/
*/

// You can delete this file if you're not using it
5 changes: 5 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[build]
publish = "public"
command = "yarn build"
[build.environment]
YARN_VERSION = "1.19.0"
53 changes: 53 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"name": "mchacks7",
"private": true,
"description": "McHacks website",
"version": "1.0.0",
"author": "HackMcGill @hackmcgill",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-brands-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"@fortawesome/react-fontawesome": "^0.1.7",
"babel-plugin-styled-components": "^1.10.6",
"gatsby": "^2.15.28",
"gatsby-image": "^2.2.23",
"gatsby-plugin-manifest": "^2.2.20",
"gatsby-plugin-offline": "^3.0.11",
"gatsby-plugin-react-helmet": "^3.1.10",
"gatsby-plugin-sass": "^2.1.20",
"gatsby-plugin-sharp": "^2.2.27",
"gatsby-plugin-styled-components": "^3.1.8",
"gatsby-source-filesystem": "^2.1.28",
"gatsby-transformer-sharp": "^2.2.19",
"node-sass": "^4.12.0",
"prop-types": "^15.7.2",
"react": "^16.10.1",
"react-dom": "^16.10.1",
"react-hamburger-menu": "^1.1.1",
"react-helmet": "^5.2.1",
"styled-components": "^4.4.0"
},
"devDependencies": {
"prettier": "^1.18.2"
},
"keywords": [
"gatsby"
],
"license": "MIT",
"scripts": {
"build": "gatsby build",
"develop": "gatsby develop",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"start": "npm run develop",
"serve": "gatsby serve",
"test": "echo \"Write tests! -> https://gatsby.dev/unit-testing \""
},
"repository": {
"type": "git",
"url": "https://github.com/gatsbyjs/gatsby-starter-default"
},
"bugs": {
"url": "https://github.com/gatsbyjs/gatsby/issues"
}
}
29 changes: 29 additions & 0 deletions src/components/about.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import React from "react"

import AboutImg from "../images/about.svg"
import * as Styles from "../styles/components/index.js"

const About = () => (
<Styles.About>
<Styles.AboutContent>
<Styles.AboutText>
<h2>Behind Canada’s original collegiate hackathon</h2>
<p>
McHacks isn't your typical hackathon, and our hackers aren't either!
For 24 hours, over 500 of the boldest young minds in North America
come together for a weekend of beginner-to-pro workshops, decked-out
hardware, delicious food, and some epic hacking.
<br />
<br />
Whether you're writing your first line of code, playing around with
APIs, or building the next blockchain, McHacks has everything setup
for your next big hack. We hope you'll join us this winter as we jump
into another round of Canada's favourite hackathon!
</p>
</Styles.AboutText>
<Styles.AboutImg src={AboutImg} />
</Styles.AboutContent>
</Styles.About>
)

export default About
49 changes: 49 additions & 0 deletions src/components/footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from "react"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { faEnvelope } from "@fortawesome/free-solid-svg-icons"
import {
faTwitter,
faFacebookSquare,
faInstagram,
} from "@fortawesome/free-brands-svg-icons"

import * as Styles from "../styles/components/nav.js"

const Footer = () => (
<Styles.Footer>
<Styles.FooterLinks>
{/* TODO
<Styles.FooterLink>
Code of Conduct
</Styles.FooterLink>
<Styles.FooterLink>
Press Kit
</Styles.FooterLink>
<Styles.FooterLink>
Privacy Policy
</Styles.FooterLink>
*/}
</Styles.FooterLinks>

<Styles.FooterLinksSocial>
<Styles.FooterLinkSocial></Styles.FooterLinkSocial>
<Styles.FooterLinkSocial
href="mailto:[email protected]?Subject=Hello!"
target="_blank"
>
<FontAwesomeIcon icon={faEnvelope} />
</Styles.FooterLinkSocial>
<Styles.FooterLinkSocial href="https://fb.com/mcgillhacks">
<FontAwesomeIcon icon={faFacebookSquare} />
</Styles.FooterLinkSocial>
<Styles.FooterLinkSocial href="https://twitter.com/mcgillhacks">
<FontAwesomeIcon icon={faTwitter} />
</Styles.FooterLinkSocial>
<Styles.FooterLinkSocial href="https://instagram.com/mcgillhacks">
<FontAwesomeIcon icon={faInstagram} />
</Styles.FooterLinkSocial>
</Styles.FooterLinksSocial>
</Styles.Footer>
)

export default Footer
Loading

0 comments on commit 372995b

Please sign in to comment.