Merge pull request #623 from VATSIM-Radar/next

1.0.0

.config/k8s/main/app.yml

@@ -133,3 +133,49 @@ spec:
   behavior:
     scaleDown:
       stabilizationWindowSeconds: 300
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vatglasses
+spec:
+  progressDeadlineSeconds: 360
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: vatglasses
+  template:
+    metadata:
+      labels:
+        app: vatglasses
+    spec:
+      imagePullSecrets:
+        - name: ghcr-login-secret
+      nodeSelector:
+        doks.digitalocean.com/node-pool: basic-2
+      containers:
+        - name: worker
+          image: ghcr.io/vatsim-radar/vatsim-radar/production
+          imagePullPolicy: Always
+          command: ["/radar/.config/vatglasses-worker-prod.sh"]
+          ports:
+            - containerPort: 8880
+          resources:
+            requests:
+              cpu: 600m
+              memory: 300Mi
+            limits:
+              cpu: 1000m
+              memory: 1Gi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: vatglasses
+spec:
+  ports:
+    - port: 8880
+  selector:
+    app: vatglasses

.config/k8s/next/app.yml

@@ -42,6 +42,16 @@ spec:
       nodeSelector:
         doks.digitalocean.com/node-pool: basic-2-2
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: app-next
+spec:
+  ports:
+    - port: 3000
+  selector:
+    app: app-next
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -96,12 +106,48 @@ spec:
   selector:
     app: worker-next
 ---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vatglasses-next
+spec:
+  progressDeadlineSeconds: 360
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: vatglasses-next
+  template:
+    metadata:
+      labels:
+        app: vatglasses-next
+    spec:
+      imagePullSecrets:
+        - name: ghcr-login-secret
+      nodeSelector:
+        doks.digitalocean.com/node-pool: basic-2-2
+      containers:
+        - name: worker
+          image: ghcr.io/vatsim-radar/vatsim-radar/next
+          imagePullPolicy: Always
+          command: ["/radar/.config/vatglasses-worker-prod.sh"]
+          ports:
+            - containerPort: 8880
+          resources:
+            requests:
+              cpu: 600m
+              memory: 300Mi
+            limits:
+              cpu: 1000m
+              memory: 1Gi
+---
 apiVersion: v1
 kind: Service
 metadata:
-  name: app-next
+  name: vatglasses-next
 spec:
   ports:
-    - port: 3000
+    - port: 8880
   selector:
-    app: app-next
+    app: vatglasses-next

.config/vatglasses-worker-prod.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /radar
+exec node --env-file=/radar/.env --import=tsx /radar/src/utils/backend/worker/vatglasses-worker.ts

.config/vatglasses-worker.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd /radar
+npx prisma generate
+npx prisma migrate deploy
+exec node --import=tsx /radar/src/utils/backend/worker/vatglasses-worker.ts

.config/worker-prod.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /radar
-exec node --import=tsx /radar/src/utils/backend/worker/data-worker.ts
+exec node --env-file=/radar/.env --import=tsx /radar/src/utils/backend/worker/data-worker.ts

.github/workflows/codecheck.yaml

@@ -2,7 +2,7 @@ name: Code check
 
 on:
   pull_request:
-    branches: [ main, next ]
+    branches: [ main, next, next-test ]
 
 jobs:
   check:

.github/workflows/publish-next.yaml

@@ -2,7 +2,7 @@ name: Publish
 
 on:
   push:
-    branches: [ next ]
+    branches: [ next, next-test ]
 
 jobs:
   check:
@@ -61,10 +61,14 @@ jobs:
         run: kubectl rollout restart deployment app-next
       - name: Apply Worker
         run: kubectl rollout restart deployment worker-next
+      - name: Apply VG
+        run: kubectl rollout restart deployment vatglasses-next
       - name: Validate App
         run: kubectl rollout status deployment app-next
       - name: Validate Worker
         run: kubectl rollout status deployment worker-next
+      - name: Validate VG
+        run: kubectl rollout status deployment vatglasses-next
 
   deploy-db-redis:
     runs-on: ubuntu-latest
@@ -89,10 +93,10 @@ jobs:
         run: kubectl apply -f .config/k8s/next/db.yml
       - name: Validate DB
         run: kubectl rollout status deployment db-next
-      - name: Deploy Influx
-        run: kubectl apply -f .config/k8s/influx.yml
-      - name: Validate Influx
-        run: kubectl rollout status deployment influx
+      #- name: Deploy Influx
+      #  run: kubectl apply -f .config/k8s/influx.yml
+      #- name: Validate Influx
+      #  run: kubectl rollout status deployment influx
 
   deploy-ingress:
     runs-on: ubuntu-latest

.github/workflows/publish.yaml

@@ -89,10 +89,10 @@ jobs:
         run: kubectl apply -f .config/k8s/main/db.yml
       - name: Validate DB
         run: kubectl rollout status deployment db
-      - name: Deploy Influx
-        run: kubectl apply -f .config/k8s/influx.yml
-      - name: Validate Influx
-        run: kubectl rollout status deployment influx
+#      - name: Deploy Influx
+#        run: kubectl apply -f .config/k8s/influx.yml
+#      - name: Validate Influx
+#        run: kubectl rollout status deployment influx
 
   deploy-ingress:
     runs-on: ubuntu-latest

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

CHANGELOG.md

@@ -1,5 +1,95 @@
 # Changelog
 
