Compare commits

6 Commits

Author SHA1 Message Date
7d1ceded8d meow 2025-04-17 17:42:50 +02:00
b3e23a53d9 feat: added children to context 2025-04-17 14:39:14 +02:00
b2513f7caf improved child cards from overview 2025-04-17 14:22:48 +02:00
4743456bd8 feat: improved translation cards 2025-04-17 14:08:26 +02:00
6994662bb4 feat: shift the headers in the preview 2025-04-17 14:05:59 +02:00
db23ceac78 feat: removed unnecessary code 2025-04-17 13:54:37 +02:00
4 changed files with 58 additions and 37 deletions

View File

@@ -7,7 +7,6 @@
<link rel="stylesheet" href="/static/bulma.min.css" />
</head>
<body>
<!-- Header (Navbar) -->
<nav
class="navbar is-primary"
role="navigation"
@@ -23,22 +22,31 @@
<section class="section">
{% if translations|length %}
<div class="container content">
<div class="column is-half is-offset-one-quarter">
<div class="content">
<h1>Translations</h1>
</div>
<div class="column is-half is-offset-one-quarter">
<div class="columns is-multiline">
{% for t in translations %}
<div class="card mb-4" lang="{{t.language.code}}">
<a href="{{t.url}}" hreflang="{{t.language.code}}" class="card mb-4" style="color: inherit; text-decoration: none;">
<div class="card-content">
<p class="title">{{t.language.flag}} {{t.title}} </p>
<p class="content">
{{t.preview}}
<br />
<time datetime="{{iso_date}}">{{date}}</time>
</p>
<div class="column is-half">
<div class="card mb-4" lang="{{t.language.code}}" style="height: 100%;">
<a href="{{t.url}}" hreflang="{{t.language.code}}" class="card mb-4" style="color: inherit; text-decoration: none;">
<div class="card-header">
<div class="card-header-title">{{t.title}} </div>
<div class="card-header-icon">{{t.language.flag}}</div>
</div>
</a>
<div class="card-content">
<hr />
<p class="content">
{{t.preview}}
</p>
</div>
<div class="card-footer">
<time datetime="{{iso_date}}">{{date}}</time>
</div>
</a>
</div>
</div>
{% endfor %}
</div>
@@ -49,7 +57,7 @@
{% if children|length %}
<div class="container content">
<div class="column is-half is-offset-one-quarter">
<h1>Child Articles</h1>
<h1>Further reading</h1>
</div>
<div class="column is-half is-offset-one-quarter">
{% for c in children %}
@@ -57,9 +65,14 @@
<a href="{{c.url}}" class="card mb-4" style="color: inherit; text-decoration: none;">
<div class="card-content">
<p class="title">{{c.slug}} </p>
<p class="content">
<time datetime="{{iso_date}}">{{date}}</time>
<hr />
<p class="content is-flex is-flex-direction-column" style="gap: 10px;">
{% for ct in c.translations %}
<a href="{{ct.url}}" hreflang="{{ct.language.code}}">{{ct.language.flag}}: {{ct.title}}</a>
{% endfor %}
</p>
<hr />
<time datetime="{{iso_date}}">{{date}}</time>
</div>
</a>
</div>

View File

@@ -3,7 +3,8 @@ source_directory = "src"
dist_directory = "dist"
[formatting]
article_preview_length = 400
preview_length = 400
preview_header_shift = 2
datetime_format = "%d. %B %Y"
default_language = "de"

View File

@@ -4,9 +4,10 @@ class config:
dist_directory = "dist"
class formatting:
article_preview_length = 200
datetime_format = "%d. %B %Y"
fallback_language = "en"
preview_length = 400
preview_header_shift = 2
languages = {
"af": {

View File

@@ -14,13 +14,6 @@ import jinja2
from . import config
def replace_values(template: str, values: Dict[str, str]) -> str:
for key, value in values.items():
template = template.replace("{" + key + "}", value)
return template
def get_first_header_content(content, fallback: str = ""):
soup = BeautifulSoup(content, 'html.parser')
for level in range(1, 7):
@@ -31,7 +24,7 @@ def get_first_header_content(content, fallback: str = ""):
return fallback
def shorten_text_and_clean(html_string, max_length=config.formatting.article_preview_length):
def shorten_text_and_clean(html_string, max_length=config.formatting.preview_length):
soup = BeautifulSoup(html_string, 'html.parser')
# Keep track of total characters added
@@ -69,6 +62,23 @@ def shorten_text_and_clean(html_string, max_length=config.formatting.article_pre
return str(soup)
def shift_headings(html_string, header_shift=config.formatting.preview_header_shift):
soup = BeautifulSoup(html_string, 'html.parser')
for level in range(6, 0, -1): # Start from h6 to h1 to avoid overwriting
old_tag = f'h{level}'
for tag in soup.find_all(old_tag):
new_level = min(level + header_shift, 6) # Cap at h6
new_tag = f'h{new_level}'
tag.name = new_tag
return str(soup)
def get_preview_text(html_string: str):
return shift_headings(shorten_text_and_clean(html_string))
def stem_to_language_code(stem: str) -> str:
language_code = stem.lower().replace("-", "_")
@@ -83,7 +93,6 @@ def stem_to_language_code(stem: str) -> str:
exit(1)
class TemplateDict(dict):
def __init__(self, folder: Path):
self.folder = folder
@@ -99,8 +108,10 @@ class TemplateDict(dict):
self[name] = t
return t
TEMPLATE: Dict[str, jinja2.Template] = TemplateDict(Path(config.setup.source_directory, "templates"))
class LanguageDict(dict):
def __missing__(self, key: str):
if key not in config.languages:
@@ -116,6 +127,7 @@ class LanguageDict(dict):
return lang_dict
LANGUAGES = LanguageDict()
@@ -135,15 +147,6 @@ class ArticleTranslation:
self.priority = LANGUAGES[self.language_code]["priority"]
self.real_language_code = LANGUAGES[self.language_code]["code"]
# TODO remove
self.article_content = self.file.read_text()
self.article_preview = self.article_content[:config.formatting.article_preview_length] + "..."
if self.file.suffix == ".md":
self.article_content = markdown.markdown(self.article_content)
self.article_preview = markdown.markdown(self.article_preview)
self.title = get_first_header_content(self.article_content, fallback="")
def __init_context__(self):
self.context["meta"] = self.article.context_shared
self.context["url"] = self.url
@@ -156,7 +159,10 @@ class ArticleTranslation:
self.context["title"] = get_first_header_content(html_content, fallback=LANGUAGES[self.language_code]["native_name"])
self.context["content"] = html_content
self.context["preview"] = shorten_text_and_clean(html_string=html_content)
self.context["preview"] = get_preview_text(html_string=html_content)
# get children
self.context["children"] = [c.article_translations_map[self.language_code].context for c in self.article.child_articles if self.language_code in c.article_translations_map]
def build(self):
self.dist_path.mkdir(parents=True, exist_ok=True)