Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
drodichkin committed Feb 17, 2025
2 parents 0bd1f73 + 3509d52 commit 739813e
Show file tree
Hide file tree
Showing 49 changed files with 1,196 additions and 760 deletions.
6 changes: 3 additions & 3 deletions .config/k8s/influx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ spec:
containers:
- name: influx
image: reg.nyan404.ru/telegraf-influxdb:latest
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
resources:
requests:
cpu: 300m
memory: 600Mi
limits:
cpu: 2000m
memory: 2Gi
cpu: 4000m
memory: 8Gi
env:
- name: TELEGRAF_INPUT_URLS
value: "https://next.vatsim-radar.com/api/data/vatsim/turns-data"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-next.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,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
Expand Down
22 changes: 21 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

# [1.1.0-alpha.5]

- Diverting flight state by MindCollaps

# [1.1.0-alpha.4]

- Changed data projection to EPSG:4326, thus improving data consumption, improving performance and making VR easier to work with for developers in most cases where EPSG:EPSG:3857 will now only be used under the hood

# [1.1.0-alpha.3]

- Added Where2Fly integration into airports popup

# [1.1.0-alpha.2]

- SIGMETs layer and page have been added
Expand All @@ -14,7 +26,15 @@

- Stats tab has been put into operations. View most popular airports, airlines and routes, as well as currently online pilots and ATC

# [1.0.2-final]
# [1.0.3]

- New icons from DotWallop (P180, BA11, DH88, F28, J328)
- Added model matching (B3XM)
- Fixed ZSE VATGlasses display (we can now ignore some incomplete VG files. If you need this - write to us)
- Fixed sectors sometimes not rendering on mobile devices
- Improved rendering performance for mobile devices

# [1.0.2]

- New map layers, replacing CartoDB, and available in Light and Detailed variants. This layer renders on your device, so if you experience performance issues after this update - switch to Basic layer instead
- Fixed an error when pilot info panel was sometimes not displayed
Expand Down
3 changes: 3 additions & 0 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ export default defineNuxtConfig({
],
},
},
server: {
allowedHosts: ['localhost', 'frontend', 'nuxt', 'bs-local'],
},
css: {
preprocessorMaxWorkers: true,
preprocessorOptions: {
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vatsim-radar",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.5",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -22,7 +22,7 @@
"dependencies": {
"@influxdata/influxdb-client": "^1.35.0",
"@influxdata/influxdb-client-apis": "^1.35.0",
"@pinia/nuxt": "^0.9.0",
"@pinia/nuxt": "^0.10.1",
"@prisma/client": "^6.3.1",
"@turf/difference": "^7.2.0",
"@turf/great-circle": "^7.2.0",
Expand All @@ -40,26 +40,26 @@
"chardet": "^2.0.0",
"croner": "^9.0.0",
"deep-equal": "^2.2.3",
"discord.js": "^14.17.3",
"discord.js": "^14.18.0",
"idb": "^8.0.2",
"ioredis": "^5.5.0",
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^3.1.0",
"kafkajs": "^2.2.4",
"klona": "^2.0.6",
"marked": "^15.0.6",
"marked": "^15.0.7",
"merge-ranges": "^1.0.2",
"metar-taf-parser": "^9.1.1",
"nuxt": "3.15.4",
"ol": "^10.4.0",
"ol-mapbox-style": "^12.4.1",
"pinia": "^2.3.1",
"pinia": "^3.0.1",
"prisma": "^6.3.1",
"protomaps-themes-base": "^4.4.0",
"sharp": "^0.33.5",
"sqlite3": "^5.1.7",
"svgo": "^3.3.2",
"ua-parser-js": "2.0.1",
"ua-parser-js": "2.0.2",
"vite-plugin-pwa": "^0.21.1",
"vite-svg-loader": "^5.1.0",
"vue": "^3.5.13",
Expand All @@ -71,20 +71,20 @@
"@nuxt/devtools": "^2.0.0",
"@nuxt/eslint": "^1.0.1",
"@nuxtjs/stylelint-module": "^5.2.0",
"@stylistic/eslint-plugin": "^3.0.1",
"@stylistic/eslint-plugin": "^3.1.0",
"@stylistic/stylelint-plugin": "^3.1.2",
"@types/adm-zip": "^0.5.7",
"@types/deep-equal": "^1.0.4",
"@types/geojson": "^7946.0.16",
"@types/jsonwebtoken": "^9.0.8",
"@types/merge-ranges": "^1.0.2",
"@types/node": "^22.13.1",
"@types/node": "^22.13.4",
"@types/ws": "^8.5.14",
"eslint": "^9.19.0",
"eslint": "^9.20.1",
"fast-xml-parser": "^4.5.1",
"postcss": "^8.5.1",
"postcss": "^8.5.2",
"postcss-html": "^1.8.0",
"sass-embedded": "^1.83.4",
"sass-embedded": "^1.85.0",
"stylelint": "^16.14.1",
"stylelint-config-clean-order": "^7.0.0",
"stylelint-config-recommended-scss": "^14.1.0",
Expand Down
11 changes: 11 additions & 0 deletions src/assets/icons/aircraft/ba11.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 739813e

Please sign in to comment.