Compare commits

..

12 Commits

6 changed files with 59 additions and 11 deletions
+5 -2
View File
@@ -406,7 +406,7 @@ def _is_inventory_module_path(path):
if not path:
return False
if path == '/' or path == '/home':
if path == '/' or path.startswith('/home'):
return True
inventory_prefixes = (
@@ -416,7 +416,10 @@ def _is_inventory_module_path(path):
'/manage_filters',
'/manage_locations',
'/admin_borrowings',
'/admin_damaged_items'
'/admin_damaged_items',
'/admin/borrowings',
'/admin/damaged_items',
'/terminplan',
)
return path.startswith(inventory_prefixes)
Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

+26 -1
View File
@@ -192,6 +192,24 @@
flex-shrink: 0;
}
#loginNavbar .navbar-brand {
padding-right: 0;
}
#loginNavbar .navbar-brand::before {
content: none;
margin-right: 0;
}
#loginNavbar .invario-logo {
display: block;
height: 48px;
width: auto;
max-width: min(58vw, 280px);
object-fit: contain;
filter: drop-shadow(0 0 2px rgba(255, 255, 255, 0.45));
}
.navbar-text.tenant-badge {
font-size: 0.82rem;
color: rgba(255,255,255,0.9);
@@ -337,6 +355,11 @@
font-size: 0.75rem;
padding: 0.4rem 0.5rem;
}
#loginNavbar .invario-logo {
height: 34px;
max-width: 62vw;
}
}
.navbar.nav-compact .navbar-brand {
@@ -1268,7 +1291,9 @@
{% else %}
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
<div class="container-fluid">
<a class="navbar-brand" href="{{ url_for('home') }}" data-icon="🔹">Invario</a>
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
</a>
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a>
+1 -1
View File
@@ -20,7 +20,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
- .:/workspace
entrypoint: >
sh -c "apk add --no-cache bash docker-cli && cd /workspace && ./manage-tenant.sh \"$$@\"" --
sh -c "apk add --no-cache bash docker-cli docker-cli-compose && cd /workspace && ./manage-tenant.sh \"$$@\"" --
redis:
image: redis:7-alpine
+24 -6
View File
@@ -175,13 +175,31 @@ EOF
restart_app_container() {
local env_file="$PWD/.docker-build.env"
local compose_args=( -f "$PWD/docker-compose-multitenant.yml" )
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
local compose_args=()
# If HOST_WORKDIR is set (called from container), use absolute paths so docker daemon resolves them correctly
if [ -n "$HOST_WORKDIR" ]; then
compose_args+=( -f "$(readlink -f "$HOST_WORKDIR/docker-compose-multitenant.yml")" )
if [ -f "$HOST_WORKDIR/.docker-compose.runtime.override.yml" ]; then
compose_args+=( -f "$(readlink -f "$HOST_WORKDIR/.docker-compose.runtime.override.yml")" )
fi
if [ -f "$HOST_WORKDIR/.docker-build.env" ]; then
compose_args+=( --env-file "$(readlink -f "$HOST_WORKDIR/.docker-build.env")" )
fi
else
# Normal case: called directly from host
compose_args+=( -f "$PWD/docker-compose-multitenant.yml" )
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
fi
if [ -f "$env_file" ]; then
compose_args+=( --env-file "$env_file" )
fi
fi
if [ -f "$env_file" ]; then
compose_args+=( --env-file "$env_file" )
# Pass along COMPOSE_PROJECT_NAME if set so the internal docker-compose sees it
if [ -n "$COMPOSE_PROJECT_NAME" ]; then
compose_args=( -p "$COMPOSE_PROJECT_NAME" "${compose_args[@]}" )
fi
echo "Restarting app container to apply tenant configuration changes..."
+3 -1
View File
@@ -1,3 +1,5 @@
#!/bin/bash
# Wrapper to run tenant management fully containerized via docker-compose
docker compose -f docker-compose-multitenant.yml --profile tools run --rm tenant-manager "$@"
PROJECT_NAME=${COMPOSE_PROJECT_NAME:-$(basename "$PWD" | tr '[:upper:]' '[:lower:]')}
# Pass the absolute working directory to the container so docker compose can resolve paths correctly
docker compose -f docker-compose-multitenant.yml --profile tools run --rm -e COMPOSE_PROJECT_NAME="$PROJECT_NAME" -e HOST_WORKDIR="$PWD" tenant-manager "$@"