Skip to content

Commit c4dc6fd

Browse files
authored
Merge pull request #53 from jennydaman/master
Fall 2019
2 parents 96d8516 + e8c87cd commit c4dc6fd

File tree

8 files changed

+29
-11
lines changed

8 files changed

+29
-11
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.DS_Store
22
run_server.sh
33
.sass-cache/*
4-
_site/*
4+
_site/
5+
.idea/

CNAME

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
hacks.io
1+
nuhacks.io

Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM jekyll/jekyll
2+
3+
COPY Gemfile .
4+
COPY Gemfile.lock .
5+
6+
RUN bundle install --quiet --clean
7+
8+
CMD ["jekyll", "serve"]

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ DEPENDENCIES
259259
tzinfo-data
260260

261261
RUBY VERSION
262-
ruby 2.4.1p111
262+
ruby 2.6.4p104
263263

264264
BUNDLED WITH
265-
1.17.1
265+
1.17.3

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ NU Hacks
33

44
The website for NUHacks, a Northeastern University student organization for hackers and makers.
55

6-
Hosted at: http://hacks.io
6+
## Local Server
7+
8+
```bash
9+
# 1. build image
10+
docker build -t nuhacks $PWD
11+
# 2. start container for the first time (use `-it` instead of `-p` for process to ocupy terminal)
12+
docker run --rm -it -p 4000:4000 --name nuhacks -v $PWD:/srv/jekyll nuhacks
13+
```
714

815
## Adding new announcments
916
Create a new `.md` file that's descriptive of your announcement in `_announcements/`.

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# in the templates via {{ site.myvariable }}.
33

44
title: NU Hacks
5-
email: nuhacksboard@gmail.com
5+
email: eboard@nuhacks.io
66
description: The website for NUHacks, a Northeastern University student organization for hackers and makers.
77
baseurl: "" # the subpath of your site, e.g. /blog
8-
url: "http://hacks.io"
8+
url: "https://nuhacks.io"
99
twitter_username: NUHacks
1010
github_username: hacks
1111
github_repo: hacks/hacks.github.io

_data/mentors.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
- name: Jacob Aronoff
22
blurb: I like hacking at hacks
3-
- name: Trey Del Bonis
4-
blurb: I like Linux, Bitcoin, Rust, and Minecraft.
3+
- name: Jennings Zhang
4+
blurb: I like cyber-security, linux, and bio. Free rants!
5+
- name: Nat Hsu
6+
blurb: I like illustrating stuff, and I am a boba fanatic.

_layouts/home.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<img src="/assets/img/hacktopus-web.png" id="hacktopus" alt="Hacktopus Logo">
1111
<h1>If you like making, breaking, hacking, designing, building, and other creative-type things, you should hang with us.</h1>
1212
<p>Thursdays 20:30&mdash;00:00 at
13-
<a href="https://goo.gl/maps/UTf6rc2RLaT2" target="_blank">Ell Hall 411</a>
13+
<a href="https://www.khoury.northeastern.edu/directions-and-parking/" target="_blank">West Village H, room 366</a>
1414
</p>
1515
<p>Read our <a href="/conduct">Code of Conduct</a></p>
1616

@@ -34,7 +34,7 @@ <h2>Need help? Ask our mentors!</h2>
3434
This whole capture ordeal is because we are including a markdown file inside html.
3535
{% endcomment %}
3636
{{ mentors | markdownify }}
37-
<h3>Want a full list? Click <a href="http://mentors.hacks.io/">here</a>!</h3>
37+
<h3>Want a full list? Click <a href="http://mentors.nuhacks.io/">here</a>!</h3>
3838
</aside>
3939
</div>
4040

0 commit comments

Comments
 (0)