Merge pull request #69 from UWCS/repeat

Repeat Events 2
UWCS · Aug 10, 2024 · 9b1e687 · 9b1e687
2 parents bf30857 + 82f5284
commit 9b1e687
Show file tree

Hide file tree

Showing 87 changed files with 91 additions and 646 deletions.
diff --git a/content/events/_index.md b/content/events/_index.md
@@ -2,8 +2,8 @@
 title = "Events"
 weight = 2
 sort_by = "weight"
-template = "events_list.html"
-page_template = "event.html"
+template = "events/events_list.html"
+page_template = "events/event.html"
 +++
 
 Check out our events! 

diff --git a/content/events/archive/2324/t1/w0/_index.md b/content/events/archive/2324/t1/w0/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Welcome Week"
 

diff --git a/content/events/archive/2324/t1/w1/_index.md b/content/events/archive/2324/t1/w1/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 1"
 

diff --git a/content/events/archive/2324/t1/w10/_index.md b/content/events/archive/2324/t1/w10/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 10"
 

diff --git a/content/events/archive/2324/t1/w2/_index.md b/content/events/archive/2324/t1/w2/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 2"
 

diff --git a/content/events/archive/2324/t1/w3/_index.md b/content/events/archive/2324/t1/w3/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 3"
 

diff --git a/content/events/archive/2324/t1/w4/_index.md b/content/events/archive/2324/t1/w4/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 4"
 

diff --git a/content/events/archive/2324/t1/w5/_index.md b/content/events/archive/2324/t1/w5/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 5"
 

diff --git a/content/events/archive/2324/t1/w6/_index.md b/content/events/archive/2324/t1/w6/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 6"
 

diff --git a/content/events/archive/2324/t1/w7/_index.md b/content/events/archive/2324/t1/w7/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 7"
 

diff --git a/content/events/archive/2324/t1/w8/_index.md b/content/events/archive/2324/t1/w8/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 8"
 

diff --git a/content/events/archive/2324/t1/w9/_index.md b/content/events/archive/2324/t1/w9/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 9"
 

diff --git a/content/events/archive/2324/t2/w1/_index.md b/content/events/archive/2324/t2/w1/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 1"
 

diff --git a/content/events/archive/2324/t2/w10/_index.md b/content/events/archive/2324/t2/w10/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 10"
 

diff --git a/content/events/archive/2324/t2/w2/_index.md b/content/events/archive/2324/t2/w2/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 2"
 

diff --git a/content/events/archive/2324/t2/w3/_index.md b/content/events/archive/2324/t2/w3/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 3"
 

diff --git a/content/events/archive/2324/t2/w4/_index.md b/content/events/archive/2324/t2/w4/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 4"
 

diff --git a/content/events/archive/2324/t2/w5/_index.md b/content/events/archive/2324/t2/w5/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 5"
 

diff --git a/content/events/archive/2324/t2/w6/_index.md b/content/events/archive/2324/t2/w6/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 6"
 

diff --git a/content/events/archive/2324/t2/w7/_index.md b/content/events/archive/2324/t2/w7/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 7"
 

diff --git a/content/events/archive/2324/t2/w8/_index.md b/content/events/archive/2324/t2/w8/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 8"
 

diff --git a/content/events/archive/2324/t2/w9/_index.md b/content/events/archive/2324/t2/w9/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 9"
 

diff --git a/content/events/archive/2324/t3/w0/_index.md b/content/events/archive/2324/t3/w0/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 0"
 

diff --git a/content/events/archive/2324/t3/w1/_index.md b/content/events/archive/2324/t3/w1/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 1"
 

diff --git a/content/events/archive/2324/t3/w2/_index.md b/content/events/archive/2324/t3/w2/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 2"
 

diff --git a/content/events/archive/2324/t3/w3/_index.md b/content/events/archive/2324/t3/w3/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 3"
 

diff --git a/content/events/archive/2324/t3/w4/_index.md b/content/events/archive/2324/t3/w4/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 4"
 

diff --git a/content/events/archive/2324/t3/w5/_index.md b/content/events/archive/2324/t3/w5/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 5"
 

diff --git a/content/events/archive/2324/t3/w6/_index.md b/content/events/archive/2324/t3/w6/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 6"
 

diff --git a/content/events/archive/2324/t3/w7/_index.md b/content/events/archive/2324/t3/w7/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 7"
 

diff --git a/content/events/archive/2324/t3/w8/_index.md b/content/events/archive/2324/t3/w8/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 8"
 

diff --git a/content/events/archive/2324/t3/w9/_index.md b/content/events/archive/2324/t3/w9/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Week 9"
 

diff --git a/content/events/archive/_index.md b/content/events/archive/_index.md
@@ -1,7 +1,7 @@
 +++
 title = "Event Archive"
 weight = 1
-template = "event_archive.html"
+template = "events/event_archive.html"
 
 [extra]
 reverse_subsections = true

diff --git a/content/events/archive/calendar.md b/content/events/archive/calendar.md
@@ -1,6 +1,6 @@
 +++
 title = "Past Events"
-template = "events.html"
+template = "events/events.html"
 
 [extra]
 archive = true

