From 0ca88b5941a17b8dd1975a8c6ffd5fd826028dab Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Tue, 25 Apr 2023 17:59:16 +0200
Subject: [PATCH] same as last couple of commits

---
 files/helpers/assetcache.py                          |  4 ++--
 files/templates/default.html                         |  6 +++---
 files/templates/{ => events}/DKD/music.html          |  2 +-
 files/templates/{ => events}/fistmas/awards.html     | 12 ++++++------
 files/templates/{ => events}/fistmas/banner.html     |  8 ++++----
 files/templates/{ => events}/fistmas/banner.svg      |  0
 .../templates/{ => events}/fistmas/banner_rDrama.svg |  0
 files/templates/{ => events}/fistmas/music.html      |  2 +-
 files/templates/sidebar_WPD.html                     |  2 +-
 files/templates/sidebar_rDrama.html                  |  2 +-
 files/templates/submission.html                      |  2 +-
 files/templates/util/html_head.html                  |  6 +++---
 12 files changed, 23 insertions(+), 23 deletions(-)
 rename files/templates/{ => events}/DKD/music.html (82%)
 rename files/templates/{ => events}/fistmas/awards.html (62%)
 rename files/templates/{ => events}/fistmas/banner.html (62%)
 rename files/templates/{ => events}/fistmas/banner.svg (100%)
 rename files/templates/{ => events}/fistmas/banner_rDrama.svg (100%)
 rename files/templates/{ => events}/fistmas/music.html (83%)

diff --git a/files/helpers/assetcache.py b/files/helpers/assetcache.py
index ee0e0da50..4b3334d22 100644
--- a/files/helpers/assetcache.py
+++ b/files/helpers/assetcache.py
@@ -13,9 +13,9 @@ ASSET_URL = '/assets/'
 ASSET_CACHE = defaultdict(lambda: None)
 
 if IS_DKD():
-	ASSET_SUBDIRS.extend(['/DKD/js'])
+	ASSET_SUBDIRS.extend(['/events/DKD/js'])
 elif IS_FISTMAS():
-	ASSET_SUBDIRS.extend(['/fistmas/css', '/fistmas/css/themes', '/fistmas/js', '/fistmas/js/vendor'])
+	ASSET_SUBDIRS.extend(['/events/fistmas/css', '/events/fistmas/css/themes', '/events/fistmas/js', '/events/fistmas/js/vendor'])
 
 def assetcache_build(asset_dir, subdirs):
 	for subdir in subdirs:
diff --git a/files/templates/default.html b/files/templates/default.html
index 889ba58f1..bb640f01d 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -5,7 +5,7 @@
 	{% include "modals/expanded_image.html" %}
 	{% if err or '@' not in request.path %}
 		{% if IS_FISTMAS() and not sub %}
-			{% include 'fistmas/banner.html' %}
+			{% include 'events/fistmas/banner.html' %}
 		{% else %}
 			{% if IS_BIRTHGAY() and not sub %}
 				{% set src = macros.random_image("assets/events/birthgay/images/banners/" ~ SITE_NAME) %}
@@ -101,9 +101,9 @@
 {% endif %}
 
 {% if IS_DKD() %}
-	{% include "DKD/music.html" %}
+	{% include "events/DKD/music.html" %}
 {% elif IS_FISTMAS() %}
-	{% include "fistmas/music.html" %}
+	{% include "events/fistmas/music.html" %}
 {% endif %}
 
 {% endblock %}
