Compare commits

..
23 Commits
Author SHA1 Message Date
dredgy a68e31dad7 Merge remote-tracking branch 'origin/main' into fix-achievement-category-ordering 2026-08-21 23:22:56 +10:00
dredgy 023ce6f964 Sort achievement categories 2026-08-21 23:22:42 +10:00
dredgy c66c734868 Merge pull request 'Ui fixes' (#16) from ui-fixes into main
Reviewed-on: #16
2026-08-21 22:54:13 +10:00
dredgy 94a7bc2807 Added missing data tooltips 2026-08-21 22:53:29 +10:00
dredgy 4a296705a6 Added admin controls for missing airlines 2026-08-21 22:41:29 +10:00
dredgy a6bf1c09fe Added "Save Flight And Add Another Button" 2026-08-21 22:17:53 +10:00
dredgy ef73dc0bc3 Added note on flight details page 2026-08-21 22:03:10 +10:00
dredgy b395de6719 Fixed column width on mobile and added a note column 2026-08-21 21:59:04 +10:00
dredgy 3b4ded2fab Fixed notification menu on mobile 2026-08-21 21:45:52 +10:00
dredgy 5492cc72d7 Updated arrival date input on flight form 2026-08-21 21:40:02 +10:00
dredgy 76118d0bfd Set default view to Profile 2026-08-21 20:52:06 +10:00
dredgy c0b8d10add Make progressive achievements get notifications when complete 2026-08-21 17:02:12 +10:00
dredgy 3ae1e75275 Merge branch 'make-flighttooltip-better-on-mobile' into main 2026-08-20 16:47:07 +10:00
dredgy 1ef4ae4a21 Merge remote-tracking branch 'origin/main' into make-flighttooltip-better-on-mobile 2026-08-20 16:46:44 +10:00
dredgy 90ea8d81d2 Allow "Log 1st Flight" achievement to be awarded even if flight is upcoming 2026-08-20 16:21:14 +10:00
dredgy 8514d76724 Merge pull request 'Tooltip on Mobile' (#12) from make-flighttooltip-better-on-mobile into main
Reviewed-on: #12
2026-08-16 20:48:02 +10:00
dredgy 7bca9a8d31 Tooltip on Mobile 2026-08-16 20:47:20 +10:00
dredgy e17203aefc Merge pull request 'Formatting and Share Buttons' (#11) from form-validation-improvements into main
Reviewed-on: #11
2026-08-15 21:05:22 +10:00
dredgy 02521da9c3 Merge remote-tracking branch 'origin/main' into form-validation-improvements
# Conflicts:
#	resources/js/Components/FlightsGoneBy/MainHeader.vue
2026-08-15 21:05:07 +10:00
dredgy ed0ce97548 Formatting and Share Buttons 2026-08-15 21:02:02 +10:00
dredgy 1030a14094 Merge pull request 'Add London Airport and Million Mile Challenges' (#10) from add-london-airport-challenge into main
Reviewed-on: #10
2026-08-11 20:53:13 +10:00
dredgy 2b41c3ed44 Add London Airport and Million Mile Challenges 2026-08-11 20:52:21 +10:00
dredgy 65e8c7575e Allowed filters in the url 2026-08-11 20:04:11 +10:00
42 changed files with 1253 additions and 223 deletions
@@ -3,19 +3,35 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Models\User; use App\Models\User;
use Illuminate\Console\Attributes\Argument;
use Illuminate\Console\Attributes\Description; use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature; use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command; use Illuminate\Console\Command;
#[Signature('app:recalculate-achivements')] #[Signature('app:recalculate-achievements {username? : The username of a single user to recalculate}')]
#[Description('Recalculate achievements for all users')] #[Description('Recalculate achievements for all users, or a single user by username')]
class RecalculateAchievements extends Command class RecalculateAchievements extends Command
{ {
public function handle(): void public function handle(): void
{ {
$users = User::all(); $username = $this->argument('username');
foreach ($users as $user) {
if ($username) {
$user = User::where('name', $username)->first();
if (! $user) {
$this->error("No user found with username [{$username}].");
return;
}
$user->calculateAchievements(); $user->calculateAchievements();
$this->info("Recalculated achievements for {$username}.");
return;
} }
$users = User::all();
$this->withProgressBar($users, fn (User $user) => $user->calculateAchievements());
$this->newLine();
$this->info("Recalculated achievements for {$users->count()} users.");
} }
} }
+14
View File
@@ -7,6 +7,7 @@ use App\Models\IgnoredMissingLivery;
use App\Models\User; use App\Models\User;
use App\Models\UserFlight; use App\Models\UserFlight;
use App\Services\AdminService; use App\Services\AdminService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Inertia\Inertia; use Inertia\Inertia;
@@ -66,4 +67,17 @@ class AdminController extends Controller
return back(); return back();
} }
public function ignoreMissingAirline(Request $request): JsonResponse
{
$validated = $request->validate([
'flight_id' => ['required', 'integer', 'exists:user_flights,id'],
]);
$flight = UserFlight::findOrFail($validated['flight_id']);
$flight->ignoreMissingAirline()->firstOrCreate([]);
return response()->json(['status' => 'ok']);
}
} }
+8 -4
View File
@@ -245,15 +245,19 @@ class FlightController extends Controller
$newFlight = auth()->user()->flights()->create($this->flightPayload($validated)); $newFlight = auth()->user()->flights()->create($this->flightPayload($validated));
UserAction::create([ UserAction::create([
'user_id' => $newFlight->user_id, 'user_id' => $newFlight->user_id,
'type' => $newFlight->departure_date->isFuture() ? 'flight_booked' : 'flight_logged', 'type' => $newFlight->departure_date->isFuture() ? 'flight_booked' : 'flight_logged',
'data' => [ 'data' => [
'flight' => $newFlight->snapshot($newFlight->id), 'flight' => $newFlight->snapshot($newFlight->id),
], ],
]); ]);
if ($request->boolean('add_more')) {
return redirect()->route('flights.add')
->with('success', 'Flight saved. Add another below.');
}
return redirect()->route('profile.departure-board', [Auth::user()->name, $newFlight->id]); return redirect()->route('profile.flight', [Auth::user()->name, $newFlight->id]);
} }
+16 -2
View File
@@ -3,7 +3,9 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Achievement; use App\Models\Achievement;
use App\Models\AchievementCategory;
use App\Models\Aircraft; use App\Models\Aircraft;
use App\Models\Airport;
use App\Models\Alliance; use App\Models\Alliance;
use App\Models\Continent; use App\Models\Continent;
use App\Models\Country; use App\Models\Country;
@@ -104,8 +106,14 @@ class UserProfileController extends Controller
$achievements = Achievement::with(['category', 'difficulty']) $achievements = Achievement::with(['category', 'difficulty'])
->orderBy('id', 'asc') ->orderBy('id', 'asc')
->get() ->get()
->groupBy(fn(Achievement $a) => $a->category->name) ->groupBy(fn(Achievement $a) => $a->category->internal_name)
->map(fn($group) => $group->sortBy('sort_order')->values()); ->sortBy(function ($group, $internalName) {
$index = array_search($internalName, AchievementCategory::ORDER);
return $index === false ? PHP_INT_MAX : $index;
})
->mapWithKeys(fn($group) => [
$group->first()->category->name => $group->sortBy('sort_order')->values(),
]);
$userAchievements = $user->achievements() $userAchievements = $user->achievements()
->with('achievement') ->with('achievement')
@@ -199,6 +207,11 @@ class UserProfileController extends Controller
default => [], default => [],
}; };
$londonAirports = match($achievement->internal_name){
'fun_challenges.all_london_airports' => Airport::LONDON_AIRPORTS,
default => [],
};
$canView = Gate::allows('viewProfileData', $user); $canView = Gate::allows('viewProfileData', $user);
return Inertia::render('Profile/UserAchievement', [ return Inertia::render('Profile/UserAchievement', [
@@ -212,6 +225,7 @@ class UserProfileController extends Controller
'airlines' => $airlines, 'airlines' => $airlines,
'continents' => $continents, 'continents' => $continents,
'aircraft_families' => $aircraftFamilies, 'aircraft_families' => $aircraftFamilies,
'london_airports' => $londonAirports,
'achievementCount' => $user->unlockedAchievements()->count(), 'achievementCount' => $user->unlockedAchievements()->count(),
'majorAlliances' => Alliance::whereIn('internal_name', $majorAlliances)->get(), 'majorAlliances' => Alliance::whereIn('internal_name', $majorAlliances)->get(),
'canView' => $canView, 'canView' => $canView,
+10
View File
@@ -16,6 +16,16 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
*/ */
class AchievementCategory extends Model class AchievementCategory extends Model
{ {
const array ORDER = [
'number_of_flights',
'distance',
'general_flying',
'countries_and_continents',
'aircraft',
'airlines_and_alliances',
'fun_challenges',
];
protected $fillable = [ protected $fillable = [
'internal_name', 'internal_name',
'name', 'name',
+4
View File
@@ -33,6 +33,10 @@ class Airport extends Model
'display_name', 'display_name',
]; ];
const array LONDON_AIRPORTS = [
'LHR', 'LGW', 'STN', 'LTN', 'LCY', 'SEN',
];
protected function displayName() : Attribute{ protected function displayName() : Attribute{
return Attribute::make( return Attribute::make(
get: function () { get: function () {
+11
View File
@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@@ -271,6 +272,16 @@ class UserFlight extends Model
} }
public function ignoreMissingAirline(): HasOne
{
return $this->hasOne(UserFlightIgnoreMissingAirline::class);
}
public function isIgnoringMissingAirline(): bool
{
return $this->ignoreMissingAirline()->exists();
}
public function aircraft(): BelongsTo public function aircraft(): BelongsTo
{ {
return $this->belongsTo(Aircraft::class); return $this->belongsTo(Aircraft::class);
@@ -0,0 +1,20 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class UserFlightIgnoreMissingAirline extends Model
{
protected $table = 'user_flights_ignore_missing_airlines';
protected $fillable = [
'user_flight_id',
];
public function userFlight(): BelongsTo
{
return $this->belongsTo(UserFlight::class);
}
}
@@ -12,6 +12,7 @@ use App\Services\Achievements\Checkers\AchievementCheckerInterface;
use App\Services\Achievements\Checkers\AircraftChecker; use App\Services\Achievements\Checkers\AircraftChecker;
use App\Services\Achievements\Checkers\CountriesAndContinentsChecker; use App\Services\Achievements\Checkers\CountriesAndContinentsChecker;
use App\Services\Achievements\Checkers\AirlinesAndAlliancesChecker; use App\Services\Achievements\Checkers\AirlinesAndAlliancesChecker;
use App\Services\Achievements\Checkers\DistanceChecker;
use App\Services\Achievements\Checkers\FunChallengesChecker; use App\Services\Achievements\Checkers\FunChallengesChecker;
use App\Services\Achievements\Checkers\GeneralFlyingChecker; use App\Services\Achievements\Checkers\GeneralFlyingChecker;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@@ -30,6 +31,7 @@ class AchievementService
AircraftChecker::class, AircraftChecker::class,
AirlinesAndAlliancesChecker::class, AirlinesAndAlliancesChecker::class,
FunChallengesChecker::class, FunChallengesChecker::class,
DistanceChecker::class,
]; ];
public function __construct() public function __construct()
@@ -45,6 +47,7 @@ class AchievementService
* @var Collection<int,UserFlight> $flights * @var Collection<int,UserFlight> $flights
*/ */
private Collection $flights; private Collection $flights;
private int $loggedFlightCount;
public function calculate(User $user): void public function calculate(User $user): void
{ {
@@ -62,20 +65,24 @@ class AchievementService
'arrivalAirport.region.continent', 'arrivalAirport.region.continent',
])->where('departure_date', '<=', now('UTC'))->get(); ])->where('departure_date', '<=', now('UTC'))->get();
$this->loggedFlightCount = $user->flights()->count();
foreach ($this->checkers as $checkerClass) { foreach ($this->checkers as $checkerClass) {
$checker = new $checkerClass($this); $checker = new $checkerClass($this);
$checker->check($user); $checker->check($user);
} }
} }
/**
* @return Collection<int,UserFlight>
*/
public function getFlights(): Collection public function getFlights(): Collection
{ {
return $this->flights; return $this->flights;
} }
public function getLoggedFlightCount(): int
{
return $this->loggedFlightCount;
}
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Award / revoke // Award / revoke
@@ -91,7 +98,8 @@ class AchievementService
->where('achievement_id', $achievement->id) ->where('achievement_id', $achievement->id)
->first(); ->first();
$alreadyUnlocked = $existing !== null; $alreadyUnlocked = $existing !== null
&& (! $achievement->progressive || $existing->progress >= $achievement->threshold);
UserAchievement::updateOrCreate( UserAchievement::updateOrCreate(
['user_id' => $user->id, 'achievement_id' => $achievement->id], ['user_id' => $user->id, 'achievement_id' => $achievement->id],
@@ -15,6 +15,11 @@ abstract class BaseChecker implements AchievementCheckerInterface
return $this->service->getFlights(); return $this->service->getFlights();
} }
protected function allLoggedFlightsCount(): int
{
return $this->service->getLoggedFlightCount();
}
/** /**
* Resolve an achievement ID from its internal name. * Resolve an achievement ID from its internal name.
* Results are cached on the service so repeated lookups are free. * Results are cached on the service so repeated lookups are free.
@@ -0,0 +1,26 @@
<?php
namespace App\Services\Achievements\Checkers;
use App\Models\User;
use App\Models\UserFlight;
use Illuminate\Database\Eloquent\Collection;
class DistanceChecker extends BaseChecker
{
public function check(): void
{
/**
* @var $flights Collection<int, UserFlight>
*/
$flights = $this->flights();
$totalDistance = $flights->sum('distance');
$this->awardProgress((int) $totalDistance, 'distance.circumference_of_the_earth');
$this->awardProgress((int) $totalDistance, 'distance.to_the_moon');
$this->awardProgress((int) $totalDistance, 'distance.gigametre');
$this->awardProgress((int) $totalDistance, 'distance.million_miles');
}
}
@@ -2,6 +2,7 @@
namespace App\Services\Achievements\Checkers; namespace App\Services\Achievements\Checkers;
use App\Models\Airport;
use App\Models\User; use App\Models\User;
use App\Models\UserFlight; use App\Models\UserFlight;
@@ -131,5 +132,19 @@ class FunChallengesChecker extends BaseChecker
->count(); ->count();
$this->awardProgress($visitedCanadianProvinces, 'fun_challenges.canadian_provinces'); $this->awardProgress($visitedCanadianProvinces, 'fun_challenges.canadian_provinces');
// --- London Airports ---
$visitedLondonAirports = $flights
->flatMap(fn(UserFlight $f) => [
$f->departureAirport?->iata_code,
$f->arrivalAirport?->iata_code,
])
->filter()
->map(fn($code) => strtoupper($code))
->filter(fn($code) => in_array($code, Airport::LONDON_AIRPORTS))
->unique()
->count();
$this->awardProgress($visitedLondonAirports, 'fun_challenges.all_london_airports');
} }
} }
@@ -15,10 +15,11 @@ class GeneralFlyingChecker extends BaseChecker
*/ */
$flights = $this->flights(); $flights = $this->flights();
$count = $flights->count(); $count = $flights->count();
$allLoggedFlightsCount = $this->allLoggedFlightsCount();
// --- Boolean achievements --- // --- Boolean achievements ---
$this->awardIf($count >= 1, 'general_flying.first_flight'); $this->awardIf($allLoggedFlightsCount >= 1, 'general_flying.first_flight');
$this->awardIf( $this->awardIf(
$flights->contains(fn ($f) => $f->isDomestic()), $flights->contains(fn ($f) => $f->isDomestic()),
@@ -68,14 +69,6 @@ class GeneralFlyingChecker extends BaseChecker
'general_flying.domestic_two_countries' 'general_flying.domestic_two_countries'
); );
// --- Progressive achievements ---
$totalDistance = $flights->sum('distance');
$this->awardProgress((int) $totalDistance, 'general_flying.circumference_of_the_earth');
$this->awardProgress((int) $totalDistance, 'general_flying.to_the_moon');
$this->awardProgress((int) $totalDistance, 'general_flying.gigametre');
$this->awardProgress($count,'general_flying.10_flights'); $this->awardProgress($count,'general_flying.10_flights');
$this->awardProgress($count,'general_flying.50_flights'); $this->awardProgress($count,'general_flying.50_flights');
$this->awardProgress($count,'general_flying.100_flights'); $this->awardProgress($count,'general_flying.100_flights');
+5 -3
View File
@@ -51,26 +51,28 @@ class AdminService
{ {
$flights = UserFlight::whereNotNull('flight_number') $flights = UserFlight::whereNotNull('flight_number')
->whereNull('airline_id') ->whereNull('airline_id')
->with('user:id,name') // adjust to your actual user relation/columns ->whereDoesntHave('ignoreMissingAirline')
->with('user:id,name')
->get(['id', 'flight_number', 'user_id']); ->get(['id', 'flight_number', 'user_id']);
return $flights return $flights
->map(function ($flight) { ->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); preg_match('/^([A-Za-z0-9]{2})\d+/', trim($flight->flight_number), $matches);
return [ return [
'id' => $flight->id,
'code' => $matches[1] ?? null, 'code' => $matches[1] ?? null,
'flight_number' => $flight->flight_number, 'flight_number' => $flight->flight_number,
'link' => "/u/{$flight->user->name}/flight/{$flight->id}", 'link' => "/u/{$flight->user->name}/flight/{$flight->id}",
]; ];
}) })
->filter(fn ($f) => $f['code'] !== null) // drop any that didn't match the pattern ->filter(fn ($f) => $f['code'] !== null)
->groupBy('code') ->groupBy('code')
->map(function ($group, $code) { ->map(function ($group, $code) {
return [ return [
'code' => $code, 'code' => $code,
'flights' => $group->map(fn ($f) => [ 'flights' => $group->map(fn ($f) => [
'id' => $f['id'],
'flight_number' => $f['flight_number'], 'flight_number' => $f['flight_number'],
'link' => $f['link'], 'link' => $f['link'],
])->values()->all(), ])->values()->all(),
+2 -2
View File
@@ -72,7 +72,7 @@ class SettingsRegistry
'type' => 'select', 'type' => 'select',
'label' => 'Default Page', 'label' => 'Default Page',
'category' => 'FlightsGoneBy Settings', 'category' => 'FlightsGoneBy Settings',
'default' => 'feed_first', 'default' => 'profile',
'options' => [ 'options' => [
['value' => 'feed_first', 'label' => 'My Feed if Following People, My Profile if Not'], ['value' => 'feed_first', 'label' => 'My Feed if Following People, My Profile if Not'],
['value' => 'profile', 'label' => 'My Profile'], ['value' => 'profile', 'label' => 'My Profile'],
@@ -155,7 +155,7 @@ class SettingsRegistry
['value' => 'seat_type_id', 'label' => 'Seat Type'], ['value' => 'seat_type_id', 'label' => 'Seat Type'],
['value' => 'seat_number', 'label' => 'Seat Number'], ['value' => 'seat_number', 'label' => 'Seat Number'],
['value' => 'flight_reason_id', 'label' => 'Reason'], ['value' => 'flight_reason_id', 'label' => 'Reason'],
['value' => 'note', 'label' => 'Note'],
['value' => 'aircraft.display_name_short', 'label' => 'Aircraft Full Name'], ['value' => 'aircraft.display_name_short', 'label' => 'Aircraft Full Name'],
['value' => 'class_seat_combined', 'label' => 'Class/Seat Type/Seat Number Combined'], ['value' => 'class_seat_combined', 'label' => 'Class/Seat Type/Seat Number Combined'],
], ],
+1 -1
View File
@@ -67,7 +67,7 @@ return Application::configure(basePath: dirname(__DIR__))
'message' => 'You don\'t have permission to access this page.', 'message' => 'You don\'t have permission to access this page.',
], ],
404 => [ 404 => [
'title' => 'You Flight Has Been Cancelled', 'title' => 'Your Flight Has Been Cancelled',
'message' => 'The page you are looking for doesn\'t exist or has been moved.', 'message' => 'The page you are looking for doesn\'t exist or has been moved.',
], ],
419 => [ 419 => [
@@ -0,0 +1,87 @@
<?php
use App\Models\Achievement;
use App\Models\AchievementCategory;
use App\Models\AchievementDifficulty;
use App\Models\User;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
$hard = AchievementDifficulty::where('internal_name', 'hard')->first();
$near_impossible = AchievementDifficulty::where('internal_name', 'near_impossible')->first();
$fun_challenges = AchievementCategory::where('internal_name', 'fun_challenges')->first();
Achievement::create([
'name' => 'London Calling',
'internal_name' => 'fun_challenges.all_london_airports',
'short_description' => 'Fly to all official London airports',
'progressive' => true,
'difficulty_description' => 'Much more achievable if you live in London!',
'threshold' => 6,
'achievement_category_id' => $fun_challenges->id,
'achievement_difficulty_id' => $hard->id,
'has_page' => true,
'sort_order' => 10,
'icon' => 'standard_achievement.png',
'long_description' => '',
]);
$distance = AchievementCategory::create([
'name' => 'Distance',
'internal_name' => 'distance',
'description' => 'Achievements that are based on distance'
]);
Achievement::create([
'name' => 'Million Miler',
'internal_name' => 'distance.million_miles',
'short_description' => 'Fly one million miles',
'progressive' => true,
'threshold' => 1609344,
'achievement_category_id' => $distance->id,
'achievement_difficulty_id' => $near_impossible->id,
'has_page' => false,
'sort_order' => 4,
'icon' => 'standard_achievement.png',
'long_description' => '',
]);
Achievement::whereInternalName('general_flying.gigametre')->update([
'internal_name' => 'distance.gigametre',
'achievement_category_id' => $distance->id,
'sort_order' => 3
]);
Achievement::whereInternalName('general_flying.circumference_of_the_earth')->update([
'internal_name' => 'distance.circumference_of_the_earth',
'achievement_category_id' => $distance->id,
'sort_order' => 1
]);
Achievement::whereInternalName('general_flying.to_the_moon')->update([
'internal_name' => 'distance.to_the_moon',
'achievement_category_id' => $distance->id,
'sort_order' => 2
]);
foreach(User::all() as $user){
$user->calculateAchievements();
}
}
/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};
@@ -0,0 +1,26 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::create('user_flights_ignore_missing_airlines', function (Blueprint $table) {
$table->id();
$table->foreignId('user_flight_id')
->constrained('user_flights')
->cascadeOnDelete();
$table->timestamps();
$table->unique('user_flight_id');
});
}
public function down(): void
{
Schema::dropIfExists('user_flights_ignore_missing_airlines');
}
};
@@ -0,0 +1,57 @@
<?php
use App\Models\Achievement;
use App\Models\AchievementCategory;
use Illuminate\Database\Migrations\Migration;
return new class extends Migration
{
public function up(): void
{
$newCategory = AchievementCategory::create([
'internal_name' => 'number_of_flights',
'name' => 'Number of Flights',
'description' => 'Achievements for reaching flight count milestones.',
]);
$achievementsToUpdate = [
'general_flying.first_flight',
'general_flying.10_flights',
'general_flying.500_flights',
'general_flying.50_flights',
'general_flying.100_flights',
'general_flying.1000_flights',
];
foreach ($achievementsToUpdate as $internalName) {
$achievement = Achievement::where('internal_name', $internalName)->first();
if (!$achievement) {
continue; // or throw, depending how strict you want this
}
$achievement->update([
'achievement_category_id' => $newCategory->id,
'internal_name' => str_replace('general_flying.', 'number_of_flights.', $internalName),
]);
}
}
public function down(): void
{
$oldCategory = AchievementCategory::where('internal_name', 'general_flying')->first();
if ($oldCategory) {
Achievement::where('internal_name', 'like', 'number_of_flights.%')
->get()
->each(function (Achievement $achievement) use ($oldCategory) {
$achievement->update([
'achievement_category_id' => $oldCategory->id,
'internal_name' => str_replace('number_of_flights.', 'general_flying.', $achievement->internal_name),
]);
});
}
AchievementCategory::where('internal_name', 'number_of_flights')->delete();
}
};
@@ -1,25 +1,63 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed } from "vue"
import axios from "axios"
import { MissingAirline } from "@/Types/types" import { MissingAirline } from "@/Types/types"
defineProps<{ const props = defineProps<{
airline: MissingAirline airline: MissingAirline
}>() }>()
// Track ids we've dismissed locally (optimistic UI) and ones currently in-flight
const dismissedIds = ref<Set<number>>(new Set())
const pendingIds = ref<Set<number>>(new Set())
const visibleFlights = computed(() =>
props.airline.flights.filter(flight => !dismissedIds.value.has(flight.id))
)
async function dismissFlight(flightId: number) {
if (pendingIds.value.has(flightId)) return
pendingIds.value.add(flightId)
// Optimistically remove the pill
dismissedIds.value.add(flightId)
try {
await axios.post('/admin/ignore-missing-airline', {
flight_id: flightId,
})
} catch (error) {
// Revert on failure so the flight isn't silently lost from view
dismissedIds.value.delete(flightId)
console.error('Failed to ignore missing airline for flight', flightId, error)
} finally {
pendingIds.value.delete(flightId)
}
}
</script> </script>
<template> <template>
<div class="missing-airline-card"> <div class="missing-airline-card">
<div class="card-header"> <div class="card-header">
<span class="airline-code">{{ airline.code }}</span> <span class="airline-code">{{ airline.code }}</span>
<span class="flight-count">{{ airline.flights.length }} flight{{ airline.flights.length === 1 ? '' : 's' }}</span> <span class="flight-count">{{ visibleFlights.length }} flight{{ visibleFlights.length === 1 ? '' : 's' }}</span>
</div> </div>
<ul class="flight-list"> <div class="flight-list">
<li v-for="flight in airline.flights" :key="flight.link" class="flight-item"> <v-chip
<a :href="flight.link" class="flight-link" target="_blank" rel="noopener"> v-for="flight in visibleFlights"
:key="flight.link"
class="flight-chip"
size="small"
closable
:disabled="pendingIds.has(flight.id)"
@click:close="dismissFlight(flight.id)"
>
<a :href="flight.link" class="flight-link" target="_blank" rel="noopener" @click.stop>
{{ flight.flight_number }} {{ flight.flight_number }}
</a> </a>
</li> </v-chip>
</ul> </div>
</div> </div>
</template> </template>
@@ -62,30 +100,23 @@ defineProps<{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
gap: 0.5rem; gap: 0.5rem;
list-style: none;
padding: 0;
margin: 0;
} }
.flight-item { .flight-chip {
display: flex;
}
.flight-link {
font-family: 'Share Tech Mono', monospace; font-family: 'Share Tech Mono', monospace;
font-size: 0.72rem; font-size: 0.72rem;
letter-spacing: 0.06em; letter-spacing: 0.06em;
background: rgba(255, 255, 255, 0.04) !important;
border: 1px solid rgba(255, 255, 255, 0.06);
}
.flight-link {
color: #9fb3c8; color: #9fb3c8;
text-decoration: none; text-decoration: none;
background: rgba(255, 255, 255, 0.04); transition: color 0.15s ease;
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 { .flight-link:hover {
color: #ffc107; color: #ffc107;
border-color: rgba(255, 193, 7, 0.4);
} }
</style> </style>
@@ -0,0 +1,55 @@
<template>
<v-btn
:color="copied ? 'success' : color"
:variant="variant"
:icon="iconOnly"
:size="iconOnly ? 'x-small' : 'default'"
@click="handleCopy"
>
<v-icon :start="!iconOnly" :icon="copied ? 'mdi-check' : 'mdi-content-copy'" />
<template v-if="!iconOnly">{{ copied ? 'Copied Link To Page!' : label }}</template>
<v-tooltip v-if="iconOnly" activator="parent" location="top">
{{ copied ? 'Copied Link To Page!' : label }}
</v-tooltip>
</v-btn>
</template>
<script setup lang="ts">
import { ref } from 'vue';
import { useDisplay } from 'vuetify';
import { copyToClipboard } from '@/Composables/useClipboard';
interface Props {
label?: string;
color?: string;
variant?: 'flat' | 'text' | 'elevated' | 'tonal' | 'outlined' | 'plain';
resetDelay?: number;
}
const props = withDefaults(defineProps<Props>(), {
label: 'Copy link',
color: 'primary',
variant: 'outlined',
resetDelay: 2000,
});
const { mobile } = useDisplay();
const iconOnly = mobile;
const copied = ref(false);
let resetTimeout: ReturnType<typeof setTimeout> | null = null;
async function handleCopy() {
try {
await copyToClipboard(window.location.href);
copied.value = true;
if (resetTimeout) clearTimeout(resetTimeout);
resetTimeout = setTimeout(() => {
copied.value = false;
}, props.resetDelay);
} catch (err) {
console.error('Failed to copy URL:', err);
}
}
</script>
@@ -17,7 +17,7 @@ const props = defineProps<{
const page = usePage<SharedProps>().props const page = usePage<SharedProps>().props
const ITEMS_PER_PAGE = 25 const ITEMS_PER_PAGE = 25
const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined'] const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined', 'note']
const columnsToShow = computed(() => page.auth.user?.resolved_settings?.departure_board_columns ?? defaultColumns) const columnsToShow = computed(() => page.auth.user?.resolved_settings?.departure_board_columns ?? defaultColumns)
const showColumn = (column: string) => columnsToShow.value.includes(column) const showColumn = (column: string) => columnsToShow.value.includes(column)
@@ -44,6 +44,7 @@ const allHeaders = [
{ title: 'SEAT TYPE', key: 'seat_type_id', sortable: true }, { title: 'SEAT TYPE', key: 'seat_type_id', sortable: true },
{ title: 'SEAT NO.', key: 'seat_number', sortable: true }, { title: 'SEAT NO.', key: 'seat_number', sortable: true },
{ title: 'REASON', key: 'flight_reason_id', sortable: true }, { title: 'REASON', key: 'flight_reason_id', sortable: true },
{ title: 'NOTE', key: 'note', sortable: true },
{ title: '', key: 'actions', sortable: false }, { title: '', key: 'actions', sortable: false },
] ]
@@ -41,7 +41,7 @@ const reasonBadgeVariant = (reason: string) => {
} }
const showColumn = (column: string) => props.columnsToShow.includes(column) const showColumn = (column: string) => props.columnsToShow.includes(column)
console.log(props.columnsToShow)
</script> </script>
<template> <template>
@@ -170,6 +170,10 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
</span> </span>
</td> </td>
<td v-if="showColumn('note')" class="v-data-table__td note-cell">
<span v-if="flight.note" class="note-text">{{ flight.note }}</span>
</td>
<td class="v-data-table__td actions-cell"> <td class="v-data-table__td actions-cell">
<UserFlightContextMenu :profile-user="user" :can-edit="canEdit" :flight="flight" /> <UserFlightContextMenu :profile-user="user" :can-edit="canEdit" :flight="flight" />
</td> </td>
@@ -184,6 +188,17 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
padding-right: 0 !important; padding-right: 0 !important;
} }
.note-cell {
min-width: 200px;
max-width: 320px;
}
.note-text {
display: block;
overflow: hidden;
font-size: 0.85rem;
}
.city-name{ .city-name{
color: #556; color: #556;
text-transform: uppercase; text-transform: uppercase;
@@ -211,23 +226,14 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
align-items: center; align-items: center;
vertical-align: middle; vertical-align: middle;
gap: 0.5rem; gap: 0.5rem;
overflow-x: auto; width: fit-content;
max-width: 160px;
/* Hide scrollbar but keep functionality */
scrollbar-width: none;
&::-webkit-scrollbar { display: none; }
} }
.iata { .iata {
font-weight: 600; font-weight: 600;
} }
.class-cell {
display: flex;
align-items: center;
vertical-align: middle;
gap: 0.5rem;
}
.actions-cell { .actions-cell {
width: 40px; width: 40px;
@@ -277,15 +283,5 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
padding: 0 !important; padding: 0 !important;
} }
.class-badges-cell {
max-width: 140px;
overflow: hidden;
}
.class-cell > *:not(:first-child) {
display: none;
}
} }
</style> </style>
@@ -213,17 +213,6 @@ function buildOptions(flights: Flight[]) {
const availableOptions = buildOptions(props.flights) const availableOptions = buildOptions(props.flights)
// When selected countries change, drop any selected regions that no longer
// belong to any of the selected countries.
watch(() => filters.country, (countries) => {
if (countries.length === 0) return
filters.airportRegion = filters.airportRegion.filter((regionId: number) => {
const region = availableOptions.airportRegions.find(r => r.id === regionId)
if (!region) return false
return [...region.countryCodes].some((code: string) => countries.includes(code))
})
})
// ── URL query sync ────────────────────────────────────────────────────────── // ── URL query sync ──────────────────────────────────────────────────────────
function loadFiltersFromQuery(): boolean { function loadFiltersFromQuery(): boolean {
@@ -281,20 +270,6 @@ onMounted(async () => {
emitFilters() emitFilters()
}) })
// ── Copy link ─────────────────────────────────────────────────────────────────
const linkCopied = ref(false)
async function copyFilterLink() {
try {
await navigator.clipboard.writeText(window.location.href)
linkCopied.value = true
setTimeout(() => { linkCopied.value = false }, 2000)
} catch {
// Clipboard API unavailable (e.g. non-secure context) - nothing to fall
// back to here, the button just silently no-ops.
}
}
// ── Helpers ─────────────────────────────────────────────────────────────────── // ── Helpers ───────────────────────────────────────────────────────────────────
@@ -681,18 +656,6 @@ const countryFlagClass = (code: string) =>
</v-select> </v-select>
</div> </div>
<div class="flight-filters-actions">
<v-btn
:prepend-icon="linkCopied ? 'mdi-check' : 'mdi-link-variant'"
:color="linkCopied ? 'success' : undefined"
variant="outlined"
size="small"
@click="copyFilterLink"
>
{{ linkCopied ? 'Copied!' : 'Copy Link to This Page With Filters' }}
</v-btn>
</div>
</div> </div>
</template> </template>
@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div class="flight-map-wrapper"> <div class="flight-map-wrapper" :class="{ tooltip }">
<PlaneLoader v-if="!mapReady" class="map-loader" /> <PlaneLoader v-if="!mapReady" class="map-loader" />
<div ref="mapContainer" class="map-container" :class="{ 'map-hidden': !mapReady }" /> <div ref="mapContainer" class="map-container" :class="{ 'map-hidden': !mapReady }" />
<button @click="exportMapBasic()" class="export-btn" title="Download as Image"> <button @click="exportMapBasic()" class="export-btn" title="Download as Image">
@@ -277,8 +277,11 @@ export default defineComponent({
compact: { compact: {
type: Boolean, type: Boolean,
default: false, default: false,
},
tooltip: {
type: Boolean,
default: false,
} }
}, },
setup(props) { setup(props) {
@@ -821,6 +824,11 @@ export default defineComponent({
aspect-ratio: 7 / 10; aspect-ratio: 7 / 10;
max-height: none; max-height: none;
} }
.flight-map-wrapper.tooltip {
aspect-ratio: 16 / 10;
max-height: 30vh;
}
} }
small.attribution{ small.attribution{
@@ -40,7 +40,7 @@ defineProps<{
<ToolTipRows v-if="isActive.value"> <ToolTipRows v-if="isActive.value">
<FlightMap :flights="[flight]" :showLegend="false" compact /> <FlightMap :flights="[flight]" :showLegend="false" compact tooltip />
</ToolTipRows> </ToolTipRows>
<ToolTipDivider /> <ToolTipDivider />
@@ -4,6 +4,7 @@ defineProps<{
rowKey: (row: T) => string | number rowKey: (row: T) => string | number
hasItems: (row: T) => boolean hasItems: (row: T) => boolean
labelWidth?: string labelWidth?: string
compactOnMobile?: boolean
}>() }>()
</script> </script>
@@ -15,7 +16,11 @@ defineProps<{
class="badge-row" class="badge-row"
> >
<!-- Label column: consumer provides content --> <!-- Label column: consumer provides content -->
<div class="badge-label" :style="labelWidth ? `width: ${labelWidth}` : ''"> <div
class="badge-label"
:class="{ 'badge-label--compact': compactOnMobile }"
:style="labelWidth ? `width: ${labelWidth}` : ''"
>
<slot name="label" :row="row" /> <slot name="label" :row="row" />
</div> </div>
@@ -38,8 +43,6 @@ defineProps<{
container-type: inline-size; container-type: inline-size;
} }
.badge-row { .badge-row {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -49,13 +52,13 @@ defineProps<{
.badge-label { .badge-label {
flex: 0 0 auto; flex: 0 0 auto;
width: 15em; width: 21em;
padding: 0.5em; padding: 0.5em;
border-right: 1px solid var(--table-border); border-right: 1px solid var(--table-border);
align-self: stretch; align-self: stretch;
display: flex; display: flex;
align-items: center; align-items: center;
font-size:0.9rem; font-size: 0.9rem;
} }
@container (max-width: 480px) { @container (max-width: 480px) {
@@ -63,6 +66,12 @@ defineProps<{
font-size: 0.75rem; font-size: 0.75rem;
width: 9em; width: 9em;
} }
.badge-label--compact {
font-size: 0.7rem;
width: clamp(6em, 50cqw, 9em);
flex-shrink: 0;
}
} }
.badge-scroll-container { .badge-scroll-container {
@@ -1,6 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { Link, usePage } from "@inertiajs/vue3" import { Link, usePage } from "@inertiajs/vue3"
import { SharedProps } from "@/Types/types" import { SharedProps } from "@/Types/types"
import CopyPageButton from "@/Components/FlightsGoneBy/CopyPageButton.vue";
const page = usePage<SharedProps>().props const page = usePage<SharedProps>().props
const year = new Date().getFullYear() const year = new Date().getFullYear()
@@ -63,9 +64,17 @@ footer {
color: #ffc107; color: #ffc107;
} }
.footer-version {
opacity: 0.8;
margin-left: 0.4em;
}
@media (max-width: 600px) { @media (max-width: 600px) {
footer { footer {
padding: 0 1rem; flex-wrap: wrap;
flex: 0 0 auto;
row-gap: 0.5rem;
padding: 0.6rem 1rem;
} }
.footer-copyright { .footer-copyright {
@@ -75,10 +84,6 @@ footer {
.footer-link { .footer-link {
font-size: 0.6rem; font-size: 0.6rem;
} }
}
.footer-version {
opacity: 0.8;
margin-left: 0.4em;
} }
</style> </style>
@@ -31,7 +31,7 @@ onUnmounted(() => document.removeEventListener('click', handleClickOutside))
<Logo variant="color" /> <Logo variant="color" />
</Link> </Link>
<UserSearchBox density="compact" style="max-width:400px; width: 400px;" /> <UserSearchBox class="nav-desktop" density="compact" style="max-width:400px; width: 400px;" />
<NotificationMenu v-if="page.props.auth?.user" :unread-count="page.props.unread_notification_count" /> <NotificationMenu v-if="page.props.auth?.user" :unread-count="page.props.unread_notification_count" />
<!-- Desktop nav --> <!-- Desktop nav -->
@@ -371,5 +371,6 @@ header {
@media (max-width: 600px) { @media (max-width: 600px) {
.nav-desktop { display: none; } .nav-desktop { display: none; }
.hamburger { display: flex; } .hamburger { display: flex; }
.user-search-box { display: none; }
} }
</style> </style>
@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch, onMounted } from 'vue' import { ref, watch, onMounted, onUnmounted } from 'vue'
import axios from "axios"; import axios from "axios";
import { Notification } from "@/Types/types"; import { Notification } from "@/Types/types";
import { Link } from "@inertiajs/vue3"; import { Link } from "@inertiajs/vue3";
@@ -18,6 +18,7 @@ onMounted(() => {
const open = ref(false) const open = ref(false)
const notifications = ref<Notification[]>([]) const notifications = ref<Notification[]>([])
const loading = ref(false) const loading = ref(false)
const wrapperRef = ref<HTMLElement | null>(null)
const markAllRead = async (notifications: Notification[]) => { const markAllRead = async (notifications: Notification[]) => {
const unread = notifications.filter(n => !n.read_at) const unread = notifications.filter(n => !n.read_at)
@@ -27,6 +28,20 @@ const markAllRead = async (notifications: Notification[]) => {
unread.forEach(n => n.read_at = new Date().toISOString()) unread.forEach(n => n.read_at = new Date().toISOString())
} }
const handleClickOutside = (event: MouseEvent) => {
if (open.value && wrapperRef.value && !wrapperRef.value.contains(event.target as Node)) {
open.value = false
}
}
onMounted(() => {
document.addEventListener('click', handleClickOutside)
})
onUnmounted(() => {
document.removeEventListener('click', handleClickOutside)
})
watch(open, async (isOpen) => { watch(open, async (isOpen) => {
if (!isOpen) return if (!isOpen) return
@@ -43,7 +58,7 @@ watch(open, async (isOpen) => {
</script> </script>
<template> <template>
<div class="notif-wrapper"> <div class="notif-wrapper" ref="wrapperRef">
<v-btn icon variant="text" @click="open = !open" aria-label="Notifications"> <v-btn icon variant="text" @click="open = !open" aria-label="Notifications">
<v-badge :content="store.unreadCount" :model-value="store.unreadCount > 0" color="primary"> <v-badge :content="store.unreadCount" :model-value="store.unreadCount > 0" color="primary">
<v-icon>mdi-bell-outline</v-icon> <v-icon>mdi-bell-outline</v-icon>
@@ -106,6 +121,16 @@ watch(open, async (isOpen) => {
overflow: hidden; overflow: hidden;
} }
@media (max-width: 480px) {
.notif-menu {
position: fixed;
top: 4.5rem; /* adjust to sit just below your navbar height */
left: 50%;
transform: translateX(-50%);
width: min(320px, calc(100vw - 1.5rem));
}
}
.notif-header { .notif-header {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -4,6 +4,7 @@ import FlightMap from "@/Components/FlightsGoneBy/FlightMap.vue";
import Panel from "@/Components/FlightsGoneBy/Panels/Panel.vue"; import Panel from "@/Components/FlightsGoneBy/Panels/Panel.vue";
import DetailRows from "@/Components/FlightsGoneBy/Panels/DetailRows.vue"; import DetailRows from "@/Components/FlightsGoneBy/Panels/DetailRows.vue";
import DetailRow from "@/Components/FlightsGoneBy/Panels/DetailRow.vue"; import DetailRow from "@/Components/FlightsGoneBy/Panels/DetailRow.vue";
import PanelLabel from "@/Components/FlightsGoneBy/Panels/PanelLabel.vue";
defineProps<{ defineProps<{
flight: Flight flight: Flight
@@ -19,6 +20,10 @@ defineProps<{
<DetailRow label="Distance" :value="flight.distance + 'km'" /> <DetailRow label="Distance" :value="flight.distance + 'km'" />
<DetailRow label="Duration" :value="flight.duration_display" /> <DetailRow label="Duration" :value="flight.duration_display" />
</DetailRows> </DetailRows>
<DetailRows>
<PanelLabel v-if="flight.note?.length">Notes</PanelLabel>
{{flight.note}}
</DetailRows>
</Panel> </Panel>
</template> </template>
@@ -0,0 +1,53 @@
<script setup lang="ts">
import GlassTooltip from '@/Components/FlightsGoneBy/GlassTooltip.vue'
import type { Anchor } from 'vuetify'
withDefaults(defineProps<{
label?: string
location?: Anchor
}>(), {
label: 'Missing something?',
})
defineSlots<{
default(): any
}>()
</script>
<template>
<GlassTooltip :location="location ?? 'top'" :open-delay="150">
<template #activator="{ props: activatorProps }">
<button
v-bind="activatorProps"
type="button"
class="missing-entity-link"
>
{{ label }}
</button>
</template>
<template #default>
<slot />
</template>
</GlassTooltip>
</template>
<style scoped>
.missing-entity-link {
display: inline-block;
margin-top: 4px;
padding: 0;
background: none;
border: none;
font-size: 12px;
color: rgba(255, 255, 255, 0.55);
text-decoration: underline;
text-underline-offset: 2px;
cursor: pointer;
transition: color 0.15s ease;
}
.missing-entity-link:hover {
color: rgba(255, 255, 255, 0.85);
}
</style>
@@ -63,6 +63,7 @@ watch(search, (newQuery) => {
no-filter no-filter
clearable clearable
hide-details hide-details
hide-no-data
autocomplete="off" autocomplete="off"
> >
<template #item="{ item }"> <template #item="{ item }">
+18
View File
@@ -9,6 +9,7 @@ import { ref } from "vue";
import NotificationListener from "@/Components/FlightsGoneBy/NotificationListener.vue"; import NotificationListener from "@/Components/FlightsGoneBy/NotificationListener.vue";
import {SharedProps} from "@/Types/types"; import {SharedProps} from "@/Types/types";
import PushNotificationPrompt from "@/Components/PushNotificationPrompt.vue"; import PushNotificationPrompt from "@/Components/PushNotificationPrompt.vue";
import CopyPageButton from "@/Components/FlightsGoneBy/CopyPageButton.vue";
const transitionKey = ref(0); const transitionKey = ref(0);
const page = usePage<SharedProps>().props const page = usePage<SharedProps>().props
@@ -27,6 +28,9 @@ router.on('success', () => {
<slot /> <slot />
</main> </main>
</Transition> </Transition>
<span class="footer-share">
<CopyPageButton label="Share Link" />
</span>
<MainFooter :key="`footer-${transitionKey}`" /> <MainFooter :key="`footer-${transitionKey}`" />
</div> </div>
<NotificationListener v-if="page.auth.user?.id" :user-id="page.auth.user?.id" /> <NotificationListener v-if="page.auth.user?.id" :user-id="page.auth.user?.id" />
@@ -51,6 +55,14 @@ footer {
min-height: 3rem; min-height: 3rem;
} }
@media (max-width: 600px) {
footer {
flex: 0 1 auto;
min-height: 3.25rem;
padding-block: 0.35rem;
}
}
main { main {
flex: 1 1 auto; flex: 1 1 auto;
background: transparent; background: transparent;
@@ -60,6 +72,12 @@ main {
align-items: center; align-items: center;
} }
.footer-share {
padding:1em;
display: flex;
justify-content: center;
}
.fade-enter-from, .fade-enter-from,
.fade-leave-to { opacity: 0; } .fade-leave-to { opacity: 0; }
.fade-enter-active, .fade-enter-active,
+381 -90
View File
@@ -6,8 +6,9 @@ import AirlineSearchBox from '@/Components/FlightsGoneBy/AirlineSearchBox.vue'
import AircraftSearchBox from '@/Components/FlightsGoneBy/AircraftSearchBox.vue' import AircraftSearchBox from '@/Components/FlightsGoneBy/AircraftSearchBox.vue'
import AirportSearchBox from '@/Components/FlightsGoneBy/AirportSearchBox.vue' import AirportSearchBox from '@/Components/FlightsGoneBy/AirportSearchBox.vue'
import type {SeatType, FlightReason, FlightClass, CrewType, SharedProps} from '@/Types/types' import type {SeatType, FlightReason, FlightClass, CrewType, SharedProps} from '@/Types/types'
import { ref, watch, computed } from 'vue' import { ref, watch, computed, onMounted, nextTick } from 'vue'
import { VTimePicker, VDatePicker } from 'vuetify/components' import { VTimePicker, VDatePicker } from 'vuetify/components'
import MissingEntityLink from "@/Components/FlightsGoneBy/Tooltips/MissingEntityLink.vue";
defineOptions({ layout: MainLayout }) defineOptions({ layout: MainLayout })
const page = usePage<SharedProps>().props const page = usePage<SharedProps>().props
@@ -49,25 +50,13 @@ const pad = (n: number) => String(n).padStart(2, '0')
const flightNumber = ref(props.flight?.flight_number ?? '') const flightNumber = ref(props.flight?.flight_number ?? '')
const lookupLoading = ref(false) const lookupLoading = ref(false)
const lookupError = ref<string | null>(null) const lookupError = ref<string | null>(null)
const lookupComplete = ref(true)
interface LookupResult {
airline_options: { value: number; title: string, logo_url: string }[]
from_options: { value: number; title: string; country_code: string }[]
to_options: { value: number; title: string; country_code: string }[]
aircraft_options: { value: number; title: string }[]
scheduled_departure_time: string | null
scheduled_arrival_time: string | null
}
const lookupResult = ref<LookupResult | null>(null)
const lookupKey = ref(0) const lookupKey = ref(0)
async function lookupFlight() { async function lookupFlight() {
if (!flightNumber.value.trim()) return if (!flightNumber.value.trim()) return
lookupLoading.value = true lookupLoading.value = true
lookupError.value = null lookupError.value = null
lookupResult.value = null
try { try {
const response = await fetch(`${route('flights.lookup')}?number=${encodeURIComponent(flightNumber.value.trim())}`, { const response = await fetch(`${route('flights.lookup')}?number=${encodeURIComponent(flightNumber.value.trim())}`, {
@@ -78,8 +67,6 @@ async function lookupFlight() {
lookupError.value = data.message ?? 'Lookup failed.' lookupError.value = data.message ?? 'Lookup failed.'
return return
} }
lookupResult.value = data
lookupComplete.value = true
if (data.airline_options?.length) { if (data.airline_options?.length) {
airlineOptionsData.value = data.airline_options airlineOptionsData.value = data.airline_options
if (!form.airline) form.airline = data.airline_options[0] if (!form.airline) form.airline = data.airline_options[0]
@@ -111,6 +98,12 @@ async function lookupFlight() {
} }
suppressArrivalAutoFill = false suppressArrivalAutoFill = false
// NOTE: if the lookup API is ever extended to return a day
// difference for the arrival (e.g. `data.arrival_day_offset`),
// wire it in here: `arrivalOffset.value = data.arrival_day_offset`
// (clamped/mapped to 'custom' if outside -1..2). Left out for now
// since the API doesn't provide it yet.
lookupKey.value++ lookupKey.value++
} catch (e) { } catch (e) {
lookupError.value = String(e) lookupError.value = String(e)
@@ -122,7 +115,6 @@ async function lookupFlight() {
// ── Display form (drives the template) ─────────────────────────────────────── // ── Display form (drives the template) ───────────────────────────────────────
const form = useForm({ const form = useForm({
flight_number: props.flight?.flight_number ?? '',
departure_date: props.flight?.departure_date ?? '', departure_date: props.flight?.departure_date ?? '',
arrival_date: props.flight?.arrival_date ?? '', arrival_date: props.flight?.arrival_date ?? '',
from: props.flight?.from_options[0] ?? null as { value: number; title: string; country_code: string } | null, from: props.flight?.from_options[0] ?? null as { value: number; title: string; country_code: string } | null,
@@ -163,9 +155,9 @@ const submitForm = useForm({
crew_type_id: null as number | null, crew_type_id: null as number | null,
note: '' as string | null, note: '' as string | null,
auto_update: false, auto_update: false,
add_more: false,
}) })
const departureIsFuture = computed(() => { const departureIsFuture = computed(() => {
if (!form.departure_date) return false if (!form.departure_date) return false
return new Date(form.departure_date) > new Date() return new Date(form.departure_date) > new Date()
@@ -177,7 +169,7 @@ watch(departureIsFuture, (isFuture) => {
}, { immediate: true }) }, { immediate: true })
function submit() { function submit(addMore = false) {
submitForm.flight_number = flightNumber.value submitForm.flight_number = flightNumber.value
submitForm.departure_date = form.departure_date submitForm.departure_date = form.departure_date
submitForm.arrival_date = form.arrival_date submitForm.arrival_date = form.arrival_date
@@ -193,6 +185,7 @@ function submit() {
submitForm.crew_type_id = form.crew_type?.id ?? null submitForm.crew_type_id = form.crew_type?.id ?? null
submitForm.note = form.note submitForm.note = form.note
submitForm.auto_update = form.auto_update submitForm.auto_update = form.auto_update
submitForm.add_more = addMore
if (isEdit) { if (isEdit) {
submitForm.put(route('flights.update', { flight: props.flight!.id })) submitForm.put(route('flights.update', { flight: props.flight!.id }))
@@ -230,9 +223,15 @@ function combineDateTime(date: Date | null, time: string | null): string {
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${(hh ?? '00').padStart(2, '0')}:${(mm ?? '00').padStart(2, '0')}` 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 } // Whole-day difference between two Date objects (time-of-day ignored).
function diffInDays(from: Date | null, to: Date | null): number | null {
if (!from || !to) return null
const a = new Date(from.getFullYear(), from.getMonth(), from.getDate())
const b = new Date(to.getFullYear(), to.getMonth(), to.getDate())
return Math.round((b.getTime() - a.getTime()) / 86_400_000)
}
function clearDepartureTime() { departureTimePart.value = null } function clearDepartureTime() { departureTimePart.value = null }
function clearArrivalDate() { arrivalDatePart.value = null }
function clearArrivalTime() { arrivalTimePart.value = null } function clearArrivalTime() { arrivalTimePart.value = null }
// Normalizes whatever shape the API sends a scheduled time in ("14:30", // Normalizes whatever shape the API sends a scheduled time in ("14:30",
@@ -278,19 +277,88 @@ watch([arrivalDatePart, arrivalTimePart], () => {
form.arrival_date = combineDateTime(arrivalDatePart.value, arrivalTimePart.value) form.arrival_date = combineDateTime(arrivalDatePart.value, arrivalTimePart.value)
}) })
// Auto-fill arrival (+1hr) the first time a departure TIME is chosen (and a // ── Arrival day offset ───────────────────────────────────────────────────────
// departure date is already set) and arrival is still empty. Picking the // Rather than making the user pick an independent arrival date, arrival date
// departure date alone no longer triggers this — only setting the time does. // is normally *derived* from departure date + a small relative offset
// (-1 / Same day / +1 / +2). "Custom" drops back to a real date picker for
// the rare case that falls outside that range. This avoids needing airport
// time zones to work out the arrival date, which a duration-based input
// would require.
type ArrivalOffset = -1 | 0 | 1 | 2
const arrivalOffsetOptions: { value: ArrivalOffset; label: string }[] = [
{ value: -1, label: '1 Day' },
{ value: 0, label: 'Same Day' },
{ value: 1, label: '+1 Day' },
{ value: 2, label: '+2 Days' },
]
const initialDiff = diffInDays(depInit.date, arrInit.date)
const initialDiffIsQuickOption = initialDiff !== null && ([-1, 0, 1, 2] as number[]).includes(initialDiff)
// 'offset' (the default): arrival date is derived from departure date + the
// selected quick offset. 'custom': the user has dropped into a real date
// picker, e.g. because the actual gap is more than +2 days.
const arrivalDateMode = ref<'offset' | 'custom'>(
initialDiff !== null && !initialDiffIsQuickOption ? 'custom' : 'offset'
)
const arrivalOffset = ref<ArrivalOffset>(
initialDiffIsQuickOption ? (initialDiff as ArrivalOffset) : 0
)
function applyArrivalOffset() {
if (suppressArrivalAutoFill) return
if (arrivalDateMode.value === 'custom') return
if (!departureDatePart.value) {
arrivalDatePart.value = null
return
}
const d = new Date(departureDatePart.value)
d.setDate(d.getDate() + arrivalOffset.value)
arrivalDatePart.value = d
}
// Re-derive arrival date whenever departure date moves, or the offset is
// changed by hand.
watch(departureDatePart, applyArrivalOffset)
watch(arrivalOffset, applyArrivalOffset)
function useCustomArrivalDate() {
arrivalDateMode.value = 'custom'
}
function useQuickArrivalOffset() {
arrivalDateMode.value = 'offset'
applyArrivalOffset()
}
function formatFullDate(d: Date | null): string {
if (!d) return ''
return d.toLocaleDateString(undefined, { weekday: 'short', day: 'numeric', month: 'short', year: 'numeric' })
}
// Auto-fill arrival TIME (+1hr) the first time a departure time is chosen
// (and a departure date is already set) and arrival time is still empty.
// If adding the hour rolls over midnight, bump the offset selector to match
// (e.g. departs 23:30 -> offset flips to "+1") so the resolved arrival date
// stays correct without the user having to notice and fix it themselves.
watch(departureTimePart, (newTime) => { watch(departureTimePart, (newTime) => {
if (suppressArrivalAutoFill) return if (suppressArrivalAutoFill) return
if (!newTime || !departureDatePart.value || arrivalDatePart.value) return if (arrivalDateMode.value === 'custom') return
if (!newTime || !departureDatePart.value || arrivalTimePart.value) return
const dep = new Date(departureDatePart.value) const dep = new Date(departureDatePart.value)
const [h, m] = newTime.split(':').map(Number) const [h, m] = newTime.split(':').map(Number)
dep.setHours(h, m) dep.setHours(h, m)
const arr = new Date(dep.getTime() + 60 * 60 * 1000) const arr = new Date(dep.getTime() + 60 * 60 * 1000)
const rawDiff = diffInDays(departureDatePart.value, arr) ?? 0
const clampedDiff = Math.min(Math.max(rawDiff, -1), 2) as -1 | 0 | 1 | 2
suppressArrivalAutoFill = true suppressArrivalAutoFill = true
arrivalOffset.value = clampedDiff
arrivalDatePart.value = new Date(arr.getFullYear(), arr.getMonth(), arr.getDate()) arrivalDatePart.value = new Date(arr.getFullYear(), arr.getMonth(), arr.getDate())
arrivalTimePart.value = `${pad(arr.getHours())}:${pad(arr.getMinutes())}` arrivalTimePart.value = `${pad(arr.getHours())}:${pad(arr.getMinutes())}`
suppressArrivalAutoFill = false suppressArrivalAutoFill = false
@@ -313,11 +381,31 @@ const arrivalMaxDate = computed(() => arrivalMax.value ? new Date(arrivalMax.val
// ── Native date inputs ─────────────────────────────────────────────────────── // ── Native date inputs ───────────────────────────────────────────────────────
// departureDatePart / arrivalDatePart stay the source of truth as Date // departureDatePart / arrivalDatePart stay the source of truth as Date
// objects. These computed get/set pairs are what the native <input type=date> // objects. The <input type="date"> elements below are deliberately left
// elements bind to — the browser handles locale display, typing, and // UNCONTROLLED from Vue's perspective — no v-model, no :model-value, no
// validation itself, so no custom format-aware parsing is needed here. // reactive :value binding of any kind. That's on purpose: any reactive
// The Vuetify v-date-picker is still available via a separate calendar icon // binding through Vuetify's v-text-field — even one that only commits on
// for users who prefer to pick from a calendar rather than type. // blur/change, not every keystroke — still runs through v-text-field's own
// internal echo of the field, which re-renders the wrapped <input> on every
// keystroke regardless of what we bind from outside. For type="date"
// specifically, that internal re-render resets the browser's own
// per-segment editing state mid-type (day/month/year), which is what was
// scrambling what you typed. Using a genuinely uncontrolled native <input>
// (not wrapped in v-text-field at all) sidesteps that entirely.
//
// We grab a direct DOM ref to each native input and manage its .value
// imperatively instead:
// - once on mount, to show the initial value
// - whenever departureDatePart/arrivalDatePart changes from elsewhere
// (the calendar picker, a flight lookup, auto-fill) — but only if the
// field isn't currently focused, so we never fight with active typing
// - the native `change` event (fires once a full date has been entered
// and committed, or cleared) is what flows the typed value back into
// departureDatePart/arrivalDatePart
// This keeps the real native, locale-aware date input and picker UI intact.
//
// The arrival native date input only exists in the DOM while arrivalOffset
// is 'custom' (see template); its value is (re)synced whenever it mounts.
function toIsoDateString(d: Date | null): string { function toIsoDateString(d: Date | null): string {
if (!d) return '' if (!d) return ''
@@ -331,16 +419,42 @@ function fromIsoDateString(value: string): Date | null {
return new Date(y, m - 1, d) return new Date(y, m - 1, d)
} }
const departureDateValue = computed({ const departureDateEl = ref<HTMLInputElement | null>(null)
get: () => toIsoDateString(departureDatePart.value), const arrivalDateEl = ref<HTMLInputElement | null>(null)
set: (value: string) => { departureDatePart.value = fromIsoDateString(value) },
onMounted(() => {
if (departureDateEl.value) departureDateEl.value.value = toIsoDateString(departureDatePart.value)
if (arrivalDateEl.value) arrivalDateEl.value.value = toIsoDateString(arrivalDatePart.value)
}) })
const arrivalDateValue = computed({ watch(departureDatePart, (d) => {
get: () => toIsoDateString(arrivalDatePart.value), const el = departureDateEl.value
set: (value: string) => { arrivalDatePart.value = fromIsoDateString(value) }, if (el && document.activeElement !== el) el.value = toIsoDateString(d)
}) })
watch(arrivalDatePart, (d) => {
const el = arrivalDateEl.value
if (el && document.activeElement !== el) el.value = toIsoDateString(d)
})
// The arrival native input only exists while arrivalDateMode === 'custom',
// so re-sync its value whenever it (re)mounts into the DOM.
watch(arrivalDateMode, async (mode) => {
if (mode !== 'custom') return
await nextTick()
if (arrivalDateEl.value) arrivalDateEl.value.value = toIsoDateString(arrivalDatePart.value)
})
function commitDepartureDateInput(e: Event) {
const value = (e.target as HTMLInputElement).value
departureDatePart.value = value ? fromIsoDateString(value) : null
}
function commitArrivalDateInput(e: Event) {
const value = (e.target as HTMLInputElement).value
arrivalDatePart.value = value ? fromIsoDateString(value) : null
}
// ── Editable, format-aware time text fields ──────────────────────────────── // ── Editable, format-aware time text fields ────────────────────────────────
// departureTimePart / arrivalTimePart stay the source of truth as internal // departureTimePart / arrivalTimePart stay the source of truth as internal
// "HH:mm" (24hr) strings. These input refs are what the text-fields actually // "HH:mm" (24hr) strings. These input refs are what the text-fields actually
@@ -472,30 +586,33 @@ function commitArrivalTimeInput() {
<!-- Departure date + time --> <!-- Departure date + time -->
<v-row> <v-row>
<v-col cols="12" sm="6"> <v-col cols="12" sm="6">
<v-text-field <div class="native-date-field">
v-model="departureDateValue" <v-icon icon="mdi-calendar" size="20" class="native-date-field__icon" />
type="date" <label class="native-date-field__label">Departure Date</label>
label="Departure Date" <input
prepend-inner-icon="mdi-calendar" ref="departureDateEl"
:disabled="!lookupComplete" type="date"
:error-messages="submitForm.errors.departure_date" class="native-date-field__input"
> @change="commitDepartureDateInput"
<template #append-inner> >
<v-menu v-model="depDateMenu" :close-on-content-click="false"> <v-menu v-model="depDateMenu" :close-on-content-click="false">
<template #activator="{ props: menuProps }"> <template #activator="{ props: menuProps }">
<v-icon <v-icon
v-bind="menuProps" v-bind="menuProps"
icon="mdi-calendar-month" icon="mdi-calendar-month"
style="cursor: pointer" size="20"
/> style="cursor: pointer"
</template>
<v-date-picker
v-model="departureDatePart"
@update:model-value="depDateMenu = false"
/> />
</v-menu> </template>
</template> <v-date-picker
</v-text-field> v-model="departureDatePart"
@update:model-value="depDateMenu = false"
/>
</v-menu>
</div>
<div v-if="submitForm.errors.departure_date" class="native-date-field__error text-error">
{{ submitForm.errors.departure_date }}
</div>
</v-col> </v-col>
<v-col cols="12" sm="6"> <v-col cols="12" sm="6">
<v-menu v-model="depTimeMenu" :close-on-content-click="false"> <v-menu v-model="depTimeMenu" :close-on-content-click="false">
@@ -507,7 +624,6 @@ function commitArrivalTimeInput() {
clearable clearable
prepend-inner-icon="mdi-clock-outline" prepend-inner-icon="mdi-clock-outline"
:placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'" :placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'"
:disabled="!lookupComplete"
@click:clear="clearDepartureTime" @click:clear="clearDepartureTime"
@blur="commitDepartureTimeInput" @blur="commitDepartureTimeInput"
@keydown.enter="commitDepartureTimeInput" @keydown.enter="commitDepartureTimeInput"
@@ -528,23 +644,59 @@ function commitArrivalTimeInput() {
</v-col> </v-col>
</v-row> </v-row>
<!-- Arrival date + time --> <!-- Arrival -->
<v-row> <v-row>
<v-col cols="12" sm="6"> <v-col cols="12" sm="6">
<v-text-field <label class="arrival-offset__label">Arrival Date</label>
v-model="arrivalDateValue"
type="date" <template v-if="arrivalDateMode === 'offset'">
label="Arrival Date" <v-btn-toggle
prepend-inner-icon="mdi-calendar" v-model="arrivalOffset"
:disabled="!lookupComplete" mandatory
:error-messages="submitForm.errors.arrival_date" variant="outlined"
> color="primary"
<template #append-inner> divided
class="arrival-offset__toggle"
>
<v-btn
v-for="opt in arrivalOffsetOptions"
:key="opt.value"
:value="opt.value"
class="arrival-offset__btn"
>
{{ opt.label }}
</v-btn>
</v-btn-toggle>
<div class="arrival-offset__footer">
<span v-if="arrivalDatePart" class="arrival-offset__hint">
Arrives {{ formatFullDate(arrivalDatePart) }}
</span>
<button
type="button"
class="arrival-offset__link"
@click="useCustomArrivalDate"
>
Custom date
</button>
</div>
</template>
<template v-else>
<div class="native-date-field">
<v-icon icon="mdi-calendar" size="20" class="native-date-field__icon" />
<input
ref="arrivalDateEl"
type="date"
class="native-date-field__input"
@change="commitArrivalDateInput"
>
<v-menu v-model="arrDateMenu" :close-on-content-click="false"> <v-menu v-model="arrDateMenu" :close-on-content-click="false">
<template #activator="{ props: menuProps }"> <template #activator="{ props: menuProps }">
<v-icon <v-icon
v-bind="menuProps" v-bind="menuProps"
icon="mdi-calendar-month" icon="mdi-calendar-month"
size="20"
style="cursor: pointer" style="cursor: pointer"
/> />
</template> </template>
@@ -555,8 +707,19 @@ function commitArrivalTimeInput() {
@update:model-value="arrDateMenu = false" @update:model-value="arrDateMenu = false"
/> />
</v-menu> </v-menu>
</template> </div>
</v-text-field> <button
type="button"
class="arrival-offset__link mt-1"
@click="useQuickArrivalOffset"
>
Use quick select instead
</button>
</template>
<div v-if="submitForm.errors.arrival_date" class="native-date-field__error text-error">
{{ submitForm.errors.arrival_date }}
</div>
</v-col> </v-col>
<v-col cols="12" sm="6"> <v-col cols="12" sm="6">
<v-menu v-model="arrTimeMenu" :close-on-content-click="false"> <v-menu v-model="arrTimeMenu" :close-on-content-click="false">
@@ -568,7 +731,6 @@ function commitArrivalTimeInput() {
clearable clearable
prepend-inner-icon="mdi-clock-outline" prepend-inner-icon="mdi-clock-outline"
:placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'" :placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'"
:disabled="!lookupComplete"
@click:clear="clearArrivalTime" @click:clear="clearArrivalTime"
@blur="commitArrivalTimeInput" @blur="commitArrivalTimeInput"
@keydown.enter="commitArrivalTimeInput" @keydown.enter="commitArrivalTimeInput"
@@ -597,8 +759,11 @@ function commitArrivalTimeInput() {
label="From" label="From"
:prefilled-options="fromOptionsData" :prefilled-options="fromOptionsData"
:error-messages="submitForm.errors.from_id" :error-messages="submitForm.errors.from_id"
:disabled="!lookupComplete"
/> />
<MissingEntityLink label="Missing airport?">
<p>If you can't find an airport we will be happy to add it, but you'll have to contact support with details of the airport.</p>
<p>Unfortunately you won't be able to proceed with adding this flight until the airport has been added.</p>
</MissingEntityLink>
</v-col> </v-col>
</v-row> </v-row>
@@ -610,7 +775,6 @@ function commitArrivalTimeInput() {
label="To" label="To"
:prefilled-options="toOptionsData" :prefilled-options="toOptionsData"
:error-messages="submitForm.errors.to_id" :error-messages="submitForm.errors.to_id"
:disabled="!lookupComplete"
/> />
</v-col> </v-col>
</v-row> </v-row>
@@ -623,8 +787,11 @@ function commitArrivalTimeInput() {
v-model="form.airline" v-model="form.airline"
:prefilled-options="airlineOptionsData" :prefilled-options="airlineOptionsData"
:error-messages="submitForm.errors.airline_id" :error-messages="submitForm.errors.airline_id"
:disabled="!lookupComplete"
/> />
<MissingEntityLink label="Missing airline? No problem">
<p>If you can't find the airline you flew with, just leave it blank but make sure to add a valid flight number. We will be notified of flights with missing airlines and add the airline shortly.</p>
<p>If you don't know your flight number or a missing airline hasn't been added within 48 hours, please contact support.</p>
</MissingEntityLink>
</v-col> </v-col>
</v-row> </v-row>
@@ -636,7 +803,6 @@ function commitArrivalTimeInput() {
v-model="form.aircraft" v-model="form.aircraft"
:prefilled-options="aircraftOptionsData" :prefilled-options="aircraftOptionsData"
:error-messages="submitForm.errors.aircraft_id" :error-messages="submitForm.errors.aircraft_id"
:disabled="!lookupComplete"
/> />
</v-col> </v-col>
</v-row> </v-row>
@@ -648,7 +814,6 @@ function commitArrivalTimeInput() {
v-model="form.aircraft_registration" v-model="form.aircraft_registration"
label="Aircraft Registration" label="Aircraft Registration"
placeholder="e.g. VH-OQA" placeholder="e.g. VH-OQA"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.aircraft_registration" :error-messages="submitForm.errors.aircraft_registration"
/> />
</v-col> </v-col>
@@ -660,7 +825,6 @@ function commitArrivalTimeInput() {
item-title="name" item-title="name"
item-value="id" item-value="id"
:return-object="true" :return-object="true"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.flight_class_id" :error-messages="submitForm.errors.flight_class_id"
/> />
</v-col> </v-col>
@@ -673,7 +837,6 @@ function commitArrivalTimeInput() {
v-model="form.seat_number" v-model="form.seat_number"
label="Seat Number" label="Seat Number"
placeholder="e.g. 12A" placeholder="e.g. 12A"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.seat_number" :error-messages="submitForm.errors.seat_number"
/> />
</v-col> </v-col>
@@ -685,7 +848,6 @@ function commitArrivalTimeInput() {
item-title="name" item-title="name"
item-value="id" item-value="id"
:return-object="true" :return-object="true"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.seat_type_id" :error-messages="submitForm.errors.seat_type_id"
/> />
</v-col> </v-col>
@@ -701,7 +863,6 @@ function commitArrivalTimeInput() {
item-title="name" item-title="name"
item-value="id" item-value="id"
:return-object="true" :return-object="true"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.flight_reason_id" :error-messages="submitForm.errors.flight_reason_id"
/> />
</v-col> </v-col>
@@ -713,7 +874,6 @@ function commitArrivalTimeInput() {
item-title="name" item-title="name"
item-value="id" item-value="id"
:return-object="true" :return-object="true"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.crew_type_id" :error-messages="submitForm.errors.crew_type_id"
/> />
</v-col> </v-col>
@@ -726,7 +886,6 @@ function commitArrivalTimeInput() {
v-model="form.note" v-model="form.note"
label="Note" label="Note"
placeholder="Any additional notes…" placeholder="Any additional notes…"
:disabled="!lookupComplete"
:error-messages="submitForm.errors.note" :error-messages="submitForm.errors.note"
rows="3" rows="3"
auto-grow auto-grow
@@ -740,7 +899,6 @@ function commitArrivalTimeInput() {
<v-checkbox <v-checkbox
v-model="form.auto_update" v-model="form.auto_update"
label="Automatically update flight details within 24 hours of flight departure" label="Automatically update flight details within 24 hours of flight departure"
:disabled="!lookupComplete"
hide-details hide-details
density="compact" density="compact"
/> />
@@ -749,15 +907,27 @@ function commitArrivalTimeInput() {
<!-- Submit --> <!-- Submit -->
<v-row> <v-row>
<v-col cols="12"> <v-col v-if="!isEdit" cols="12" md="6">
<v-btn <v-btn
block block
size="large" size="large"
:loading="submitForm.processing" variant="outlined"
:disabled="!lookupComplete || submitForm.processing" :loading="submitForm.processing && submitForm.add_more"
@click="submit" :disabled="submitForm.processing"
@click="submit(true)"
> >
{{ isEdit ? 'Save Changes' : 'Add Flight' }} Save Flight and Add Another
</v-btn>
</v-col>
<v-col cols="12" :md="isEdit ? 12 : 6">
<v-btn
block
size="large"
:loading="submitForm.processing && !submitForm.add_more"
:disabled="submitForm.processing"
@click="submit(false)"
>
{{ isEdit ? 'Save Changes' : 'Save Flight' }}
</v-btn> </v-btn>
</v-col> </v-col>
</v-row> </v-row>
@@ -768,8 +938,129 @@ function commitArrivalTimeInput() {
</template> </template>
<style scoped> <style scoped>
:deep(input[type="date"]::-webkit-calendar-picker-indicator) { /* Hand-rolled field chrome for the native <input type="date"> fields.
These deliberately bypass v-text-field (see the "Native date inputs"
comment in the script block for why), so we approximate the surrounding
Vuetify outlined-field look here instead of getting it for free. */
.native-date-field {
position: relative;
display: flex;
align-items: center;
gap: 10px;
min-height: 56px;
padding: 8px 12px;
border: 1px none rgba(255, 255, 255, 0.24);
border-bottom-style: solid;
background: transparent;
transition: border-color 0.15s ease;
}
.native-date-field:focus-within {
border-color: rgb(var(--surface));
border-width: 2px;
padding: 7px 11px;
}
.native-date-field__icon {
opacity: 0.7;
flex-shrink: 0;
}
.native-date-field__label {
position: absolute;
top: -8px;
left: 38px;
padding: 0 4px;
font-size: 12px;
line-height: 1;
color: rgba(255, 255, 255, 0.6);
pointer-events: none;
}
.native-date-field__input {
flex: 1;
min-width: 0;
background: transparent;
border: none;
outline: none;
color: inherit;
font-size: 16px;
color-scheme: dark;
}
.native-date-field__input::-webkit-calendar-picker-indicator {
display: none; display: none;
-webkit-appearance: none; -webkit-appearance: none;
} }
/* Firefox doesn't support ::-webkit-calendar-picker-indicator; this trims
its built-in indicator/spinner button area instead. */
.native-date-field__input::-moz-calendar-picker-indicator {
display: none;
}
.native-date-field__error {
margin-top: 4px;
padding-left: 12px;
font-size: 12px;
}
/* Arrival day-offset control */
.arrival-offset__label {
display: block;
font-size: 12px;
line-height: 1;
color: rgba(255, 255, 255, 0.6);
margin-bottom: 6px;
padding-left: 2px;
}
.arrival-offset__toggle {
display: grid;
grid-template-columns: repeat(4, 1fr);
width: 100%;
height: 48px;
border-radius: 4px;
}
.arrival-offset__btn {
min-width: 0;
flex: none;
width: 100%;
height: 100%;
font-size: 11px;
letter-spacing: 0;
text-transform: none;
padding: 0 4px;
}
.arrival-offset__footer {
display: flex;
align-items: baseline;
justify-content: space-between;
gap: 8px;
margin-top: 6px;
padding: 0 2px;
}
.arrival-offset__hint {
font-size: 13px;
color: rgba(255, 255, 255, 0.7);
}
.arrival-offset__link {
flex-shrink: 0;
font-size: 12px;
color: rgba(255, 255, 255, 0.75);
background: none;
border: none;
padding: 0;
cursor: pointer;
text-decoration: underline;
text-underline-offset: 2px;
}
.arrival-offset__link:hover {
color: rgb(255, 255, 255);
}
</style> </style>
+1 -1
View File
@@ -19,7 +19,7 @@ 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"> <Link v-if="missingAirlineCount" :href="route('admin.reconcile-missing-airlines')" class="sidebar-link">
<v-icon icon="mdi-airplane-takeoff" size="18" /> <v-icon icon="mdi-airplane-takeoff" size="18" />
Reconcile Missing Airlines Reconcile Missing Airlines
<v-chip size="x-small" color="error" class="ml-1">{{ missingAirlineCount }}</v-chip> <v-chip size="x-small" color="error" class="ml-1">{{ missingAirlineCount }}</v-chip>
@@ -21,6 +21,12 @@ const continents = computed(() => props.continents.filter(c => c.internal_name !
const { entriesByDeparture, departureNames, completedCount, totalCount } = const { entriesByDeparture, departureNames, completedCount, totalCount } =
useDirectedContinentPairs(flights, continents) useDirectedContinentPairs(flights, continents)
// Split "Africa Asia" into ["Africa", "Asia"] for independent flex items
function splitLabel(label: string): [string, string] {
const [from, to] = label.split('→').map(part => part.trim())
return [from, to]
}
</script> </script>
<template> <template>
@@ -35,11 +41,16 @@ const { entriesByDeparture, departureNames, completedCount, totalCount } =
:rows="entriesByDeparture.get(dep) ?? []" :rows="entriesByDeparture.get(dep) ?? []"
:rowKey="entry => entry.key" :rowKey="entry => entry.key"
:hasItems="entry => entry.flights.length > 0" :hasItems="entry => entry.flights.length > 0"
labelWidth="18em" compactOnMobile
> >
<template #label="{ row: entry }"> <template #label="{ row: entry }">
<div class="pair-label"> <div class="pair-label">
<span class="pair-name">{{ entry.label }}</span> <span class="pair-part">{{ splitLabel(entry.label)[0] }}</span>
<span class="pair-divider">
<span class="divider-horizontal">{{ '\u2192\uFE0E' }}</span>
<span class="divider-vertical">{{ '\u2193\uFE0E' }}</span>
</span>
<span class="pair-part">{{ splitLabel(entry.label)[1] }}</span>
</div> </div>
</template> </template>
@@ -80,4 +91,55 @@ const { entriesByDeparture, departureNames, completedCount, totalCount } =
gap: 1rem; gap: 1rem;
margin-bottom: 0.75rem; margin-bottom: 0.75rem;
} }
.pair-label {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: 0.35rem;
padding: 0 0.25rem;
}
.pair-part {
font-size: 0.9rem;
text-align: center;
white-space: nowrap;
}
.pair-divider {
font-size: 0.9rem;
opacity: 0.6;
flex-shrink: 0;
}
.divider-vertical {
display: none;
}
@container (max-width: 480px) {
.pair-label {
flex-direction: column;
gap: 0.1rem;
}
.pair-part {
font-size: 0.7rem;
white-space: normal;
}
.pair-divider {
font-size: 0.65rem;
line-height: 1;
}
.divider-horizontal {
display: none;
}
.divider-vertical {
display: inline;
}
}
</style> </style>
@@ -19,6 +19,12 @@ const flights = computed(() => props.flights)
const continents = computed(() => props.continents.filter(c => c.internal_name !== 'antarctica')) const continents = computed(() => props.continents.filter(c => c.internal_name !== 'antarctica'))
const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flights, continents) const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flights, continents)
// Split "AfricaAsia" into ["Africa", "Asia"] for independent flex items
function splitLabel(label: string): [string, string] {
const [from, to] = label.split('↔')
return [from, to]
}
</script> </script>
<template> <template>
@@ -32,11 +38,16 @@ const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flig
:rows="entries" :rows="entries"
:rowKey="entry => entry.key" :rowKey="entry => entry.key"
:hasItems="entry => entry.flights.length > 0" :hasItems="entry => entry.flights.length > 0"
labelWidth="18em" compactOnMobile
> >
<template #label="{ row: entry }"> <template #label="{ row: entry }">
<div class="pair-label"> <div class="pair-label">
<span class="pair-name">{{ entry.label }}</span> <span class="pair-part">{{ splitLabel(entry.label)[0] }}</span>
<span class="pair-divider">
<span class="divider-horizontal">{{ '\u2194\uFE0E' }}</span>
<span class="divider-vertical">{{ '\u2195\uFE0E' }}</span>
</span>
<span class="pair-part">{{ splitLabel(entry.label)[1] }}</span>
</div> </div>
</template> </template>
@@ -80,12 +91,51 @@ const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flig
.pair-label { .pair-label {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row;
align-items: center; align-items: center;
gap: 0.5rem; justify-content: center;
gap: 0.35rem;
padding: 0 0.25rem; padding: 0 0.25rem;
} }
.pair-name { .pair-part {
font-size: 0.9rem; font-size: 0.9rem;
text-align: center;
white-space: nowrap;
}
.pair-divider {
font-size: 0.9rem;
opacity: 0.6;
flex-shrink: 0;
}
.divider-vertical {
display: none;
}
@container (max-width: 480px) {
.pair-label {
flex-direction: column;
gap: 0.1rem;
}
.pair-part {
font-size: 0.7rem;
white-space: normal;
}
.pair-divider {
font-size: 0.65rem;
line-height: 1;
}
.divider-horizontal {
display: none;
}
.divider-vertical {
display: inline;
}
} }
</style> </style>
@@ -0,0 +1,139 @@
<script setup lang="ts">
import { computed } from 'vue'
import { Achievement, Flight, User, Airport } from '@/Types/types'
import Panel from '@/Components/FlightsGoneBy/Panels/Panel.vue'
import PanelHeader from '@/Components/FlightsGoneBy/Panels/PanelHeader.vue'
import BadgeTable from '@/Components/FlightsGoneBy/GenericBadgeTable.vue'
import FlightBadge from '@/Components/FlightsGoneBy/FlightBadge.vue'
defineOptions({ inheritAttrs: false })
const props = defineProps<{
achievement: Achievement
user: User
followStatus: string
londonAirports: string[]
flights: Flight[]
}>()
interface AirportEntry {
code: string
airport: Airport | null
flights: Flight[]
}
const LONDON_AIRPORT_NAMES: Record<string, string> = {
LHR: 'Heathrow Airport',
LGW: 'Gatwick Airport',
STN: 'Stansted Airport',
LTN: 'Luton Airport',
LCY: 'City Airport',
SEN: 'Southend Airport',
}
const airports = computed<AirportEntry[]>(() => {
const entries = props.londonAirports.map(code => ({
code,
airport: null as Airport | null,
flights: [] as Flight[],
}))
const byCode = new Map(entries.map(e => [e.code, e]))
for (const flight of props.flights) {
const dep = flight.departure_airport
const arr = flight.arrival_airport
if (dep?.iata_code && byCode.has(dep.iata_code)) {
const entry = byCode.get(dep.iata_code)!
entry.airport ??= dep
entry.flights.push(flight)
}
if (arr?.iata_code && byCode.has(arr.iata_code)) {
const entry = byCode.get(arr.iata_code)!
entry.airport ??= arr
entry.flights.push(flight)
}
}
return entries
})
const rows = computed(() => airports.value.map(e => e.code))
function entryFor(code: string): AirportEntry {
return airports.value.find(e => e.code === code)!
}
function flightTitle(flight: Flight): string {
const name = flight.airline?.name ?? 'Unknown airline'
return `${name}: ${flight.departure_airport?.iata_code}${flight.arrival_airport?.iata_code}`
}
</script>
<template>
<!-- Airports table -->
<Panel>
<div class="table-toolbar">
<PanelHeader>London Airports</PanelHeader>
</div>
<BadgeTable
:rows="rows"
:rowKey="code => code"
:hasItems="code => entryFor(code).flights.length > 0"
labelWidth="14em"
>
<template #label="{ row: code }">
<div class="airport-label">
<span class="airport-code">{{ code }}</span>
<span>{{ LONDON_AIRPORT_NAMES[code] ?? code }}</span>
</div>
</template>
<template #items="{ row: code }">
<FlightBadge
v-for="flight in entryFor(code).flights"
:key="flight.id"
:title="flightTitle(flight)"
:flight="flight"
/>
</template>
</BadgeTable>
</Panel>
<!-- Requirements -->
<Panel>
<PanelHeader centered>Requirements</PanelHeader>
<p>
To complete this challenge you must fly to all {{ londonAirports.length }} of
London's airports Heathrow, Gatwick, Stansted, Luton, London City, and Southend.
</p>
</Panel>
</template>
<style scoped>
.table-toolbar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 1rem;
margin-bottom: 0.75rem;
}
.airport-label {
width: 100%;
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0 0.25rem;
}
.airport-code {
font-weight: 600;
opacity: 0.7;
min-width: 2.75rem;
}
</style>
@@ -25,6 +25,7 @@ const props = defineProps<{
regions: Region[] regions: Region[]
alliance: Alliance | null alliance: Alliance | null
airlines: Airline[] airlines: Airline[]
london_airports: string[]
continents: Continent[] continents: Continent[]
aircraft_families: Record<string, string[]> aircraft_families: Record<string, string[]>
majorAlliances: Alliance[] majorAlliances: Alliance[]
@@ -119,6 +120,7 @@ const unlocked = computed(() => {
:continents="continents" :continents="continents"
:families="aircraft_families" :families="aircraft_families"
:major-alliances="majorAlliances" :major-alliances="majorAlliances"
:london-airports="london_airports"
/> />
<FollowingSelectBox <FollowingSelectBox
+1
View File
@@ -334,6 +334,7 @@ export interface MissingAirline{
flights: { flights: {
flight_number: string; flight_number: string;
link: string; link: string;
id: number;
}[] }[]
} }
+2
View File
@@ -42,6 +42,8 @@ use Inertia\Inertia;
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'); Route::get('/missing-airlines', [AdminController::class, 'reconcileMissingAirlines'])->name('reconcile-missing-airlines')->middleware('permission:reconcile_missing_liveries');
Route::post('/ignore-missing-airline', [AdminController::class, 'ignoreMissingAirline'])->name('admin.ignore-missing-airline');
}); });