diff --git a/content/events/archive/current.md b/content/events/archive/current.md
@@ -1,6 +1,6 @@
 +++
 title = "Past Events"
-template = "events_list.html"
+template = "events/events_list.html"
 
 [extra]
 archive = true

diff --git a/content/events/calendar.md b/content/events/calendar.md
@@ -2,8 +2,11 @@
 title = "Events Calendar"
 weight = 2
 sort_by = "weight"
-template = "events.html"
+template = "events/events.html"
 page_template = "event.html"
+
+[extra]
+hide = true
 +++
 
 A pretty view view of our events, looks similar to our social posts.

diff --git a/content/events/gen_seq.py b/content/events/gen_seq.py
diff --git a/content/events/repeat.md b/content/events/repeat.md
@@ -0,0 +1,8 @@
++++
+title = "Repeat Events JSON"
+weight = 3
+template = "events/repeat_list.json"
+
+[extra]
+hide = true
++++
diff --git a/content/events/t1/_index.md b/content/events/t1/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_term.html"
+template = "events/event_term.html"
 
 title = "Term 1"
 weight = 1

diff --git a/content/events/t1/repeat/_index.md b/content/events/t1/repeat/_index.md
@@ -0,0 +1,8 @@
++++
+template = "events/event_week.html"
+
+title = "Repeat Events"
+
+[extra]
+base_date = "2024-04-15"
++++
diff --git a/content/events/t1/w2/compcafe.md → content/events/t1/repeat/compcafe.md b/content/events/t1/w2/compcafe.md → content/events/t1/repeat/compcafe.md
@@ -10,11 +10,11 @@ end_time = "21:00"
 location = "CS0.06"
 
 icon = "ph-coffee"
-colour = "academic"
+colour = "compcafe"
 +++
 
 𝚢𝚘𝚞 𝚙𝚛𝚘𝚋𝚊𝚋𝚕𝚢 𝚑𝚊𝚟𝚎 𝚜𝚘𝚖𝚎 𝚠𝚘𝚛𝚔, 𝚜𝚘 𝚠𝚑𝚢 𝚗𝚘𝚝 𝚍𝚘 𝚒𝚝 𝚠𝚒𝚝𝚑 𝚏𝚛𝚎𝚎 𝚜𝚗𝚊𝚌𝚔𝚜!
 
 Computing Cafe exists to help you with any assignments you have! There will be tons of people from different years and differents courses, so you'll find whoever you need.
 
-There is also free coffee from the department vending machine in the common room, so take advantage of that while you can :D
+There is also free coffee from the department vending machine in the common room, so take advantage of that while you can :D
diff --git a/content/events/t1/w1/fng.md → content/events/t1/repeat/fng.md b/content/events/t1/w1/fng.md → content/events/t1/repeat/fng.md
diff --git a/content/events/t1/w2/pub.md → content/events/t1/repeat/pub-coach.md b/content/events/t1/w2/pub.md → content/events/t1/repeat/pub-coach.md
@@ -2,18 +2,18 @@
 title = "Pub Meal"
 date = "Monday 6pm"
 
-[taxonomies]
-tags = ["Pub Meal"]
-
 [extra]
-end_time = "9pm"
+end_time = "8pm"
 location = "Phantom Coach"
 location_url = "https://goo.gl/maps/wAptxmC4L7uajZEPA"
-
 icon = "ph-hamburger"
 colour = "social"
+weeks = ["w2", "w4", "w6", "w8"]
+
+[taxonomies]
+tags = ["Pub Meal"]
 +++
 
 Every Monday we go to one of the local pubs for some socializing and some food!
 
-*We will be meeting at DCS at 5:45, so meet us there if you'd like and we can walk over together.*
+*We will be meeting at DCS at 5:45, so meet us there if you'd like and we can walk over together.*
diff --git a/content/events/t1/w3/pub.md → content/events/t1/repeat/pub-duck.md b/content/events/t1/w3/pub.md → content/events/t1/repeat/pub-duck.md
@@ -1,16 +1,16 @@
 +++
 title = "Pub Meal"
-date = "Mon 6pm"
-
-[taxonomies]
-tags = ["Pub Meal"]
+date = "Monday 6pm"
 
 [extra]
-end_time = "9pm"
+end_time = "8pm"
 location = "The Dirty Duck"
-
 icon = "ph-hamburger"
 colour = "social"
+weeks = ["w1", "w3", "w5", "w7", "w9"]
+
+[taxonomies]
+tags = ["Pub Meal"]
 +++
 
-Every Monday we go to one of the local pubs for some socializing and some food!
+Every Monday we go to one of the local pubs for some socializing and some food!
diff --git a/content/events/t1/w0/_index.md b/content/events/t1/w0/_index.md
@@ -1,5 +1,5 @@
 +++
-template = "event_week.html"
+template = "events/event_week.html"
 
 title = "Welcome Week"
 

diff --git a/content/events/t1/w0/fng.md b/content/events/t1/w0/fng.md
@@ -13,7 +13,7 @@ icon = "icons/fng.svg"
 colour = "gaming"
 +++
 
-The Friday night fun begins!
+The Friday night fun continues!
 
 We have a huge selection of fun activities for you to choose from, so come along for a great night :)