diff --git a/files/templates/DKD/music.html b/files/templates/events/DKD/music.html
similarity index 82%
rename from files/templates/DKD/music.html
rename to files/templates/events/DKD/music.html
index ab4e8e0a4..31eaae2bc 100644
--- a/files/templates/DKD/music.html
+++ b/files/templates/events/DKD/music.html
@@ -4,5 +4,5 @@
 		{% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=1' %}
 		<input hidden id="DKD-song" value="{{song}}">
 	{% endif %}
-	<script defer src="{{'DKD/js/music.js' | asset}}"></script>
+	<script defer src="{{'events/DKD/js/music.js' | asset}}"></script>
 {% endif %}
diff --git a/files/templates/fistmas/awards.html b/files/templates/events/fistmas/awards.html
similarity index 62%
rename from files/templates/fistmas/awards.html
rename to files/templates/events/fistmas/awards.html
index c76bc281a..ee7f44ac6 100644
--- a/files/templates/fistmas/awards.html
+++ b/files/templates/events/fistmas/awards.html
@@ -8,24 +8,24 @@
 
 	{# idk why snow isn't working vvvvvvvvvv #}
 	{% if p.award_count("snow", v) %}
-		<script defer src="{{'fistmas/js/vendor/snow.js'|asset}}"></script>
+		<script defer src="{{'events/fistmas/js/vendor/snow.js'|asset}}"></script>
 	{% endif %}
 
 	{% if p.award_count("frostbite", v) %}
 		<div class="frost"></div>
-		<script defer src="{{'fistmas/js/frostbite.js' | asset}}"></script>
-		<script defer src="{{'fistmas/css/frostbite.css' | asset}}"></script>
+		<script defer src="{{'events/fistmas/js/frostbite.js' | asset}}"></script>
+		<script defer src="{{'events/fistmas/css/frostbite.css' | asset}}"></script>
 	{% endif %}
 </div>
 
 {% if p.award_count("lights", v) %}
-	<link rel="stylesheet" href="{{('fistmas/css/lights.css') | asset}}">
+	<link rel="stylesheet" href="{{('events/fistmas/css/lights.css') | asset}}">
 {% endif %}
 
 {% if p.award_count("candycane", v) %}
-	<link rel="stylesheet" href="{{('fistmas/css/candycane.css') | asset}}">
+	<link rel="stylesheet" href="{{('events/fistmas/css/candycane.css') | asset}}">
 {% endif %}
 
 {% if p.award_count("fireplace", v) %}
-	<link rel="stylesheet" href="{{('fistmas/css/fireplace.css') | asset}}">
+	<link rel="stylesheet" href="{{('events/fistmas/css/fireplace.css') | asset}}">
 {% endif %}
diff --git a/files/templates/fistmas/banner.html b/files/templates/events/fistmas/banner.html
similarity index 62%
rename from files/templates/fistmas/banner.html
rename to files/templates/events/fistmas/banner.html
index f6644a2ba..e4feeef44 100644
--- a/files/templates/fistmas/banner.html
+++ b/files/templates/events/fistmas/banner.html
@@ -1,16 +1,16 @@
 {% if request.path == '/' %}
-	<script defer src="{{'fistmas/js/vendor/snow.js'|asset}}"></script>
+	<script defer src="{{'events/fistmas/js/vendor/snow.js'|asset}}"></script>
 {% endif %}
 
 <a rel="nofollow noopener noreferrer" href="https://www.youtube.com/watch?v=BuKft9LpL_0" style="text-decoration: none !important">
 	{% if SITE_NAME == 'rDrama' and range(1, 20)|random() == 1 %}
 		<img loading="lazy" src="/assets/events/fistmas/images/banner_new.webp" style="width:100%" />
 	{% else %}
-		<link rel="stylesheet" href="{{'fistmas/css/banner.css' | asset}}">
+		<link rel="stylesheet" href="{{'events/fistmas/css/banner.css' | asset}}">
 		{% if SITE_NAME == 'rDrama' %}
-			{% include "fistmas/banner_rDrama.svg" %}
+			{% include "events/fistmas/banner_rDrama.svg" %}
 		{% else %}
-			{% include "fistmas/banner.svg" %}
+			{% include "events/fistmas/banner.svg" %}
 		{% endif %}
 	{% endif %}
 </a>
diff --git a/files/templates/fistmas/banner.svg b/files/templates/events/fistmas/banner.svg
similarity index 100%
rename from files/templates/fistmas/banner.svg
rename to files/templates/events/fistmas/banner.svg
diff --git a/files/templates/fistmas/banner_rDrama.svg b/files/templates/events/fistmas/banner_rDrama.svg
similarity index 100%
rename from files/templates/fistmas/banner_rDrama.svg
rename to files/templates/events/fistmas/banner_rDrama.svg
diff --git a/files/templates/fistmas/music.html b/files/templates/events/fistmas/music.html
similarity index 83%
rename from files/templates/fistmas/music.html
rename to files/templates/events/fistmas/music.html
index c885f6dbd..714c0172f 100644
--- a/files/templates/fistmas/music.html
+++ b/files/templates/events/fistmas/music.html
@@ -4,5 +4,5 @@
 		{% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=1' %}
 		<input hidden id="fistmas-song" value="{{song}}">
 	{% endif %}
-	<script defer src="{{'fistmas/js/music.js' | asset}}"></script>
+	<script defer src="{{'events/fistmas/js/music.js' | asset}}"></script>
 {% endif %}
diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html
index e67a32e6d..0529ef325 100644
--- a/files/templates/sidebar_WPD.html
+++ b/files/templates/sidebar_WPD.html
@@ -90,5 +90,5 @@
 </div>
 
 {% if IS_FISTMAS() %}
-	<script defer src="{{'fistmas/js/darkmode.js' | asset}}"></script>
+	<script defer src="{{'events/fistmas/js/darkmode.js' | asset}}"></script>
 {% endif %}
diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html
index 321c040ed..e45a09307 100644
--- a/files/templates/sidebar_rDrama.html
+++ b/files/templates/sidebar_rDrama.html
@@ -80,5 +80,5 @@
 </div>
 
 {% if IS_FISTMAS() %}
-	<script defer src="{{'fistmas/js/darkmode.js' | asset}}"></script>
+	<script defer src="{{'events/fistmas/js/darkmode.js' | asset}}"></script>
 {% endif %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 5ec5188b4..25e6c962b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -9,7 +9,7 @@
 {% block pagetype %}thread{% endblock %}
 {% block head_final %}
 	{% include "awards.html" %}
-	{% include "fistmas/awards.html" %}
+	{% include "events/fistmas/awards.html" %}
 {% endblock %}
 {% set ups=p.upvotes %}
 {% set downs=p.downvotes %}
diff --git a/files/templates/util/html_head.html b/files/templates/util/html_head.html
index f69243c9a..287ceed4a 100644
--- a/files/templates/util/html_head.html
+++ b/files/templates/util/html_head.html
@@ -136,12 +136,12 @@
 	{% endif %}
 
 	{% if IS_FISTMAS() %}
-		<link rel="stylesheet" href="{{'fistmas/css/fistmas.css' | asset}}">
+		<link rel="stylesheet" href="{{'events/fistmas/css/fistmas.css' | asset}}">
 
 		{% if v and v.event_darkmode %}
-			<link rel="stylesheet" href="{{'fistmas/css/themes/dark.css'| asset}}">
+			<link rel="stylesheet" href="{{'events/fistmas/css/themes/dark.css'| asset}}">
 		{% else %}
-			<link rel="stylesheet" href="{{'fistmas/css/themes/light.css'| asset}}">
+			<link rel="stylesheet" href="{{'events/fistmas/css/themes/light.css'| asset}}">
 		{% endif %}
 	{% endif %}