Fix #4831 mobile header menu not working

docker/ci.env

@@ -1,6 +1,6 @@
 AUTHENTIK_SECRET_KEY=gl8woZe8L6IIX8SC0c5Ocsj0xPkX5uJo5DVZCFl+L/QGbzuplfutYuua2ODNLEiDD3aFd9H2ylJmrke0
 AUTHENTIK_REDIS__HOST=authentik-redis
-AUTHENTIK_POSTGRESQL__HOST=db-postgres
+AUTHENTIK_POSTGRESQL__HOST=pgdb.internal
 AUTHENTIK_POSTGRESQL__USER=authentik
 AUTHENTIK_POSTGRESQL__NAME=authentik
 AUTHENTIK_POSTGRESQL__PASSWORD=07EKS5NLI6Tpv68tbdvrxfvj

docker/docker-compose.ci.postgres.yml

@@ -6,7 +6,7 @@ services:
 
   fullstack:
     environment:
-      DB_POSTGRES_HOST: "db-postgres"
+      DB_POSTGRES_HOST: "pgdb.internal"
       DB_POSTGRES_PORT: "5432"
       DB_POSTGRES_USER: "npm"
       DB_POSTGRES_PASSWORD: "npmpass"
@@ -27,7 +27,9 @@ services:
       - psql_vol:/var/lib/postgresql/data
       - ./ci/postgres:/docker-entrypoint-initdb.d
     networks:
-      - fulltest
+      fulltest:
+        aliases:
+          - pgdb.internal
 
   authentik-redis:
     image: "redis:alpine"
@@ -41,6 +43,8 @@ services:
       timeout: 3s
     volumes:
       - redis_vol:/data
+    networks:
+      - fulltest
 
   authentik:
     image: ghcr.io/goauthentik/server:2024.10.1
@@ -51,6 +55,8 @@ services:
     depends_on:
       - authentik-redis
       - db-postgres
+    networks:
+      - fulltest
 
   authentik-worker:
     image: ghcr.io/goauthentik/server:2024.10.1
@@ -61,6 +67,8 @@ services:
     depends_on:
       - authentik-redis
       - db-postgres
+    networks:
+      - fulltest
 
   authentik-ldap:
     image: ghcr.io/goauthentik/ldap:2024.10.1
@@ -71,6 +79,8 @@ services:
     restart: unless-stopped
     depends_on:
       - authentik
+    networks:
+      - fulltest
 
 volumes:
   psql_vol:

docker/docker-compose.ci.yml

@@ -3,31 +3,30 @@
 # This is a base compose file, it should be extended with a
 # docker-compose.ci.*.yml file
 services:
-
   fullstack:
     image: "${IMAGE}:${BRANCH_LOWER}-ci-${BUILD_NUMBER}"
     environment:
       TZ: "${TZ:-Australia/Brisbane}"
-      DEBUG: 'true'
+      DEBUG: "true"
-      CI: 'true'
+      CI: "true"
       FORCE_COLOR: 1
       # Required for DNS Certificate provisioning in CI
-      LE_SERVER: 'https://ca.internal/acme/acme/directory'
+      LE_SERVER: "https://ca.internal/acme/acme/directory"
-      REQUESTS_CA_BUNDLE: '/etc/ssl/certs/NginxProxyManager.crt'
+      REQUESTS_CA_BUNDLE: "/etc/ssl/certs/NginxProxyManager.crt"
     volumes:
-      - 'npm_data_ci:/data'
+      - "npm_data_ci:/data"
-      - 'npm_le_ci:/etc/letsencrypt'
+      - "npm_le_ci:/etc/letsencrypt"
-      - './dev/letsencrypt.ini:/etc/letsencrypt.ini:ro'
+      - "./dev/letsencrypt.ini:/etc/letsencrypt.ini:ro"
-      - './dev/resolv.conf:/etc/resolv.conf:ro'
+      - "./dev/resolv.conf:/etc/resolv.conf:ro"
-      - '/etc/localtime:/etc/localtime:ro'
+      - "/etc/localtime:/etc/localtime:ro"
     healthcheck:
       test: ["CMD", "/usr/bin/check-health"]
       interval: 10s
       timeout: 3s
     expose:
-      - '80-81/tcp'
+      - "80-81/tcp"
-      - '443/tcp'
+      - "443/tcp"
-      - '1500-1503/tcp'
+      - "1500-1503/tcp"
     networks:
       fulltest:
         aliases:
@@ -38,8 +37,8 @@ services:
   stepca:
     image: jc21/testca
     volumes:
