Add config.json handling for Docker setup and update script

Add module detection for dynamic navbar rendering
Add asset versioning for cache-busting in templates and configuration
2026-04-10 16:35:49 +02:00 · 2026-04-10 16:22:03 +02:00 · 2026-04-10 16:10:30 +02:00 · 2026-04-10 16:02:18 +02:00 · 2026-04-10 15:57:44 +02:00 · 2026-04-10 15:56:42 +02:00
9 changed files with 157 additions and 69 deletions
@@ -203,6 +203,7 @@ jobs:
              expose:
                - "8000"
              volumes:
+                - ./config.json:/app/config.json:ro
                - app_uploads:/app/Web/uploads
                - app_thumbnails:/app/Web/thumbnails
                - app_previews:/app/Web/previews
@@ -225,6 +226,7 @@ jobs:
          cp stop.sh release-bundle/stop.sh
          cp restart.sh release-bundle/restart.sh
          cp backup.sh release-bundle/backup.sh
+          cp config.json release-bundle/config.json
          cp update.sh release-bundle/update.sh
          cp init-admin.sh release-bundle/init-admin.sh

@@ -1,4 +1,5 @@
 dist
 logs
 certs
-build
+build
+.venv
@@ -1,5 +1,7 @@
 # Inventarsystem

+[![https://github.com/AIIrondev/legendary-octo-garbanzo](https://github.com/AIIrondev/legendary-octo-garbanzo/actions/workflows/release-docker.yml/badge.svg)](https://github.com/AIIrondev/legendary-octo-garbanzo/actions/workflows/release-docker.yml)
+
 [![wakatime](https://wakatime.com/badge/user/30b8509f-5e17-4d16-b6b8-3ca0f3f936d3/project/8a380b7f-389f-4a7e-8877-0fe9e1a4c243.svg)](https://wakatime.com/badge/user/30b8509f-5e17-4d16-b6b8-3ca0f3f936d3/project/8a380b7f-389f-4a7e-8877-0fe9e1a4c243)

 **Aktuelle Version: 3.2.1**
@@ -92,6 +92,45 @@ SCHOOL_PERIODS = cfg.SCHOOL_PERIODS

 # Apply the configuration for general use throughout the app
 APP_VERSION = __version__
+RELEASE_STATE_FILE = os.path.join(os.path.dirname(BASE_DIR), '.release-version')
+
+
+def _get_asset_version():
+    """Return a cache-busting asset version tied to deployment state."""
+    env_version = os.getenv('INVENTAR_ASSET_VERSION', '').strip()
+    if env_version:
+        return env_version
+
+    try:
+        if os.path.exists(RELEASE_STATE_FILE):
+            with open(RELEASE_STATE_FILE, 'r', encoding='utf-8') as f:
+                release_tag = f.read().strip()
+                if release_tag:
+                    return release_tag
+    except Exception:
+        pass
+
+    return APP_VERSION
+
+
+def _is_library_module_path(path):
+    """Return True when the current request path belongs to the library module."""
+    if not path:
+        return False
+
+    library_prefixes = (
+        '/library',
+        '/library_',
+        '/student_cards',
+    )
+    return path.startswith(library_prefixes)
+
+
+def _get_current_module(path):
+    """Resolve the active UI module for navbar separation."""
+    if cfg.LIBRARY_MODULE_ENABLED and _is_library_module_path(path):
+        return 'library'
+    return 'inventory'


 def _parse_money_value(value):
@@ -293,13 +332,19 @@ def _prepare_invoice_pdf_payload(invoice_data, borrow_doc=None, item_doc=None):
 def inject_version():
    """Inject global template variables."""
    is_admin = False
+    asset_version = _get_asset_version()
    if 'username' in session:
        try:
            is_admin = us.check_admin(session['username'])
        except Exception:
            is_admin = False
+
+    current_module = _get_current_module(request.path)
+
    return {
        'APP_VERSION': APP_VERSION,
+        'ASSET_VERSION': asset_version,
+        'CURRENT_MODULE': current_module,
        'school_periods': SCHOOL_PERIODS,
        'library_module_enabled': cfg.LIBRARY_MODULE_ENABLED,
        'student_cards_module_enabled': cfg.STUDENT_CARDS_MODULE_ENABLED,
@@ -7,7 +7,7 @@
   For commercial licensing inquiries: https://github.com/AIIrondev
 -->
 <!DOCTYPE html>
-<html lang="en" data-module="inventory">
+<html lang="en" data-module="{{ CURRENT_MODULE }}">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, user-scalable=yes">
@@ -20,8 +20,8 @@
    <link rel="preconnect" href="https://fonts.googleapis.com">
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
    <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/planned_appointments.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css', v=ASSET_VERSION) }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/planned_appointments.css', v=ASSET_VERSION) }}">
    <link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}">
    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
    <style>
@@ -369,7 +369,7 @@
        <span class="module-label">Module:</span>
        <div class="module-tabs">
            <a href="{{ url_for('home') }}" 
-               class="module-tab" 
+               class="module-tab {% if CURRENT_MODULE == 'inventory' %}active{% endif %}" 
               id="inventoryModule" 
               data-module="inventory">
               📦 Inventarsystem
@@ -377,7 +377,7 @@
            {% if library_module_enabled %}
            <div class="module-separator"></div>
            <a href="{{ url_for('library_view') }}" 
-               class="module-tab" 
+               class="module-tab {% if CURRENT_MODULE == 'library' %}active{% endif %}" 
               id="libraryModule" 
               data-module="library">
               📚 Bibliothek
@@ -386,48 +386,7 @@
        </div>
    </div>
    {% endif %}
-
-    <script>
-        (function() {
-            // Detect current module based on URL and update data-module attribute
-            const currentPath = window.location.pathname;
-            const htmlTag = document.documentElement;
-            
-            // Detect module and pages
-            const isLibraryModule = currentPath.includes('/library') || 
-                                   currentPath.includes('/library_admin') ||
-                                   currentPath.includes('/library_loans') ||
-                                   currentPath.includes('/student_cards');
-            
-            const currentModule = isLibraryModule ? 'library' : 'inventory';
-            htmlTag.setAttribute('data-module', currentModule);
-            
-            // Update module selector tabs
-            const invModule = document.getElementById('inventoryModule');
-            const libModule = document.getElementById('libraryModule');
-
-            if (currentModule === 'library') {
-                if (libModule) libModule.classList.add('active');
-                if (invModule) invModule.classList.remove('active');
-            } else {
-                if (invModule) invModule.classList.add('active');
-                if (libModule) libModule.classList.remove('active');
-            }
-            
-            // Show/hide appropriate navbar based on current module
-            const invNavbar = document.getElementById('inventoryNavbar');
-            const libNavbar = document.getElementById('libraryNavbar');
-
-            if (currentModule === 'library') {
-                if (invNavbar) invNavbar.style.display = 'none';
-                if (libNavbar) libNavbar.style.display = '';
-            } else {
-                if (invNavbar) invNavbar.style.display = '';
-                if (libNavbar) libNavbar.style.display = 'none';
-            }
-        })();
-    </script>
-
+    {% if CURRENT_MODULE != 'library' %}
    <nav class="navbar navbar-expand-lg navbar-dark" id="inventoryNavbar">
        <div class="container-fluid">
            <a class="navbar-brand" href="{{ url_for('home') }}" data-icon="📦">Inventarsystem</a>
@@ -490,9 +449,10 @@
            </div>
        </div>
    </nav>
+    {% endif %}

-    {% if library_module_enabled %}
-    <nav class="navbar navbar-expand-lg navbar-dark" id="libraryNavbar" style="display: none;">
+    {% if library_module_enabled and CURRENT_MODULE == 'library' %}
+    <nav class="navbar navbar-expand-lg navbar-dark" id="libraryNavbar">
        <div class="container-fluid">
            <a class="navbar-brand" href="{{ url_for('library_view') }}" data-icon="📚">Bibliothek</a>
            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#libraryNavContent">
@@ -555,23 +515,6 @@
        </div>
    </nav>
    {% endif %}
-
-    <script>
-        (function() {
-            // Show/hide appropriate navbar based on current module
-            const currentPath = window.location.pathname;
-            const invNavbar = document.getElementById('inventoryNavbar');
-            const libNavbar = document.getElementById('libraryNavbar');
-
-            if (currentPath.includes('/library')) {
-                if (invNavbar) invNavbar.style.display = 'none';
-                if (libNavbar) libNavbar.style.display = '';
-            } else {
-                if (invNavbar) invNavbar.style.display = '';
-                if (libNavbar) libNavbar.style.display = 'none';
-            }
-        })();
-    </script>
    <div class="container">
        {% with messages = get_flashed_messages(with_categories=true) %}
            {% if messages %}
@@ -42,6 +42,7 @@ services:
    expose:
      - "8000"
    volumes:
+      - ./config.json:/app/config.json:ro
      - ./Web:/app/Web
      - app_uploads:/app/Web/uploads
      - app_thumbnails:/app/Web/thumbnails
@@ -47,6 +47,72 @@ refresh_start_script_from_main() {
    fi
 }

+pin_compose_app_image() {
+    local tag="$1"
+    local compose_file
+    compose_file="$PROJECT_DIR/docker-compose.yml"
+
+    if [ ! -f "$compose_file" ]; then
+        echo "Warning: $compose_file not found; cannot pin app image"
+        return 0
+    fi
+
+    python3 - <<'PY' "$compose_file" "$tag"
+import re
+import sys
+
+compose_file, tag = sys.argv[1], sys.argv[2]
+target_image = f"ghcr.io/aiirondev/legendary-octo-garbanzo:{tag}"
+
+with open(compose_file, "r", encoding="utf-8") as f:
+    lines = f.readlines()
+
+out = []
+in_app = False
+in_build = False
+image_set = False
+
+for line in lines:
+    stripped = line.lstrip(" ")
+    indent = len(line) - len(stripped)
+
+    if not in_app and re.match(r"^\s{2}app:\s*$", line):
+        in_app = True
+        image_set = False
+        out.append(line)
+        out.append(f"    image: {target_image}\n")
+        image_set = True
+        continue
+
+    if in_app:
+        if indent == 2 and re.match(r"^[A-Za-z0-9_-]+:\s*$", stripped):
+            in_app = False
+            in_build = False
+
+        if in_app:
+            if in_build:
+                if indent > 4:
+                    continue
+                in_build = False
+
+            if re.match(r"^\s{4}build:\s*$", line):
+                in_build = True
+                continue
+
+            if re.match(r"^\s{4}image:\s*", line):
+                if image_set:
+                    continue
+                out.append(f"    image: {target_image}\n")
+                image_set = True
+                continue
+
+    out.append(line)
+
+with open(compose_file, "w", encoding="utf-8") as f:
+    f.writelines(out)
+PY
+}
+
 install_docker_if_missing() {
    if command -v docker >/dev/null 2>&1; then
        return 0
@@ -303,6 +369,8 @@ main() {
    curl -fL "$bundle_url" -o "$TMP_DIR/$BUNDLE_ASSET"
    sudo tar -xzf "$TMP_DIR/$BUNDLE_ASSET" -C "$PROJECT_DIR"

+    pin_compose_app_image "$tag"
+
    if [ -z "$image_url" ]; then
        echo "Error: release image asset is missing"
        exit 1
@@ -310,6 +378,8 @@ main() {

    curl -fL "$image_url" -o "$TMP_DIR/inventarsystem-image-$tag.tar.gz"
    sudo docker load -i "$TMP_DIR/inventarsystem-image-$tag.tar.gz" >/dev/null
+    # Compatibility alias: some legacy compose bundles may still reference :latest.
+    sudo docker tag "ghcr.io/aiirondev/legendary-octo-garbanzo:$tag" "ghcr.io/aiirondev/legendary-octo-garbanzo:latest" >/dev/null 2>&1 || true

    if [ ! -f "$PROJECT_DIR/start.sh" ]; then
        echo "Error: release bundle is missing start.sh"
@@ -8,12 +8,12 @@ PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LOG_DIR="$PROJECT_DIR/logs"
 LOG_FILE="$LOG_DIR/update.log"
 STATE_FILE="$PROJECT_DIR/.release-version"
-REPO_SLUG="AIIrondev/Inventarsystem"
+REPO_SLUG="AIIrondev/legendary-octo-garbanzo"
 API_URL="https://api.github.com/repos/$REPO_SLUG/releases/latest"
 BUNDLE_ASSET="inventarsystem-docker-bundle.tar.gz"
 APP_IMAGE_ASSET_PREFIX="inventarsystem-image-"
 ENV_FILE="$PROJECT_DIR/.docker-build.env"
-APP_IMAGE_REPO="ghcr.io/aiirondev/inventarsystem"
+APP_IMAGE_REPO="ghcr.io/aiirondev/legendary-octo-garbanzo"
 DIST_DIR="$PROJECT_DIR/dist"

 mkdir -p "$LOG_DIR"
@@ -234,10 +234,26 @@ load_release_image() {
    log_message "Loading app image from release asset $image_asset"
    curl -fL "$image_url" -o "$archive"
    docker load -i "$archive" >> "$LOG_FILE" 2>&1
+    docker tag "$APP_IMAGE_REPO:$tag" "$APP_IMAGE_REPO:latest" >> "$LOG_FILE" 2>&1 || true

    trap - RETURN
 }

+refresh_runtime_scripts_from_main() {
+    local start_url stop_url restart_url update_url
+    start_url="https://raw.githubusercontent.com/$REPO_SLUG/main/start.sh"
+    stop_url="https://raw.githubusercontent.com/$REPO_SLUG/main/stop.sh"
+    restart_url="https://raw.githubusercontent.com/$REPO_SLUG/main/restart.sh"
+    update_url="https://raw.githubusercontent.com/$REPO_SLUG/main/update.sh"
+
+    curl -fsSL "$start_url" -o "$PROJECT_DIR/start.sh" || log_message "WARNING: Could not refresh start.sh from main"
+    curl -fsSL "$stop_url" -o "$PROJECT_DIR/stop.sh" || log_message "WARNING: Could not refresh stop.sh from main"
+    curl -fsSL "$restart_url" -o "$PROJECT_DIR/restart.sh" || log_message "WARNING: Could not refresh restart.sh from main"
+    curl -fsSL "$update_url" -o "$PROJECT_DIR/update.sh" || log_message "WARNING: Could not refresh update.sh from main"
+
+    chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh"
+}
+
 find_local_dist_image_archive() {
    local tag="$1"
    local archive
@@ -277,6 +293,7 @@ load_local_dist_image() {

    log_message "Loading app image from local dist artifact: $archive"
    if docker load -i "$archive" >> "$LOG_FILE" 2>&1; then
+        docker tag "$APP_IMAGE_REPO:$tag" "$APP_IMAGE_REPO:latest" >> "$LOG_FILE" 2>&1 || true
        return 0
    fi

@@ -308,6 +325,11 @@ download_and_extract_bundle() {
        cp -f "$tmp_dir/update.sh" "$PROJECT_DIR/update.sh"
    fi

+    if [ ! -f "$PROJECT_DIR/config.json" ] && [ -f "$tmp_dir/config.json" ]; then
+        cp -f "$tmp_dir/config.json" "$PROJECT_DIR/config.json"
+        log_message "Installed default config.json from release bundle"
+    fi
+
    chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh"
 }

@@ -342,6 +364,7 @@ EOF

    docker compose --env-file "$ENV_FILE" pull nginx mongodb >> "$LOG_FILE" 2>&1
    docker compose --env-file "$ENV_FILE" up -d --remove-orphans >> "$LOG_FILE" 2>&1
+    docker tag "$app_image" "$APP_IMAGE_REPO:latest" >> "$LOG_FILE" 2>&1 || true
 }

 verify_stack_health() {
@@ -460,6 +483,7 @@ main() {

    log_message "Updating from release $latest_tag"
    download_and_extract_bundle "$bundle_url" "$tmp_dir"
+    refresh_runtime_scripts_from_main
    deploy "$latest_tag" "$meta_file"
    if ! verify_stack_health; then
        log_message "ERROR: Updated stack failed health check"
Author	SHA1	Message	Date
Aiirondev_dev	a85461711c	Add config.json handling for Docker setup and update script	2026-04-10 16:35:49 +02:00
Aiirondev_dev	bf0a50ad57	Add module detection for dynamic navbar rendering	2026-04-10 16:22:03 +02:00
Aiirondev_dev	9212ad04f5	Add asset versioning for cache-busting in templates and configuration	2026-04-10 16:10:30 +02:00
Aiirondev_dev	1931e07013	Add function to refresh runtime scripts from main repository and update image tags	2026-04-10 16:02:18 +02:00
Maximilian G.	c81aa882e9	Add badges for CI and coding activity Added badges for GitHub Actions and Wakatime to README.	2026-04-10 15:57:44 +02:00
Aiirondev_dev	142e6e990e	Update repository slug and image repository in update script	2026-04-10 15:56:42 +02:00
Aiirondev_dev	9333b5cdd0	Add versioning to CSS file links in base template	2026-04-10 15:51:35 +02:00
Aiirondev_dev	b11739de3b	Add compatibility alias for legacy compose bundles in installer script	2026-04-10 15:37:01 +02:00
Aiirondev_dev	269f084227	Add function to pin application image in docker-compose file	2026-04-10 15:33:15 +02:00