fix: user locator, redirects. (#203)

morganney · Mar 1, 2024 · bb7f76d · bb7f76d
1 parent 1dc2fec
commit bb7f76d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           node-version: '20.11.0'
       - name: Install Dependencies

diff --git 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/[email protected].1
+        uses: actions/[email protected].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/[email protected]
-        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
@@ -79,7 +79,7 @@ const UserLocator: FC<UserLocatorProps> = ({ withDistance = false }) => {
     }
   }, [position, map])
 
-  if (permission !== 'granted') {
+  if (permission === 'denied') {
     return null
   }
 

diff --git 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
@@ -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;
 }