-      - './dev/resolv.conf:/etc/resolv.conf:ro'
+      - "./dev/resolv.conf:/etc/resolv.conf:ro"
-      - '/etc/localtime:/etc/localtime:ro'
+      - "/etc/localtime:/etc/localtime:ro"
     networks:
       fulltest:
         aliases:
@@ -48,18 +47,18 @@ services:
   pdns:
     image: pschiffe/pdns-mysql:4.8
     volumes:
-      - '/etc/localtime:/etc/localtime:ro'
+      - "/etc/localtime:/etc/localtime:ro"
     environment:
-      PDNS_master: 'yes'
+      PDNS_master: "yes"
-      PDNS_api: 'yes'
+      PDNS_api: "yes"
-      PDNS_api_key: 'npm'
+      PDNS_api_key: "npm"
-      PDNS_webserver: 'yes'
+      PDNS_webserver: "yes"
-      PDNS_webserver_address: '0.0.0.0'
+      PDNS_webserver_address: "0.0.0.0"
-      PDNS_webserver_password: 'npm'
+      PDNS_webserver_password: "npm"
-      PDNS_webserver-allow-from: '127.0.0.0/8,192.0.0.0/8,10.0.0.0/8,172.0.0.0/8'
+      PDNS_webserver-allow-from: "127.0.0.0/8,192.0.0.0/8,10.0.0.0/8,172.0.0.0/8"
-      PDNS_version_string: 'anonymous'
+      PDNS_version_string: "anonymous"
       PDNS_default_ttl: 1500
-      PDNS_allow_axfr_ips: '127.0.0.0/8,192.0.0.0/8,10.0.0.0/8,172.0.0.0/8'
+      PDNS_allow_axfr_ips: "127.0.0.0/8,192.0.0.0/8,10.0.0.0/8,172.0.0.0/8"
       PDNS_gmysql_host: pdns-db
       PDNS_gmysql_port: 3306
       PDNS_gmysql_user: pdns
@@ -76,14 +75,14 @@ services:
   pdns-db:
     image: mariadb
     environment:
-      MYSQL_ROOT_PASSWORD: 'pdns'
+      MYSQL_ROOT_PASSWORD: "pdns"
-      MYSQL_DATABASE: 'pdns'
+      MYSQL_DATABASE: "pdns"
-      MYSQL_USER: 'pdns'
+      MYSQL_USER: "pdns"
-      MYSQL_PASSWORD: 'pdns'
+      MYSQL_PASSWORD: "pdns"
     volumes:
-      - 'pdns_mysql_vol:/var/lib/mysql'
+      - "pdns_mysql_vol:/var/lib/mysql"
-      - '/etc/localtime:/etc/localtime:ro'
+      - "/etc/localtime:/etc/localtime:ro"
-      - './dev/pdns-db.sql:/docker-entrypoint-initdb.d/01_init.sql:ro'
+      - "./dev/pdns-db.sql:/docker-entrypoint-initdb.d/01_init.sql:ro"
     networks:
       - fulltest
 
@@ -100,12 +99,12 @@ services:
       context: ../
       dockerfile: test/cypress/Dockerfile
     environment:
-      HTTP_PROXY: 'squid:3128'
+      HTTP_PROXY: "squid:3128"
-      HTTPS_PROXY: 'squid:3128'
+      HTTPS_PROXY: "squid:3128"
     volumes:
-      - 'cypress_logs:/test/results'
+      - "cypress_logs:/test/results"
-      - './dev/resolv.conf:/etc/resolv.conf:ro'
+      - "./dev/resolv.conf:/etc/resolv.conf:ro"
-      - '/etc/localtime:/etc/localtime:ro'
+      - "/etc/localtime:/etc/localtime:ro"
     command: cypress run --browser chrome --config-file=cypress/config/ci.js
     networks:
       - fulltest
@@ -113,9 +112,9 @@ services:
   squid:
     image: ubuntu/squid
     volumes:
-      - './dev/squid.conf:/etc/squid/squid.conf:ro'
+      - "./dev/squid.conf:/etc/squid/squid.conf:ro"
-      - './dev/resolv.conf:/etc/resolv.conf:ro'
+      - "./dev/resolv.conf:/etc/resolv.conf:ro"
-      - '/etc/localtime:/etc/localtime:ro'
+      - "/etc/localtime:/etc/localtime:ro"
     networks:
       - fulltest
 

docker/docker-compose.dev.yml

@@ -32,7 +32,7 @@ services:
       # DB_MYSQL_PASSWORD: 'npm'
       # DB_MYSQL_NAME: 'npm'
       # db-postgres:
-      DB_POSTGRES_HOST: "db-postgres"
+      DB_POSTGRES_HOST: "pgdb.internal"
       DB_POSTGRES_PORT: "5432"
       DB_POSTGRES_USER: "npm"
       DB_POSTGRES_PASSWORD: "npmpass"
