Skip to content

Commit 57b3ab6

Browse files
dangerwormdangerworm
authored
Merge pull request #47 from cowlingj/master
Add Jonathan to people page and make edits to people page easier
2 parents c7c6440 + 649c463 commit 57b3ab6

File tree

9 files changed

+139
-12
lines changed

9 files changed

+139
-12
lines changed

‎Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM ruby:2.7.1
2+
RUN mkdir /app
3+
WORKDIR /app
4+
COPY Gemfile /app/Gemfile
5+
COPY Gemfile.lock /app/Gemfile.lock
6+
7+
RUN bundle config set deployment true
8+
RUN bundle install --jobs=4
9+
10+
COPY . /app
11+
12+
EXPOSE 3000
13+
14+
ENTRYPOINT [ "bundle" ]
15+
16+
CMD [ "exec", "jekyll", "serve", "--drafts", "-H", "0.0.0.0", "-P", "3000" ]

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source "https://rubygems.org"
55

66
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
77

8-
gem 'github-pages', group: :jekyll_plugins
8+
gem 'github-pages', group: :jekyll_plugins

‎Gemfile.lock‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ GEM
2525
ethon (0.12.0)
2626
ffi (>= 1.3.0)
2727
eventmachine (1.2.7)
28-
eventmachine (1.2.7-x64-mingw32)
2928
execjs (2.7.0)
3029
faraday (1.0.1)
3130
multipart-post (>= 1.2, < 3)
3231
ffi (1.13.1)
33-
ffi (1.13.1-x64-mingw32)
3432
forwardable-extended (2.6.0)
3533
gemoji (3.0.1)
3634
github-pages (207)
@@ -212,8 +210,6 @@ GEM
212210
multipart-post (2.1.1)
213211
nokogiri (1.10.10)
214212
mini_portile2 (~> 2.4.0)
215-
nokogiri (1.10.10-x64-mingw32)
216-
mini_portile2 (~> 2.4.0)
217213
octokit (4.18.0)
218214
faraday (>= 0.9)
219215
sawyer (~> 0.8.0, >= 0.5.3)
@@ -249,13 +245,11 @@ GEM
249245
unf (0.1.4)
250246
unf_ext
251247
unf_ext (0.0.7.7)
252-
unf_ext (0.0.7.7-x64-mingw32)
253248
unicode-display_width (1.7.0)
254249
zeitwerk (2.4.0)
255250

256251
PLATFORMS
257252
ruby
258-
x64-mingw32
259253

260254
DEPENDENCIES
261255
github-pages

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ Jeykll has functionality to include files, which this site makes extensive use o
7676
## To add yourself to the people page
7777