+# [1.0.0-final]
+
+This update marks an important milestone for VATSIM Radar. 
+
+Of course, no one considered it a beta anymore, but we still didn't have features people could get used to in other map services. 
+
+Well, we do now.
+
+## Highlights
+
+- 👓 VATGlasses integration: developed by community member Felix
+- 🛣️ Airports Layouts: taxiway maps for Navigraph Unlimited subscribers
+- ⭐ Friends: favorite your friends and create different lists for them
+- 🗺️ Filters: configure what's displayed on the map to your liking
+- 📌 Bookmarks: bookmark favorite locations or airports
+- 🛠️ Quality of Life: new aircraft icons, airline name in popup, and many more UI/UX changes & improvements, as well as bug fixes
+
+### VATGlasses
+
+VATGlasses is a tool familiar to many, especially flying in complex European airspace. From now on, VATSIM Radar has integration with their data!
+
+It is enabled by default, if you are logged in and have active flight. As always, you can control it from map settings.
+
+You can also select active airports if there are some directly from pilot popup or airport info tab.
+
+Thanks to Felix for developing this integration.
+
+### Airports Layouts
+
+Airports Layouts is a feature for Navigraph Unlimited subscribers that allows you to view airport map for large airports. 
+
+Those airports have also received updates gates - that would be noticeable for airports that had incorrect gates before. As always, you can disable Layouts, as well as separated layers or fallback to old gates system in Map Settings -> Visibility. 
+
+And for those of you who didn’t buy Navigraph Unlimited yet - here are the [Subscription options](https://navigraph.com/pricing?utm_source=vatsimradar&utm_medium=referral&utm_campaign=subscribe).
+
+### Filters
+
+Meet filters - inspired by VATSpy and FlightRadar 24 fitlers, they allow you to filter things out of map.
+
+Filter by many things - callsigns, friend lists, dep/arr airports, routes (you can also set those from active events!), ratings, positions, and more.
+
+You can also save your filters, and share them - even for those who are not logged in.
+
+### Friends
+
+An amazing feature that allows you to favorite your friends - and track them on map.
+
+You can even make a different lists with different colors for easier tracking!
+
+### Bookmarks
+
+That one is simple: bookmark any location on a map to your list. You can also "favorite" an airport coordinate!
+
+Bookmarks are also shareable with anyone. By the way, you can add a key binding for any bookmark!
+
+## Features and Improvements
+
+### New Features
+
+- Added airline display into pilot popup
+- Added active flight tracking button
+- You can now share a link to atc via ?controller route param
+- You can now change airport default zoom level
+- New icons from DotWallop: A139-189, AN2, AS32-50, ATP, B06, B190, C310, DV20, E145, F2TH, F900, FAxx, IL76, L410, LJ35, PC6T, SF34, SF50, SU95, TEX2, TOR, YK40
+
+### UI/UX Improvements
+
+- Added basic VatSpy-like theme with no country borders etc. Very traffic effective
+- Sectors borders and Airport Layouts are now drawn on x2 distance from your visible area
+- You can now zoom higher
+- After almost a year since user settings have appeared, you can now close them by clicking outside. A shame this took so long, isn't it?
+- Opening airport dashboard will no longer cause airport to stay opened when you come back to main map
+- Tabs are now pinned in every overlay you open
+- Slight redesign of featured airports
+- METARs and NOTAMs are now auto-expanded
+- Increased width of copy block for easier read
+- Removed map control buttons from mobile version
+- Your aircraft will no longer be auto-tracked if you loaded website with query params
+- Pilots stats in aircraft list will now be colored depending on their hours
+- CTRL+F will now open VATSIM Radar's search box
+
+### Bug Fixes
+
+- Fixed search window sometimes lagging and taking whole screen height
+- Fixed error when you couldn't switch fast between airports - nothing happened when you clicked on map
+- Removed search button from non-homepage on mobile version. I mean, why was it here anyway?
+- Supervisors online count will now show more precise data
+- Fixed inability to re-select default opacity for OSM/Satellite layers
+- Fixed BECMG active time display
+
 # [0.5.1-1-final]
 
 - You can now once again hover over aircraft overlay in resized window
@@ -12,7 +102,7 @@
 
 - Removed orientation restriction for PWA apps. Those who installed VATSIM Radar on their devices and faced this issue may have to reinstall the app
 - Once again fixed USA TRACONs, such as Houston approach, SCT_APP, CHI_X_APP, PCT_APP. I'm really sorry this kept happening each major update folks
-- New icons from DotWallop: ATR4x, ATR7x, FA10, GL5T, GL7T, GLF5-6, DIMO
+- New aircraft icons from DotWallop
 - Added model matching for C310 (as C172 for now)
 
 ## Features and Improvements
@@ -38,6 +128,7 @@
 # [0.5.0.1-final]
 
 A small hotfix with an issue when you could not save your map preset, if:
+
 - You had once changed visibility of atc labels or airports without changing visibility of aircraft
 - You pressed exclude my location without excluding arrival for airports hide
 - You had the same local preset as the one you import
@@ -94,7 +185,7 @@ Change colors or transparency for almost anything you see on map
 
 ### Events page
 
-Made by Thorsten. 
+Made by Thorsten.
 
 - Basic, beta implementation
 - View valuable info and beautiful banner

default.json

@@ -16,10 +16,6 @@
   "dependencyDashboardOSVVulnerabilitySummary": "all",
   "osvVulnerabilityAlerts": true,
   "packageRules": [
-    {
-      "matchPackageNames": "typescript",
-      "allowedVersions": "<5.7"
-    },
     {
       "matchPackageNames": [
         "tsx"
@@ -98,8 +94,7 @@
   "separateMultipleMajor": true,
   "updateInternalDeps": true,
   "baseBranches": [
-    "next",
-    "/^release\\/.*/"
+    "next"
   ],
   "extends": [
     ":automergeDisabled",