Skip to content

Commit 31e0807

Browse files
dangerwormdangerworm
authored
Merge pull request #50 from CodeWithGroup/feature/add-simon
Feature/add simon
2 parents 01ee68f + 5fdb6a6 commit 31e0807

File tree

11 files changed

+94
-9
lines changed

11 files changed

+94
-9
lines changed

‎Gemfile.lock‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ GEM
2424
http_parser.rb (~> 0.6.0)
2525
ethon (0.12.0)
2626
ffi (>= 1.3.0)
27+
eventmachine (1.2.7)
2728
eventmachine (1.2.7-x64-mingw32)
2829
execjs (2.7.0)
2930
faraday (1.0.1)
3031
multipart-post (>= 1.2, < 3)
32+
ffi (1.13.1)
3133
ffi (1.13.1-x64-mingw32)
3234
forwardable-extended (2.6.0)
3335
gemoji (3.0.1)
@@ -208,6 +210,8 @@ GEM
208210
jekyll-seo-tag (~> 2.1)
209211
minitest (5.14.2)
210212
multipart-post (2.1.1)
213+
nokogiri (1.10.10)
214+
mini_portile2 (~> 2.4.0)
211215
nokogiri (1.10.10-x64-mingw32)
212216
mini_portile2 (~> 2.4.0)
213217
octokit (4.18.0)
@@ -244,11 +248,13 @@ GEM
244248
thread_safe (~> 0.1)
245249
unf (0.1.4)
246250
unf_ext
251+
unf_ext (0.0.7.7)
247252
unf_ext (0.0.7.7-x64-mingw32)
248253
unicode-display_width (1.7.0)
249254
zeitwerk (2.4.0)
250255

251256
PLATFORMS
257+
ruby
252258
x64-mingw32
253259

254260
DEPENDENCIES

‎README.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,21 @@ Quoted from https://jekyllrb.com/docs/
4343

4444
## Jekyll setup
4545

46-
Use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
46+
If you're familiar with Ruby gems, run the following:
47+
48+
`gem install bundle`
49+
50+
`gem install jekyll`
51+
52+
If this is your first time using Ruby or gems, use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
4753

4854
## Building the site
4955

50-
Open a command line in the root directory of the repository
56+
Open a command line in the root directory of the repository.
57+
58+
If this is the first time you have built the site, make sure you have run `bundle pack` before attempting to build the site using jekyll.
5159

52-
Run `bundle exec jekyll build` to build the site, this will produce a `_site` folder with the required content
60+
Otherwise, run `bundle exec jekyll build` to build the site, this will produce a `_site` folder with the required content.
5361

5462
>:Warning: do not edit anything in the site folder as it will not be comitted and is overwritten everytime you build the site.
5563

‎about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h4><a href="people.html#jim-evans">Jim Evans</a></h4>
6060
<img class="profile-photo" src="images/simon-profile-photo.png">
6161
<br />
6262
<h4>Simon Davey</h4>
63-
<smaller>Equity Officer</smaller>
63+
<smaller>Interim Equity Officer</smaller>
6464
</div>
6565
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
6666
<img class="profile-photo" src="images/sean-profile-photo.png">

‎activities.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- CSSTricks,
88
- FreeCodeCamp,
99
- git,
10-
- Javascript,
10+
- JavaScript,
1111
- Udemy,
1212
- #100DaysOfCode,
1313
- AdventOfCode,

‎images/simon-profile-photo.png‎

131 KB
Loading

‎pages-people/people-drew.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h5>Drew can help with...</h5>
5050
<span class="badge badge-secondary">CSS</span>
5151
<span class="badge badge-secondary">HTML</span>
5252
<span class="badge badge-secondary">Java</span>
53-
<span class="badge badge-secondary">Javascript</span>
53+
<span class="badge badge-secondary">JavaScript</span>
5454
<span class="badge badge-secondary">jQuery</span>
5555
<span class="badge badge-secondary">Neo4J</span>
5656
<span class="badge badge-secondary">Python</span>

