Skip to content

Commit

Permalink
Site cleanup (#259)
Browse files Browse the repository at this point in the history
* Change back to 2019 dates

* Remove mchacks7 sponsorship package

* Revert sponsor page to 2019 one

* Update URL

* Add 2020 link to navbar

* Delete package-lock.json

* Bump version to 1.0.0

* Revert "Delete package-lock.json"

This reverts commit a2a5adc.

* Update README

* Fix #99

* Add 2020 link to hamburger menu

* Add projects link to hero
  • Loading branch information
loreina authored Oct 25, 2019
1 parent 4d3c37a commit 7e6b78e
Show file tree
Hide file tree
Showing 14 changed files with 675 additions and 688 deletions.
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# [mchacks6](https://2019.mchacks.ca)

![McHacks logo](https://raw.githubusercontent.com/hackmcgill/mchacks6/master/src/static/mchacks.png?s=200)

[![Netlify Status](https://api.netlify.com/api/v1/badges/e8bad70c-dd5e-4c44-85d3-0bc059b9737e/deploy-status)](https://app.netlify.com/sites/mchacks6/deploys)

This is the repository for the static landing page for [McHacks 6](https://www.mchacks.ca). Code based upon [boilerplate here](https://github.com/erickzhao/static-html-webpack-boilerplate).
This is the repository for the static landing page for [McHacks 6](https://www.2019.mchacks.ca). Code based upon [boilerplate here](https://github.com/erickzhao/static-html-webpack-boilerplate).

## Setup
1. Make sure you have [node](https://nodejs.org/en/) and [yarn](https://yarnpkg.com/lang/en/) installed.
Expand All @@ -27,10 +29,12 @@ This is the repository for the static landing page for [McHacks 6](https://www.m

## Deployment

We are using Netlify to compile and host our code automatically. When a PR is created, Netlify will generate preview builds of the site to confirm that everything is working as expected. Once code is merged to `master`, Netlify will promote that code to production at `2019.mchacks.ca`. Netlify also handles the SSL certificate for this site. @krubenok is currently the admin on the Netlify plan.
We are using Netlify to compile and host our code automatically. When a PR is created, Netlify will generate preview builds of the site to confirm that everything is working as expected. Once code is merged to `master`, Netlify will promote that code to production at `2019.mchacks.ca`. Netlify also handles the SSL certificate for this site.

### Domains

The primary domain for this site (`mchacks.ca`) is registered with the HackMcGill Namecheap, DNS is with Cloudflare. Currently, the naked `mchacks.ca` and `2019.mchacks.ca` have CNAME records pointing to `mchacks6.netlify.com`
The primary domain for this site `mchacks.ca` is registered with the HackMcGill Namecheap and DNS is with Cloudflare. The secondary domain `mchacks.io` is registered with Cloudflare. `2019.mchacks.ca` and `2019.mchacks.io` have CNAME records pointing to `mchacks6.netlify.com`.

## Status

We also have a secondary set of domains, `mchcaks.io` and `2019.mchacks.io` pointing to `mchacks6.netlify.com` via CNAME as above. `mchacks.io` is also registered with Namecheap and the DNS with Cloudflare.
This repository is pseudo-archived for the purposes of McHacks 6.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mchacks6",
"version": "0.0.0",
"version": "1.0.0",
"description": "Website for McHacks 6",
"main": "index.js",
"scripts": {
Expand Down
12 changes: 8 additions & 4 deletions src/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -22,7 +22,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down Expand Up @@ -85,7 +85,9 @@
<a class="navbar__nav-item navbar__link" href="https://2018.mchacks.ca" target="_blank">
2018
</a>
<a class="navbar__nav-item navbar__button" href="https://app.mchacks.ca">Apply →</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</div>
<button class="hamburger hamburger--elastic" type="button">
<span class="hamburger-box">
Expand All @@ -108,7 +110,9 @@
2018
</a>
<br><br>
<a href="https://app.mchacks.ca">Apply</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</button>
</nav>
<div class="not-found__wrapper">
Expand Down
4 changes: 2 additions & 2 deletions src/apply.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<title>Apply | McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -24,7 +24,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down
12 changes: 8 additions & 4 deletions src/code-of-conduct.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>Code of Conduct | McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -22,7 +22,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down Expand Up @@ -85,7 +85,9 @@
<a class="navbar__nav-item navbar__link" href="https://2018.mchacks.ca" target="_blank">
2018
</a>
<a class="navbar__nav-item navbar__button" href="https://app.mchacks.ca">Apply →</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</div>
<button class="hamburger hamburger--elastic" type="button">
<span class="hamburger-box">
Expand All @@ -108,7 +110,9 @@
2018
</a>
<br><br>
<a href="https://app.mchacks.ca">Apply</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</button>
</nav>
<div class="code-of-conduct__wrapper">
Expand Down
23 changes: 16 additions & 7 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -22,7 +22,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down Expand Up @@ -91,6 +91,9 @@
<a class="navbar__nav-item navbar__link" href="https://2018.mchacks.ca" target="_blank">
2018
</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</div>
<button class="hamburger hamburger--elastic" type="button">
<span class="hamburger-box">
Expand All @@ -113,17 +116,23 @@
2018
</a>
<br><br>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</button>
</nav>
<section class="hero">
<div class="hero__copy">
<h1 class="hero__heading">Create, build, and play @
<em>McHacks</em>
</h1>
<p class="hero__subheading">Montreal, Canada - February 1-2, 2020</p>
<p class="hero__cta">Join us for an epic weekend at Canada's favourite hackathon.</p>
<p class="hero__email">Sign up for updates about McHacks. No spam, we promise.</p>
<div id="mc_embed_signup">
<p class="hero__subheading">Montreal, Canada - February 2-3, 2019</p>
<p class="hero__cta">Thanks for joining us for an epic weekend at Canada's favourite hackathon! 👋</p>
<div class="hero__button-holder">
<a class="hero__button" href="https://mchacks6.devpost.com">View projects →</a>
</div>
<!-- <p class="hero__email">Sign up for updates about McHacks. No spam, we promise.</p> -->
<!-- <div id="mc_embed_signup">
<form action="https://mchacks.us12.list-manage.com/subscribe/post?u=daca896c9229eac78a0cc3810&amp;id=a5a34f6561"
method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate"
target="_blank" novalidate>
Expand Down Expand Up @@ -161,7 +170,7 @@ <h1 class="hero__heading">Create, build, and play @
ftypes[4] = 'phone';
}(jQuery));
var $mcj = jQuery.noConflict(true);
</script>
</script> -->
</div>
</div>
<div id="motionPath">
Expand Down
6 changes: 3 additions & 3 deletions src/live.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -22,7 +22,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down Expand Up @@ -85,7 +85,7 @@
<a class="navbar__nav-item navbar__link" href="#resources">
Resources
</a>
<a class="navbar__nav-item navbar__button" href="https://mchacks.ca">
<a class="navbar__nav-item navbar__button" href="https://2019.mchacks.ca">
Home →
</a>
</div>
Expand Down
12 changes: 8 additions & 4 deletions src/privacy.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>Privacy Policy | McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -22,7 +22,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down Expand Up @@ -85,7 +85,9 @@
<a class="navbar__nav-item navbar__link" href="https://2018.mchacks.ca" target="_blank">
2018
</a>
<a class="navbar__nav-item navbar__button" href="https://app.mchacks.ca">Apply →</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</div>
<button class="hamburger hamburger--elastic" type="button">
<span class="hamburger-box">
Expand All @@ -108,7 +110,9 @@
2018
</a>
<br><br>
<a href="https://app.mchacks.ca">Apply</a>
<a class="navbar__nav-item navbar__link" href="https://2020.mchacks.ca" target="_blank">
2020
</a>
</button>
</nav>
<div class="privacy__wrapper">
Expand Down
4 changes: 2 additions & 2 deletions src/promo.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<title>Apply | McHacks</title>

<meta property="og:title" content="McHacks" />
<meta property="og:url" content="https://mchacks.ca" />
<meta property="og:url" content="https://2019.mchacks.ca" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="McHacks" />
<meta property="og:description" content="Create, build, and play with us at McHacks, Canada's favourite hackathon,
Expand All @@ -25,7 +25,7 @@
hosted at McGill University." />
<meta name="twitter:creator" content="@mcgillhacks">
<meta name="twitter:image" content="static/mchacks-og.png">
<meta name="twitter:domain" content="https://mchacks.ca">
<meta name="twitter:domain" content="https://2019.mchacks.ca">
<meta name="twitter:site" content="@mcgillhacks">

<link rel="apple-touch-icon" sizes="57x57" href="static/favicon/apple-touch-icon-57x57.png" />
Expand Down
Loading

0 comments on commit 7e6b78e

Please sign in to comment.