dredgy/FlightsAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Session api token validation

Browse Source
This commit is contained in:
dredgy
2026-06-23 11:20:01 +10:00
parent cd1538ba12
commit fcba639bae
25 changed files with 491 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/FeedController.php
+47
View File
@@ -3,7 +3,9 @@
namespace App\Http\Controllers;
use App\Models\UserAction;
use App\Models\UserFlight;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Inertia\Inertia;
class FeedController extends Controller
@@ -28,4 +30,49 @@ class FeedController extends Controller
'feed' => $feed,
]);
}
public function following()
{
$user = auth()->user();
return Cache::remember(
"user:{$user->id}:following",
now()->addMinutes(15),
fn () => $user->following()
->with('followee')
->get()
->pluck('followee')
->filter()
->values()
->toArray()
);
}
public function followingFlights()
{
$user = auth()->user();
return Cache::remember(
"user_following_flights_{$user->id}",
now()->addDays(30),
function () use ($user) {
$followingIds = $user->following()
->with('followee')
->get()
->pluck('followee')
->filter()
->reject(fn ($followee) => ($followee->settings['profile_privacy'] ?? 'public') === 'private')
->pluck('id');
return UserFlight::query()
->with(['departureAirport', 'arrivalAirport', 'user'])
->whereIn('user_id', $followingIds)
->orderByDesc('departure_date')
->limit(100)
->get()
->values()
->toArray();
}
);
}
}
app/Http/Controllers/FollowerController.php
+51
View File
@@ -7,6 +7,8 @@ use App\Models\Notification;
use App\Models\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Gate;
class FollowerController extends Controller
{
@@ -24,6 +26,43 @@ class FollowerController extends Controller
return response()->json($followers);
}
public function follow(User $user): JsonResponse
{
abort_if($user->id === auth()->id(), 403);
$existing = Followee::where('user_id', auth()->id())
->where('followee_id', $user->id)
->first();
if ($existing) {
$existing->delete();
$this->clearFollowingCache(auth()->user());
return response()->json(['status' => 'none']);
}
$canView = Gate::allows('viewProfileData', $user);
Followee::create([
'user_id' => auth()->id(),
'followee_id' => $user->id,
'verified' => $canView,
]);
$this->clearFollowingCache(auth()->user());
Notification::create([
'user_id' => $user->id,
'title' => $canView ? 'New follower' : 'Follow request',
'body' => $canView
? auth()->user()->name . ' is now following you.'
: auth()->user()->name . ' wants to follow you.',
'is_achievement' => false,
'url' => $canView ? '/u/' . auth()->user()->name : '/follow-requests',
]);
return response()->json(['status' => $canView ? 'following' : 'requested']);
}
public function approve(User $follower): JsonResponse
{
$followee = Followee::where('user_id', $follower->id)
@@ -33,6 +72,8 @@ class FollowerController extends Controller
$followee->update(['verified' => true]);
$this->clearFollowingCache($follower);
Notification::create([
'user_id' => $follower->id,
'title' => 'Follow request accepted',
@@ -51,6 +92,8 @@ class FollowerController extends Controller
->pending()
->delete();
$this->clearFollowingCache($follower);
return response()->json(['status' => 'denied']);
}
@@ -61,6 +104,14 @@ class FollowerController extends Controller
->verified()
->delete();
$this->clearFollowingCache($follower);
return response()->json(['status' => 'removed']);
}
protected function clearFollowingCache(User $user): void
{
Cache::forget("user:{$user->id}:following");
Cache::forget("user_following_flights_{$user->id}");
}
}
app/Http/Controllers/HomePageController.php
+3 -2
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Models\UserFlight;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Inertia\Inertia;
use Inertia\Response;
@@ -14,9 +15,9 @@ class HomePageController extends Controller
{
return Cache::remember('splash_flights', now()->addHours(12), function () {
return UserFlight::query()
->with(['departureAirport', 'arrivalAirport'])
->with(['departureAirport', 'arrivalAirport', 'user'])
->whereHas('user', function ($query) {
$query->whereRaw("settings->>'profile_privacy' is distinct from 'private'");
$query->whereRaw(DB::raw("settings->>'profile_privacy' is distinct from 'private'"));
})
->orderByDesc('departure_date')
->limit(50)
app/Http/Controllers/UserController.php
+1 -63
View File
@@ -9,74 +9,12 @@ use App\Settings\SettingsRegistry;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Gate;
use Inertia\Inertia;
class UserController extends Controller
{
public function follow(User $user): JsonResponse
{
abort_if($user->id === auth()->id(), 403);
$existing = Followee::where('user_id', auth()->id())
->where('followee_id', $user->id)
->first();
if ($existing) {
$existing->delete();
return response()->json(['status' => 'none']);
}
$canView = Gate::allows('viewProfileData', $user);
Followee::create([
'user_id' => auth()->id(),
'followee_id' => $user->id,
'verified' => $canView,
]);
Notification::create([
'user_id' => $user->id,
'title' => $canView ? 'New follower' : 'Follow request',
'body' => $canView
? auth()->user()->name . ' is now following you.'
: auth()->user()->name . ' wants to follow you.',
'is_achievement' => false,
'url' => $canView ? '/u/' . auth()->user()->name : '/follow-requests',
]);
return response()->json(['status' => $canView ? 'following' : 'requested']);
}
public function approveRequest(User $follower): JsonResponse
{
$followee = Followee::where('user_id', $follower->id)
->where('followee_id', auth()->id())
->pending()
->firstOrFail();
$followee->update(['verified' => true]);
Notification::create([
'user_id' => $follower->id,
'title' => 'Follow request accepted',
'body' => auth()->user()->name . ' accepted your follow request.',
'is_achievement' => false,
'url' => '/u/' . auth()->user()->name,
]);
return response()->json(['approved' => true]);
}
public function denyRequest(User $follower): JsonResponse
{
Followee::where('user_id', $follower->id)
->where('followee_id', auth()->id())
->pending()
->delete();
return response()->json(['denied' => true]);
}
public function settings(?string $category = null){
$allowedTabs = ['general', 'followers'];
app/Http/Middleware/RefreshApiToken.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use App\Listeners\IssueApiToken;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
class RefreshApiToken
{
public function handle(Request $request, Closure $next): Response
{
if (!$request->user() || !session('api_token_id')) {
return $next($request);
}
$token = $request->user()
->tokens()
->find(session('api_token_id'));
// Refresh if expired or within 30 minutes of expiry
if (!$token || $token->expires_at->subMinutes(30)->isPast()) {
app(IssueApiToken::class)->createToken($request->user());
}
return $next($request);
}
}
app/Listeners/IssueApiToken.php
+17 -4
View File
@@ -11,13 +11,26 @@ class IssueApiToken
{
/** @var User $user */
$user = $event->user;
$user->tokens()->where('name', 'frontend')->delete();
$token = $user->createToken(
$this->createToken($user);
}
public function createToken(User $user): void
{
// Delete only this session's existing token (if any)
if ($tokenId = session('api_token_id')) {
$user->tokens()->where('id', $tokenId)->delete();
}
$newToken = $user->createToken(
'frontend',
['*'],
now()->addHours(4)
)->plainTextToken;
);
session(['api_token' => $token]);
session([
'api_token' => $newToken->plainTextToken,
'api_token_id' => $newToken->accessToken->id,
]);
}
}
app/Listeners/RevokeApiToken.php
+5 -2
View File
@@ -17,7 +17,10 @@ class RevokeApiToken
/** @var User $user */
$user = $event->user;
$user?->tokens()->where('name', 'frontend')->delete();
session()->forget('api_token');
if ($tokenId = session('api_token_id')) {
$user?->tokens()->where('id', $tokenId)->delete();
}
session()->forget(['api_token', 'api_token_id']);
}
}
app/Models/User.php
+3 -3
View File
@@ -140,19 +140,19 @@ class User extends Authenticatable
public function following(): HasMany
{
return $this->hasMany(Followee::class, 'user_id');
return $this->hasMany(Followee::class, 'user_id')->verified();
}
public function followers(): HasMany
{
return $this->hasMany(Followee::class, 'followee_id');
return $this->hasMany(Followee::class, 'followee_id')->verified();
}
public function isFollowing(User $user): bool
{
return $this->following()
->where('followee_id', $user->id)
->verified()
->exists();
}
app/Observers/FlightObserver.php
+5
View File
@@ -10,6 +10,11 @@ class FlightObserver
protected function clearCache(UserFlight $flight): void
{
Cache::forget("user_flights_{$flight->user->id}");
//Make queued task if the site gets big
$flight->user->followers()
->get()
->each(fn ($follower) => Cache::forget("user_following_flights_{$follower->id}"));
}
bootstrap/app.php
+2
View File
@@ -1,6 +1,7 @@
<?php
use App\Http\Middleware\HandleInertiaRequests;
use App\Http\Middleware\RefreshApiToken;
use App\Http\Middleware\SanctumOrTrustedOrigin;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Application;
@@ -28,6 +29,7 @@ return Application::configure(basePath: dirname(__DIR__))
$middleware->web(append: [
HandleInertiaRequests::class,
AddLinkHeadersForPreloadedAssets::class,
RefreshApiToken::class
]);
$middleware->alias([
'role' => RoleMiddleware::class,
resources/js/Components/FlightsGoneBy/Feed/Avatar.vue
+33
View File
@@ -0,0 +1,33 @@
<script setup lang="ts">
import {User} from "@/Types/types";
defineProps<{
user: User
}>()
import {Link} from "@inertiajs/vue3";
</script>
<template>
<div class="avatar">
<Link :href="route('profile.view', { user: user?.name })">
{{ user?.name?.charAt(0).toUpperCase() ?? '?' }}
</Link>
</div>
</template>
<style scoped>
.avatar {
width: 2.25rem;
height: 2.25rem;
border-radius: 50%;
background: rgba(99, 102, 241, 0.2);
border: 1px solid rgba(99, 102, 241, 0.35);
display: flex;
align-items: center;
justify-content: center;
font-weight: 600;
font-size: 0.9rem;
color: #818cf8;
flex-shrink: 0;
}
</style>
resources/js/Components/FlightsGoneBy/Feed/FeedItem.vue
+2 -20
View File
@@ -14,6 +14,7 @@ import FlightCancelledFeedItem from "@/Components/FlightsGoneBy/Feed/FlightCance
import FlightImportedFeedItem from "@/Components/FlightsGoneBy/Feed/FlightImportedFeedItem.vue";
import FlightMovedFeedItem from "@/Components/FlightsGoneBy/Feed/FlightMovedFeedItem.vue";
import ButtonLink from "@/Components/FlightsGoneBy/ButtonLink.vue";
import Avatar from "@/Components/FlightsGoneBy/Feed/Avatar.vue";
const props = defineProps<{
action: UserAction
@@ -56,11 +57,7 @@ function timeAgo(dateStr: string): string {
<template>
<div class="feed-item glass glass-border">
<div class="card-top">
<div class="avatar">
<Link :href="route('profile.view', { user: action.user?.name })">
{{ action.user?.name?.charAt(0).toUpperCase() ?? '?' }}
</Link>
</div>
<Avatar :user="action.user" />
<div class="meta">
<span class="name">
<Link :href="route('profile.view', { user: action.user?.name })">
@@ -110,21 +107,6 @@ function timeAgo(dateStr: string): string {
border-top: 1px solid rgba(255, 255, 255, 0.06);
}
.avatar {
width: 2.25rem;
height: 2.25rem;
border-radius: 50%;
background: rgba(99, 102, 241, 0.2);
border: 1px solid rgba(99, 102, 241, 0.35);
display: flex;
align-items: center;
justify-content: center;
font-weight: 600;
font-size: 0.9rem;
color: #818cf8;
flex-shrink: 0;
}
.meta {
display: flex;
flex-direction: column;
resources/js/Components/FlightsGoneBy/FlightMap.vue
+46 -5
View File
@@ -171,7 +171,11 @@ function airportPopupHTML(airport: Airport): string {
function routePopupHTML(historical: Flight[], future: Flight[]): string {
interface AirlineEntry { html: string; count: number }
interface DirectionGroup { label: string; airlines: Map<string, AirlineEntry> }
interface DirectionGroup {
label: string
airlines: Map<string, AirlineEntry>
users: Map<number, { name: string }>
}
const groupByDirection = (flights: Flight[]): DirectionGroup[] => {
const groups = new Map<string, DirectionGroup>()
@@ -180,13 +184,19 @@ function routePopupHTML(historical: Flight[], future: Flight[]): string {
const key = `${flight.departure_airport.id}-${flight.arrival_airport.id}`
const label = `${flight.departure_airport.municipality} to ${flight.arrival_airport.municipality}`
if (!groups.has(key)) groups.set(key, { label, airlines: new Map() })
if (!groups.has(key)) groups.set(key, { label, airlines: new Map(), users: new Map() })
const group = groups.get(key)!
if (flight.user) {
group.users.set(flight.user.id, { name: flight.user.name })
}
if (!flight.airline) return
const { iata_code, logo_url, name } = flight.airline
const airlineKey = iata_code ?? ''
const airlines = groups.get(key)!.airlines
const airlines = group.airlines
if (airlines.has(airlineKey)) {
airlines.get(airlineKey)!.count++
@@ -204,10 +214,20 @@ function routePopupHTML(historical: Flight[], future: Flight[]): string {
return [...groups.values()]
}
const renderUsers = (users: Map<number, { name: string }>): string => {
if (!users.size) return ''
const badges = [...users.values()]
.map(({ name }) => `<span class="rp-user-badge">${name}</span>`)
.join('')
return `<div class="rp-users">${badges}</div>`
}
const renderSection = (title: string, flights: Flight[]): string => {
if (!flights.length) return ''
const rows = groupByDirection(flights).map(({ label, airlines }) => {
const rows = groupByDirection(flights).map(({ label, airlines, users }) => {
const airlineLines = [...airlines.values()]
.map(({ html, count }) => count > 1
? `<span style="display:inline-flex;align-items:center;gap:4px;">${html}<span style="color:#556677">(x${count})</span></span>`
@@ -218,6 +238,7 @@ function routePopupHTML(historical: Flight[], future: Flight[]): string {
<div class="rp-direction">
<div class="rp-route">${label}</div>
<div class="rp-airlines">${airlineLines || '—'}</div>
${renderUsers(users)}
</div>`
}).join('')
@@ -778,13 +799,17 @@ export default defineComponent({
position: relative;
width: 100%;
aspect-ratio: 16 / 9;
max-height: 70vh;
display: flex;
align-items: center;
justify-content: center;
}
@media (max-width: 768px) {
.flight-map-wrapper { aspect-ratio: 7 / 10; }
.flight-map-wrapper {
aspect-ratio: 7 / 10;
max-height: none;
}
}
.map-container { position: absolute; inset: 0; }
@@ -860,6 +885,22 @@ export default defineComponent({
.rp-airlines { font-size: 0.75rem; color: #778899; }
.rp-divider { height: 1px; background: rgba(255,255,255,0.08); margin: 2px 0; }
.rp-users {
display: flex;
flex-wrap: wrap;
gap: 4px;
margin-top: 4px;
}
.rp-user-badge {
font-size: 0.7rem;
color: #c8cdd8;
background: rgba(77,166,255,0.12);
border: 1px solid rgba(77,166,255,0.25);
border-radius: 999px;
padding: 1px 8px;
white-space: nowrap;
}
/* Map controls */
.maplibregl-ctrl-group { background: rgba(10,14,22,0.85) !important; border: 1px solid rgba(255,255,255,0.08) !important; }
.maplibregl-ctrl-group button { color: #a0b4c8 !important; }
resources/js/Components/FlightsGoneBy/FollowButton.vue
+2 -2
View File
@@ -7,13 +7,13 @@ type FollowStatus = 'following' | 'requested' | 'none'
const props = defineProps<{
user: User
followStatus: FollowStatus
followStatus: string
}>()
const snackbar = ref(false)
const snackbarMessage = ref('')
const status = ref<FollowStatus>(props.followStatus)
const status = ref<FollowStatus>(props.followStatus as FollowStatus)
const processing = ref(false)
const auth = usePage<SharedProps>().props.auth
resources/js/Components/FlightsGoneBy/ProfileHeader.vue
+2 -1
View File
@@ -11,6 +11,7 @@ const props = defineProps<{
achievementCount?: number
followStatus?: string
show: "flights" | "achievements"
showCount?: boolean
}>()
const counts = computed(() => {
@@ -39,7 +40,7 @@ const counts = computed(() => {
</div>
</div>
<div class="board-count">
<div class="board-count" v-if="showCount">
<span class="count-number">{{ counts[show] }}</span>
<span class="count-label">{{show.toUpperCase()}}</span>
</div>
resources/js/Components/FlightsGoneBy/ProfileLayout.vue
+2 -1
View File
@@ -13,13 +13,14 @@ defineProps<{
loading: boolean
canView: boolean
title?: string
showCount?: boolean
}>()
</script>
<template>
<div class="board-wrapper">
<Head :title="title" />
<ProfileHeader :show="achievementCount && achievementCount > 0 ? 'achievements' : 'flights'" :followStatus="followStatus" :user="user" :flightCount="flightCount" :achievementCount="achievementCount" />
<ProfileHeader :showCount="showCount" :show="achievementCount && achievementCount > 0 ? 'achievements' : 'flights'" :followStatus="followStatus" :user="user" :flightCount="flightCount" :achievementCount="achievementCount" />
<div v-if="loading" class="loading-state">
<PlaneLoader />
</div>
resources/js/Pages/Feed.vue
+175 -19
View File
@@ -1,8 +1,14 @@
<script setup lang="ts">
import MainLayout from "@/Layouts/MainLayout.vue";
import {User, UserAction} from "@/Types/types";
import { Head } from "@inertiajs/vue3";
import { User, UserAction } from "@/Types/types";
import {Head, Link} from "@inertiajs/vue3";
import FeedItem from "@/Components/FlightsGoneBy/Feed/FeedItem.vue";
import ProfileLayout from "@/Components/FlightsGoneBy/ProfileLayout.vue";
import FlightMap from "@/Components/FlightsGoneBy/FlightMap.vue";
import PlaneLoader from "@/Components/FlightsGoneBy/PlaneLoader.vue";
import { useFlights } from "@/Composables/useFlights";
import { useApiResource } from "@/Composables/useApiResource";
import Avatar from "@/Components/FlightsGoneBy/Feed/Avatar.vue";
defineOptions({ layout: MainLayout })
@@ -10,32 +16,78 @@ const props = defineProps<{
user: User
feed: UserAction[]
}>()
// Flights belonging to people the user follows — adjust endpoint to match your API
const { flights: followingFlights, flightsLoading } = useFlights('/internal/feed/following-flights')
// People the user follows — adjust shape/endpoint to match your API
const { data: following, loading: followingLoading } = useApiResource<User[]>('/internal/feed/following')
</script>
<template>
<Head title="Feed" />
<ProfileLayout :showCount="false" :user="user" followStatus="none" :canView="true" :loading="false">
<Head title="Feed" />
<div class="feed-page">
<header class="feed-header">
<h1>Feed</h1>
<span class="feed-count">{{ feed.length }} updates</span>
</header>
<div class="feed-page">
<header class="feed-header">
<h1>Feed</h1>
<span class="feed-count">{{ feed.length }} updates</span>
</header>
<div v-if="feed.length === 0" class="empty">
<p>Nothing here yet — follow someone to see their flight updates!</p>
<!-- MAP: the headline content -->
<section class="map-section">
<div class="map-caption">
<span class="caption-icon">🛫</span>
Recently logged by people you follow
</div>
<FlightMap v-if="!flightsLoading" :flights="followingFlights" :show-legend="false" />
<div v-else class="loading-state">
<PlaneLoader />
</div>
</section>
<div class="feed-grid">
<!-- FOLLOWING: secondary, supporting content -->
<aside class="following-box">
<h2>Following</h2>
<div v-if="followingLoading" class="following-loading">
<PlaneLoader />
</div>
<div v-else-if="!following?.length" class="empty-small">
<p>You're not following anyone yet.</p>
</div>
<ul v-else class="following-list">
<li v-for="person in following" :key="person.id" class="following-item">
<Avatar :user="person" />
<Link :href="route('profile.view', { user: person?.name })">
<span class="following-name">{{ person.name }}</span>
</Link>
</li>
</ul>
</aside>
<!-- FEED: condensed, de-emphasised -->
<div class="feed-condensed">
<div v-if="feed.length === 0" class="empty">
<p>Nothing here yet — follow someone to see their flight updates!</p>
</div>
<div v-else class="feed-list">
<FeedItem v-for="action in feed" :key="action.id" :action="action" compact />
</div>
</div>
</div>
</div>
<div class="feed-list">
<FeedItem v-for="action in feed" :key="action.id" :action="action" />
</div>
</div>
</ProfileLayout>
</template>
<style scoped>
.feed-page {
margin: 0 auto;
padding: 2rem 1rem;
width: 55%;
width: 70%;
display: flex;
flex-direction: column;
gap: 2rem;
}
@media (max-width: 768px) {
@@ -48,7 +100,6 @@ const props = defineProps<{
display: flex;
align-items: baseline;
gap: 0.75rem;
margin-bottom: 1.5rem;
}
.feed-header h1 {
@@ -62,14 +113,119 @@ const props = defineProps<{
color: #6b7280;
}
/* MAP */
.map-section {
position: relative;
overflow: hidden;
}
.map-caption {
position: absolute;
top: 1rem;
left: 1rem;
z-index: 10;
display: inline-flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 1rem;
background: rgba(10, 15, 30, 0.65);
backdrop-filter: blur(8px);
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 999px;
font-size: 0.85rem;
font-weight: 500;
color: rgba(255, 255, 255, 0.9);
}
.caption-icon {
font-size: 1rem;
line-height: 1;
}
.loading-state {
display: flex;
justify-content: center;
align-items: center;
min-height: 40dvh;
}
/* GRID: following sidebar + condensed feed */
.feed-grid {
display: grid;
grid-template-columns: 240px 1fr;
gap: 2rem;
align-items: start;
}
@media (max-width: 768px) {
.feed-grid {
grid-template-columns: 1fr;
}
}
.following-box {
border: 1px solid rgba(255, 255, 255, 0.1);
padding: 1rem;
}
.following-box h2 {
font-size: 1rem;
font-weight: 600;
margin: 0 0 0.75rem;
}
.following-list {
list-style: none;
margin: 0;
padding: 0;
display: flex;
flex-direction: column;
gap: 0.6rem;
}
.following-item {
display: flex;
align-items: center;
gap: 0.6rem;
}
.following-avatar {
width: 28px;
height: 28px;
border-radius: 50%;
object-fit: cover;
}
.following-name {
font-size: 0.85rem;
}
.following-loading {
display: flex;
justify-content: center;
padding: 1rem 0;
}
.empty-small p {
font-size: 0.8rem;
color: #6b7280;
margin: 0;
}
/* CONDENSED FEED — de-emphasised vs before */
.feed-condensed {
opacity: 0.92;
}
.empty p {
text-align: center;
margin-top: 3rem;
color: #6b7280;
margin-top: 1rem;
}
.feed-list {
display: flex;
flex-direction: column;
gap: 2rem;
gap: 1rem; /* tightened from 2rem */
}
</style>
resources/js/Pages/Profile/UserAchievement.vue
+1 -1
View File
@@ -56,7 +56,7 @@ const unlocked = computed(() => {
</script>
<template>
<ProfileLayout :title="`${achievement.name}`" :canView="canView" :achievementCount="achievementCount" :user="user" :followStatus="followStatus" :loading="flightsLoading">
<ProfileLayout :title="`${achievement.name}`" :canView="canView" :achievementCount="achievementCount" :user="user" :followStatus="followStatus" :loading="flightsLoading" showCount>
<div class="innerLayout">
<ButtonLink variant="flat" icon="mdi-arrow-left" :label="`Back to ${user.name}'s Achievements`" :href="`${route('profile.achievements', { user: user.name })}#${achievement.internal_name}`" />
resources/js/Pages/ProfileBoardingPasses.vue
-30
View File
@@ -1,30 +0,0 @@
<script setup lang="ts">
import MainLayout from "@/Layouts/MainLayout.vue";
import { Head } from '@inertiajs/vue3';
import {Flight, User} from "@/Types/types";
import ProfileViewSwitcher from "@/Components/FlightsGoneBy/ProfileViewSwitcher.vue";
import ProfileLayout from "@/Components/FlightsGoneBy/ProfileLayout.vue";
import BoardingPasses from "@/Components/FlightsGoneBy/BoardingPasses.vue";
defineOptions({
layout: MainLayout
})
defineProps<{
user: User
flights: Flight[]
canEdit: boolean
}>()
</script>
<template>
<Head :title="`${user.name}'s Flights`" />
<ProfileLayout :flights="flights" :user="user">
<ProfileViewSwitcher :user="user" active-view="passes" />
<BoardingPasses :flights="flights" :canEdit="canEdit" />
</ProfileLayout>
</template>
<style scoped>
</style>
resources/js/Pages/UserAchievements.vue
+1
View File
@@ -71,6 +71,7 @@ const filteredUnlockedCount = computed(() =>
:loading="false"
:canView="canView"
:title="`${user.name}'s Achievements`"
showCount
>
<ProfileViewSwitcher active-view="achievements" :user="user" />
resources/js/Pages/UserFlight.vue
+1
View File
@@ -30,6 +30,7 @@ const props = defineProps<{
:user="user"
:followStatus="followStatus"
:flight-count="flightCount"
showCount
:loading="false">
<Head :title="`${flight.flight_number ?? user.name + '\'s Flight'}`" />
resources/js/Pages/UserProfile.vue
+1 -1
View File
@@ -187,7 +187,7 @@ function switchView(view: ProfileView) {
</script>
<template>
<ProfileLayout :title="`${user.name}'s Flights`" :canView="canView" :followStatus="followStatus" :flightCount="flightCount" :user="user" :loading="flightsLoading">
<ProfileLayout :title="`${user.name}'s Flights`" :canView="canView" :followStatus="followStatus" :flightCount="flightCount" :user="user" :loading="flightsLoading" showCount>
<div class="toolbar">
<ProfileViewSwitcher :user="user" :active-view="activeView" @update:active-view="switchView" />
resources/js/Types/types.d.ts
Vendored
+1
View File
@@ -300,6 +300,7 @@ export interface Flight {
range: FlightRange
region_range: RegionRange
livery_url?: string
user?: User | null
}
routes/api.php
+6 -1
View File
@@ -3,6 +3,7 @@
use App\Http\Controllers\Api\AircraftApiController;
use App\Http\Controllers\Api\AirlineApiController;
use App\Http\Controllers\Api\UserApiController;
use App\Http\Controllers\FeedController;
use App\Http\Controllers\HomePageController;
use Illuminate\Support\Facades\Route;
@@ -16,7 +17,11 @@ Route::domain(config('app.api_domain'))->group(function () {
Route::prefix('internal')->middleware('sanctum.or.trusted')->group(function () {
Route::get('/user/{user}/flights', [UserApiController::class, 'viewableFlights'])->name('api.user.flights');
Route::get('/user/{user}/flights/departed', [UserApiController::class, 'viewableDepartedFlights'])->name('api.user.flights.departed');
Route::get('/flights/most-recent', [HomePageController::class ,'mostRecentFlights'])->name('api.user.flights.departed');
Route::get('/flights/most-recent', [HomePageController::class ,'mostRecentFlights'])->name('home-page.most-recent-flights');
Route::get('/feed/following', [FeedController::class ,'following'])->name('feed.following');
Route::get('/feed/following-flights', [FeedController::class ,'followingFlights'])->name('feed.following-flights');
});
routes/web.php
+55 -80
View File
@@ -1,114 +1,89 @@
<?php
use App\Http\Controllers\AchievementController;
use App\Http\Controllers\AdminController;
use App\Http\Controllers\AdminToolsController;
use App\Http\Controllers\Api\AircraftApiController;
use App\Http\Controllers\Api\AirlineApiController;
use App\Http\Controllers\Api\UserApiController;
use App\Http\Controllers\FeedController;
use App\Http\Controllers\FlightController;
use App\Http\Controllers\FlightImportController;
use App\Http\Controllers\FollowerController;
use App\Http\Controllers\HomePageController;
use App\Http\Controllers\UserProfileController;
use App\Http\Controllers\LogoController;
use App\Http\Controllers\NotificationController;
use App\Http\Controllers\ProfileController;
use App\Http\Controllers\SearchController;
use App\Http\Controllers\SettingsController;
use App\Http\Controllers\UserController;
use App\Http\Controllers\UserFlightController;
use App\Models\Airline;
use App\Models\FlightClass;
use App\Models\FlightReason;
use App\Models\SeatType;
use Illuminate\Foundation\Application;
use Illuminate\Support\Facades\Route;
use Inertia\Inertia;
/**
* App Routes
*/
Route::domain(config('app.domain'))->group(
function() {
Route::get('/', [UserProfileController::class, 'index'])->name('home');
* App Routes
*/
Route::get('/', [UserProfileController::class, 'index'])->name('home');
Route::get('/splash', [HomePageController::class, 'splash'])->name('splash');
Route::get('/splash', [HomePageController::class, 'splash'])->name('splash');
Route::get('/dashboard', function () {
return Inertia::render('Dashboard');
})->middleware(['auth', 'verified'])->name('dashboard');
Route::get('/dashboard', function () {
return Inertia::render('Dashboard');
})->middleware(['auth', 'verified'])->name('dashboard');
Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->group(function () {
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::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->group(function () {
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::middleware('auth')->group(function () {
Route::post('/flights', [FlightController::class, 'store'])->name('flights.store');
Route::get('/flights/add', [FlightController::class, 'add'])->name('flights.add');
Route::get('/flights/{flight}/edit', [FlightController::class, 'edit'])->name('flights.edit');
Route::put('/flights/{flight}', [FlightController::class, 'update'])->name('flights.update');
Route::delete('/flights/{flight}/{referrer?}', [FlightController::class, 'delete'])->name('flights.delete');
Route::middleware('auth')->group(function () {
Route::post('/flights', [FlightController::class, 'store'])->name('flights.store');
Route::get('/flights/add', [FlightController::class, 'add'])->name('flights.add');
Route::get('/flights/{flight}/edit', [FlightController::class, 'edit'])->name('flights.edit');
Route::put('/flights/{flight}', [FlightController::class, 'update'])->name('flights.update');
Route::delete('/flights/{flight}/{referrer?}', [FlightController::class, 'delete'])->name('flights.delete');
Route::patch('/settings/{key}', [SettingsController::class, 'updateSingle'])
->where('key', '[a-z_]+')
->name('settings.update-single');
Route::patch('/settings/{key}', [SettingsController::class, 'updateSingle'])
->where('key', '[a-z_]+')
->name('settings.update-single');
Route::get('/import/fr24', [FlightImportController::class, 'showFr24Import'])->name('import.fr24');
Route::get('/reconcile', [FlightImportController::class, 'reconcile'])->name('reconcile');;
Route::get('/import/fr24', [FlightImportController::class, 'showFr24Import'])->name('import.fr24');
Route::get('/reconcile', [FlightImportController::class, 'reconcile'])->name('reconcile');;
Route::get('/flights/lookup', [FlightController::class, 'lookup'])->name('flights.lookup');
Route::post('/flights/import', [FlightImportController::class, 'store'])->name('flights.import.store');
Route::post('/u/{user}/follow', [UserController::class, 'follow'])->name('profile.follow');
Route::get('/settings/{category?}', [UserController::class, 'settings'])->name('user.settings');
Route::get('/flights/lookup', [FlightController::class, 'lookup'])->name('flights.lookup');
Route::post('/flights/import', [FlightImportController::class, 'store'])->name('flights.import.store');
Route::get('/notifications', [NotificationController::class, 'index'])->name('notifications.get');
Route::patch('/notifications/{notification}/read', [NotificationController::class, 'markRead']);
Route::get('/feed', [FeedController::class, 'view'])->name('feed');
Route::patch('/settings', [SettingsController::class, 'update'])->name('settings.update');
Route::get('/followers', [FollowerController::class, 'index'])->name('followers.index');
Route::post('/followers/{follower}/approve', [FollowerController::class, 'approve'])->name('followers.approve');
Route::post('/followers/{follower}/deny', [FollowerController::class, 'deny'])->name('followers.deny');
Route::delete('/followers/{follower}', [FollowerController::class, 'remove'])->name('followers.remove');
});
Route::post('/import/save', [FlightImportController::class, 'save'])->name('import.save');
//Search Routes
Route::get('/search/airlines', [SearchController::class, 'airlines'])->name('search.airlines');
Route::get('/search/aircraft', [SearchController::class, 'aircraft'])->name('search.aircraft');
Route::get('/search/airports', [SearchController::class, 'airports'])->name('search.airports');
Route::get('/u/{user}', [UserProfileController::class, 'view'])->name('profile.view');
Route::get('/u/{user}/map', [UserProfileController::class, 'map'])->name('profile.map');
Route::get('/u/{user}/departure-board/{flight?}', [UserProfileController::class, 'departureBoard'])->name('profile.departure-board');
Route::get('/u/{user}/boarding-passes', [UserProfileController::class, 'boardingPasses'])->name('profile.boarding-passes');
Route::get('/u/{user}/achievements', [UserProfileController::class, 'achievements'])->name('profile.achievements');
Route::get('/u/{user}/achievement/{achievement}', [UserProfileController::class, 'achievement'])->name('profile.achievement');
Route::get('/u/{user}/flight/{userFlight}', [UserProfileController::class, 'flight'])->name('profile.flight');
Route::get('/settings/{category?}', [UserController::class, 'settings'])->name('user.settings');
require __DIR__.'/auth.php';
Route::get('/notifications', [NotificationController::class, 'index'])->name('notifications.get');
Route::patch('/notifications/{notification}/read', [NotificationController::class, 'markRead']);
}
);
Route::get('/feed', [FeedController::class, 'view'])->name('feed');
Route::patch('/settings', [SettingsController::class, 'update'])->name('settings.update');
Route::post('/u/{user}/follow', [FollowerController::class, 'follow'])->name('profile.follow');
Route::get('/followers', [FollowerController::class, 'index'])->name('followers.index');
Route::post('/followers/{follower}/approve', [FollowerController::class, 'approve'])->name('followers.approve');
Route::post('/followers/{follower}/deny', [FollowerController::class, 'deny'])->name('followers.deny');
Route::delete('/followers/{follower}', [FollowerController::class, 'remove'])->name('followers.remove');
});
Route::post('/import/save', [FlightImportController::class, 'save'])->name('import.save');
//Search Routes
Route::get('/search/airlines', [SearchController::class, 'airlines'])->name('search.airlines');
Route::get('/search/aircraft', [SearchController::class, 'aircraft'])->name('search.aircraft');
Route::get('/search/airports', [SearchController::class, 'airports'])->name('search.airports');
Route::get('/u/{user}', [UserProfileController::class, 'view'])->name('profile.view');
Route::get('/u/{user}/map', [UserProfileController::class, 'map'])->name('profile.map');
Route::get('/u/{user}/departure-board/{flight?}', [UserProfileController::class, 'departureBoard'])->name('profile.departure-board');
Route::get('/u/{user}/boarding-passes', [UserProfileController::class, 'boardingPasses'])->name('profile.boarding-passes');
Route::get('/u/{user}/achievements', [UserProfileController::class, 'achievements'])->name('profile.achievements');
Route::get('/u/{user}/achievement/{achievement}', [UserProfileController::class, 'achievement'])->name('profile.achievement');
Route::get('/u/{user}/flight/{userFlight}', [UserProfileController::class, 'flight'])->name('profile.flight');
/**
* API Routes
*/
Route::domain(config('app.api_domain'))->group(function () {
require __DIR__.'/auth.php';
});