From 795cd7328f460d91938c248bc95f0bf2141c8fdb Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 26 Oct 2023 13:33:53 +0100 Subject: [PATCH 01/10] Updated contact information --- content/resources/contact.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/content/resources/contact.md b/content/resources/contact.md index 7fc7d5f..eeb55eb 100644 --- a/content/resources/contact.md +++ b/content/resources/contact.md @@ -7,7 +7,9 @@ menu: --- You can stay in touch via [Twitter](https://twitter.com/TinkerSoc), -[Facebook](http://facebook.com/TinkerSoc) and [Email](mailto:committee@tinkersoc.org). +[Instagram](https://www.instagram.com/tinkersoc/) and [Email](mailto:committee@tinkersoc.org). + +You can also contact the [President](mailto:rachel@tinkersoc.org), [Vice-President](mailto:josh@tinkersoc.org) and [Treasurer](mailto:james@tinkersoc.org) individually. ## Follow us ## @@ -19,9 +21,6 @@ us. Follow @TinkerSoc - - - ## Email us ## If you'd like to contact us directly, you can use our committee email address: From 9d943f872540ecb5c36b4f8229375feec363b50c Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:16:07 +0100 Subject: [PATCH 02/10] Instagram button test --- content/resources/contact.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/content/resources/contact.md b/content/resources/contact.md index eeb55eb..7ed08b6 100644 --- a/content/resources/contact.md +++ b/content/resources/contact.md @@ -14,12 +14,17 @@ You can also contact the [President](mailto:rachel@tinkersoc.org), [Vice-Preside ## Follow us ## -Follow us on Twitter and Facebook for last minute updates! We also post links +Follow us on Instagram for updates about events and ongoing projects! + +https://www.instagram.com/tinkersoc/?hl=en-gb - + + + + ## Email us ## From 6ab6a844bd66c576b35b1c7b0d5afc867c7c59e4 Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:16:22 +0100 Subject: [PATCH 03/10] Instagram button test --- content/resources/contact.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/content/resources/contact.md b/content/resources/contact.md index 7ed08b6..7cdb6e1 100644 --- a/content/resources/contact.md +++ b/content/resources/contact.md @@ -6,6 +6,9 @@ menu: parent: resources --- + + + You can stay in touch via [Twitter](https://twitter.com/TinkerSoc), [Instagram](https://www.instagram.com/tinkersoc/) and [Email](mailto:committee@tinkersoc.org). @@ -19,7 +22,11 @@ Follow us on Instagram for updates about events and ongoing projects! to interesting hacky/tinkery things we've found around the internet. us. --> -https://www.instagram.com/tinkersoc/?hl=en-gb +
Instagram social icon + + + +
From 36fb6a0d99ec99957a7478c3a4dad9980f19d5af Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:20:51 +0100 Subject: [PATCH 04/10] Updated emails --- content/resources/contact.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/resources/contact.md b/content/resources/contact.md index 7cdb6e1..38cedcd 100644 --- a/content/resources/contact.md +++ b/content/resources/contact.md @@ -12,7 +12,7 @@ menu: You can stay in touch via [Twitter](https://twitter.com/TinkerSoc), [Instagram](https://www.instagram.com/tinkersoc/) and [Email](mailto:committee@tinkersoc.org). -You can also contact the [President](mailto:rachel@tinkersoc.org), [Vice-President](mailto:josh@tinkersoc.org) and [Treasurer](mailto:james@tinkersoc.org) individually. +You can also contact the [President](mailto:josh@tinkersoc.org), [Vice-President](mailto:rachel@tinkersoc.org) and [Treasurer](mailto:james@tinkersoc.org) individually. ## Follow us ## @@ -22,7 +22,7 @@ Follow us on Instagram for updates about events and ongoing projects! to interesting hacky/tinkery things we've found around the internet. us. --> -
Instagram social icon +
Instagram social icon From 3d319d175831f73ee5c365cf652fa715c8e6be7f Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:31:17 +0100 Subject: [PATCH 05/10] Changed insta link --- content/resources/contact.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/content/resources/contact.md b/content/resources/contact.md index 38cedcd..27846e1 100644 --- a/content/resources/contact.md +++ b/content/resources/contact.md @@ -17,16 +17,13 @@ You can also contact the [President](mailto:josh@tinkersoc.org), [Vice-President ## Follow us ## -Follow us on Instagram for updates about events and ongoing projects! +Follow us on Instagram for +updates about events and ongoing projects! + - From 2529add2c5de9291573543cfa06e882ac1c7bb7a Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:37:59 +0100 Subject: [PATCH 06/10] added 2022 previous committee --- themes/TinkerSoc/layouts/_default/committee.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/themes/TinkerSoc/layouts/_default/committee.html b/themes/TinkerSoc/layouts/_default/committee.html index 01f3556..1e71855 100755 --- a/themes/TinkerSoc/layouts/_default/committee.html +++ b/themes/TinkerSoc/layouts/_default/committee.html @@ -18,6 +18,21 @@

{{ .Title }}

Previous Committee Members

+ +

2022 - 2023

+ {{ range $.Site.Data.committee_2022 }} +
+ Photo of {{.Name}} +
+ {{ .comment }} - {{if .url }}{{ .name }}{{else}}{{.name}}{{end}} +
+
+ {{ end }} +

2021 - 2022

{{ range $.Site.Data.committee_2021 }}
From b19ea16d040bae359f077d9ab34f5b8db1a284d4 Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:41:00 +0100 Subject: [PATCH 07/10] Moved current committee to previous committee --- data/committee_2023.json | 21 +++++++++++++++++++ .../TinkerSoc/layouts/_default/committee.html | 14 +++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 data/committee_2023.json diff --git a/data/committee_2023.json b/data/committee_2023.json new file mode 100644 index 0000000..bc928f4 --- /dev/null +++ b/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 + } + +] diff --git a/themes/TinkerSoc/layouts/_default/committee.html b/themes/TinkerSoc/layouts/_default/committee.html index 1e71855..1ca90b0 100755 --- a/themes/TinkerSoc/layouts/_default/committee.html +++ b/themes/TinkerSoc/layouts/_default/committee.html @@ -19,6 +19,20 @@

{{ .Title }}

Previous Committee Members

+

2023 - 2024

+ {{ range $.Site.Data.committee_2023 }} +
+ Photo of {{.Name}} +
+ {{ .comment }} - {{if .url }}{{ .name }}{{else}}{{.name}}{{end}} +
+
+ {{ end }} +

2022 - 2023

{{ range $.Site.Data.committee_2022 }}
From 283a7a77ce69440a960a16cdaaad8894544ced8b Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:41:10 +0100 Subject: [PATCH 08/10] Updated current committee --- data/committee_current.json | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/data/committee_current.json b/data/committee_current.json index 289bab7..7f1e0d6 100755 --- a/data/committee_current.json +++ b/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 } ] From ec01bfc6a312bb0ddd9a0a48ec5a197ee479cce3 Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:42:13 +0100 Subject: [PATCH 09/10] Removed twitter --- content/resources/contact.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/content/resources/contact.md b/content/resources/contact.md index 27846e1..4c5a155 100644 --- a/content/resources/contact.md +++ b/content/resources/contact.md @@ -9,12 +9,10 @@ menu: -You can stay in touch via [Twitter](https://twitter.com/TinkerSoc), -[Instagram](https://www.instagram.com/tinkersoc/) and [Email](mailto:committee@tinkersoc.org). +You can stay in touch via [Instagram](https://www.instagram.com/tinkersoc/) and [Email](mailto:committee@tinkersoc.org). You can also contact the [President](mailto:josh@tinkersoc.org), [Vice-President](mailto:rachel@tinkersoc.org) and [Treasurer](mailto:james@tinkersoc.org) individually. - ## Follow us ## Follow us on Instagram for From 6945f70cd68c02aa78c8e690a8cff0ace6d6b3e8 Mon Sep 17 00:00:00 2001 From: RayMuir Date: Thu, 19 Sep 2024 00:47:49 +0100 Subject: [PATCH 10/10] updated location --- themes/TinkerSoc/layouts/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/TinkerSoc/layouts/index.html b/themes/TinkerSoc/layouts/index.html index 5fba0de..480fb24 100755 --- a/themes/TinkerSoc/layouts/index.html +++ b/themes/TinkerSoc/layouts/index.html @@ -33,7 +33,7 @@

TinkerSoc


TinkerSoc is Kent's Maker society, where you can learn coding, electronics, 3D-printing, amateur radio, metalwork and more!

- We have moved for 2023! TinkerSoc will be in the new School of Computing Makerspace, in the Kennedy Building. + TinkerSoc is held in the School of Computing's Makerspace, located within the Kennedy Building.

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?