‎pages-people/people-jim.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h5>Jim can help with...</h5>
4848
<span class="badge badge-secondary">PHP</span>
4949
<span class="badge badge-secondary">CSS</span>
5050
<span class="badge badge-secondary">HTML</span>
51-
<span class="badge badge-secondary">Javascript</span>
51+
<span class="badge badge-secondary">JavaScript</span>
5252
<span class="badge badge-secondary">jQuery</span>
5353
<span class="badge badge-secondary">Bootstrap</span>
5454
<span class="badge badge-secondary">SQL</span>

‎pages-people/people-keiran.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h5>Keiran can help with...</h5>
5252
<span class="badge badge-secondary">CSS</span>
5353
<span class="badge badge-secondary">HTML</span>
5454
<span class="badge badge-secondary">Java</span>
55-
<span class="badge badge-secondary">Javascript</span>
55+
<span class="badge badge-secondary">JavaScript</span>
5656
<span class="badge badge-secondary">jQuery</span>
5757
<span class="badge badge-secondary">php</span>
5858
<span class="badge badge-secondary">Python</span>

‎pages-people/people-sean.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ <h5>Sean can help with...</h5>
6969
<span class="badge badge-secondary">VS Code</span>
7070
<span class="badge badge-secondary">Postman</span>
7171
<span class="badge badge-secondary">OBS</span>
72-
<span class="badge badge-secondary">VS Code</span>
7372
</p>
7473
</div>
7574
</div>

‎pages-people/people-simon.html‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<a name="simon-davey"></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/simon-profile-photo.png" alt="Simon Davey's profile picture" />
6+
</div>
7+
<div class="col-12 text-center">
8+
<h4>Simon Davey</h4>
9+
</div>
10+
</div>
11+
<div class="col-md-8 col-lg-6">
12+
<div class="row">
13+
<div class="col col-md-12">
14+
<p class="text-muted no-margin">Mentor, Interim Equity Officer</p>
15+
</div>
16+
</div>
17+
<div class="row">
18+
<div class="col-md-12">
19+
<p>
20+
Simon started coding in Python as a hobby while at university. After that, he worked as a gardener, quality inspector,
21+
care worker, and nuts &amp; bolts salesperson. During that time, he started attending coding meetups and eventually
22+
decided to retrain. He now works as a junior full-stack web developer. He lives in Sheffield with two cats and a human,
23+
and likes cooking, knitting, and nature.
24+
</p>
25+
</div>
26+
</div>
27+
</div>
28+
<div class="col-lg-12 col-xl-3 skills">
29+
<div class="row">
30+
<div class="col-12">
31+
<h5>Simon can help with...</h5>
32+
</div>
33+
<div class="col-md-4 col-lg-12">
34+
<!-- <h6>Languages</h6> -->
35+
<p>
36+
<span class="badge badge-secondary">HTML</span>
37+
<span class="badge badge-secondary">CSS</span>
38+
<span class="badge badge-secondary">JavaScript</span>
39+
<span class="badge badge-secondary">TypeScript</span>
40+
<span class="badge badge-secondary">Python</span>
41+
<span class="badge badge-secondary">SQL</span>
42+
</p>
43+
</div>
44+
<div class="col-md-4 col-lg-12">
45+
<!-- <h6>Technologies</h6> -->
46+
<p>
47+
<span class="badge badge-secondary">React</span>
48+
<span class="badge badge-secondary">Redux</span>
49+
<span class="badge badge-secondary">Bootstrap</span>
50+
<span class="badge badge-secondary">NodeJS</span>
51+
<span class="badge badge-secondary">Mocha</span>
52+
<span class="badge badge-secondary">Ava</span>
53+
<span class="badge badge-secondary">TypeORM</span>
54+
<span class="badge badge-secondary">JSON</span>
55+
<span class="badge badge-secondary">REST</span>
56+
</p>
57+
</div>
58+
<div class="col-md-4 col-lg-12">
59+
<!-- <h6>Tools</h6> -->
60+
<p>
61+
<span class="badge badge-secondary">Git</span>
62+
<span class="badge badge-secondary">Docker</span>
63+
<span class="badge badge-secondary">VS Code</span>
64+
<span class="badge badge-secondary">IDLE</span>
65+
<span class="badge badge-secondary">Vim</span>
66+
</p>
67+
</div>
68+
</div>
69+
</div>
70+
</div>

0 commit comments

Comments
 (0)