@@ -81,8 +81,6 @@ services:
   db-postgres:
     image: postgres:17
     container_name: npm2dev.db-postgres
-    networks:
-      - nginx_proxy_manager
     environment:
       POSTGRES_USER: "npm"
       POSTGRES_PASSWORD: "npmpass"
@@ -90,6 +88,10 @@ services:
     volumes:
       - psql_data:/var/lib/postgresql/data
       - ./ci/postgres:/docker-entrypoint-initdb.d
+    networks:
+      nginx_proxy_manager:
+        aliases:
+          - pgdb.internal
 
   stepca:
     image: jc21/testca

frontend/src/Router.tsx

@@ -1,15 +1,6 @@
 import { lazy, Suspense } from "react";
 import { BrowserRouter, Route, Routes } from "react-router-dom";
-import {
+import { ErrorNotFound, LoadingPage, Page, SiteContainer, SiteFooter, SiteHeader, Unhealthy } from "src/components";
-	ErrorNotFound,
-	LoadingPage,
-	Page,
-	SiteContainer,
-	SiteFooter,
-	SiteHeader,
-	SiteMenu,
-	Unhealthy,
-} from "src/components";
 import { useAuthState } from "src/context";
 import { useHealth } from "src/hooks";
 
@@ -55,7 +46,6 @@ function Router() {
 			<Page>
 				<div>
 					<SiteHeader />
-					<SiteMenu />
 				</div>
 				<SiteContainer>
 					<Suspense fallback={<LoadingPage noLogo />}>

frontend/src/components/SiteHeader.tsx

@@ -1,5 +1,7 @@
 import { IconLock, IconLogout, IconUser } from "@tabler/icons-react";
-import { LocalePicker, NavLink, ThemeSwitcher } from "src/components";
+import cs from "classnames";
+import { useState } from "react";
+import { LocalePicker, NavLink, SiteMenu, ThemeSwitcher } from "src/components";
 import { useAuthState } from "src/context";
 import { useUser } from "src/hooks";
 import { T } from "src/locale";
@@ -10,105 +12,110 @@ export function SiteHeader() {
 	const { data: currentUser } = useUser("me");
 	const isAdmin = currentUser?.roles.includes("admin");
 	const { logout } = useAuthState();
+	const [expanded, setExpanded] = useState(false);
 
 	return (
-		<header className="navbar navbar-expand-md d-print-none">
+		<>
-			<div className="container-xl">
+			<header className="navbar navbar-expand-md d-print-none">
-				<button
+				<div className="container-xl">
-					className="navbar-toggler"
+					<button
-					type="button"
+						className={cs("navbar-toggler", { collapsed: !expanded })}
-					data-bs-toggle="collapse"
+						type="button"
-					data-bs-target="#navbar-menu"
+						data-bs-toggle="collapse"
-					aria-controls="navbar-menu"
+						data-bs-target="#navbar-menu"
-					aria-expanded="false"
+						aria-controls="navbar-menu"
-					aria-label="Toggle navigation"
+						aria-expanded={expanded}
-				>
+						aria-label="Toggle navigation"
-					<span className="navbar-toggler-icon" />
+						onClick={() => setExpanded(!expanded)}
-				</button>
+					>
-				<div className="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
+						<span className="navbar-toggler-icon" />
-					<NavLink to="/">
+					</button>
-						<div className={styles.logo}>
+					<div className="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-							<img
+						<NavLink to="/">
-								src="/images/logo-no-text.svg"
+							<div className={styles.logo}>
-								width={40}
+								<img
-								height={40}
+									src="/images/logo-no-text.svg"
-								className="navbar-brand-image"
+									width={40}
-								alt="Logo"
+									height={40}
-							/>
+									className="navbar-brand-image"
-						</div>
+									alt="Logo"
-						Nginx Proxy Manager
-					</NavLink>
-				</div>
-				<div className="navbar-nav flex-row order-md-last">
-					<div className="d-none d-md-flex">
-						<div className="nav-item">
-							<LocalePicker />
-						</div>
-						<div className="nav-item">
-							<ThemeSwitcher />
-						</div>
-					</div>
-					<div className="nav-item d-none d-md-flex me-3">
-						<div className="nav-item dropdown">
-							<a
-								href="/"
-								className="nav-link d-flex lh-1 p-0 px-2"
-								data-bs-toggle="dropdown"
-								aria-label="Open user menu"
-							>
-								<span
-									className="avatar avatar-sm"
-									style={{
-										backgroundImage: `url(${currentUser?.avatar || "/images/default-avatar.jpg"})`,
-									}}
 								/>
-								<div className="d-none d-xl-block ps-2">
+							</div>
-									<div>{currentUser?.nickname}</div>
+							Nginx Proxy Manager
-									<div className="mt-1 small text-secondary">
+						</NavLink>
-										<T id={isAdmin ? "role.admin" : "role.standard-user"} />
+					</div>
+					<div className="navbar-nav flex-row order-md-last">
+						<div className="d-none d-md-flex">
+							<div className="nav-item">
+								<LocalePicker />
+							</div>
+							<div className="nav-item">
+								<ThemeSwitcher />
+							</div>
+						</div>
+						<div className="nav-item d-none d-md-flex me-3">
+							<div className="nav-item dropdown">
+								<a
+									href="/"
+									className="nav-link d-flex lh-1 p-0 px-2"
+									data-bs-toggle="dropdown"
+									aria-label="Open user menu"
+								>
+									<span
+										className="avatar avatar-sm"
+										style={{
+											backgroundImage: `url(${currentUser?.avatar || "/images/default-avatar.jpg"})`,
+										}}
+									/>
+									<div className="d-none d-xl-block ps-2">
+										<div>{currentUser?.nickname}</div>
+										<div className="mt-1 small text-secondary">
+											<T id={isAdmin ? "role.admin" : "role.standard-user"} />
+										</div>
 									</div>
+								</a>
+								<div className="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
+									<a
+										href="?"
+										className="dropdown-item"
+										onClick={(e) => {
+											e.preventDefault();
+											showUserModal("me");
+										}}
+									>
+										<IconUser width={18} />
+										<T id="user.edit-profile" />
+									</a>
+									<a
+										href="?"
+										className="dropdown-item"
+										onClick={(e) => {
+											e.preventDefault();
+											showChangePasswordModal("me");
+										}}
+									>
+										<IconLock width={18} />
+										<T id="user.change-password" />
+									</a>
+									<div className="dropdown-divider" />
+									<a
+										href="?"
+										className="dropdown-item"
+										onClick={(e) => {
+											e.preventDefault();
+											logout();
+										}}
+									>
+										<IconLogout width={18} />
+										<T id="user.logout" />
+									</a>
 								</div>
-							</a>
-							<div className="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
-								<a
-									href="?"
-									className="dropdown-item"
-									onClick={(e) => {
-										e.preventDefault();
-										showUserModal("me");
-									}}
-								>
-									<IconUser width={18} />
-									<T id="user.edit-profile" />
-								</a>
-								<a
-									href="?"
-									className="dropdown-item"
-									onClick={(e) => {
-										e.preventDefault();
-										showChangePasswordModal("me");
-									}}
-								>
-									<IconLock width={18} />
-									<T id="user.change-password" />
-								</a>
-								<div className="dropdown-divider" />
-								<a
-									href="?"
-									className="dropdown-item"
-									onClick={(e) => {
-										e.preventDefault();
-										logout();
-									}}
-								>
-									<IconLogout width={18} />
-									<T id="user.logout" />
-								</a>
 							</div>
 						</div>
 					</div>
 				</div>
-			</div>
+			</header>
-		</header>
+			<SiteMenu mobileExpanded={expanded} setMobileExpanded={setExpanded} />
+		</>
 	);
 }

frontend/src/components/SiteMenu.tsx

@@ -175,7 +175,11 @@ const getMenuDropown = (item: MenuItem, onClick?: () => void) => {
 	);
 };
 
