Merge branch 'release' into feature/pretty-the-links

KeiranWDigital · KeiranWDigital · commit 756d81085bd7 · 2020-09-15T22:45:21.000+01:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,10 +24,12 @@ GEM
       http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
+    eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
     execjs (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
+    ffi (1.13.1)
     ffi (1.13.1-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
@@ -208,6 +210,8 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.14.2)
     multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     nokogiri (1.10.10-x64-mingw32)
       mini_portile2 (~> 2.4.0)
     octokit (4.18.0)
@@ -244,11 +248,13 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
+    unf_ext (0.0.7.7)
     unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     zeitwerk (2.4.0)
 
 PLATFORMS
+  ruby
   x64-mingw32
 
 DEPENDENCIES
diff --git a/README.md b/README.md
@@ -43,13 +43,21 @@ Quoted from https://jekyllrb.com/docs/
 
 ## Jekyll setup
 
-Use [this guide](https://jekyllrb.com/docs/installation/) to setup Jekyll for your operating system.
+If you're familiar with Ruby gems, run the following:
+
+`gem install bundle`
+
+`gem install jekyll`
+
+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.
 
 ## Building the site
 
-Open a command line in the root directory of the repository
+Open a command line in the root directory of the repository.
+
+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.
 
-Run `bundle exec jekyll build` to build the site, this will produce a `_site` folder with the required content
+Otherwise, run `bundle exec jekyll build` to build the site, this will produce a `_site` folder with the required content.
 
 >:Warning: do not edit anything in the site folder as it will not be comitted and is overwritten everytime you build the site.
 
diff --git a/about.html b/about.html
@@ -60,7 +60,7 @@ <h4><a href="people#jim-evans">Jim Evans</a></h4>
         <img class="profile-photo" src="images/simon-profile-photo.png">
         <br />
         <h4>Simon Davey</h4>
-        <smaller>Equity Officer</smaller>
+        <smaller>Interim Equity Officer</smaller>
     </div>
     <div class="col-sm-5 col-md-4 col-lg-3 card text-center">
         <img class="profile-photo" src="images/sean-profile-photo.png">
diff --git a/activities.html b/activities.html
@@ -7,7 +7,7 @@
     - CSSTricks,
     - FreeCodeCamp,
     - git,
-    - Javascript,
+    - JavaScript,
     - Udemy,
     - #100DaysOfCode,
     - AdventOfCode,
diff --git a/images/simon-profile-photo.png b/images/simon-profile-photo.png
diff --git a/pages-events/events-drop-ins.html b/pages-events/events-drop-ins.html
@@ -73,33 +73,4 @@ <h3>National Coding Week</h3>
             </div>
         </div>
     </div>
-    <div class="row card">
-        <div class="col-12">
-            <div class="row">
-                <div class="col-sm-4 col-lg-2 event-date">
-                    <span class="event-date-month">OCT</span>
-                    <span class="event-date-day">12</span>
-                    <p>
-                        <span class="event-date-start-time">7pm - </span>
-
-                        <span class="event-date-end-time">9pm</span>
-                    </p>
-                </div>
-                <div class="col-sm-8 col-lg-10 event-title">
-                    <span class="event-title">CodeWith Drop-In</span>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12 col-lg-9 event-description">
-                    <span class="event-description">
-                        An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
-                        something related to one of our workshops, a question about how to get started, or anything else! </span>
-                </div>
-                <div class="col-md-12 col-lg-3 event-book-button">
-                    <a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
-                        <span class="fas fa-link"></span></a>
-                </div>
-            </div>
-        </div>
-    </div>
 </section>
diff --git a/pages-people/people-drew.html b/pages-people/people-drew.html
@@ -50,7 +50,7 @@ <h5>Drew can help with...</h5>
                     <span class="badge badge-secondary">CSS</span>
                     <span class="badge badge-secondary">HTML</span>
                     <span class="badge badge-secondary">Java</span>
-                    <span class="badge badge-secondary">Javascript</span>
+                    <span class="badge badge-secondary">JavaScript</span>
                     <span class="badge badge-secondary">jQuery</span>
                     <span class="badge badge-secondary">Neo4J</span>
                     <span class="badge badge-secondary">Python</span>
diff --git a/pages-people/people-jim.html b/pages-people/people-jim.html
@@ -48,7 +48,7 @@ <h5>Jim can help with...</h5>
                     <span class="badge badge-secondary">PHP</span>
                     <span class="badge badge-secondary">CSS</span>
                     <span class="badge badge-secondary">HTML</span>
-                    <span class="badge badge-secondary">Javascript</span>
+                    <span class="badge badge-secondary">JavaScript</span>
                     <span class="badge badge-secondary">jQuery</span>
                     <span class="badge badge-secondary">Bootstrap</span>
                     <span class="badge badge-secondary">SQL</span>
diff --git a/pages-people/people-keiran.html b/pages-people/people-keiran.html
@@ -52,7 +52,7 @@ <h5>Keiran can help with...</h5>
                     <span class="badge badge-secondary">CSS</span>
                     <span class="badge badge-secondary">HTML</span>
                     <span class="badge badge-secondary">Java</span>
-                    <span class="badge badge-secondary">Javascript</span>
+                    <span class="badge badge-secondary">JavaScript</span>
                     <span class="badge badge-secondary">jQuery</span>
                     <span class="badge badge-secondary">php</span>
                     <span class="badge badge-secondary">Python</span>
diff --git a/pages-people/people-sean.html b/pages-people/people-sean.html
@@ -69,7 +69,6 @@ <h5>Sean can help with...</h5>
                     <span class="badge badge-secondary">VS Code</span>
                     <span class="badge badge-secondary">Postman</span>
                     <span class="badge badge-secondary">OBS</span>
-                    <span class="badge badge-secondary">VS Code</span>
                 </p>
             </div>
         </div>
diff --git a/pages-people/people-simon.html b/pages-people/people-simon.html
@@ -0,0 +1,70 @@
+<a name="simon-davey"></a>
+<div class="row person-blurb">
+    <div class="col-md-4 col-lg-5 col-xl-3">
+        <div class="mb-2 box-shadow text-center">
+            <img class="profile-photo" src="./images/simon-profile-photo.png" alt="Simon Davey's profile picture" />
+        </div>
+        <div class="col-12 text-center">
+            <h4>Simon Davey</h4>
+        </div>
+    </div>
+    <div class="col-md-8 col-lg-6">
+        <div class="row">
+            <div class="col col-md-12">
+                <p class="text-muted no-margin">Mentor, Interim Equity Officer</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <p>
+                    Simon started coding in Python as a hobby while at university. After that, he worked as a gardener, quality inspector,
+                    care worker, and nuts &amp; bolts salesperson. During that time, he started attending coding meetups and eventually
+                    decided to retrain. He now works as a junior full-stack web developer. He lives in Sheffield with two cats and a human,
+                    and likes cooking, knitting, and nature.
+                </p>
+            </div>
+        </div>
+    </div>
+    <div class="col-lg-12 col-xl-3 skills">
+        <div class="row">
+            <div class="col-12">
+                <h5>Simon can help with...</h5>
+            </div>
+            <div class="col-md-4 col-lg-12">
+                <!-- <h6>Languages</h6> -->
+                <p>
+                    <span class="badge badge-secondary">HTML</span>
+                    <span class="badge badge-secondary">CSS</span>
+                    <span class="badge badge-secondary">JavaScript</span>
+                    <span class="badge badge-secondary">TypeScript</span>
+                    <span class="badge badge-secondary">Python</span>
+                    <span class="badge badge-secondary">SQL</span>
+                </p>
+            </div>
+            <div class="col-md-4 col-lg-12">
+                <!-- <h6>Technologies</h6> -->
+                <p>
+                    <span class="badge badge-secondary">React</span>
+                    <span class="badge badge-secondary">Redux</span>
+                    <span class="badge badge-secondary">Bootstrap</span>
+                    <span class="badge badge-secondary">NodeJS</span>
+                    <span class="badge badge-secondary">Mocha</span>
+                    <span class="badge badge-secondary">Ava</span>
+                    <span class="badge badge-secondary">TypeORM</span>
+                    <span class="badge badge-secondary">JSON</span>
+                    <span class="badge badge-secondary">REST</span>
+                </p>
+            </div>
+            <div class="col-md-4 col-lg-12">
+                <!-- <h6>Tools</h6> -->
+                <p>
+                    <span class="badge badge-secondary">Git</span>
+                    <span class="badge badge-secondary">Docker</span>
+                    <span class="badge badge-secondary">VS Code</span>
+                    <span class="badge badge-secondary">IDLE</span>
+                    <span class="badge badge-secondary">Vim</span>
+                </p>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/people.html b/people.html
@@ -22,3 +22,5 @@ <h1>{{page.title}}</h1>
 {% include_relative pages-people/people-liz.html %}
 <br />
 {% include_relative pages-people/people-sean.html %}
+<br />
+{% include_relative pages-people/people-simon.html %}
