diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 81e33a8..963eabd 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,51 +1,48 @@ services: - db: - image: docker.io/library/postgres:16-alpine - restart: unless-stopped - # NOTE: Change POSTGRES_PASSWORD in production. Consider using Docker secrets or - # a managed PostgreSQL service instead of local credentials. - environment: - POSTGRES_DB: kmountain - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - volumes: - - pgdata:/var/lib/postgresql/data - - pgsocket:/var/run/postgresql - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 5s - timeout: 5s - retries: 5 - - # NOTE: Update KMTN_CORS_ORIGINS in production to your actual domain(s). - # Set KMTN_DATABASE_URL to your managed PostgreSQL connection if not using the local db service. api: - image: truenas.local:35000/kmtnflower-api:latest - restart: unless-stopped - environment: - KMTN_DATABASE_URL: postgresql+asyncpg://postgres:postgres@/kmountain?host=/var/run/postgresql - KMTN_CORS_ORIGINS: '["http://truenas.local:4200", "http://truenas.local"]' - KMTN_ADMIN_USERNAME: admin - KMTN_ADMIN_PASSWORD: 123 - volumes: - - pgsocket:/var/run/postgresql - ports: - - "8000:8000" depends_on: db: condition: service_healthy - - frontend: - image: truenas.local:35000/kmtnflower:latest - restart: unless-stopped environment: - API_UPSTREAM: http://api:8000 - API_PUBLIC_URL: "http://truenas.local:8000" + KMTN_ADMIN_PASSWORD: 123 + KMTN_ADMIN_USERNAME: admin + KMTN_CORS_ORIGINS: '["http://truenas.local:4200", "http://truenas.local"]' + KMTN_DATABASE_URL: >- + postgresql+asyncpg://postgres:postgres@/kmountain?host=/var/run/postgresql + image: truenas.local:35000/kmtnflower-api:latest + pull_policy: always ports: - - "4200:80" + - '8000:8000' + restart: unless-stopped + volumes: + - pgsocket:/var/run/postgresql + db: + environment: + POSTGRES_DB: kmountain + POSTGRES_PASSWORD: postgres + POSTGRES_USER: postgres + healthcheck: + interval: 5s + retries: 5 + test: + - CMD-SHELL + - pg_isready -U postgres + timeout: 5s + image: docker.io/library/postgres:16-alpine + restart: unless-stopped + volumes: + - /mnt/WestTek_Mainframe/vm_data/kmtndata:/var/lib/postgresql/data + - pgsocket:/var/run/postgresql + frontend: depends_on: - api - + environment: + API_PUBLIC_URL: http://truenas.local:8000 + API_UPSTREAM: http://api:8000 + image: truenas.local:35000/kmtnflower:latest + pull_policy: always + ports: + - '4200:80' + restart: unless-stopped volumes: - pgdata: - pgsocket: + pgsocket: Null diff --git a/src/app/app.scss b/src/app/app.scss index 16e3dd3..33db825 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -3,6 +3,7 @@ // Bar heights (keep in sync so player sits flush below navbar) $navbar-height-mobile: 64px; $navbar-height-desktop: 52px; +$player-height: 48px; app-navbar { position: fixed; @@ -21,7 +22,7 @@ app-media-player { } main { - padding-top: calc(#{$navbar-height-mobile} + 44px); + padding-top: calc(#{$navbar-height-mobile} + #{$player-height}); } @media (min-width: #{$bp-md}) { @@ -30,6 +31,6 @@ main { } main { - padding-top: calc(#{$navbar-height-desktop} + 44px); + padding-top: calc(#{$navbar-height-desktop} + #{$player-height}); } } diff --git a/src/app/hero/hero.component.html b/src/app/hero/hero.component.html index 8969442..c755a3d 100644 --- a/src/app/hero/hero.component.html +++ b/src/app/hero/hero.component.html @@ -92,8 +92,8 @@ (mouseleave)="resumeCarousel()" >