From d8ef14acef051c1b8105eba82e3fb9484df325b4 Mon Sep 17 00:00:00 2001 From: wizzdom Date: Sat, 1 Mar 2025 00:39:36 +0000 Subject: [PATCH 01/12] add initial about and events sections --- src/_data/site.yml | 2 + src/_includes/home/sections/about.njk | 93 +++++++++++++ .../home/sections/events-carousel.njk | 129 ++++++++++++++++++ src/_includes/home/sections/events.njk | 42 ++++++ src/site/index.md | 4 +- 5 files changed, 269 insertions(+), 1 deletion(-) create mode 100644 src/_includes/home/sections/about.njk create mode 100644 src/_includes/home/sections/events-carousel.njk create mode 100644 src/_includes/home/sections/events.njk diff --git a/src/_data/site.yml b/src/_data/site.yml index 6878428..736f629 100644 --- a/src/_data/site.yml +++ b/src/_data/site.yml @@ -160,3 +160,5 @@ home: position: 🥇 First Year Rep. username: jstkamil image: https://img.redbrick.dcu.ie/150x275,sc/https://cdn.redbrick.dcu.ie/atlas/cmt24-25/jstkamil.jpg + events: + api: https://clubsandsocs.jakefarrell.ie/dcuclubsandsocs.ie/society/redbrick diff --git a/src/_includes/home/sections/about.njk b/src/_includes/home/sections/about.njk new file mode 100644 index 0000000..6fc309f --- /dev/null +++ b/src/_includes/home/sections/about.njk @@ -0,0 +1,93 @@ +
+ +
+
+
+
+
+

+ About Us +

+

+ "What is Redbrick?" - this is the age-old query which has plagued the DCU Networking Society for years. + Redbrick + is such a diverse society that a million monkeys working on a million typewriters for a million years might + reproduce the works of Shakespeare, but they'll never come up with a concise explanation as to what Redbrick is. +

+

+ Simply put, Redbrick is a rather big social society with a slant on computers and technology. We host a plethora + of techy events designed to entertain and educate anyone and everyone, including cinema trips, pub nights and + tutorials and workshops on programming, web design and graphic design. Expect to see the return of the annual + RedBrick Freshers' Ball (booze! booze! booze!) and the table quiz; last year, the quiz saw members having prizes + practically thrown at them, with Sega Mega Drives, portable hard drives, Lucky Charms cereal and plenty of spot + prizes being won. We also raffled off a brand new Eee PC laptop. +

+

+ At the start of 2009, over twenty Brickies went to Finland - birthplace of the Linux kernel - to mess about in + massive technology museums, employ stealth and cunning in a battle to snow each other into our cabins and feast + on reindeer and mead in a Viking restaurant (all while being quite drunk). +

+

+ Redbrick isn't just about events though; we are lucky enough to own our own servers on which we host the + services used daily by our members: IRC (Internet Relay Chat - our most popular service, as it's great for + putting off assignments until the last minute, waffling about whatever's on your mind and meeting new + people),webspace (host your own website with massive amounts of storage space), forums/message + boards, the photo + gallery and your own @redbrick.dcu.ie e-mail address. We also have our own wiki site, + where all members can create/edit/vandalise pages on whatever you feel like. You can access all of these + services from any computer connected to the Internet. +

+

+ Networking societies are to be found all over the country, and Redbrick - as part of the Intersocs network - is + often found mingling with other nerds from Trinity, DIT, NUI Maynooth and University of Limerick, both at + Intersocs events and in the IRC channel. +

+

+ So, if you want to make new friends, talk about anything that's on your mind, or just get twisted because you + have nothing better to do with your time, RedBrick has something to offer you! +

+
+
+ + + + + + + + + + + + + + Redbrick Logo +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/src/_includes/home/sections/events-carousel.njk b/src/_includes/home/sections/events-carousel.njk new file mode 100644 index 0000000..0c1c6ca --- /dev/null +++ b/src/_includes/home/sections/events-carousel.njk @@ -0,0 +1,129 @@ + + + + + diff --git a/src/_includes/home/sections/events.njk b/src/_includes/home/sections/events.njk new file mode 100644 index 0000000..98ab29f --- /dev/null +++ b/src/_includes/home/sections/events.njk @@ -0,0 +1,42 @@ +
+ + + + +
+
+

