diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca7fbae..cba44f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.1 - name: Setup Node - uses: actions/setup-node@v4.0.1 + uses: actions/setup-node@v4.0.2 with: node-version: '20.11.0' - name: Install Dependencies diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 18840e5..c9e1721 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -38,9 +38,9 @@ jobs: mkcert -key-file busmap.localhost-key.pem -cert-file busmap.localhost.pem busmap.localhost localhost cp *.pem packages/web/certs - name: Setup Node - uses: actions/setup-node@v4.0.1 + uses: actions/setup-node@v4.0.2 with: - node-version: '20.11.0' + node-version: '20.11.1' - name: Install Dependencies run: npm ci - name: Install Playwright @@ -66,7 +66,7 @@ jobs: SSO_GOOG_CLIENT_SECRET: ${{ secrets.SSO_GOOG_CLIENT_SECRET }} - name: Upload Test Results uses: actions/upload-artifact@v4.3.0 - if: failure() + if: ${{ failure() }} with: name: playwright-report path: test-results diff --git a/packages/ui/src/modules/location/components/userLocator.tsx b/packages/ui/src/modules/location/components/userLocator.tsx index d29c63a..4882162 100644 --- a/packages/ui/src/modules/location/components/userLocator.tsx +++ b/packages/ui/src/modules/location/components/userLocator.tsx @@ -79,7 +79,7 @@ const UserLocator: FC = ({ withDistance = false }) => { } }, [position, map]) - if (permission !== 'granted') { + if (permission === 'denied') { return null } diff --git a/packages/web/nginx.conf b/packages/web/nginx.conf index 05bcc86..50e1a89 100644 --- a/packages/web/nginx.conf +++ b/packages/web/nginx.conf @@ -17,6 +17,7 @@ http { access_log /var/log/nginx/access.log main; sendfile on; keepalive_timeout 65; + server_names_hash_bucket_size 128; include /etc/nginx/conf.d/core/upstreams.conf; include /etc/nginx/conf.d/core/logging.conf; diff --git a/packages/web/templates/default.conf.template b/packages/web/templates/default.conf.template index 3d152e4..e595a83 100644 --- a/packages/web/templates/default.conf.template +++ b/packages/web/templates/default.conf.template @@ -1,22 +1,8 @@ # Configuration to stage a production build. server { - # Redirect server configuration - listen 80 default_server; - listen [::]:80 default_server; - server_name _; - server_tokens off; - - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; server_name test.busmap.online; server_tokens off; - include /etc/nginx/conf.d/core/ssl.conf; return 301 https://try.busmap.online$request_uri; }