Merge pull request #121 from CodeWithGroup/feature/new-design

Feature/new design

Author: dangerworm

Gemfile.lock

@@ -1,47 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
-      base64
-      bigdecimal
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
-      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    dnsruby (1.70.0)
+    concurrent-ruby (1.3.3)
+    dnsruby (1.72.2)
       simpleidn (~> 0.2.1)
-    drb (2.2.0)
-      ruby2_keywords
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     execjs (2.9.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
-      net-http
-    ffi (1.16.3-x64-mingw-ucrt)
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    ffi (1.17.0-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    github-pages (230)
+    github-pages (231)
       github-pages-health-check (= 1.18.2)
       jekyll (= 3.9.5)
       jekyll-avatar (= 0.8.0)
@@ -57,7 +50,7 @@ GEM
       jekyll-paginate (= 1.1.0)
       jekyll-readme-index (= 0.3.0)
       jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.7.0)
+      jekyll-relative-links (= 0.6.1)
       jekyll-remote-theme (= 0.4.3)
       jekyll-sass-converter (= 1.5.2)
       jekyll-seo-tag (= 2.8.0)
@@ -96,7 +89,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.5)
       addressable (~> 2.4)
@@ -144,7 +137,7 @@ GEM
       jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.7.0)
+    jekyll-relative-links (0.6.1)
       jekyll (>= 3.3, < 5.0)
     jekyll-remote-theme (0.4.3)
       addressable (~> 2.0)
@@ -211,31 +204,29 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
-    multipart-post (2.1.1)
-    nokogiri (1.13.6-x64-mingw32)
-      racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
+    minitest (5.24.1)
+    nokogiri (1.13.10-x64-mingw32)
       racc (~> 1.4)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (5.1.1)
+    racc (1.8.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.3.4)
+      strscan
     rouge (3.30.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -248,29 +239,26 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
+    simpleidn (0.2.3)
+    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1-x64-mingw-ucrt)
     unicode-display_width (1.8.0)
-    uri (0.13.0)
-    wdm (0.1.1)
+    wdm (0.2.0)
     webrick (1.8.1)
+    zeitwerk (2.6.17)
 
 PLATFORMS
-  x64-mingw-ucrt
+  x64-mingw32
 
 DEPENDENCIES
   github-pages
   wdm (>= 0.1.0)
   webrick (~> 1.8)
 
 BUNDLED WITH
-   2.5.6
+   2.3.17

_data/people/0001.yaml

@@ -1,40 +1,45 @@
 first_name: "Drew"
 last_name: "Morgan"
 anchor: "drew-morgan"
-photo: "drew-profile-photo.png"
+photo: "drew-profile-photo.jpg"
 roles: "Benevolent Leader, Mentor"
 twitter_handle: "dangerworm"
 description_paragraphs:
   - >
-    Drew has been coding since he was 7 years old and has worked in the healthcare, education and
-    finance sectors. After qualifying as a physics teacher in 2011, he taught for three years before
-    returning to software development and now works as a full-stack web and applications developer
-    for a healthcare company. He also has a
-    <a href="https://play.google.com/store/apps/details?id=com.drewmorgan.propertyprices">mobile app</a>
-    on the Google Play Store.
+    Drew has been coding since he was 7 years old and has worked in the healthcare, education, finance
+    and gaming industries. After qualifying as a physics teacher in 2011, he taught for three years before
+    returning to software development and now works as a senior developer and technical lead for a
+    consultancy in 'tech for good'. Drew specialises in back end and enterprise development, but knows
+    enough about front end development to get stuff done.
   - >
-    Drew loves science and technology and at university studied Physics for two years before changing
-    course and graduating with a degree in Computer Science with Artificial Intelligence. He plays
-    piano, tuba, guitar and clarinet, regularly goes bouldering indoors and is a BSAC scuba diving
-    instructor. Drew loves to share his experiences and will talk about anything with anyone.
+    Drew loves science and technology and has studied both Physics and Computer Science (with Artificial
+    Intelligence). Outside of work he is learning Esperanto, plays piano, tuba, and guitar, and is a BSAC 
+    scuba diving instructor. He also plays PC games when he has time and especially enjoys Elite Dangerous
+    in VR.
+  - >
+    Drew loves to share his experiences and will talk about anything with anyone.
 
 languages:
   - .Net
+  - Blockchain
   - C#
   - CSS
   - Cypher
+  - GraphQL
   - HTML
   - Javascript
   - jQuery
-  - Neo4J
   - Python
+  - Solidity
   - SQL
   - Typescript
   - Visual Basic
 
 technologies:
+  - APIs
   - JSON
   - Linux
+  - Neo4J
   - NodeJS
   - React
   - WPF
@@ -46,5 +51,6 @@ tools:
   - Git
   - GitHub
   - IDLE
+  - Postman
   - Visual Studio
   - VS Code