7878
* Create a branch
79-
* Make a copy of one of the existing bios in *pages-people*
80-
* Name it using the convention people-*yourname*
79+
* Make a copy of one of the existing bios in *_data/people/*
80+
* Name it using the convention *yourname*
8181
* Modify to be your bio including
8282
* Photograph
8383
* Information paragraph
@@ -86,9 +86,6 @@ Jeykll has functionality to include files, which this site makes extensive use o
8686

8787
If you need any help, contact one of the pople who have already added themselves.
8888

89-
Copy the includes code `<br />
90-
{% include_relative pages-people/people-yourname.html %}` to the bottom of people.html (ensure you update the file name)
91-
9289
## Sitemap
9390
All pages not defined as a default in _config.yml are added to the sitemap
9491

‎_data/people/jonathan.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
first_name: "Jonathan"
2+
last_name: "Cowling"
3+
anchor: "jonathan-cowling"
4+
photo: "jonathan-profile-photo.jpg"
5+
roles: "Mentor"
6+
twitter_handle: "_cowlingj_"
7+
description_paragraphs:
8+
- >
9+
Jonathan is an Associate Consultant at Infinity Works after recently graduating from the University of Manchester.
10+
His love of code stems from a keen interest in peering behind the curtain to see how things work (or don't).
11+
- >
12+
Most of the projects he's working on now use JavaScript,
13+
but Jonathan has experience in a bunch of different areas including Android development.
14+
- >
15+
Aside from the many projects he tinkers with, Jonathan enjoys playing Dungeons and Dragons in his spare time.
16+
17+
languages:
18+
- Javascript
19+
- Typescript
20+
- Bash
21+
- Python
22+
- Java
23+
- HTML
24+
- CSS
25+
26+
technologies:
27+
- JSON
28+
- Linux
29+
- Kubernetes
30+
- NodeJS
31+
- React
32+
- Vue
33+
- Express
34+
- Jest
35+
36+
tools:
37+
- Git
38+
- GitHub
39+
- VS Code
40+
- Docker

‎_includes/person.html‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<a name="{{ include.person.anchor }}"></a>
2+
<div class="row person-blurb">
3+
<div class="col-md-4 col-lg-5 col-xl-3">
4+
<div class="mb-2 box-shadow text-center">
5+
<img class="profile-photo" src="./images/{{ include.person.photo | default: 'keyboard-green.png' }}" />
6+
</div>
7+
<div class="col-12 text-center">
8+
<h4>{{ include.person.first_name }} {{ include.person.last_name }}</h4>
9+
</div>
10+
</div>
11+
<div class="col-md-8 col-lg-6">
12+
<div class="row">
13+
<div class="col col-md-6">
14+
<p class="text-muted no-margin">{{ include.person.roles }}</p>
15+
</div>
16+
{% if include.person.twitter_handle %}
17+
<div class="col-md-6 twitter-mention-container text-right">
18+
<a href="https://twitter.com/intent/tweet?screen_name={{include.person.twitter_handle}}" class="twitter-mention-button"
19+
data-show-count="false">
20+
Tweet to @{{ include.person.twitter_handle }}
21+
</a>
22+
</div>
23+
{% endif %}
24+
</div>
25+
<div class="row">
26+
<div class="col-md-12">
27+
{% for paragraph in include.person.description_paragraphs %}
28+
<p>
29+
{{ paragraph }}
30+
</p>
31+
{% endfor %}
32+
</div>
33+
</div>
34+
</div>
35+
<div class="col-lg-12 col-xl-3 skills">
36+
<div class="row">
37+
<div class="col-12">
38+
<h5>{{ include.person.first_name }} can help with...</h5>
39+
</div>
40+
<div class="col-md-4 col-lg-12">
41+
<!-- <h6>Languages</h6> -->
42+
<p>
43+
{% for language in include.person.languages %}
44+
<span class="badge badge-secondary">{{ language }}</span>
45+
{% endfor %}
46+
</p>
47+
</div>
48+
<div class="col-md-4 col-lg-12">
49+
<!-- <h6>Technologies</h6> -->
50+
<p>
51+
{% for technology in include.person.technologies %}
52+
<span class="badge badge-secondary">{{ technology }}</span>
53+
{% endfor %}
54+
</p>
55+
</div>
56+
<div class="col-md-4 col-lg-12">
57+
<!-- <h6>Tools</h6> -->
58+
<p>
59+
{% for tool in include.person.tools %}
60+
<span class="badge badge-secondary">{{ tool }}</span>
61+
{% endfor %}
62+
</p>
63+
</div>
64+
</div>
65+
</div>
66+
</div>

‎docker/bundle.Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM ruby:2.7.1
2+
RUN mkdir /app
3+
WORKDIR /app
4+
COPY Gemfile /app/Gemfile
5+
6+
ENTRYPOINT [ "bundle" ]

‎images/jonathan-profile-photo.jpg‎

58.1 KB
Loading

‎people.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
- Drew,
55
- Keiran,
66
- Jim,
7+
- Jonathan,
78
- Liz,
89
- Sean,
10+
- Simon,
911
- Us
1012
title: People
1113
---
@@ -24,3 +26,9 @@ <h1>{{page.title}}</h1>
2426
{% include_relative pages-people/people-sean.html %}
2527
<br />
2628
{% include_relative pages-people/people-simon.html %}
29+
30+
{% for person_hash in site.data.people %}
31+
{% assign person = person_hash[1] %}
32+
<br />
33+
{% include_relative _includes/person.html person=person %}
34+
{% endfor %}

0 commit comments

Comments
 (0)