Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2a5d2d7875 |
@@ -19,7 +19,6 @@ class AdminController extends Controller
|
|||||||
function staticAdminData(){
|
function staticAdminData(){
|
||||||
return [
|
return [
|
||||||
'missingLiveryCount' => $this->adminService->getMissingLiveries()->count(),
|
'missingLiveryCount' => $this->adminService->getMissingLiveries()->count(),
|
||||||
'missingAirlineCount' => $this->adminService->getMissingAirlines()->count(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,16 +44,6 @@ 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)
|
public function ignoreMissingLivery(Request $request)
|
||||||
{
|
{
|
||||||
$validated = $request->validate([
|
$validated = $request->validate([
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ namespace App\Services;
|
|||||||
use App\DTOs\MissingLivery;
|
use App\DTOs\MissingLivery;
|
||||||
use App\Models\IgnoredMissingLivery;
|
use App\Models\IgnoredMissingLivery;
|
||||||
use App\Models\UserFlight;
|
use App\Models\UserFlight;
|
||||||
use Illuminate\Support\Enumerable;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
@@ -46,36 +45,4 @@ class AdminService
|
|||||||
->sortBy('airline_name')
|
->sortBy('airline_name')
|
||||||
->values();
|
->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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
<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>
|
|
||||||
@@ -659,7 +659,7 @@ export default defineComponent({
|
|||||||
|
|
||||||
const fitBounds = (): void => {
|
const fitBounds = (): void => {
|
||||||
if (!props.flights.length) return
|
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 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])
|
const lats = props.flights.flatMap(f => [f.departure_airport.latitude_deg, f.arrival_airport.latitude_deg])
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import {Head} from "@inertiajs/vue3";
|
|||||||
defineProps<{
|
defineProps<{
|
||||||
title: string;
|
title: string;
|
||||||
missingLiveryCount: number;
|
missingLiveryCount: number;
|
||||||
missingAirlineCount: number;
|
|
||||||
|
|
||||||
}>()
|
}>()
|
||||||
</script>
|
</script>
|
||||||
@@ -16,7 +15,7 @@ defineProps<{
|
|||||||
<MainLayout>
|
<MainLayout>
|
||||||
<Head :title="title" />
|
<Head :title="title" />
|
||||||
<div class="admin-container">
|
<div class="admin-container">
|
||||||
<AdminSidebar :missingAirlineCount="missingAirlineCount" :missingLiveryCount="missingLiveryCount" />
|
<AdminSidebar :missingLiveryCount="missingLiveryCount" />
|
||||||
<div class="admin-content">
|
<div class="admin-content">
|
||||||
<GlassBox class="admin-page" :title="title">
|
<GlassBox class="admin-page" :title="title">
|
||||||
<slot />
|
<slot />
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import {Link} from "@inertiajs/vue3";
|
|||||||
import {number} from "echarts";
|
import {number} from "echarts";
|
||||||
defineProps<{
|
defineProps<{
|
||||||
missingLiveryCount: number;
|
missingLiveryCount: number;
|
||||||
missingAirlineCount: number;
|
|
||||||
}>()
|
}>()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -19,11 +18,6 @@ defineProps<{
|
|||||||
Reconcile Missing Liveries
|
Reconcile Missing Liveries
|
||||||
<v-chip size="x-small" color="error" class="ml-1">{{ missingLiveryCount }}</v-chip>
|
<v-chip size="x-small" color="error" class="ml-1">{{ missingLiveryCount }}</v-chip>
|
||||||
</Link>
|
</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>
|
</aside>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
<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>
|
|
||||||
Vendored
-8
@@ -326,14 +326,6 @@ export interface MissingLivery {
|
|||||||
clipboard_text: string;
|
clipboard_text: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MissingAirline{
|
|
||||||
code: string;
|
|
||||||
flights: {
|
|
||||||
flight_number: string;
|
|
||||||
link: string;
|
|
||||||
}[]
|
|
||||||
}
|
|
||||||
|
|
||||||
declare module '@inertiajs/vue3' {
|
declare module '@inertiajs/vue3' {
|
||||||
interface PageProps extends SharedProps {}
|
interface PageProps extends SharedProps {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,8 +40,6 @@ use Inertia\Inertia;
|
|||||||
Route::get('/', [AdminController::class, 'dashboard'])->name('dashboard');
|
Route::get('/', [AdminController::class, 'dashboard'])->name('dashboard');
|
||||||
Route::get('/missing-liveries', [AdminController::class, 'reconcileMissingLiveries'])->name('reconcile-missing-liveries')->middleware('permission:reconcile_missing_liveries');
|
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::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');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user