From 1e581f086763b2241d3d7addce664cc6c0cfa95d Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Fri, 10 Sep 2021 00:39:22 +0000
Subject: [PATCH] Move default theme into themes directory, make themes
 directory a thing.

---
 MANIFEST.assets                                     |   5 +----
 bemani/frontend/app.py                              |   2 +-
 .../frontend/static/{ => themes}/default/color.css  |   0
 .../static/{ => themes}/default/favicon.png         | Bin
 .../frontend/static/{ => themes}/default/form.css   |   0
 .../static/{ => themes}/default/section.css         |   0
 .../frontend/static/{ => themes}/default/site.css   |   0
 .../frontend/static/{ => themes}/default/table.css  |   0
 8 files changed, 2 insertions(+), 5 deletions(-)
 rename bemani/frontend/static/{ => themes}/default/color.css (100%)
 rename bemani/frontend/static/{ => themes}/default/favicon.png (100%)
 rename bemani/frontend/static/{ => themes}/default/form.css (100%)
 rename bemani/frontend/static/{ => themes}/default/section.css (100%)
 rename bemani/frontend/static/{ => themes}/default/site.css (100%)
 rename bemani/frontend/static/{ => themes}/default/table.css (100%)

diff --git a/MANIFEST.assets b/MANIFEST.assets
index cc498a7..1946d0a 100644
--- a/MANIFEST.assets
+++ b/MANIFEST.assets
@@ -5,10 +5,7 @@ include bemani/frontend/static/*.css
 include bemani/frontend/static/*.js
 include bemani/frontend/static/*.gif
 include bemani/frontend/static/*.png
-include bemani/frontend/static/default/*.css
-include bemani/frontend/static/default/*.js
-include bemani/frontend/static/default/*.gif
-include bemani/frontend/static/default/*.png
+graft bemani/frontend/static/themes
 include bemani/frontend/static/components/*.js
 include bemani/frontend/static/controllers/*.js
 include bemani/frontend/static/controllers/admin/*.js
diff --git a/bemani/frontend/app.py b/bemani/frontend/app.py
index d7e2506..e8c079e 100644
--- a/bemani/frontend/app.py
+++ b/bemani/frontend/app.py
@@ -263,7 +263,7 @@ def jinja2_any(lval: Optional[List[Any]], pull: str, equals: str) -> bool:
 
 
 def jinja2_theme(filename: str) -> str:
-    return url_for('static', filename=f"{config.theme}/{filename}")
+    return url_for('static', filename=f"themes/{config.theme}/{filename}")
 
 
 @app.context_processor
diff --git a/bemani/frontend/static/default/color.css b/bemani/frontend/static/themes/default/color.css
similarity index 100%
rename from bemani/frontend/static/default/color.css
rename to bemani/frontend/static/themes/default/color.css
diff --git a/bemani/frontend/static/default/favicon.png b/bemani/frontend/static/themes/default/favicon.png
similarity index 100%
rename from bemani/frontend/static/default/favicon.png
rename to bemani/frontend/static/themes/default/favicon.png
diff --git a/bemani/frontend/static/default/form.css b/bemani/frontend/static/themes/default/form.css
similarity index 100%
rename from bemani/frontend/static/default/form.css
rename to bemani/frontend/static/themes/default/form.css
diff --git a/bemani/frontend/static/default/section.css b/bemani/frontend/static/themes/default/section.css
similarity index 100%
rename from bemani/frontend/static/default/section.css
rename to bemani/frontend/static/themes/default/section.css
diff --git a/bemani/frontend/static/default/site.css b/bemani/frontend/static/themes/default/site.css
similarity index 100%
rename from bemani/frontend/static/default/site.css
rename to bemani/frontend/static/themes/default/site.css
diff --git a/bemani/frontend/static/default/table.css b/bemani/frontend/static/themes/default/table.css
similarity index 100%
rename from bemani/frontend/static/default/table.css
rename to bemani/frontend/static/themes/default/table.css