refactor: Move static assets out of code directory

open-contracting · Nov 8, 2021 · 80bbd09 · 80bbd09
1 parent 07df37a
commit 80bbd09
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 3 deletions.
diff --git a/...tools/fonts/GT Eesti Pro Display Bold.ttf → ...ssets/fonts/GT Eesti Pro Display Bold.ttf b/...tools/fonts/GT Eesti Pro Display Bold.ttf → ...ssets/fonts/GT Eesti Pro Display Bold.ttf
diff --git a/...ls/fonts/GT Eesti Pro Display Regular.ttf → ...ts/fonts/GT Eesti Pro Display Regular.ttf b/...ls/fonts/GT Eesti Pro Display Regular.ttf → ...ts/fonts/GT Eesti Pro Display Regular.ttf
diff --git a/backend/dqt/tools/fonts/UbuntuMono-B.ttf → backend/dqt/assets/fonts/UbuntuMono-B.ttf b/backend/dqt/tools/fonts/UbuntuMono-B.ttf → backend/dqt/assets/fonts/UbuntuMono-B.ttf
diff --git a/backend/dqt/tools/fonts/UbuntuMono-BI.ttf → backend/dqt/assets/fonts/UbuntuMono-BI.ttf b/backend/dqt/tools/fonts/UbuntuMono-BI.ttf → backend/dqt/assets/fonts/UbuntuMono-BI.ttf
diff --git a/backend/dqt/tools/fonts/UbuntuMono-R.ttf → backend/dqt/assets/fonts/UbuntuMono-R.ttf b/backend/dqt/tools/fonts/UbuntuMono-R.ttf → backend/dqt/assets/fonts/UbuntuMono-R.ttf
diff --git a/backend/dqt/tools/fonts/UbuntuMono-RI.ttf → backend/dqt/assets/fonts/UbuntuMono-RI.ttf b/backend/dqt/tools/fonts/UbuntuMono-RI.ttf → backend/dqt/assets/fonts/UbuntuMono-RI.ttf
diff --git a/backend/dqt/tools/images/lifecycle.png → backend/dqt/assets/images/lifecycle.png b/backend/dqt/tools/images/lifecycle.png → backend/dqt/assets/images/lifecycle.png
diff --git a/backend/dqt/tools/graphs.py b/backend/dqt/tools/graphs.py
@@ -1,4 +1,5 @@
 import math
+import os
 from collections import OrderedDict
 from io import BytesIO
 
@@ -8,7 +9,7 @@
 from PIL import Image, ImageDraw, ImageFont
 
 font_dirs = [
-    "dqt/tools/fonts",
+    os.path.join("dqt", "assets", "fonts"),
 ]
 font_files = font_manager.findSystemFonts(fontpaths=font_dirs)
 for font_file in font_files:
@@ -407,9 +408,9 @@ def table_result_box(counts_pairs, total_count=None, return_aspect_ratio=False):
 def lifecycle_image(
     planning_count, tender_count, award_count, contract_count, implementation_count, return_aspect_ratio=False
 ):
-    image = Image.open("dqt/tools/images/lifecycle.png")
+    image = Image.open(os.path.join("dqt", "assets", "images", "lifecycle.png"))
     draw = ImageDraw.Draw(image)
-    font = ImageFont.truetype("dqt/tools/fonts/GT Eesti Pro Display Regular.ttf", 45)
+    font = ImageFont.truetype(os.path.join("dqt", "assets", "fonts", "GT Eesti Pro Display Regular.ttf"), 45)
 
     draw.text(
         xy=(154, 283),