Author SHA1 Message Date
dredgy 39c0ce1b44 Added custom date format 2026-07-18 00:47:14 +10:00
dredgy 792cb082fd Merge remote-tracking branch 'origin/main' into allow-custom-date-time-formats 2026-07-18 00:46:47 +10:00
dredgy ae77fec0da Merge pull request 'Compact map padding amended' (#5) from fix-map-padding into main
Reviewed-on: #5
2026-07-18 00:46:37 +10:00
dredgy 2a5d2d7875 Compact map padding amended 2026-07-17 23:43:16 +10:00
dredgy dbb3dac7f6 Fixed Bug With Shared Flights 2026-07-17 23:40:44 +10:00
dredgy 731a6aa09a Merge pull request 'Add missing airline check' (#4) from add-missing-airline-check into main
Reviewed-on: #4
2026-07-15 11:36:47 +10:00
dredgy dc476fedd6 Merge remote-tracking branch 'origin/main' into add-missing-airline-check 2026-07-15 11:36:07 +10:00
dredgy a11e8f1428 Fixed Bug With Shared Flights 2026-07-12 18:33:01 +10:00
dredgy 90630489df Fixed Bug With Shared Flights 2026-07-12 17:52:27 +10:00
dredgy 2d55aa8488 Add preliminary missing airline check 2026-07-12 01:50:44 +10:00
dredgy fd3b5b0405 Add preliminary missing airline check 2026-07-12 01:42:57 +10:00
dredgy 1f23cbc033 Merge pull request 'Add Meta Description to App' (#3) from add-meta-description-to-app into main
Reviewed-on: #3
2026-07-12 01:16:36 +10:00
dredgy e9ad1b45e0 Merge branch 'main' into add-meta-description-to-app 2026-07-12 01:16:28 +10:00
dredgy 64e164887b Merge pull request 'Add Version Number To Footer' (#2) from add-version-number-to-footer into main
Reviewed-on: #2
2026-07-12 01:16:17 +10:00
dredgy 4b8fb1119b Merge branch 'main' into add-version-number-to-footer 2026-07-12 01:16:08 +10:00
dredgy f0306a6dd8 Add Version Number To Footer 2026-07-12 01:11:45 +10:00
dredgy 35c439dba4 Add Version Number To Footer 2026-07-12 01:05:37 +10:00
dredgy 3a082a57ff Merge pull request 'Add Date and Time Picker Separate' (#1) from split-date-and-time-pickers into main
Reviewed-on: #1
2026-07-12 00:57:20 +10:00
dredgy c016a4aaaf Add Date and Time Picker Separate 2026-07-12 00:56:23 +10:00
20 changed files with 661 additions and 45 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ enum FlightNotificationType: string
{
return match ($this) {
self::Booked => "{$user->name} booked a new flight",
self::Logged => "{$user->name} logged a new flight",
self::Logged => "{$user->name} logged a historic flight",
self::Cancelled => "{$user->name} cancelled a flight",
self::Departed => "{$user->name} is taking off!",
self::Arrived => "{$user->name} has landed!",
+11
View File
@@ -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([
+20 -1
View File
@@ -153,7 +153,26 @@ class User extends Authenticatable implements MustVerifyEmail
->toJson();
});
$collection = collect(json_decode($json));
$dateFormat = auth()->user()?->resolved_settings['date_format'] ?? 'j M Y';
$timeFormat = auth()->user()?->resolved_settings['time_format'] === '24hr' ? 'Hi' : 'g:iA';
$collection = collect(json_decode($json))
->map(function ($flight) use ($dateFormat, $timeFormat) {
$departure = Carbon::parse($flight->departure_date)
->setTimezone($flight->departure_airport->timezone);
$arrival = Carbon::parse($flight->arrival_date)
->setTimezone($flight->arrival_airport->timezone);
$flight->departure_date_display = $departure->format($dateFormat);
$flight->departure_time_display = $departure->format($timeFormat);
$flight->arrival_date_display = $arrival->format($dateFormat);
$flight->arrival_time_display = $arrival->format($timeFormat);
return $flight;
});
$today = now('UTC')->toDateString();
return match ($filter) {
+33
View File
@@ -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();
}
}
+37 -12
View File
@@ -13,24 +13,13 @@ class SettingsRegistry
'AI Generated Content' => 'Airline tail logos and liveries are AI generated with human cleanup. If you would rather not see any AI, then our blank aircraft templates are human created.',
'Account & Privacy' => 'Everything to do with your account.',
'Notifications' => 'What you want to hear about (or not!)',
'Localization' => 'Units of measurement, date and time preferences.',
];
}
public static function schema(): array
{
return [
[
'key' => 'distance_unit',
'type' => 'select',
'label' => 'Distance Units',
'category' => 'FlightsGoneBy Settings',
'default' => 'km',
'options' => [
['value' => 'km', 'label' => 'Kilometres (km)'],
['value' => 'mi', 'label' => 'Miles (mi)'],
['value' => 'nm', 'label' => 'Nautical miles (nm)'],
],
],
[
'category' => 'Account & Privacy',
'key' => 'profile_privacy',
@@ -42,6 +31,42 @@ class SettingsRegistry
['value' => 'private', 'label' => 'Private Profile Viewable Only By You and Your Approved Followers'],
]
],
[
'key' => 'distance_unit',
'type' => 'select',
'label' => 'Distance Units',
'category' => 'Localization',
'default' => 'km',
'options' => [
['value' => 'km', 'label' => 'Kilometres (km)'],
['value' => 'mi', 'label' => 'Miles (mi)'],
['value' => 'nm', 'label' => 'Nautical miles (nm)'],
],
],
[
'key' => 'time_format',
'type' => 'select',
'label' => 'Time Format',
'category' => 'Localization',
'default' => 'ampm',
'options' => [
['value' => 'ampm', 'label' => 'AM/PM'],
['value' => '24hr', 'label' => '24-Hour'],
],
],
[
'key' => 'date_format',
'type' => 'select',
'label' => 'Date Format',
'category' => 'Localization',
'default' => 'j M Y',
'options' => [
['value' => 'j M Y', 'label' => '20 Feb 2015'],
['value' => 'Y-m-d', 'label' => '2015-02-20'],
['value' => 'd/m/Y', 'label' => '20/02/2015'],
['value' => 'm/d/Y', 'label' => '02/20/2015'],
],
],
[
'key' => 'default_login_page',
'type' => 'select',
+4
View File
@@ -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
+1 -1
View File
@@ -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",
@@ -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>
@@ -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>
@@ -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])
@@ -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>
+341 -21
View File
@@ -1,15 +1,16 @@
<script setup lang="ts">
import MainLayout from '@/Layouts/MainLayout.vue'
import GlassBox from '@/Components/FlightsGoneBy/GlassBox.vue'
import { Head, useForm } from '@inertiajs/vue3'
import {Head, useForm, usePage} from '@inertiajs/vue3'
import AirlineSearchBox from '@/Components/FlightsGoneBy/AirlineSearchBox.vue'
import AircraftSearchBox from '@/Components/FlightsGoneBy/AircraftSearchBox.vue'
import AirportSearchBox from '@/Components/FlightsGoneBy/AirportSearchBox.vue'
import type {SeatType, FlightReason, FlightClass, CrewType} from '@/Types/types'
import type {SeatType, FlightReason, FlightClass, CrewType, SharedProps} from '@/Types/types'
import { ref, watch, computed } from 'vue'
import { VTimePicker, VDatePicker } from 'vuetify/components'
defineOptions({ layout: MainLayout })
const page = usePage<SharedProps>().props
const props = defineProps<{
flight?: {
@@ -38,6 +39,11 @@ const props = defineProps<{
const isEdit = !!props.flight
// ── User format preferences ─────────────────────────────────────────────────
const timeFormat = computed(() => page.auth?.user?.resolved_settings?.time_format ?? 'ampm')
const pad = (n: number) => String(n).padStart(2, '0')
// ── Flight number lookup ──────────────────────────────────────────────────────
const flightNumber = ref(props.flight?.flight_number ?? '')
@@ -91,6 +97,20 @@ async function lookupFlight() {
if (!form.aircraft) form.aircraft = data.aircraft_options[0]
}
// Populate scheduled times if the API returned them and the user
// hasn't already entered a time themselves. Suppress the +1hr
// auto-fill guess while doing this, since we have real data.
suppressArrivalAutoFill = true
const scheduledDep = normalizeTimeString(data.scheduled_departure_time)
if (scheduledDep && !departureTimePart.value) {
departureTimePart.value = scheduledDep
}
const scheduledArr = normalizeTimeString(data.scheduled_arrival_time)
if (scheduledArr && !arrivalTimePart.value) {
arrivalTimePart.value = scheduledArr
}
suppressArrivalAutoFill = false
lookupKey.value++
} catch (e) {
lookupError.value = String(e)
@@ -188,19 +208,98 @@ const fromOptionsData = ref<{ value: number; title: string; country_code: st
const toOptionsData = ref<{ value: number; title: string; country_code: string }[]>(props.flight?.to_options ?? [])
const aircraftOptionsData = ref<{ value: number; title: string }[]>(props.flight?.aircraft_options ?? [])
// ── Split date/time pickers ───────────────────────────────────────────────────
// form.departure_date / form.arrival_date stay as the single source of truth
// (YYYY-MM-DDTHH:mm strings) that the rest of the component and submit() rely
// on. These refs + watchers just give the template two separate pickers while
// keeping those combined strings in sync — no server-side changes needed.
watch(() => form.departure_date, (newVal) => {
if (!newVal || form.arrival_date) return
const dep = new Date(newVal)
function parseDateTime(dt: string | null | undefined) {
if (!dt) return { date: null as Date | null, time: null as string | null }
const d = new Date(dt)
if (isNaN(d.getTime())) return { date: null as Date | null, time: null as string | null }
return {
date: new Date(d.getFullYear(), d.getMonth(), d.getDate()),
time: `${pad(d.getHours())}:${pad(d.getMinutes())}`,
}
}
function combineDateTime(date: Date | null, time: string | null): string {
if (!date) return ''
const [hh, mm] = (time ?? '00:00').split(':')
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${(hh ?? '00').padStart(2, '0')}:${(mm ?? '00').padStart(2, '0')}`
}
function clearDepartureDate() { departureDatePart.value = null }
function clearDepartureTime() { departureTimePart.value = null }
function clearArrivalDate() { arrivalDatePart.value = null }
function clearArrivalTime() { arrivalTimePart.value = null }
// Normalizes whatever shape the API sends a scheduled time in ("14:30",
// "14:30:00", or a full datetime string) down to the internal "HH:mm" format.
function normalizeTimeString(t: string | null | undefined): string | null {
if (!t) return null
const match = t.match(/(\d{1,2}):(\d{2})/)
if (match) {
return `${match[1].padStart(2, '0')}:${match[2]}`
}
const d = new Date(t)
if (!isNaN(d.getTime())) {
return `${pad(d.getHours())}:${pad(d.getMinutes())}`
}
return null
}
const depInit = parseDateTime(form.departure_date)
const arrInit = parseDateTime(form.arrival_date)
const departureDatePart = ref<Date | null>(depInit.date)
const departureTimePart = ref<string | null>(depInit.time)
const arrivalDatePart = ref<Date | null>(arrInit.date)
const arrivalTimePart = ref<string | null>(arrInit.time)
const depDateMenu = ref(false)
const depTimeMenu = ref(false)
const arrDateMenu = ref(false)
const arrTimeMenu = ref(false)
// A short guard so programmatic updates (e.g. auto-fill of arrival) don't
// fight with the "only auto-fill once" behaviour below.
let suppressArrivalAutoFill = false
// Keep form.departure_date in sync whenever either split piece changes
watch([departureDatePart, departureTimePart], () => {
form.departure_date = combineDateTime(departureDatePart.value, departureTimePart.value)
})
// Keep form.arrival_date in sync whenever either split piece changes
watch([arrivalDatePart, arrivalTimePart], () => {
if (suppressArrivalAutoFill) return
form.arrival_date = combineDateTime(arrivalDatePart.value, arrivalTimePart.value)
})
// Auto-fill arrival (+1hr) the first time a departure TIME is chosen (and a
// departure date is already set) and arrival is still empty. Picking the
// departure date alone no longer triggers this — only setting the time does.
watch(departureTimePart, (newTime) => {
if (suppressArrivalAutoFill) return
if (!newTime || !departureDatePart.value || arrivalDatePart.value) return
const dep = new Date(departureDatePart.value)
const [h, m] = newTime.split(':').map(Number)
dep.setHours(h, m)
const arr = new Date(dep.getTime() + 60 * 60 * 1000)
const pad = (n: number) => String(n).padStart(2, '0')
form.arrival_date = `${arr.getFullYear()}-${pad(arr.getMonth() + 1)}-${pad(arr.getDate())}T${pad(arr.getHours())}:${pad(arr.getMinutes())}`
})
suppressArrivalAutoFill = true
arrivalDatePart.value = new Date(arr.getFullYear(), arr.getMonth(), arr.getDate())
arrivalTimePart.value = `${pad(arr.getHours())}:${pad(arr.getMinutes())}`
suppressArrivalAutoFill = false
form.arrival_date = combineDateTime(arrivalDatePart.value, arrivalTimePart.value)
}, { flush: 'sync' })
const getArrivalBound = (form: any, offsetDays: number) => {
if (!form.departure_date) return undefined
const pad = (n: number) => String(n).padStart(2, '0')
const d = new Date(form.departure_date)
d.setDate(d.getDate() + offsetDays)
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`
@@ -208,6 +307,127 @@ const getArrivalBound = (form: any, offsetDays: number) => {
const arrivalMin = computed(() => getArrivalBound(form, -2))
const arrivalMax = computed(() => getArrivalBound(form, 3))
const arrivalMinDate = computed(() => arrivalMin.value ? new Date(arrivalMin.value) : undefined)
const arrivalMaxDate = computed(() => arrivalMax.value ? new Date(arrivalMax.value) : undefined)
// ── Native date inputs ───────────────────────────────────────────────────────
// departureDatePart / arrivalDatePart stay the source of truth as Date
// objects. These computed get/set pairs are what the native <input type=date>
// elements bind to — the browser handles locale display, typing, and
// validation itself, so no custom format-aware parsing is needed here.
// The Vuetify v-date-picker is still available via a separate calendar icon
// for users who prefer to pick from a calendar rather than type.
function toIsoDateString(d: Date | null): string {
if (!d) return ''
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
}
function fromIsoDateString(value: string): Date | null {
if (!value) return null
const [y, m, d] = value.split('-').map(Number)
if (!y || !m || !d) return null
return new Date(y, m - 1, d)
}
const departureDateValue = computed({
get: () => toIsoDateString(departureDatePart.value),
set: (value: string) => { departureDatePart.value = fromIsoDateString(value) },
})
const arrivalDateValue = computed({
get: () => toIsoDateString(arrivalDatePart.value),
set: (value: string) => { arrivalDatePart.value = fromIsoDateString(value) },
})
// ── Editable, format-aware time text fields ────────────────────────────────
// departureTimePart / arrivalTimePart stay the source of truth as internal
// "HH:mm" (24hr) strings. These input refs are what the text-fields actually
// bind to, so the user can type freely; parsing only commits on blur/enter.
function formatTimeForFormat(t: string | null, format: string): string {
if (!t) return ''
const [hStr, mStr] = t.split(':')
let h = parseInt(hStr, 10)
if (isNaN(h)) return ''
if (format === '24hr') {
return `${pad(h)}:${mStr}`
}
const ampm = h >= 12 ? 'PM' : 'AM'
let h12 = h % 12
if (h12 === 0) h12 = 12
return `${h12}:${mStr} ${ampm}`
}
function parseTimeInput(input: string): string | null {
const trimmed = input.trim()
if (!trimmed) return null
// ampm form: "2:30 PM", "2:30PM", "2 PM", "2PM"
let match = trimmed.match(/^(\d{1,2}):?(\d{2})?\s*([AaPp][Mm])$/)
if (match) {
let h = parseInt(match[1], 10)
const m = match[2] ? parseInt(match[2], 10) : 0
const ampm = match[3].toUpperCase()
if (h >= 1 && h <= 12 && m >= 0 && m <= 59) {
if (ampm === 'PM' && h !== 12) h += 12
if (ampm === 'AM' && h === 12) h = 0
return `${pad(h)}:${pad(m)}`
}
return null
}
// 24hr form: "14:30" or "1430"
match = trimmed.match(/^(\d{1,2}):?(\d{2})$/)
if (match) {
const h = parseInt(match[1], 10)
const m = parseInt(match[2], 10)
if (h >= 0 && h <= 23 && m >= 0 && m <= 59) {
return `${pad(h)}:${pad(m)}`
}
}
return null
}
const departureTimeInput = ref(formatTimeForFormat(departureTimePart.value, timeFormat.value))
const arrivalTimeInput = ref(formatTimeForFormat(arrivalTimePart.value, timeFormat.value))
watch([departureTimePart, timeFormat], () => {
departureTimeInput.value = formatTimeForFormat(departureTimePart.value, timeFormat.value)
})
watch([arrivalTimePart, timeFormat], () => {
arrivalTimeInput.value = formatTimeForFormat(arrivalTimePart.value, timeFormat.value)
})
function commitDepartureTimeInput() {
if (!departureTimeInput.value.trim()) {
departureTimePart.value = null
return
}
const parsed = parseTimeInput(departureTimeInput.value)
if (parsed !== null) {
departureTimePart.value = parsed
} else {
departureTimeInput.value = formatTimeForFormat(departureTimePart.value, timeFormat.value)
}
}
function commitArrivalTimeInput() {
if (!arrivalTimeInput.value.trim()) {
arrivalTimePart.value = null
return
}
const parsed = parseTimeInput(arrivalTimeInput.value)
if (parsed !== null) {
arrivalTimePart.value = parsed
} else {
arrivalTimeInput.value = formatTimeForFormat(arrivalTimePart.value, timeFormat.value)
}
}
</script>
<template>
@@ -249,27 +469,123 @@ const arrivalMax = computed(() => getArrivalBound(form, 3))
</v-col>
</v-row>
<!-- Departure + Arrival datetime -->
<!-- Departure date + time -->
<v-row>
<v-col cols="12" md="6">
<v-col cols="12" sm="6">
<v-text-field
v-model="form.departure_date"
label="Departure Date & Time"
type="datetime-local"
v-model="departureDateValue"
type="date"
label="Departure Date"
prepend-inner-icon="mdi-calendar"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.departure_date"
>
<template #append-inner>
<v-menu v-model="depDateMenu" :close-on-content-click="false">
<template #activator="{ props: menuProps }">
<v-icon
v-bind="menuProps"
icon="mdi-calendar-month"
style="cursor: pointer"
/>
</template>
<v-date-picker
v-model="departureDatePart"
@update:model-value="depDateMenu = false"
/>
</v-menu>
</template>
</v-text-field>
</v-col>
<v-col cols="12" md="6">
<v-col cols="12" sm="6">
<v-menu v-model="depTimeMenu" :close-on-content-click="false">
<template #activator="{ props: menuProps }">
<v-text-field
v-model="form.arrival_date"
label="Arrival Date & Time"
type="datetime-local"
v-bind="menuProps"
v-model="departureTimeInput"
label="Departure Time"
clearable
prepend-inner-icon="mdi-clock-outline"
:placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'"
:disabled="!lookupComplete"
@click:clear="clearDepartureTime"
@blur="commitDepartureTimeInput"
@keydown.enter="commitDepartureTimeInput"
/>
</template>
<v-card>
<v-time-picker
v-model="departureTimePart"
:format="timeFormat"
scrollable
/>
<v-card-actions>
<v-spacer />
<v-btn variant="text" @click="depTimeMenu = false">OK</v-btn>
</v-card-actions>
</v-card>
</v-menu>
</v-col>
</v-row>
<!-- Arrival date + time -->
<v-row>
<v-col cols="12" sm="6">
<v-text-field
v-model="arrivalDateValue"
type="date"
label="Arrival Date"
prepend-inner-icon="mdi-calendar"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.arrival_date"
:min="arrivalMin"
:max="arrivalMax"
>
<template #append-inner>
<v-menu v-model="arrDateMenu" :close-on-content-click="false">
<template #activator="{ props: menuProps }">
<v-icon
v-bind="menuProps"
icon="mdi-calendar-month"
style="cursor: pointer"
/>
</template>
<v-date-picker
v-model="arrivalDatePart"
:min="arrivalMinDate"
:max="arrivalMaxDate"
@update:model-value="arrDateMenu = false"
/>
</v-menu>
</template>
</v-text-field>
</v-col>
<v-col cols="12" sm="6">
<v-menu v-model="arrTimeMenu" :close-on-content-click="false">
<template #activator="{ props: menuProps }">
<v-text-field
v-bind="menuProps"
v-model="arrivalTimeInput"
label="Arrival Time"
clearable
prepend-inner-icon="mdi-clock-outline"
:placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'"
:disabled="!lookupComplete"
@click:clear="clearArrivalTime"
@blur="commitArrivalTimeInput"
@keydown.enter="commitArrivalTimeInput"
/>
</template>
<v-card>
<v-time-picker
v-model="arrivalTimePart"
:format="timeFormat"
scrollable
/>
<v-card-actions>
<v-spacer />
<v-btn variant="text" @click="arrTimeMenu = false">OK</v-btn>
</v-card-actions>
</v-card>
</v-menu>
</v-col>
</v-row>
@@ -452,4 +768,8 @@ const arrivalMax = computed(() => getArrivalBound(form, 3))
</template>
<style scoped>
:deep(input[type="date"]::-webkit-calendar-picker-indicator) {
display: none;
-webkit-appearance: none;
}
</style>
+2 -1
View File
@@ -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 />
@@ -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>
@@ -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>
-1
View File
@@ -191,7 +191,6 @@ watch(() => form.flight_reason, (val) => console.log('flight_reason changed:', v
<v-select v-model="form.seat_type" label="Seat Type" :items="flight.seat_types" :error-messages="submitForm.errors.seat_type_id" />
</v-col>
<v-col cols="12" md="6">
{{console.log(form.flight_reason)}}
<v-select v-model="form.flight_reason" label="Reason" :items="flight.flight_reasons" :error-messages="submitForm.errors.flight_reason_id" />
</v-col>
</v-row>
+11 -1
View File
@@ -30,6 +30,8 @@ export interface UserSettings {
show_map_legend: boolean
hide_impossible_achievements: boolean
hide_map_filters: boolean
time_format: "ampm" | "24hr"
date_format: string
}
@@ -303,7 +305,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 +328,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 {}
}
+1
View File
@@ -2,3 +2,4 @@
/// <reference types="vite-plugin-pwa/client" />
declare module '*.css'
declare const __APP_VERSION__: string
+2
View File
@@ -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');
});
+14
View File
@@ -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',