mirror of
https://github.com/kevinveenbirkenbach/homepage.veen.world.git
synced 2026-05-19 19:44:14 +00:00
Probe-first asset resolution (regression fix)
---------------------------------------------
cache_manager.cache_file() returned either a relative cache path
(success) or None (failure). The previous app.py fallback
asset['cache'] = cached or asset['source'] mixed both types into
one field, which the template wrapped in url_for('static', ...)
regardless — producing broken
/static/https://file.infinito.nexus/.../logo.png URLs whenever the
source couldn't be downloaded.
- New app/utils/asset_resolver.py: HEAD-probes the URL (3 s
timeout, image/* content type). On hit, embed directly via a
new external_url field — no download required. On miss, fall
back to cache_manager.cache_file. If that also fails, expose
the source URL via external_url so the browser shows the alt
text instead of an empty src.
- app.py exposes an asset_src(asset) context processor that
picks external_url first, then url_for('static', cache),
so the template never wraps an absolute URL in a static prefix.
- Templates (base, navigation, card) switch to asset_src(...) and
gate the card image branch on cache or external_url.
- 16 unit tests cover every probe/cache/fallback branch; one live
integration test exercises the canonical
https://file.infinito.nexus/assets/img/logo.png to prove the
probe-first path works end-to-end (cache dir stays empty).
- config.sample.yaml: new Infinito.Nexus card driven by the same
canonical asset URL.
Single source of truth for IMAGE_NAME and PORT
----------------------------------------------
- env.example is now the only place the literal values live.
- Makefile and docker-compose.yml reference \$(IMAGE_NAME) /
\${IMAGE_NAME:?…} (same for PORT); no defaults, no silent
fallbacks.
- New make env / make config bootstrap .env / app/config.yaml
from their checked-in templates. Idempotent.
- All container-using targets depend on the two bootstrap targets
so a fresh checkout runs in a single invocation.
- Recipes source .env at recipe-execution time so they pick up a
freshly bootstrapped .env in the same make invocation.
README
------
- Screenshot added under the title.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
104 lines
4.3 KiB
Django/Jinja
104 lines
4.3 KiB
Django/Jinja
{% macro render_icon_and_name(item) %}
|
|
<i class="{{ item.icon.class if item.icon is defined and item.icon.class is defined else 'fa-solid fa-link' }}"></i>
|
|
{% if item.name is defined %}
|
|
{{ item.name }}
|
|
{% else %}
|
|
Unnamed Item: {{item}}
|
|
{% endif %}
|
|
{% endmacro %}
|
|
<!-- Template for children -->
|
|
{% macro render_children(children) %}
|
|
{% for child in children %}
|
|
{% if child.children %}
|
|
<li class="dropdown-submenu position-relative">
|
|
<a class="dropdown-item dropdown-toggle" title="{{ child.description }}">
|
|
{{ render_icon_and_name(child) }}
|
|
</a>
|
|
<ul class="dropdown-menu">
|
|
{{ render_children(child.children) }}
|
|
</ul>
|
|
</li>
|
|
|
|
{% elif child.identifier or child.warning or child.info %}
|
|
<li>
|
|
<a class="dropdown-item"
|
|
onclick='openDynamicPopup({{ child|tojson|safe }})'
|
|
data-bs-toggle="tooltip"
|
|
title="{{ child.description }}">
|
|
{{ render_icon_and_name(child) }}
|
|
</a>
|
|
</li>
|
|
|
|
{% else %}
|
|
<li>
|
|
<a class="dropdown-item {% if child.iframe %}iframe-link{% endif %}"
|
|
{% if child.onclick %}
|
|
onclick="{{ child.onclick }}"
|
|
{% else %}
|
|
href="{{ child.url }}"
|
|
{% endif %}
|
|
target="{{ child.target|default('_blank') }}"
|
|
data-bs-toggle="tooltip"
|
|
title="{{ child.description }}">
|
|
{{ render_icon_and_name(child) }}
|
|
</a>
|
|
</li>
|
|
{% endif %}
|
|
{% endfor %}
|
|
{% endmacro %}
|
|
|
|
<!-- Navigation Bar -->
|
|
<nav class="navbar navbar-expand-lg navbar-light bg-light menu-{{menu_type}} mb-0">
|
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav{{menu_type}}" aria-controls="navbarNav{{menu_type}}" aria-expanded="false" aria-label="Toggle navigation">
|
|
<span class="navbar-toggler-icon"></span>
|
|
</button>
|
|
<div class="collapse navbar-collapse" id="navbarNav{{menu_type}}">
|
|
{% if menu_type == "header" %}
|
|
<a class="navbar-brand align-items-center d-flex js-restore" id="navbar_logo" href="#">
|
|
<img
|
|
src="{{ asset_src(platform.logo) }}"
|
|
alt="{{ platform.titel }}"
|
|
class="d-inline-block align-text-top"
|
|
style="height:2rem">
|
|
<div class="ms-2 d-flex flex-column">
|
|
<span class="fs-4 fw-bold mb-0">{{ platform.titel }}</span>
|
|
{# <small class="fs-7 text-muted">{{ platform.subtitel }}</small> #}
|
|
</div>
|
|
{% endif %}
|
|
</a>
|
|
<ul class="navbar-nav {% if menu_type == 'header' %}ms-auto{% endif %} btn-group">
|
|
{% for item in navigation[menu_type].children %}
|
|
{% if item.url or item.onclick %}
|
|
<li class="nav-item">
|
|
<a class="nav-link btn btn-light {% if item.iframe %}iframe-link{% endif %}"
|
|
{% if item.onclick %}
|
|
onclick="{{ item.onclick }}"
|
|
{% else %}
|
|
href="{{ item.url }}"
|
|
{% endif %}
|
|
target="{{ item.target|default('_blank') }}"
|
|
data-bs-toggle="tooltip"
|
|
title="{{ item.description }}">
|
|
{{ render_icon_and_name(item) }}
|
|
</a>
|
|
</li>
|
|
{% else %}
|
|
<!-- Dropdown Menu -->
|
|
<li class="nav-item dropdown">
|
|
<a class="nav-link dropdown-toggle btn btn-light" id="navbarDropdown{{ loop.index }}" role="button" data-bs-toggle="dropdown" data-bs-display="dynamic" aria-expanded="false">
|
|
{% if item.icon is defined and item.icon.class is defined %}
|
|
{{ render_icon_and_name(item) }}
|
|
{% else %}
|
|
<p>Missing icon in item: {{ item }}</p>
|
|
{% endif %}
|
|
</a>
|
|
<ul class="dropdown-menu">
|
|
{{ render_children(item.children) }}
|
|
</ul>
|
|
</li>
|
|
{% endif %}
|
|
{% endfor %}
|
|
</ul>
|
|
</div>
|
|
</nav>
|