Merge pull request #68 from TinkerSoc/test

Merging updates from test

content/resources/contact.md

@@ -6,21 +6,27 @@ menu:
         parent: resources
 ---
 
-You can stay in touch via [Twitter](https://twitter.com/TinkerSoc),
-[Facebook](http://facebook.com/TinkerSoc) and [Email](mailto:[email protected]).
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 
+You can stay in touch via [Instagram](https://www.instagram.com/tinkersoc/) and [Email](mailto:[email protected]).
+
+You can also contact the [President](mailto:[email protected]), [Vice-President](mailto:[email protected]) and [Treasurer](mailto:[email protected]) individually.
 
 ## Follow us ##
 
-Follow us on Twitter and Facebook for last minute updates!  We also post links
+Follow us on <a href="https://www.instagram.com/tinkersoc/">Instagram</a> for
+updates about events and ongoing projects!
+
+<!-- Follow us on Twitter and Facebook for last minute updates!  We also post links
 to interesting hacky/tinkery things we've found around the internet.
-us.
+us. -->
 
 <!-- Twitter Follow button -->
-<a href="https://twitter.com/TinkerSoc" class="twitter-follow-button" data-show-count="false">Follow @TinkerSoc</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<!--<a href="https://twitter.com/TinkerSoc" class="twitter-follow-button" data-show-count="false">Follow @TinkerSoc</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script> -->
 
 <!-- Facebook Like button -->
-<iframe src="https://www.facebook.com/plugins/follow.php?href=https%3A%2F%2Fwww.facebook.com%2FTinkerSoc&width=450&height=35&layout=standard&size=large&show_faces=false&appId" width="450" height="35" style="border:none;overflow:hidden;background-image:none;" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+<!-- <iframe src="https://www.facebook.com/plugins/follow.php?href=https%3A%2F%2Fwww.facebook.com%2FTinkerSoc&width=450&height=35&layout=standard&size=large&show_faces=false&appId" width="450" height="35" style="border:none;overflow:hidden;background-image:none;" scrolling="no" frameborder="0" allowTransparency="true"></iframe>-->
 
 ## Email us ##
 

data/committee_2023.json

@@ -0,0 +1,21 @@
+[
+    {
+        "name": "Rachel Muir",
+        "comment": "President",
+        "image" : "committee/rachel.jpg",
+        "url": null
+    },
+    {
+        "name" : "Josh Senior",
+        "comment" : "Vice President",
+        "image" : "committee/josh.jpg",
+        "url" : null
+    },
+    {
+        "name": "James Kavanagh",
+        "comment": "Treasurer",
+        "image": "committee/noimage.jpg",
+        "url": null
+    }
+
+]

data/committee_current.json

@@ -1,21 +1,33 @@
 [
-    {
-        "name": "Rachel Muir",
-        "comment": "President",
-        "image" : "committee/rachel.jpg",
-        "url": null
-    },
     {
         "name" : "Josh Senior",
-        "comment" : "Vice President",
+        "comment" : "President",
         "image" : "committee/josh.jpg",
         "url" : null
     },
+    {
+        "name": "Rachel Muir",
+        "comment": "Vice President",
+        "image" : "committee/rachel.jpg",
+        "url": null
+    },
     {
         "name": "James Kavanagh",
         "comment": "Treasurer",
         "image": "committee/noimage.jpg",
         "url": null
+    },
+    {
+        "name": "Chloe Cooper",
+        "comment": "Events Coordinator",
+        "image": "committee/noimage.jpg",
+        "url": null
+    },
+    {
+        "name": "Jack Dale",
+        "comment": "Social Secretary",
+        "image": "committee/noimage.jpg",
+        "url": null
     }
 
 ]

themes/TinkerSoc/layouts/_default/committee.html

@@ -18,6 +18,35 @@ <h1>{{ .Title }}</h1>
 
 
     <h2>Previous Committee Members</h2>
+
+    <h3>2023 - 2024</h3>
+    {{ range $.Site.Data.committee_2023 }}
+    <figure>
+      <img src="{{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-medium.$2" .image }}"
+          srcset="{{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-large.$2" .image }} 960w,
+          {{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-medium.$2" .image }} 480w,
+          {{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-small.$2" .image }} 280w"
+          alt="Photo of {{.Name}}"/>
+        <figcaption>
+        {{ .comment }} - {{if .url }}<a href="{{.url}}">{{ .name }}</a>{{else}}{{.name}}{{end}}
+        </figcaption>
+    </figure>
+    {{ end }}
+
+    <h3>2022 - 2023</h3>
+    {{ range $.Site.Data.committee_2022 }}
+    <figure>
+      <img src="{{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-medium.$2" .image }}"
+          srcset="{{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-large.$2" .image }} 960w,
+          {{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-medium.$2" .image }} 480w,
+          {{.Site.BaseURL}}/gen/images/{{ replaceRE "(.*)\\.(\\w+)$" "$1-small.$2" .image }} 280w"
+          alt="Photo of {{.Name}}"/>
+        <figcaption>
+        {{ .comment }} - {{if .url }}<a href="{{.url}}">{{ .name }}</a>{{else}}{{.name}}{{end}}
+        </figcaption>
+    </figure>
+    {{ end }}
+
     <h3>2021 - 2022</h3>
     {{ range $.Site.Data.committee_2021 }}
     <figure>

themes/TinkerSoc/layouts/index.html

@@ -33,7 +33,7 @@ <h1>TinkerSoc</h1>
     <br>
     <p id="belowfold"><i>TinkerSoc is Kent's Maker society, where you can learn coding, electronics, 3D-printing, amateur radio, metalwork and more!</i></p>
 
-    <b>We have moved for 2023! TinkerSoc will be in the new School of Computing Makerspace, in the Kennedy Building.</b>
+    <b>TinkerSoc is held in the School of Computing's Makerspace, located within the Kennedy Building.</b>
 
     <p>It's a Wednesday night, and you have decided that you want to MAKE something. But, where on campus do you go if you want to do some sewing? Perhaps you have an itch to turn something on a lathe or want just want to send a radio wave around the world?</p>