+ Events +

+

+ Redbrick hosts a variety of events throughout the year, from LAN parties to workshops and talks... +

+
+
+ Baxter, Browner and Magma + Distro bopping + Mail broke + Mail broke +
+ {% include "home/sections/events-carousel.njk" %} +
+
+ diff --git a/src/site/index.md b/src/site/index.md index dea203f..8cf0032 100644 --- a/src/site/index.md +++ b/src/site/index.md @@ -4,5 +4,7 @@ layout: default.njk
{% include "home/sections/hero.njk" %} {% include "home/sections/committee.njk" %} + {% include "home/sections/about.njk" %} + {% include "home/sections/events.njk" %} {% include "home/sections/cta.njk" %} -
\ No newline at end of file + From d1d00547eee3cc8333fb3fe700f81b8fb0ca9334 Mon Sep 17 00:00:00 2001 From: wizzdom Date: Tue, 18 Mar 2025 17:10:36 +0000 Subject: [PATCH 02/12] use site.yml for images --- src/_data/site.yml | 13 +++++++++++++ src/_includes/home/sections/about.njk | 4 ++-- src/_includes/home/sections/events.njk | 16 ++++++++-------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/_data/site.yml b/src/_data/site.yml index 736f629..3060bd9 100644 --- a/src/_data/site.yml +++ b/src/_data/site.yml @@ -162,3 +162,16 @@ home: image: https://img.redbrick.dcu.ie/150x275,sc/https://cdn.redbrick.dcu.ie/atlas/cmt24-25/jstkamil.jpg events: api: https://clubsandsocs.jakefarrell.ie/dcuclubsandsocs.ie/society/redbrick + graphic: + image1: + src: https://img.redbrick.dcu.ie/150x150/https://cdn.redbrick.dcu.ie/atlas/static/img/newsletter-snap.webp + alt: Baxter, Browner and Magma + image2: + src: https://img.redbrick.dcu.ie/150x150/https://cdn.redbrick.dcu.ie/atlas/static/img/sistem-mag1c.webp + alt: SISTEM crew + image3: + src: https://img.redbrick.dcu.ie/300x150/https://cdn.redbrick.dcu.ie/atlas/static/img/sistem-banner.webp + alt: SISTEM + image4: + src: https://img.redbrick.dcu.ie/150x200/https://cdn.redbrick.dcu.ie/atlas/static/img/mail-broke.webp + alt: Mail Broke diff --git a/src/_includes/home/sections/about.njk b/src/_includes/home/sections/about.njk index 6fc309f..c5e5dc6 100644 --- a/src/_includes/home/sections/about.njk +++ b/src/_includes/home/sections/about.njk @@ -61,9 +61,9 @@ - + - Redbrick Logo + {{ site.images.brick.alt }} diff --git a/src/_includes/home/sections/events.njk b/src/_includes/home/sections/events.njk index 98ab29f..97d8a88 100644 --- a/src/_includes/home/sections/events.njk +++ b/src/_includes/home/sections/events.njk @@ -14,17 +14,17 @@
Baxter, Browner and Magma + src="{{ site.home.events.graphic.image1.src }}" + alt="{{ site.home.events.graphic.image1.alt }}" data-events-card /> Distro bopping + src="{{ site.home.events.graphic.image2.src }}" + alt="{{ site.home.events.graphic.image2.alt }}" data-events-card /> Mail broke + src="{{ site.home.events.graphic.image3.src }}" + alt="{{ site.home.events.graphic.image3.alt }}" data-events-card /> Mail broke + src="{{ site.home.events.graphic.image4.src }}" + alt="{{ site.home.events.graphic.image4.alt }}" data-events-card />
{% include "home/sections/events-carousel.njk" %} From 9fc8de40eb12c648957f154f59310e6e33c14989 Mon Sep 17 00:00:00 2001 From: wizzdom Date: Tue, 18 Mar 2025 18:03:08 +0000 Subject: [PATCH 03/12] add learn more button, fix smooth scrolling --- src/_data/site.yml | 3 +++ src/_includes/home/sections/hero.njk | 5 +++++ src/site/assets/main.css | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/_data/site.yml b/src/_data/site.yml index 3060bd9..1e9b86f 100644 --- a/src/_data/site.yml +++ b/src/_data/site.yml @@ -55,6 +55,9 @@ home: secondary: text: Discord link: https://discord.redbrick.dcu.ie + tertiary: + text: Learn More! + link: "#about" graphic: image1: image: https://img.redbrick.dcu.ie/150x150/https://cdn.redbrick.dcu.ie/atlas/static/img/newsletter-snap.webp diff --git a/src/_includes/home/sections/hero.njk b/src/_includes/home/sections/hero.njk index 8989243..ef78fed 100644 --- a/src/_includes/home/sections/hero.njk +++ b/src/_includes/home/sections/hero.njk @@ -19,6 +19,11 @@ {{ site.home.hero.buttons.secondary.text }} + {% include "home/sections/hero/hero-graphic.njk" %} diff --git a/src/site/assets/main.css b/src/site/assets/main.css index f321fb3..197af18 100644 --- a/src/site/assets/main.css +++ b/src/site/assets/main.css @@ -3,7 +3,7 @@ @tailwind utilities; @layer base { - body { + html { scroll-behavior: smooth; } } From ae0f9166eb61b8d6b8d59941af30e1f90bb9482e Mon Sep 17 00:00:00 2001 From: wizzdom Date: Tue, 18 Mar 2025 18:07:40 +0000 Subject: [PATCH 04/12] remove doubled bg grid --- src/_includes/home/sections/about.njk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/_includes/home/sections/about.njk b/src/_includes/home/sections/about.njk index c5e5dc6..c42da65 100644 --- a/src/_includes/home/sections/about.njk +++ b/src/_includes/home/sections/about.njk @@ -1,8 +1,5 @@
-
-
@@ -63,7 +60,8 @@ - {{ site.images.brick.alt }} + {{ site.images.brick.alt }}
From d5e983d67a345a8c58eb050faf2beff5a043cbf9 Mon Sep 17 00:00:00 2001 From: wizzdom Date: Tue, 18 Mar 2025 23:45:40 +0000 Subject: [PATCH 05/12] add markdown about section, break css --- .eleventy.js | 20 +++++++++++++ eleventy/parsers/markdown.js | 2 +- src/_data/site.yml | 7 +++++ src/_includes/home/sections/about.md | 35 ++++++++++++++++++++++ src/_includes/home/sections/about.njk | 42 ++------------------------- 5 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 src/_includes/home/sections/about.md diff --git a/.eleventy.js b/.eleventy.js index 9d572ff..b5a9a07 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,4 +1,5 @@ const path = require('path') +const fs = require('fs') const yaml = require('js-yaml') const { DateTime } = require('luxon') const readingTime = require('reading-time') @@ -30,6 +31,25 @@ module.exports = function (eleventyConfig) { ) ) + function includeMarkdown(filePath) { + filePath = String(filePath) + const fullPath = path.resolve(process.cwd(), filePath) + let mdContent + try { + mdContent = fs.readFileSync(fullPath, "utf8") + } catch (err) { + console.error(`Error reading file at: ${fullPath}`, err) + return `

Error reading file at: ${fullPath}

` + } + return markdown.render(mdContent) + } + + // Register as a shortcode for content files + eleventyConfig.addShortcode("includeMarkdown", includeMarkdown) + // Also register as a Nunjucks global so includes have access to it + eleventyConfig.addNunjucksGlobal("includeMarkdown", includeMarkdown) + + eleventyConfig.addPlugin(gitBuildPlugin, { repos: [ { name: 'blog' }, diff --git a/eleventy/parsers/markdown.js b/eleventy/parsers/markdown.js index b1d10e1..a9f79b2 100644 --- a/eleventy/parsers/markdown.js +++ b/eleventy/parsers/markdown.js @@ -7,7 +7,7 @@ const slugify = require('../filters/slugify') const md = markdownIt({ html: true, - breaks: true, + breaks: false, linkify: true, typographer: true, }) diff --git a/src/_data/site.yml b/src/_data/site.yml index 1e9b86f..1bc54e6 100644 --- a/src/_data/site.yml +++ b/src/_data/site.yml @@ -42,6 +42,7 @@ navigation: text: Discord link: https://discord.redbrick.dcu.ie drawer: navigation + home: hero: title: @@ -78,6 +79,7 @@ home: alt: Discord emote image7: alt: Redbrick logo + cta: title: Don't Miss Out body: Redbrick hosts events for everything tech related - from computer programming tutorials to workshops with multinational tech companies. @@ -94,6 +96,7 @@ home: r3c1: https://img.redbrick.dcu.ie/1000x500/https://cdn.redbrick.dcu.ie/atlas/static/img/hecker.jpg r3c2: https://img.redbrick.dcu.ie/1000x500/https://cdn.redbrick.dcu.ie/atlas/static/img/cmt-24-25.jpg r3c3: https://img.redbrick.dcu.ie/1000x500/https://cdn.redbrick.dcu.ie/atlas/static/img/CSBallCmt24.jpg + committee: - name: Jake Farrell position: 🪑 Chair @@ -163,6 +166,10 @@ home: position: 🥇 First Year Rep. username: jstkamil image: https://img.redbrick.dcu.ie/150x275,sc/https://cdn.redbrick.dcu.ie/atlas/cmt24-25/jstkamil.jpg + + about: + heading: About Us! + events: api: https://clubsandsocs.jakefarrell.ie/dcuclubsandsocs.ie/society/redbrick graphic: diff --git a/src/_includes/home/sections/about.md b/src/_includes/home/sections/about.md new file mode 100644 index 0000000..3e54ec3 --- /dev/null +++ b/src/_includes/home/sections/about.md @@ -0,0 +1,35 @@ +*"What is Redbrick?"* - this is the age-old query which has plagued the DCU Networking Society for years. +Redbrick +is such a diverse society that a million monkeys working on a million typewriters for a million years might +reproduce the works of Shakespeare, but they'll never come up with a concise explanation as to what Redbrick is. + + +Simply put, Redbrick is a rather big social society with a slant on computers and technology. We host a plethora +of techy events designed to entertain and educate anyone and everyone, including cinema trips, pub nights and +tutorials and workshops on programming, web design and graphic design. Expect to see the return of the annual +RedBrick Freshers' Ball *(booze! booze! booze!)* and the table quiz; last year, the quiz saw members having prizes +practically thrown at them, with Sega Mega Drives, portable hard drives, Lucky Charms cereal and plenty of spot +prizes being won. We also raffled off a brand new Eee PC laptop. + + +At the start of 2009, over twenty Brickies went to Finland - birthplace of the Linux kernel - to mess about in +massive technology museums, employ stealth and cunning in a battle to snow each other into our cabins and feast +on reindeer and mead in a Viking restaurant (all while being quite drunk). + + +Redbrick isn't just about events though; we are lucky enough to own our own servers on which we host the +services used daily by our members: IRC *(Internet Relay Chat - our most popular service, as it's great for +putting off assignments until the last minute, waffling about whatever's on your mind and meeting new +people)*,webspace *(host your own website with massive amounts of storage space)*, forums/message +boards, the photo gallery and your own `@redbrick.dcu.ie` e-mail address. We also have our own [**wiki site**](https://wiki.redbrick.dcu.ie), +where all members can create/edit/~~vandalise~~ pages on whatever you feel like. You can access all of these +services from any computer connected to the Internet. + + +Networking societies are to be found all over the country, and Redbrick - as part of the Intersocs network - is +often found mingling with other nerds from Trinity, DIT, NUI Maynooth and University of Limerick, both at +Intersocs events and in the IRC channel. + + +So, if you want to make new friends, talk about anything that's on your mind, or just get twisted because you +have nothing better to do with your time, RedBrick has something to offer you! diff --git a/src/_includes/home/sections/about.njk b/src/_includes/home/sections/about.njk index c42da65..7449022 100644 --- a/src/_includes/home/sections/about.njk +++ b/src/_includes/home/sections/about.njk @@ -6,45 +6,9 @@