_data/people/0003.yaml

@@ -1,40 +1,32 @@
-first_name: "Jonathan"
-last_name: "Cowling"
-anchor: "jonathan-cowling"
-photo: "jonathan-profile-photo.jpg"
+first_name: "Peter"
+last_name: "Daily"
+anchor: "peter-daily"
+photo: "peter-profile-photo.png"
 roles: "Mentor"
-twitter_handle: "_cowlingj_"
+twitter_handle: "peterdaily"
 description_paragraphs:
   - >
-    Jonathan is an Associate Consultant at Infinity Works after recently graduating from the University of Manchester.
-    His love of code stems from a keen interest in peering behind the curtain to see how things work (or don't).
+    Peter is a self-taught developer who changed careers to web development
+    in 2016. He has since worked in the martech (marketing tech), digital agency,
+    telecommunications and property tech industries.
   - >
-    Most of the projects he's working on now use JavaScript,
-    but Jonathan has experience in a bunch of different areas including Android development.
-  - >
-    Aside from the many projects he tinkers with, Jonathan enjoys playing Dungeons and Dragons in his spare time.
+    Outside of work he enjoys mountain biking, going to music gigs and
+    playing video games. He is also a sports nerd and in particular an
+    insufferable Stockport County supporter.
 
 languages:
+  - CSS
+  - HTML
   - Javascript
   - Typescript
-  - Bash
-  - Python
-  - Java
-  - HTML
-  - CSS
 
 technologies:
-  - JSON
-  - Linux
-  - Kubernetes
+  - Angular
+  - Jest
   - NodeJS
   - React
-  - Vue
-  - Express
-  - Jest
+  - Testing
 
 tools:
   - Git
-  - GitHub
   - VS Code
-  - Docker

_data/questions/cancel.yaml

@@ -1,13 +1,13 @@
-<div class="row unpadded">
-    <div class="col">
-        <p>
-            &nbsp;
-        </p>
-        <p>
-            <a href="#">Back to top</a>
-        </p>
-        <p>
-            &nbsp;
-        </p>
-    </div>
+<div class="row">
+  <div class="col-12">
+    <p>
+      &nbsp;
+    </p>
+    <p style="text-align: center;">
+      <a href="#">Back to top</a>
+    </p>
+    <p>
+      &nbsp;
+    </p>
+  </div>
 </div>

_includes/back-to-top.html

@@ -38,7 +38,7 @@
         <link rel="stylesheet" href="{{site.url}}/css/open-dyslexic.css" type="text/css" charset="utf-8" />
 
         <link rel="stylesheet" href="{{site.url}}/css/style.css">
-        <link rel="stylesheet" href="{{site.url}}/css/sidebar.css">
+        <link rel="stylesheet" href="{{site.url}}/css/nav.css">
 
         <!-- I know scripts aren't supposed to go in the header, but we need this here in order to pick different suffix lists for the typewriter at the top -->
         <script lang="javascript">

_includes/head.html

@@ -0,0 +1,16 @@
+<header class="d-flex justify-content-center py-3">
+  <ul class="nav nav-pills">
+    <li class="nav-item"><a href="{{site.url}}" class="nav-link" aria-current="page">Home</a></li>
+    <li class="nav-item"><a href="{{site.url}}/events" class="nav-link">Events</a></li>
+    <li class="nav-item"><a href="{{site.url}}/about" class="nav-link">About</a></li>
+    <li class="nav-item"><a href="{{site.url}}/activities" class="nav-link">Activities</a></li>
+    <li class="nav-item"><a href="{{site.url}}/resources" class="nav-link">Resources</a></li>
+    <li class="nav-item"><a href="{{site.url}}/people" class="nav-link">People</a></li>
+    <li class="nav-item"><a href="{{site.url}}/contact" class="nav-link">Contact</a></li>
+    <li class="nav-item"><a href="{{site.url}}/code-of-conduct" class="nav-link">Code of Conduct</a></li>
+    <li class="nav-item"><a href="{{site.url}}/feedback" class="nav-link">Feedback</a></li>
+    <li class="nav-item"><a href="{{site.url}}/faq" class="nav-link">FAQ</a></li>
+    <li class="nav-item"><a href="{{site.url}}/branding" class="nav-link">Branding</a></li>
+    <li class="nav-item"><a id="change-font" class="change-font nav-link" href="#">OpenDyslexic</a></li>
+  </ul>
+</header>

_includes/nav.html

@@ -13,7 +13,6 @@
 
 <script type="text/javascript" src="{{site.url}}/js/change-font.js"></script>
 <script type="text/javascript" src="{{site.url}}/js/check-width.js"></script>
-<script type="text/javascript" src="{{site.url}}/js/sidebar.js"></script>
 <script type="text/javascript" src="{{site.url}}/js/typed-suffix.js"></script>
 
 <script type="text/javascript">