-export function SiteMenu() {
+interface Props {
+	mobileExpanded?: boolean;
+	setMobileExpanded?: (expanded: boolean) => void;
+}
+export function SiteMenu({ mobileExpanded = false, setMobileExpanded }: Props) {
 	// This is hacky AF. But that's the price of using a non-react UI kit.
 	const closeMenus = () => {
 		const navMenus = document.querySelectorAll(".nav-item.dropdown");
@@ -185,12 +189,13 @@ export function SiteMenu() {
 			if (dropdown) {
 				dropdown.classList.remove("show");
 			}
+			setMobileExpanded?.(false);
 		});
 	};
 
 	return (
 		<header className="navbar-expand-md">
-			<div className="collapse navbar-collapse">
+			<div className={cn("collapse", "navbar-collapse", { show: mobileExpanded })} id="navbar-menu">
 				<div className="navbar">
 					<div className="container-xl">
 						<div className="row flex-column flex-md-row flex-fill align-items-center">

frontend/src/modules/Validations.tsx

@@ -44,7 +44,7 @@ const validateEmail = () => {
 		if (!value.length) {
 			return intl.formatMessage({ id: "error.required" });
 		}
-		if (!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(value)) {
+		if (!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+$/i.test(value)) {
 			return intl.formatMessage({ id: "error.invalid-email" });
 		}
 	};