About Us

-

- "What is Redbrick?" - this is the age-old query which has plagued the DCU Networking Society for years. - Redbrick - is such a diverse society that a million monkeys working on a million typewriters for a million years might - reproduce the works of Shakespeare, but they'll never come up with a concise explanation as to what Redbrick is. -

-

- Simply put, Redbrick is a rather big social society with a slant on computers and technology. We host a plethora - of techy events designed to entertain and educate anyone and everyone, including cinema trips, pub nights and - tutorials and workshops on programming, web design and graphic design. Expect to see the return of the annual - RedBrick Freshers' Ball (booze! booze! booze!) and the table quiz; last year, the quiz saw members having prizes - practically thrown at them, with Sega Mega Drives, portable hard drives, Lucky Charms cereal and plenty of spot - prizes being won. We also raffled off a brand new Eee PC laptop. -

-

- At the start of 2009, over twenty Brickies went to Finland - birthplace of the Linux kernel - to mess about in - massive technology museums, employ stealth and cunning in a battle to snow each other into our cabins and feast - on reindeer and mead in a Viking restaurant (all while being quite drunk). -

-

- Redbrick isn't just about events though; we are lucky enough to own our own servers on which we host the - services used daily by our members: IRC (Internet Relay Chat - our most popular service, as it's great for - putting off assignments until the last minute, waffling about whatever's on your mind and meeting new - people),webspace (host your own website with massive amounts of storage space), forums/message - boards, the photo - gallery and your own @redbrick.dcu.ie e-mail address. We also have our own wiki site, - where all members can create/edit/vandalise pages on whatever you feel like. You can access all of these - services from any computer connected to the Internet. -

