Added Splash Screens for PWA

resources/js/Components/FlightsGoneBy/AllianceChallenge.vue

@@ -26,18 +26,25 @@ const props = defineProps<{
 }>()
 
 const flightsByAirline = computed(() => {
-    const allianceAirlineIds = new Set(props.airlines.map(a => a.id))
     const map = new Map<string, AirlineEntry>()
+    const idToKey = new Map<number, string>()
+
 
-    // Pre-populate every alliance airline so unflown ones still appear
     for (const airline of props.airlines) {
-        map.set(rowKey(airline), { airline, flights: [] })
+        const key = rowKey(airline)
+        map.set(key, { airline, flights: [] })
+        idToKey.set(airline.id, key)
+        for (const alias of airline.merged_from ?? []) {
+            idToKey.set(alias.id, key)
+        }
     }
 
     for (const flight of props.flights) {
         const airline = flight.airline
-        if (!airline || !allianceAirlineIds.has(airline.id)) continue
-        map.get(rowKey(airline))?.flights.push(flight)
+        if (!airline) continue
+        const key = idToKey.get(airline.id)
+        if (!key) continue
+        map.get(key)?.flights.push(flight)
     }
 
     return map

resources/js/Pages/Profile/Achievements/aircraft.all_boeing_737.vue

@@ -83,11 +83,11 @@ const generationGroups = computed(() =>
            This challenge is impossible to complete if you start today, but it's a fun one to look at because despite how common as the 737 is, it's very hard to find them all!
         </p>
         <ul>
-            <li><b>737-100</b> - It was never that popular, and is no longer in commercial service anywhere. This is what renders the challenge impossible today.</li>
-            <li><b>737-200</b> - Retired from Western fleets. A handful still fly in Africa and parts of Latin America on gravel-strip routes.</li>
-            <li><b>737-300 / 737-400 / 737-500</b> - Rare but doable with some creative routing.</li>
-            <li><b>737-600</b> - Much like it's Airbus A318 Equivalent, it sold poorly but is still in operation in Algeria and Canada.</li>
-            <li><b>737 Max 7</b> - Not possible to fly yet due to lack of certification but should hopefully become common soon enough!.</li>
+            <li><b>-100</b> - It was never that popular, and is no longer in commercial service anywhere. This is what renders the challenge impossible today.</li>
+            <li><b>-200</b> - Retired from Western fleets. A handful still fly in Africa and parts of Latin America on gravel-strip routes.</li>
+            <li><b>-300 / 737-400 / 737-500</b> - Rare but doable with some creative routing.</li>
+            <li><b>-600</b> - Much like it's Airbus A318 Equivalent, it sold poorly but is still in operation in Algeria and Canada.</li>
+            <li><b>Max 7</b> - Not possible to fly yet due to lack of certification but should hopefully become common soon enough!</li>
         </ul>
     </Panel>
 </template>

resources/js/Pages/Profile/Achievements/airlines_alliances.all_vanilla_alliance.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { Achievement, Airline, Alliance, Flight, User } from '@/Types/types'
 import AllianceChallenge from '@/Components/FlightsGoneBy/AllianceChallenge.vue'
+import Panel from "@/Components/FlightsGoneBy/Panels/Panel.vue";
+import PanelHeader from "@/Components/FlightsGoneBy/Panels/PanelHeader.vue";
 defineOptions({ inheritAttrs: false })
 defineProps<{
     achievement: Achievement
@@ -24,5 +26,18 @@ defineProps<{
         <p>
             <b>Vanilla Alliance</b> is a small, regional alliance in the Vanilla Islands. It is a paper alliance that is effectively defunct, but it's still a fun one to try for!
         </p>
+
+        <template #extra>
+            <Panel>
+                <PanelHeader centered>Difficulty</PanelHeader>
+                <p>
+                    Awkward to pull off, despite the very small number of airline need - there's no alliance cooperation and the Vanilla Islands are not always well-connected. There's no longer any Comoran airlines you need though, so that's something.
+                </p>
+                <p>
+                    Historic flight on Air Madagascar count towards Madagascar Airlines, as the rebrand was not deemed major enough to warrant it being a separate airline in anything but name.
+                </p>
+            </Panel>
+        </template>
     </AllianceChallenge>
+
 </template>

resources/js/Types/types.d.ts

@@ -234,6 +234,7 @@ export interface Airline {
     logo_url: string
     alliance_id: number | null,
     alliance?: Alliance,
+    merged_from?: Airline[] ,
 }
 
 export interface Aircraft {