Rename number of flight achievements

app/Http/Middleware/HandleInertiaRequests.php

@@ -58,6 +58,7 @@ class HandleInertiaRequests extends Middleware
                 ->whereNull('expires_at')
                 ->orWhere('expires_at', '>', now())
                 ->count(),
+            'carto_api_key' => config('services.carto.key'),
         ];
     }
 }

app/Services/Achievements/Checkers/GeneralFlyingChecker.php

@@ -19,7 +19,7 @@ class GeneralFlyingChecker extends BaseChecker
 
         // --- Boolean achievements ---
 
-        $this->awardIf($allLoggedFlightsCount >= 1, 'general_flying.first_flight');
+        $this->awardIf($allLoggedFlightsCount >= 1, 'number_of_flights.first_flight');
 
         $this->awardIf(
             $flights->contains(fn ($f) => $f->isDomestic()),
@@ -69,10 +69,10 @@ class GeneralFlyingChecker extends BaseChecker
             'general_flying.domestic_two_countries'
         );
 
-        $this->awardProgress($count,'general_flying.10_flights');
+        $this->awardProgress($count,'number_of_flights.10_flights');
-        $this->awardProgress($count,'general_flying.50_flights');
+        $this->awardProgress($count,'number_of_flights.50_flights');
-        $this->awardProgress($count,'general_flying.100_flights');
+        $this->awardProgress($count,'number_of_flights.100_flights');
-        $this->awardProgress($count,'general_flying.500_flights');
+        $this->awardProgress($count,'number_of_flights.500_flights');
-        $this->awardProgress($count,'general_flying.1000_flights');
+        $this->awardProgress($count,'number_of_flights.1000_flights');
     }
 }

config/services.php

@@ -18,6 +18,10 @@ return [
         'key' => env('POSTMARK_API_KEY'),
     ],
 
+    'carto' => [
+      'key' => env('CARTO_API_KEY'),
+    ],
+
     'resend' => [
         'key' => env('RESEND_API_KEY'),
     ],

resources/js/Components/FlightsGoneBy/AchievementCard.vue

@@ -9,11 +9,7 @@ import ButtonLink from "@/Components/FlightsGoneBy/ButtonLink.vue";
 import Distance from "@/Components/Distance.vue";
 import FormattedNumber from "@/Components/FormattedNumber.vue";
 
-const distanceAchievements = [
+const distanceAchievementCategoryId = 6
-    'general_flying.circumference_of_the_earth',
-    'general_flying.to_the_moon',
-    'general_flying.gigametre'
-];
 
 const props = defineProps<{
     achievement: Achievement
@@ -92,7 +88,7 @@ const unlocked = computed(() => {
 
                     <template v-if="achievement.progressive && progress">
                         <div class="progress-label">
-                            <span v-if="distanceAchievements.includes(achievement.internal_name)">
+                            <span v-if="achievement.achievement_category_id == distanceAchievementCategoryId">
                                 <Distance :unit="distanceUnit" :showUnits="false" :value="Math.min(progress.current, progress.threshold)" /> /
                                 <Distance :unit="distanceUnit" :value="progress.threshold" />
                             </span>

resources/js/Components/FlightsGoneBy/FlightMap.vue

@@ -50,6 +50,7 @@ import {useUpdateSetting} from "@/Composables/useUpdateSetting";
 import {usePage} from "@inertiajs/vue3";
 
 
+
 type LngLat = [number, number]
 
 interface RouteFlightBucket {
@@ -290,6 +291,7 @@ export default defineComponent({
         const { updateSetting } = useUpdateSetting()
         const page = usePage<SharedProps>().props
 
+        const carto_key = page.carto_api_key
 
         let map:        maplibregl.Map    | null = null
         let popup:      maplibregl.Popup  | null = null
@@ -736,10 +738,10 @@ export default defineComponent({
                                 maxzoom:  19,
                                 attribution: cartoAttribution.value,
                                 tiles: [
-                                    'https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
+                                    `https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
-                                    'https://b.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
+                                    `https://b.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
-                                    'https://c.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
+                                    `https://c.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
-                                    'https://d.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
+                                    `https://d.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
                                 ],
                             },
                         },

resources/js/Types/types.d.ts

@@ -110,6 +110,7 @@ export type SharedProps = import('@inertiajs/core').PageProps & {
     logo_api_url: string
     achievement_notifications: Notification[]
     unread_notification_count: number
+    carto_api_key: string
 }
 export interface AchievementDifficulty {
     id: number