-

- Networking societies are to be found all over the country, and Redbrick - as part of the Intersocs network - is - often found mingling with other nerds from Trinity, DIT, NUI Maynooth and University of Limerick, both at - Intersocs events and in the IRC channel. -

-

- So, if you want to make new friends, talk about anything that's on your mind, or just get twisted because you - have nothing better to do with your time, RedBrick has something to offer you! -

+
+ {{ includeMarkdown("./src/_includes/home/sections/about.md") | safe }} +
From a177ac52b581590a554c9c143e1adba3cf2f1417 Mon Sep 17 00:00:00 2001 From: Aris <64918822+Arisamiga@users.noreply.github.com> Date: Thu, 6 Nov 2025 18:43:29 +0000 Subject: [PATCH 06/12] Fixed Image paths --- src/_includes/home/sections/events.njk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/_includes/home/sections/events.njk b/src/_includes/home/sections/events.njk index 97d8a88..375b390 100644 --- a/src/_includes/home/sections/events.njk +++ b/src/_includes/home/sections/events.njk @@ -14,17 +14,17 @@
{{ site.home.events.graphic.image1.alt }} + src="{{ site.home.graphic.image1.src }}" + alt="{{ site.home.graphic.image1.alt }}" data-events-card /> {{ site.home.events.graphic.image2.alt }} + src="{{ site.home.graphic.image2.src }}" + alt="{{ site.home.graphic.image2.alt }}" data-events-card /> {{ site.home.events.graphic.image3.alt }} + src="{{ site.home.graphic.image3.src }}" + alt="{{ site.home.graphic.image3.alt }}" data-events-card /> {{ site.home.events.graphic.image4.alt }} + src="{{ site.home.graphic.image4.src }}" + alt="{{ site.home.graphic.image4.alt }}" data-events-card />
{% include "home/sections/events-carousel.njk" %} From 8608561c4e8ced8fa685036e6805324a7d693833 Mon Sep 17 00:00:00 2001 From: Aris <64918822+Arisamiga@users.noreply.github.com> Date: Thu, 6 Nov 2025 18:53:23 +0000 Subject: [PATCH 07/12] Fixed paths of images and events api --- src/_includes/home/sections/events-carousel.njk | 4 ++-- src/_includes/home/sections/events.njk | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/_includes/home/sections/events-carousel.njk b/src/_includes/home/sections/events-carousel.njk index 0c1c6ca..4876e11 100644 --- a/src/_includes/home/sections/events-carousel.njk +++ b/src/_includes/home/sections/events-carousel.njk @@ -30,8 +30,8 @@