Merge pull request 'Compact map padding amended' (#5) from fix-map-padding into main

Reviewed-on: #5

app/Http/Controllers/AdminController.php

@@ -19,6 +19,7 @@ class AdminController extends Controller
     function staticAdminData(){
         return [
             'missingLiveryCount' => $this->adminService->getMissingLiveries()->count(),
+            'missingAirlineCount' => $this->adminService->getMissingAirlines()->count(),
         ];
     }
 
@@ -44,6 +45,16 @@ class AdminController extends Controller
         ]);
     }
 
+    function reconcileMissingAirlines(){
+        $missingAirlines = $this->adminService->getMissingAirlines()->values();
+
+        return Inertia::render('Admin/MissingAirlines', [
+            'title' => $missingAirlines->count() . ' Missing Airlines',
+            'missingAirlines' => $missingAirlines,
+            ...$this->staticAdminData(),
+        ]);
+    }
+
     public function ignoreMissingLivery(Request $request)
     {
         $validated = $request->validate([

app/Services/AdminService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\DTOs\MissingLivery;
 use App\Models\IgnoredMissingLivery;
 use App\Models\UserFlight;
+use Illuminate\Support\Enumerable;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Collection;
 
@@ -45,4 +46,36 @@ class AdminService
             ->sortBy('airline_name')
             ->values();
     }
+
+    function getMissingAirlines(): Enumerable|Collection
+    {
+        $flights = UserFlight::whereNotNull('flight_number')
+            ->whereNull('airline_id')
+            ->with('user:id,name') // adjust to your actual user relation/columns
+            ->get(['id', 'flight_number', 'user_id']);
+
+        return $flights
+            ->map(function ($flight) {
+                // Extract the 2-character IATA-style prefix (letters and/or digits)
+                preg_match('/^([A-Za-z0-9]{2})\d+/', trim($flight->flight_number), $matches);
+
+                return [
+                    'code' => $matches[1] ?? null,
+                    'flight_number' => $flight->flight_number,
+                    'link' => "/u/{$flight->user->name}/flight/{$flight->id}",
+                ];
+            })
+            ->filter(fn ($f) => $f['code'] !== null) // drop any that didn't match the pattern
+            ->groupBy('code')
+            ->map(function ($group, $code) {
+                return [
+                    'code' => $code,
+                    'flights' => $group->map(fn ($f) => [
+                        'flight_number' => $f['flight_number'],
+                        'link' => $f['link'],
+                    ])->values()->all(),
+                ];
+            })
+            ->values();
+    }
 }

dockerfile

@@ -12,6 +12,10 @@ COPY . .
 
 RUN composer install --no-dev --optimize-autoloader
 
+ARG APP_VERSION=Dev
+ENV VITE_APP_VERSION=$APP_VERSION
+LABEL org.opencontainers.image.version=$APP_VERSION
+
 RUN npm install && npm run build && rm -f public/hot
 
 COPY docker/nginx.conf /etc/nginx/nginx.conf

package.json

@@ -8,7 +8,7 @@
         "dev": "vite",
         "dev:all": "concurrently -s all \"php artisan serve\" \"php artisan reverb:start\" \"php artisan queue:work\" \"npm run dev\" > /dev/null 2>&1",
         "serve:all": "concurrently -s all \"php artisan serve\" \"php artisan reverb:start\" \"php artisan queue:work\" > /dev/null 2>&1",
-        "updateVersion": "cross-var docker build -t dredgy/flights-api:$npm_config_tag -t dredgy/flights-api:latest . && cross-var docker push dredgy/flights-api:$npm_config_tag && docker push dredgy/flights-api:latest"
+        "updateVersion": "cross-var docker build --no-cache  --build-arg APP_VERSION=$npm_config_tag -t dredgy/flights-api:$npm_config_tag -t dredgy/flights-api:latest . && cross-var docker push dredgy/flights-api:$npm_config_tag && docker push dredgy/flights-api:latest"
     },
     "devDependencies": {
         "@inertiajs/vue3": "^2.0.0",

resources/js/Components/Admin/MissingAirlineCard.vue

@@ -0,0 +1,91 @@
+<script setup lang="ts">
+import { MissingAirline } from "@/Types/types"
+
+defineProps<{
+    airline: MissingAirline
+}>()
+</script>
+
+<template>
+    <div class="missing-airline-card">
+        <div class="card-header">
+            <span class="airline-code">{{ airline.code }}</span>
+            <span class="flight-count">{{ airline.flights.length }} flight{{ airline.flights.length === 1 ? '' : 's' }}</span>
+        </div>
+
+        <ul class="flight-list">
+            <li v-for="flight in airline.flights" :key="flight.link" class="flight-item">
+                <a :href="flight.link" class="flight-link" target="_blank" rel="noopener">
+                    {{ flight.flight_number }}
+                </a>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<style scoped>
+.missing-airline-card {
+    background: rgba(255, 255, 255, 0.03);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    border-radius: 8px;
+    padding: 1rem 1.25rem;
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+}
+
+.card-header {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    border-bottom: 1px solid rgba(255, 255, 255, 0.06);
+    padding-bottom: 0.5rem;
+}
+
+.airline-code {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 1.1rem;
+    letter-spacing: 0.08em;
+    color: #ffc107;
+    font-weight: 700;
+}
+
+.flight-count {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 0.68rem;
+    letter-spacing: 0.1em;
+    text-transform: uppercase;
+    color: #778;
+}
+
+.flight-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+.flight-item {
+    display: flex;
+}
+
+.flight-link {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 0.72rem;
+    letter-spacing: 0.06em;
+    color: #9fb3c8;
+    text-decoration: none;
+    background: rgba(255, 255, 255, 0.04);
+    border: 1px solid rgba(255, 255, 255, 0.06);
+    border-radius: 4px;
+    padding: 0.25rem 0.5rem;
+    transition: color 0.15s ease, border-color 0.15s ease;
+}
+
+.flight-link:hover {
+    color: #ffc107;
+    border-color: rgba(255, 193, 7, 0.4);
+}
+</style>

resources/js/Components/FlightsGoneBy/DepartureBoardTableRow.vue

@@ -160,7 +160,7 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
 
         <td v-if="showColumn('class_seat_combined')" class="v-data-table__td  class-badges-cell">
             <span class="class-cell">
-                <CrewTooltip v-if="flight.flight_reason?.name == 'Crew'" :crew-type="flight.crew_type!">
+                <CrewTooltip v-if="flight.flight_reason?.name == 'Crew' && flight.crew_type" :crew-type="flight.crew_type!">
                     <FlightClassBadge v-if="flight.flight_class?.internal_name === 'crew'" :flight="flight" />
                     <InlineBadge v-else variant="crew">Crew</InlineBadge>
                 </CrewTooltip>

resources/js/Components/FlightsGoneBy/FlightMap.vue

@@ -659,7 +659,7 @@ export default defineComponent({
 
         const fitBounds = (): void => {
             if (!props.flights.length) return
-            const padding = props.compact ? 25 : 60
+            const padding = props.compact ? 40 : 60
 
             const lngs = props.flights.flatMap(f => [f.departure_airport.longitude_deg, f.arrival_airport.longitude_deg])
             const lats = props.flights.flatMap(f => [f.departure_airport.latitude_deg,  f.arrival_airport.latitude_deg])

resources/js/Components/FlightsGoneBy/GlassBox.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 withDefaults(defineProps<{
-    title: string,
+    title?: string,
     wide?: boolean,
     blurb?: string
 }>(), { wide: false })

resources/js/Components/FlightsGoneBy/MainFooter.vue

@@ -4,12 +4,15 @@ import { SharedProps } from "@/Types/types"
 
 const page = usePage<SharedProps>().props
 const year = new Date().getFullYear()
+const version = __APP_VERSION__
 </script>
 
 <template>
     <footer class="glass">
         <span class="footer-copyright">
             &copy; {{ year }} FlightsGoneBy
+
+            <span class="footer-version">v{{ version }}</span>
         </span>
 
         <span class="footer-links">
@@ -73,4 +76,9 @@ footer {
         font-size: 0.6rem;
     }
 }
+
+.footer-version {
+    opacity: 0.8;
+    margin-left: 0.4em;
+}
 </style>

resources/js/Pages/Admin/AdminLayout.vue

@@ -7,6 +7,7 @@ import {Head} from "@inertiajs/vue3";
 defineProps<{
     title: string;
     missingLiveryCount: number;
+    missingAirlineCount: number;
 
 }>()
 </script>
@@ -15,7 +16,7 @@ defineProps<{
     <MainLayout>
         <Head :title="title" />
         <div class="admin-container">
-            <AdminSidebar :missingLiveryCount="missingLiveryCount" />
+            <AdminSidebar :missingAirlineCount="missingAirlineCount" :missingLiveryCount="missingLiveryCount" />
             <div class="admin-content">
                 <GlassBox class="admin-page" :title="title">
                     <slot />

resources/js/Pages/Admin/AdminSidebar.vue

@@ -3,6 +3,7 @@ import {Link} from "@inertiajs/vue3";
 import {number} from "echarts";
 defineProps<{
     missingLiveryCount: number;
+    missingAirlineCount: number;
 }>()
 </script>
 
@@ -18,6 +19,11 @@ defineProps<{
             Reconcile Missing Liveries
             <v-chip  size="x-small" color="error" class="ml-1">{{ missingLiveryCount }}</v-chip>
         </Link>
+        <Link :href="route('admin.reconcile-missing-airlines')" class="sidebar-link">
+            <v-icon icon="mdi-airplane-takeoff" size="18" />
+            Reconcile Missing Airlines
+            <v-chip  size="x-small" color="error" class="ml-1">{{ missingAirlineCount }}</v-chip>
+        </Link>
     </aside>
 </template>
 

resources/js/Pages/Admin/MissingAirlines.vue

@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import GlassBox from "@/Components/FlightsGoneBy/GlassBox.vue";
+import { Head } from "@inertiajs/vue3";
+import { MissingAirline } from "@/Types/types";
+import MissingAirlineCard from "@/Components/Admin/MissingAirlineCard.vue";
+import AdminLayout from "@/Pages/Admin/AdminLayout.vue";
+import Panel from "@/Components/FlightsGoneBy/Panels/Panel.vue";
+
+defineOptions({ layout: AdminLayout });
+
+defineProps<{
+    missingAirlines: MissingAirline[]
+}>()
+</script>
+
+<template>
+    <Head title="Missing Airlines" />
+
+    <Panel>
+        <template #header>
+            <h1 class="panel-title">Missing Airlines</h1>
+            <span class="panel-subtitle">
+                {{ missingAirlines.length }} unmatched code{{ missingAirlines.length === 1 ? '' : 's' }}
+            </span>
+        </template>
+
+        <div v-if="missingAirlines.length === 0" class="empty-state">
+            No missing airlines 🎉
+        </div>
+
+        <div v-else class="missing-airlines-grid">
+            <MissingAirlineCard
+                v-for="airline in missingAirlines"
+                :key="airline.code"
+                :airline="airline"
+            />
+        </div>
+    </Panel>
+</template>
+
+<style scoped>
+.panel-title {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 1.25rem;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+    color: #e6e9ef;
+}
+
+.panel-subtitle {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 0.7rem;
+    letter-spacing: 0.1em;
+    text-transform: uppercase;
+    color: #778;
+}
+
+.missing-airlines-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+    gap: 1rem;
+    margin-top: 1rem;
+}
+
+.empty-state {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 0.85rem;
+    color: #778;
+    padding: 2rem 0;
+    text-align: center;
+}
+</style>

resources/js/Types/types.d.ts

@@ -303,7 +303,7 @@ export interface Flight {
     airline: Airline | null
     aircraft: Aircraft | null
     seat_type: SeatType | null
-    crew_type: CrewType | null
+    crew_type?: CrewType | null
     flight_reason: FlightReason | null
     flight_class: FlightClass | null
     duration_display: string
@@ -326,6 +326,14 @@ export interface MissingLivery {
     clipboard_text: string;
 }
 
+export interface MissingAirline{
+    code: string;
+    flights: {
+        flight_number: string;
+        link: string;
+    }[]
+}
+
 declare module '@inertiajs/vue3' {
     interface PageProps extends SharedProps {}
 }

resources/js/vite-env.d.ts

@@ -2,3 +2,4 @@
 /// <reference types="vite-plugin-pwa/client" />
 
 declare module '*.css'
+declare const __APP_VERSION__: string

resources/views/app.blade.php

@@ -9,6 +9,7 @@
         <link rel="icon" type="image/x-icon" href="{{ asset('img/favicons/favicon.png') }}">
         <!-- Fonts -->
 
+        <meta name="description" content="FlightsGoneBy is the ultimate flight diary — log every flight, earn achievements, visualise your travels on an interactive map, and share your stats with friends.">
         <link rel="preconnect" href="https://fonts.bunny.net">
         <link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />
         <!-- Apple Touch Icons -->

routes/web.php

@@ -40,6 +40,8 @@ use Inertia\Inertia;
         Route::get('/', [AdminController::class, 'dashboard'])->name('dashboard');
         Route::get('/missing-liveries', [AdminController::class, 'reconcileMissingLiveries'])->name('reconcile-missing-liveries')->middleware('permission:reconcile_missing_liveries');
         Route::post('/ignore-missing-livery', [AdminController::class, 'ignoreMissingLivery'])->name('ignore-missing-livery');
+
+        Route::get('/missing-airlines', [AdminController::class, 'reconcileMissingAirlines'])->name('reconcile-missing-airlines')->middleware('permission:reconcile_missing_liveries');
     });
 
 

vite.config.ts

@@ -4,8 +4,22 @@ import vue from '@vitejs/plugin-vue';
 import path from 'path';
 import vuetify from "vite-plugin-vuetify";
 import { VitePWA } from 'vite-plugin-pwa';
+import { execSync } from 'child_process'
+
+
+function getAppVersion(): string {
+    try {
+        // Prefer a tag if one points at HEAD, else fall back to short hash
+        return execSync('git describe --tags --always --dirty').toString().trim()
+    } catch {
+        return 'Unknown'
+    }
+}
 
 export default defineConfig({
+    define: {
+        __APP_VERSION__: JSON.stringify(process.env.VITE_APP_VERSION ?? 'Dev'),
+    },
     plugins: [
         laravel({
             input: 'resources/js/app.ts',