Merge branch 'next' into VGCatches

.config/k8s/main/app.yml

@@ -25,10 +25,10 @@ spec:
           resources:
             requests:
               cpu: 600m
-              memory: 300Mi
+              memory: 600Mi
             limits:
               cpu: 950m
-              memory: 950Mi
+              memory: 2Gi
           readinessProbe:
             tcpSocket:
               port: 3000
@@ -40,7 +40,7 @@ spec:
       imagePullSecrets:
         - name: ghcr-login-secret
       nodeSelector:
-        doks.digitalocean.com/node-pool: premium
+        doks.digitalocean.com/node-pool: premium-2
 ---
 apiVersion: apps/v1
 kind: Deployment

.github/workflows/publish.yaml

@@ -61,10 +61,14 @@ jobs:
         run: kubectl rollout restart deployment app-prod
       - name: Apply Worker
         run: kubectl rollout restart deployment worker-prod
+      - name: Apply VG
+        run: kubectl rollout restart deployment vatglasses
       - name: Validate App
         run: kubectl rollout status deployment app-prod
       - name: Validate Worker
         run: kubectl rollout status deployment worker-prod
+      - name: Validate VG
+        run: kubectl rollout status deployment vatglasses
 
   deploy-db-redis:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-# [1.0.0-final]
+# [1.0.0-1]
+
+Initial changelog
+
+# [1.0.0]
 
 This update marks an important milestone for VATSIM Radar. 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vatsim-radar",
-  "version": "1.0.0-final",
+  "version": "1.0.0-1",
   "private": true,
   "type": "module",
   "scripts": {

src/components/map/popups/MapPopupAtc.vue

@@ -62,6 +62,7 @@
                         </template>
                     </common-spoiler>
                     <common-favorite-list
+                        v-if="store.user"
                         :cid="atc.cid"
                         :name="atc.name"
                     />
@@ -192,6 +193,7 @@ import CommonBubble from '~/components/common/basic/CommonBubble.vue';
 import CommonSpoiler from '~/components/common/vatsim/CommonSpoiler.vue';
 import CommonFavoriteList from '~/components/common/vatsim/CommonFavoriteList.vue';
 import ShareIcon from '@/assets/icons/kit/share.svg?component';
+import { useStore } from '~/store';
 
 const props = defineProps({
     overlay: {
@@ -202,6 +204,7 @@ const props = defineProps({
 
 const facilities = useFacilitiesIds();
 
+const store = useStore();
 const mapStore = useMapStore();
 const dataStore = useDataStore();
 const map = inject<ShallowRef<Map | null>>('map')!;

src/components/map/popups/MapPopupFlightInfo.vue

@@ -31,6 +31,7 @@
                 </template>
             </common-button>
             <common-favorite-list
+                v-if="store.user"
                 :cid="pilot.cid"
                 class="flight-info_self_favorite"
                 :name="pilot.name"
@@ -211,6 +212,7 @@ import CommonSpoiler from '~/components/common/vatsim/CommonSpoiler.vue';
 import CommonFavoriteList from '~/components/common/vatsim/CommonFavoriteList.vue';
 import { getAirlineFromCallsign } from '~/composables';
 import CommonBubble from '~/components/common/basic/CommonBubble.vue';
+import { useStore } from '~/store';
 
 const props = defineProps({
     pilot: {
@@ -229,6 +231,7 @@ const props = defineProps({
 
 const dataStore = useDataStore();
 const mapStore = useMapStore();
+const store = useStore();
 
 const getLogonTime = computed(() => {
     return getHoursAndMinutes(new Date(props.pilot.logon_time || 0).getTime());

src/components/views/ViewUpdatePopup.vue

@@ -119,7 +119,7 @@ const update: Update = {
             description: `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.`,
             list: [
                 'Airports Layouts: taximap for Navigraph Ultimate members',
-                'Filters: VATSpy and FL24-inspired filters with an ability to share them with anyone',
+                'Filters: VATSpy and FR24-inspired filters with an ability to share them with anyone',
                 'Bookmarks: Bookmark any location or airport - and assign a key to quickly open it',
                 'Friends: track users and view what are they doing, from flying to SUPing',
                 'VATGlasses: a long-awaited integration developed by community member Felix',
@@ -195,7 +195,7 @@ if (!store.user?.hasCharts) {
 }
 
 if (!store.user?.hasFms && store.user) {
-    update.features[1].list!.push('<a class="navigraph" href="http://localhost:8080/api/auth/navigraph/redirect" target="_blank"> Connect Navigraph</a>');
+    update.features[1].list!.push('<a class="navigraph" href="/api/auth/navigraph/redirect" target="_blank"> Connect Navigraph</a>');
 }
 
 const shownFeatureIndex = ref(0);

src/components/views/header/ViewHeaderList.vue

@@ -112,7 +112,7 @@
             <common-button
                 :disabled="!newUser.cid || !newUser.name || store.lists.some(x => x.users.some(x => x.cid === newUser.cid))"
                 size="S"
-                @click="[editUserList({ id: list!.id, users: [newUser, ...list.users!]}), resetNewUser()]"
+                @click="[list!.id === 0 ? editUserList({ ...list, users: [newUser]}) : editUserList({ id: list!.id, users: [newUser, ...list.users!]}), resetNewUser()]"
             >
                 Add user to list
             </common-button>

src/composables/data.ts

@@ -315,10 +315,10 @@ export async function setupDataFetch({ onFetch, onSuccessCallback }: {
             }()),
             (async function() {
                 let airlines = await clientDB.get('data', 'airlines') as IDBAirlinesData['value'] | undefined;
-                if (!airlines || Date.now() > airlines.expiresAt) {
+                if (!airlines || !airlines.expirationDate || Date.now() > airlines.expirationDate) {
                     const data = await $fetch<RadarDataAirlinesList>('/api/data/airlines');
                     airlines = {
-                        expiresAt: Date.now() + (1000 * 60 * 60 * 24 * 30),
+                        expirationDate: Date.now() + (1000 * 60 * 60 * 24 * 7),
                         airlines: data,
                     };
                     await clientDB.put('data', airlines, 'airlines');

src/utils/backend/vatsim/simaware.ts

@@ -5,7 +5,7 @@ import { $fetch } from 'ofetch';
 import type { MultiPolygon, Polygon, Position } from 'geojson';
 
 const revisions: Record<string, number> = {
-    'v1.1.25': 2,
+    'Release v1.1.32': 1,
 };
 
 export async function updateSimAware() {

src/utils/backend/vatsim/vatspy.ts

@@ -7,7 +7,7 @@ import { MultiPolygon as OlMultiPolygon } from 'ol/geom';
 import { fromServerLonLat } from '~/utils/backend/vatsim/index';
 
 const revisions: Record<string, number> = {
-    'v2410.1': 1,
+    'v2410.1': 2,
 };
 
 function parseDatFile<S extends Record<string, { title: string; children: Record<string, true> }>>({

src/utils/client-db/index.ts

@@ -25,7 +25,7 @@ interface VatglassesData {
 export interface IDBAirlinesData {
     key: 'airlines';
     value: {
-        expiresAt: number;
+        expirationDate: number;
         airlines: RadarDataAirlinesList;
     };
 }