Compare commits

..

4 Commits

Author SHA1 Message Date
jc21
2893ffb1e4 Merge pull request #4801 from sopex/react
QoL: Link to dashboard 2.13
2025-10-27 09:52:50 +10:00
Jamie Curnow
1a117a267c Fix to postgres 17 2025-10-27 08:13:03 +10:00
Konstantinos Spartalis
b8e3e594fb ;) 2025-10-17 16:00:59 +03:00
Konstantinos Spartalis
71251d2a0d :) 2025-10-17 13:51:06 +03:00
4 changed files with 30 additions and 29 deletions

View File

@@ -1,17 +1,16 @@
# WARNING: This is a CI docker-compose file used for building and testing of the entire app, it should not be used for production. # WARNING: This is a CI docker-compose file used for building and testing of the entire app, it should not be used for production.
services: services:
cypress: cypress:
environment: environment:
CYPRESS_stack: 'postgres' CYPRESS_stack: "postgres"
fullstack: fullstack:
environment: environment:
DB_POSTGRES_HOST: 'db-postgres' DB_POSTGRES_HOST: "db-postgres"
DB_POSTGRES_PORT: '5432' DB_POSTGRES_PORT: "5432"
DB_POSTGRES_USER: 'npm' DB_POSTGRES_USER: "npm"
DB_POSTGRES_PASSWORD: 'npmpass' DB_POSTGRES_PASSWORD: "npmpass"
DB_POSTGRES_NAME: 'npm' DB_POSTGRES_NAME: "npm"
depends_on: depends_on:
- db-postgres - db-postgres
- authentik - authentik
@@ -19,11 +18,11 @@ services:
- authentik-ldap - authentik-ldap
db-postgres: db-postgres:
image: postgres:latest image: postgres:17
environment: environment:
POSTGRES_USER: 'npm' POSTGRES_USER: "npm"
POSTGRES_PASSWORD: 'npmpass' POSTGRES_PASSWORD: "npmpass"
POSTGRES_DB: 'npm' POSTGRES_DB: "npm"
volumes: volumes:
- psql_vol:/var/lib/postgresql/data - psql_vol:/var/lib/postgresql/data
- ./ci/postgres:/docker-entrypoint-initdb.d - ./ci/postgres:/docker-entrypoint-initdb.d
@@ -31,11 +30,11 @@ services:
- fulltest - fulltest
authentik-redis: authentik-redis:
image: 'redis:alpine' image: "redis:alpine"
command: --save 60 1 --loglevel warning command: --save 60 1 --loglevel warning
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ['CMD-SHELL', 'redis-cli ping | grep PONG'] test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
start_period: 20s start_period: 20s
interval: 30s interval: 30s
retries: 5 retries: 5
@@ -66,9 +65,9 @@ services:
authentik-ldap: authentik-ldap:
image: ghcr.io/goauthentik/ldap:2024.10.1 image: ghcr.io/goauthentik/ldap:2024.10.1
environment: environment:
AUTHENTIK_HOST: 'http://authentik:9000' AUTHENTIK_HOST: "http://authentik:9000"
AUTHENTIK_INSECURE: 'true' AUTHENTIK_INSECURE: "true"
AUTHENTIK_TOKEN: 'wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp' AUTHENTIK_TOKEN: "wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp"
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- authentik - authentik

View File

@@ -79,7 +79,7 @@ services:
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
db-postgres: db-postgres:
image: postgres:latest image: postgres:17
container_name: npm2dev.db-postgres container_name: npm2dev.db-postgres
networks: networks:
- nginx_proxy_manager - nginx_proxy_manager

View File

@@ -135,7 +135,7 @@ services:
- db - db
db: db:
image: postgres:latest image: postgres:17
environment: environment:
POSTGRES_USER: 'npm' POSTGRES_USER: 'npm'
POSTGRES_PASSWORD: 'npmpass' POSTGRES_PASSWORD: 'npmpass'

View File

@@ -1,5 +1,5 @@
import { IconLock, IconLogout, IconUser } from "@tabler/icons-react"; import { IconLock, IconLogout, IconUser } from "@tabler/icons-react";
import { LocalePicker, ThemeSwitcher } from "src/components"; import { LocalePicker, ThemeSwitcher, NavLink } from "src/components";
import { useAuthState } from "src/context"; import { useAuthState } from "src/context";
import { useUser } from "src/hooks"; import { useUser } from "src/hooks";
import { T } from "src/locale"; import { T } from "src/locale";
@@ -26,16 +26,18 @@ export function SiteHeader() {
<span className="navbar-toggler-icon" /> <span className="navbar-toggler-icon" />
</button> </button>
<div className="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3"> <div className="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
<span className={styles.logo}> <NavLink to="/">
<img <div className={styles.logo}>
src="/images/logo-no-text.svg" <img
width={40} src="/images/logo-no-text.svg"
height={40} width={40}
className="navbar-brand-image" height={40}
alt="Logo" className="navbar-brand-image"
/> alt="Logo"
Nginx Proxy Manager />
</span> </div>
Nginx Proxy Manager
</NavLink>
</div> </div>
<div className="navbar-nav flex-row order-md-last"> <div className="navbar-nav flex-row order-md-last">
<div className="d-none d-md-flex"> <div className="d-none d-md-flex">