Spaces:
Runtime error
Runtime error
Add round-trip date validation and 12-month booking window
Browse files- Return date picker constrained to >= departure date, auto-adjusts if departure moves past it
- Return flights filtered to depart at least 1 hour after outbound arrival
- Both date pickers capped at 12 months from today
- Backend validates return date >= departure date and 12-month max window
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- backend/api/search.py +20 -1
- frontend/dist/assets/index-BxpJmc2v.js +0 -0
- frontend/dist/assets/index-C3NB9eo7.css +1 -0
- frontend/dist/index.html +14 -0
- frontend/dist/vite.svg +1 -0
- frontend/src/components/search/DatePicker.tsx +5 -1
- frontend/src/components/search/SearchForm.tsx +14 -2
- frontend/src/pages/ResultsPage.tsx +13 -5
- frontend/src/utils/date.ts +6 -0
backend/api/search.py
CHANGED
|
@@ -2,6 +2,8 @@
|
|
| 2 |
|
| 3 |
from __future__ import annotations
|
| 4 |
|
|
|
|
|
|
|
| 5 |
from fastapi import APIRouter, HTTPException
|
| 6 |
|
| 7 |
from ..config import (
|
|
@@ -15,7 +17,7 @@ from ..config import (
|
|
| 15 |
from ..data_loader import get_route_graph
|
| 16 |
from ..flight_generator import generate_flights_for_route
|
| 17 |
from ..hub_detector import compute_hub_scores
|
| 18 |
-
from ..models import FlightOffer, SearchRequest, SearchResponse, SortBy
|
| 19 |
from ..route_finder import find_routes
|
| 20 |
from ..seed_utils import make_seed
|
| 21 |
|
|
@@ -137,6 +139,23 @@ async def search_flights(req: SearchRequest):
|
|
| 137 |
if leg.destination.upper() not in graph.airports:
|
| 138 |
raise HTTPException(status_code=404, detail=f"Airport {leg.destination} not found")
|
| 139 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 140 |
# Generate outbound flights
|
| 141 |
outbound_leg = req.legs[0]
|
| 142 |
origin = outbound_leg.origin.upper()
|
|
|
|
| 2 |
|
| 3 |
from __future__ import annotations
|
| 4 |
|
| 5 |
+
from datetime import date, timedelta
|
| 6 |
+
|
| 7 |
from fastapi import APIRouter, HTTPException
|
| 8 |
|
| 9 |
from ..config import (
|
|
|
|
| 17 |
from ..data_loader import get_route_graph
|
| 18 |
from ..flight_generator import generate_flights_for_route
|
| 19 |
from ..hub_detector import compute_hub_scores
|
| 20 |
+
from ..models import FlightOffer, SearchRequest, SearchResponse, SortBy, TripType
|
| 21 |
from ..route_finder import find_routes
|
| 22 |
from ..seed_utils import make_seed
|
| 23 |
|
|
|
|
| 139 |
if leg.destination.upper() not in graph.airports:
|
| 140 |
raise HTTPException(status_code=404, detail=f"Airport {leg.destination} not found")
|
| 141 |
|
| 142 |
+
# Validate booking window: flights can only be booked up to 12 months in advance
|
| 143 |
+
max_date = date.today() + timedelta(days=365)
|
| 144 |
+
for leg in req.legs:
|
| 145 |
+
if leg.date > max_date:
|
| 146 |
+
raise HTTPException(
|
| 147 |
+
status_code=400,
|
| 148 |
+
detail="Flights can only be booked up to 12 months in advance",
|
| 149 |
+
)
|
| 150 |
+
|
| 151 |
+
# Validate round-trip date order: return date must be >= departure date
|
| 152 |
+
if req.trip_type == TripType.round_trip and len(req.legs) >= 2:
|
| 153 |
+
if req.legs[1].date < req.legs[0].date:
|
| 154 |
+
raise HTTPException(
|
| 155 |
+
status_code=400,
|
| 156 |
+
detail="Return date must be on or after the departure date",
|
| 157 |
+
)
|
| 158 |
+
|
| 159 |
# Generate outbound flights
|
| 160 |
outbound_leg = req.legs[0]
|
| 161 |
origin = outbound_leg.origin.upper()
|
frontend/dist/assets/index-BxpJmc2v.js
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
frontend/dist/assets/index-C3NB9eo7.css
ADDED
|
@@ -0,0 +1 @@
|
|
|
|
|
|
|
| 1 |
+
@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-space-y-reverse:0;--tw-border-style:solid;--tw-gradient-position:initial;--tw-gradient-from:#0000;--tw-gradient-via:#0000;--tw-gradient-to:#0000;--tw-gradient-stops:initial;--tw-gradient-via-stops:initial;--tw-gradient-from-position:0%;--tw-gradient-via-position:50%;--tw-gradient-to-position:100%;--tw-leading:initial;--tw-font-weight:initial;--tw-tracking:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-blur:initial;--tw-brightness:initial;--tw-contrast:initial;--tw-grayscale:initial;--tw-hue-rotate:initial;--tw-invert:initial;--tw-opacity:initial;--tw-saturate:initial;--tw-sepia:initial;--tw-drop-shadow:initial;--tw-drop-shadow-color:initial;--tw-drop-shadow-alpha:100%;--tw-drop-shadow-size:initial}}}@layer theme{:root,:host{--font-sans:ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";--font-mono:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;--color-red-50:oklch(97.1% .013 17.38);--color-red-200:oklch(88.5% .062 18.334);--color-red-500:oklch(63.7% .237 25.331);--color-red-600:oklch(57.7% .245 27.325);--color-red-700:oklch(50.5% .213 27.518);--color-green-50:oklch(98.2% .018 155.826);--color-green-200:oklch(92.5% .084 155.995);--color-green-500:oklch(72.3% .219 149.579);--color-green-600:oklch(62.7% .194 149.214);--color-green-700:oklch(52.7% .154 150.069);--color-green-800:oklch(44.8% .119 151.328);--color-blue-50:oklch(97% .014 254.604);--color-blue-200:oklch(88.2% .059 254.128);--color-gray-50:oklch(98.5% .002 247.839);--color-gray-100:oklch(96.7% .003 264.542);--color-gray-200:oklch(92.8% .006 264.531);--color-gray-300:oklch(87.2% .01 258.338);--color-gray-400:oklch(70.7% .022 261.325);--color-gray-500:oklch(55.1% .027 264.364);--color-gray-600:oklch(44.6% .03 256.802);--color-gray-700:oklch(37.3% .034 259.733);--color-gray-800:oklch(27.8% .033 256.848);--color-gray-900:oklch(21% .034 264.665);--color-white:#fff;--spacing:.25rem;--container-sm:24rem;--container-3xl:48rem;--container-4xl:56rem;--container-6xl:72rem;--container-7xl:80rem;--text-xs:.75rem;--text-xs--line-height:calc(1 / .75);--text-sm:.875rem;--text-sm--line-height:calc(1.25 / .875);--text-base:1rem;--text-base--line-height: 1.5 ;--text-lg:1.125rem;--text-lg--line-height:calc(1.75 / 1.125);--text-xl:1.25rem;--text-xl--line-height:calc(1.75 / 1.25);--text-2xl:1.5rem;--text-2xl--line-height:calc(2 / 1.5);--text-5xl:3rem;--text-5xl--line-height:1;--font-weight-normal:400;--font-weight-medium:500;--font-weight-semibold:600;--font-weight-bold:700;--tracking-wide:.025em;--leading-relaxed:1.625;--radius-md:.375rem;--radius-lg:.5rem;--radius-xl:.75rem;--radius-2xl:1rem;--animate-spin:spin 1s linear infinite;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4, 0, .2, 1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab,red,red)){::placeholder{color:color-mix(in oklab,currentcolor 50%,transparent)}}}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}}@layer components;@layer utilities{.pointer-events-none{pointer-events:none}.absolute{position:absolute}.relative{position:relative}.sticky{position:sticky}.-top-2{top:calc(var(--spacing) * -2)}.top-1\/2{top:50%}.top-4{top:calc(var(--spacing) * 4)}.top-6{top:calc(var(--spacing) * 6)}.top-full{top:100%}.right-0{right:calc(var(--spacing) * 0)}.right-2{right:calc(var(--spacing) * 2)}.left-0{left:calc(var(--spacing) * 0)}.left-3{left:calc(var(--spacing) * 3)}.z-10{z-index:10}.z-50{z-index:50}.mx-4{margin-inline:calc(var(--spacing) * 4)}.mx-auto{margin-inline:auto}.my-0\.5{margin-block:calc(var(--spacing) * .5)}.my-1{margin-block:calc(var(--spacing) * 1)}.my-1\.5{margin-block:calc(var(--spacing) * 1.5)}.my-2{margin-block:calc(var(--spacing) * 2)}.mt-0\.5{margin-top:calc(var(--spacing) * .5)}.mt-1{margin-top:calc(var(--spacing) * 1)}.mt-2{margin-top:calc(var(--spacing) * 2)}.mt-3{margin-top:calc(var(--spacing) * 3)}.mt-4{margin-top:calc(var(--spacing) * 4)}.mr-4{margin-right:calc(var(--spacing) * 4)}.mb-1{margin-bottom:calc(var(--spacing) * 1)}.mb-2{margin-bottom:calc(var(--spacing) * 2)}.mb-3{margin-bottom:calc(var(--spacing) * 3)}.mb-4{margin-bottom:calc(var(--spacing) * 4)}.mb-6{margin-bottom:calc(var(--spacing) * 6)}.mb-8{margin-bottom:calc(var(--spacing) * 8)}.mb-10{margin-bottom:calc(var(--spacing) * 10)}.ml-1{margin-left:calc(var(--spacing) * 1)}.ml-2{margin-left:calc(var(--spacing) * 2)}.ml-3{margin-left:calc(var(--spacing) * 3)}.ml-4{margin-left:calc(var(--spacing) * 4)}.ml-\[72px\]{margin-left:72px}.ml-px{margin-left:1px}.block{display:block}.flex{display:flex}.grid{display:grid}.hidden{display:none}.inline{display:inline}.h-2{height:calc(var(--spacing) * 2)}.h-2\.5{height:calc(var(--spacing) * 2.5)}.h-3\.5{height:calc(var(--spacing) * 3.5)}.h-4{height:calc(var(--spacing) * 4)}.h-5{height:calc(var(--spacing) * 5)}.h-8{height:calc(var(--spacing) * 8)}.h-9{height:calc(var(--spacing) * 9)}.h-10{height:calc(var(--spacing) * 10)}.h-12{height:calc(var(--spacing) * 12)}.h-16{height:calc(var(--spacing) * 16)}.h-px{height:1px}.max-h-48{max-height:calc(var(--spacing) * 48)}.max-h-64{max-height:calc(var(--spacing) * 64)}.min-h-screen{min-height:100vh}.w-2{width:calc(var(--spacing) * 2)}.w-2\.5{width:calc(var(--spacing) * 2.5)}.w-3\.5{width:calc(var(--spacing) * 3.5)}.w-4{width:calc(var(--spacing) * 4)}.w-5{width:calc(var(--spacing) * 5)}.w-8{width:calc(var(--spacing) * 8)}.w-9{width:calc(var(--spacing) * 9)}.w-10{width:calc(var(--spacing) * 10)}.w-12{width:calc(var(--spacing) * 12)}.w-16{width:calc(var(--spacing) * 16)}.w-24{width:calc(var(--spacing) * 24)}.w-44{width:calc(var(--spacing) * 44)}.w-64{width:calc(var(--spacing) * 64)}.w-full{width:100%}.w-px{width:1px}.max-w-3xl{max-width:var(--container-3xl)}.max-w-4xl{max-width:var(--container-4xl)}.max-w-6xl{max-width:var(--container-6xl)}.max-w-7xl{max-width:var(--container-7xl)}.max-w-sm{max-width:var(--container-sm)}.min-w-0{min-width:calc(var(--spacing) * 0)}.min-w-\[70px\]{min-width:70px}.min-w-\[80px\]{min-width:80px}.min-w-\[150px\]{min-width:150px}.min-w-\[180px\]{min-width:180px}.flex-1{flex:1}.flex-shrink-0{flex-shrink:0}.-translate-y-1\/2{--tw-translate-y: -50% ;translate:var(--tw-translate-x) var(--tw-translate-y)}.rotate-180{rotate:180deg}.animate-spin{animation:var(--animate-spin)}.cursor-help{cursor:help}.cursor-pointer{cursor:pointer}.appearance-none{appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.items-baseline{align-items:baseline}.items-center{align-items:center}.items-end{align-items:flex-end}.justify-between{justify-content:space-between}.justify-center{justify-content:center}.gap-1{gap:calc(var(--spacing) * 1)}.gap-1\.5{gap:calc(var(--spacing) * 1.5)}.gap-2{gap:calc(var(--spacing) * 2)}.gap-3{gap:calc(var(--spacing) * 3)}.gap-4{gap:calc(var(--spacing) * 4)}.gap-6{gap:calc(var(--spacing) * 6)}:where(.space-y-1>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing) * 1) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing) * 1) * calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-1\.5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing) * 1.5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing) * 1.5) * calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-2>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing) * 2) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-3>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing) * 3) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing) * 3) * calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing) * 6) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing) * 6) * calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-8>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing) * 8) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing) * 8) * calc(1 - var(--tw-space-y-reverse)))}.self-center{align-self:center}.self-start{align-self:flex-start}.truncate{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.overflow-y-auto{overflow-y:auto}.rounded{border-radius:.25rem}.rounded-2xl{border-radius:var(--radius-2xl)}.rounded-full{border-radius:3.40282e38px}.rounded-lg{border-radius:var(--radius-lg)}.rounded-md{border-radius:var(--radius-md)}.rounded-xl{border-radius:var(--radius-xl)}.border{border-style:var(--tw-border-style);border-width:1px}.border-2{border-style:var(--tw-border-style);border-width:2px}.border-4{border-style:var(--tw-border-style);border-width:4px}.border-t{border-top-style:var(--tw-border-style);border-top-width:1px}.border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.border-l{border-left-style:var(--tw-border-style);border-left-width:1px}.border-\[\#1a73e8\]{border-color:#1a73e8}.border-blue-200{border-color:var(--color-blue-200)}.border-gray-100{border-color:var(--color-gray-100)}.border-gray-200{border-color:var(--color-gray-200)}.border-gray-300{border-color:var(--color-gray-300)}.border-gray-400{border-color:var(--color-gray-400)}.border-green-200{border-color:var(--color-green-200)}.border-red-200{border-color:var(--color-red-200)}.border-t-\[\#1a73e8\]{border-top-color:#1a73e8}.bg-\[\#1a73e8\]{background-color:#1a73e8}.bg-blue-50{background-color:var(--color-blue-50)}.bg-gray-50{background-color:var(--color-gray-50)}.bg-gray-100{background-color:var(--color-gray-100)}.bg-gray-200{background-color:var(--color-gray-200)}.bg-gray-300{background-color:var(--color-gray-300)}.bg-gray-800{background-color:var(--color-gray-800)}.bg-green-50{background-color:var(--color-green-50)}.bg-red-50{background-color:var(--color-red-50)}.bg-white{background-color:var(--color-white)}.bg-gradient-to-b{--tw-gradient-position:to bottom in oklab;background-image:linear-gradient(var(--tw-gradient-stops))}.from-\[\#e8f0fe\]{--tw-gradient-from:#e8f0fe;--tw-gradient-stops:var(--tw-gradient-via-stops,var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position))}.to-white{--tw-gradient-to:var(--color-white);--tw-gradient-stops:var(--tw-gradient-via-stops,var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position))}.p-1{padding:calc(var(--spacing) * 1)}.p-3{padding:calc(var(--spacing) * 3)}.p-4{padding:calc(var(--spacing) * 4)}.p-6{padding:calc(var(--spacing) * 6)}.px-1{padding-inline:calc(var(--spacing) * 1)}.px-2{padding-inline:calc(var(--spacing) * 2)}.px-3{padding-inline:calc(var(--spacing) * 3)}.px-4{padding-inline:calc(var(--spacing) * 4)}.px-6{padding-inline:calc(var(--spacing) * 6)}.py-1{padding-block:calc(var(--spacing) * 1)}.py-1\.5{padding-block:calc(var(--spacing) * 1.5)}.py-2{padding-block:calc(var(--spacing) * 2)}.py-3{padding-block:calc(var(--spacing) * 3)}.py-4{padding-block:calc(var(--spacing) * 4)}.py-6{padding-block:calc(var(--spacing) * 6)}.py-8{padding-block:calc(var(--spacing) * 8)}.py-12{padding-block:calc(var(--spacing) * 12)}.py-16{padding-block:calc(var(--spacing) * 16)}.py-20{padding-block:calc(var(--spacing) * 20)}.pt-0\.5{padding-top:calc(var(--spacing) * .5)}.pt-3{padding-top:calc(var(--spacing) * 3)}.pt-24{padding-top:calc(var(--spacing) * 24)}.pr-8{padding-right:calc(var(--spacing) * 8)}.pb-1{padding-bottom:calc(var(--spacing) * 1)}.pb-4{padding-bottom:calc(var(--spacing) * 4)}.pb-16{padding-bottom:calc(var(--spacing) * 16)}.pl-3{padding-left:calc(var(--spacing) * 3)}.pl-4{padding-left:calc(var(--spacing) * 4)}.text-center{text-align:center}.text-right{text-align:right}.font-mono{font-family:var(--font-mono)}.text-2xl{font-size:var(--text-2xl);line-height:var(--tw-leading,var(--text-2xl--line-height))}.text-5xl{font-size:var(--text-5xl);line-height:var(--tw-leading,var(--text-5xl--line-height))}.text-base{font-size:var(--text-base);line-height:var(--tw-leading,var(--text-base--line-height))}.text-lg{font-size:var(--text-lg);line-height:var(--tw-leading,var(--text-lg--line-height))}.text-sm{font-size:var(--text-sm);line-height:var(--tw-leading,var(--text-sm--line-height))}.text-xl{font-size:var(--text-xl);line-height:var(--tw-leading,var(--text-xl--line-height))}.text-xs{font-size:var(--text-xs);line-height:var(--tw-leading,var(--text-xs--line-height))}.text-\[10px\]{font-size:10px}.text-\[11px\]{font-size:11px}.text-\[15px\]{font-size:15px}.leading-relaxed{--tw-leading:var(--leading-relaxed);line-height:var(--leading-relaxed)}.font-bold{--tw-font-weight:var(--font-weight-bold);font-weight:var(--font-weight-bold)}.font-medium{--tw-font-weight:var(--font-weight-medium);font-weight:var(--font-weight-medium)}.font-normal{--tw-font-weight:var(--font-weight-normal);font-weight:var(--font-weight-normal)}.font-semibold{--tw-font-weight:var(--font-weight-semibold);font-weight:var(--font-weight-semibold)}.tracking-wide{--tw-tracking:var(--tracking-wide);letter-spacing:var(--tracking-wide)}.whitespace-nowrap{white-space:nowrap}.text-\[\#1a73e8\]{color:#1a73e8}.text-gray-300{color:var(--color-gray-300)}.text-gray-400{color:var(--color-gray-400)}.text-gray-500{color:var(--color-gray-500)}.text-gray-600{color:var(--color-gray-600)}.text-gray-700{color:var(--color-gray-700)}.text-gray-900{color:var(--color-gray-900)}.text-green-500{color:var(--color-green-500)}.text-green-600{color:var(--color-green-600)}.text-green-700{color:var(--color-green-700)}.text-green-800{color:var(--color-green-800)}.text-red-500{color:var(--color-red-500)}.text-red-600{color:var(--color-red-600)}.text-red-700{color:var(--color-red-700)}.text-white{color:var(--color-white)}.uppercase{text-transform:uppercase}.line-through{text-decoration-line:line-through}.placeholder-gray-400::placeholder{color:var(--color-gray-400)}.accent-\[\#1a73e8\]{accent-color:#1a73e8}.shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a), 0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-sm{--tw-shadow:0 1px 3px 0 var(--tw-shadow-color,#0000001a), 0 1px 2px -1px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.filter{filter:var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,)}.transition-colors{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}.transition-shadow{transition-property:box-shadow;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}.transition-transform{transition-property:transform,translate,scale,rotate;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}@media(hover:hover){.group-hover\:block:is(:where(.group):hover *){display:block}.hover\:border-gray-400:hover{border-color:var(--color-gray-400)}.hover\:bg-\[\#1557b0\]:hover{background-color:#1557b0}.hover\:bg-\[\#1765cc\]:hover{background-color:#1765cc}.hover\:bg-blue-50:hover{background-color:var(--color-blue-50)}.hover\:bg-gray-50:hover{background-color:var(--color-gray-50)}.hover\:text-gray-700:hover{color:var(--color-gray-700)}.hover\:text-gray-900:hover{color:var(--color-gray-900)}.hover\:underline:hover{text-decoration-line:underline}.hover\:opacity-80:hover{opacity:.8}.hover\:shadow-md:hover{--tw-shadow:0 4px 6px -1px var(--tw-shadow-color,#0000001a), 0 2px 4px -2px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}}.focus\:border-\[\#1a73e8\]:focus{border-color:#1a73e8}.focus\:border-transparent:focus{border-color:#0000}.focus\:ring-1:focus{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.focus\:ring-\[\#1a73e8\]:focus{--tw-ring-color:#1a73e8}.focus\:outline-none:focus{--tw-outline-style:none;outline-style:none}.disabled\:cursor-not-allowed:disabled{cursor:not-allowed}.disabled\:opacity-30:disabled{opacity:.3}.disabled\:opacity-40:disabled{opacity:.4}.disabled\:opacity-50:disabled{opacity:.5}@media(min-width:40rem){.sm\:col-span-2{grid-column:span 2/span 2}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}@media(min-width:64rem){.lg\:block{display:block}}}body{-webkit-font-smoothing:antialiased;color:#202124;background:#fff;margin:0;font-family:Google Sans,Roboto,-apple-system,BlinkMacSystemFont,sans-serif}@property --tw-translate-x{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-y{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-z{syntax:"*";inherits:false;initial-value:0}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-gradient-position{syntax:"*";inherits:false}@property --tw-gradient-from{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-via{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-to{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-stops{syntax:"*";inherits:false}@property --tw-gradient-via-stops{syntax:"*";inherits:false}@property --tw-gradient-from-position{syntax:"<length-percentage>";inherits:false;initial-value:0%}@property --tw-gradient-via-position{syntax:"<length-percentage>";inherits:false;initial-value:50%}@property --tw-gradient-to-position{syntax:"<length-percentage>";inherits:false;initial-value:100%}@property --tw-leading{syntax:"*";inherits:false}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-tracking{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"<length>";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-blur{syntax:"*";inherits:false}@property --tw-brightness{syntax:"*";inherits:false}@property --tw-contrast{syntax:"*";inherits:false}@property --tw-grayscale{syntax:"*";inherits:false}@property --tw-hue-rotate{syntax:"*";inherits:false}@property --tw-invert{syntax:"*";inherits:false}@property --tw-opacity{syntax:"*";inherits:false}@property --tw-saturate{syntax:"*";inherits:false}@property --tw-sepia{syntax:"*";inherits:false}@property --tw-drop-shadow{syntax:"*";inherits:false}@property --tw-drop-shadow-color{syntax:"*";inherits:false}@property --tw-drop-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-drop-shadow-size{syntax:"*";inherits:false}@keyframes spin{to{transform:rotate(360deg)}}
|
frontend/dist/index.html
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<!doctype html>
|
| 2 |
+
<html lang="en">
|
| 3 |
+
<head>
|
| 4 |
+
<meta charset="UTF-8" />
|
| 5 |
+
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
| 6 |
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
| 7 |
+
<title>Flight Search</title>
|
| 8 |
+
<script type="module" crossorigin src="/assets/index-BxpJmc2v.js"></script>
|
| 9 |
+
<link rel="stylesheet" crossorigin href="/assets/index-C3NB9eo7.css">
|
| 10 |
+
</head>
|
| 11 |
+
<body>
|
| 12 |
+
<div id="root"></div>
|
| 13 |
+
</body>
|
| 14 |
+
</html>
|
frontend/dist/vite.svg
ADDED
|
|
frontend/src/components/search/DatePicker.tsx
CHANGED
|
@@ -2,16 +2,20 @@ interface Props {
|
|
| 2 |
label: string;
|
| 3 |
value: string; // YYYY-MM-DD
|
| 4 |
onChange: (v: string) => void;
|
|
|
|
|
|
|
| 5 |
testId?: string;
|
| 6 |
}
|
| 7 |
|
| 8 |
-
export default function DatePicker({ label, value, onChange, testId }: Props) {
|
| 9 |
return (
|
| 10 |
<div className="relative min-w-[150px]" data-testid={testId}>
|
| 11 |
<label className="absolute -top-2 left-3 bg-white px-1 text-xs text-gray-500 z-10">{label}</label>
|
| 12 |
<input
|
| 13 |
type="date"
|
| 14 |
value={value}
|
|
|
|
|
|
|
| 15 |
onChange={e => onChange(e.target.value)}
|
| 16 |
className="w-full rounded-md border border-gray-300 px-3 py-3 text-sm text-gray-900 hover:border-gray-400 focus:border-[#1a73e8] focus:outline-none cursor-pointer"
|
| 17 |
aria-label={label}
|
|
|
|
| 2 |
label: string;
|
| 3 |
value: string; // YYYY-MM-DD
|
| 4 |
onChange: (v: string) => void;
|
| 5 |
+
min?: string; // YYYY-MM-DD
|
| 6 |
+
max?: string; // YYYY-MM-DD
|
| 7 |
testId?: string;
|
| 8 |
}
|
| 9 |
|
| 10 |
+
export default function DatePicker({ label, value, onChange, min, max, testId }: Props) {
|
| 11 |
return (
|
| 12 |
<div className="relative min-w-[150px]" data-testid={testId}>
|
| 13 |
<label className="absolute -top-2 left-3 bg-white px-1 text-xs text-gray-500 z-10">{label}</label>
|
| 14 |
<input
|
| 15 |
type="date"
|
| 16 |
value={value}
|
| 17 |
+
min={min}
|
| 18 |
+
max={max}
|
| 19 |
onChange={e => onChange(e.target.value)}
|
| 20 |
className="w-full rounded-md border border-gray-300 px-3 py-3 text-sm text-gray-900 hover:border-gray-400 focus:border-[#1a73e8] focus:outline-none cursor-pointer"
|
| 21 |
aria-label={label}
|
frontend/src/components/search/SearchForm.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
import { useState } from 'react';
|
| 2 |
import type { CabinClass, Passengers, TripType } from '../../api/types';
|
| 3 |
-
import { getDefaultDepartureDate, getDefaultReturnDate } from '../../utils/date';
|
| 4 |
import AirportInput from './AirportInput';
|
| 5 |
import ClassSelector from './ClassSelector';
|
| 6 |
import DatePicker from './DatePicker';
|
|
@@ -34,6 +34,15 @@ export default function SearchForm({ initial, onSearch, compact }: Props) {
|
|
| 34 |
const [destinationDisplay, setDestinationDisplay] = useState(initial?.destinationDisplay || '');
|
| 35 |
const [departureDate, setDepartureDate] = useState(initial?.departureDate || getDefaultDepartureDate());
|
| 36 |
const [returnDate, setReturnDate] = useState(initial?.returnDate || getDefaultReturnDate());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
const [passengers, setPassengers] = useState<Passengers>(initial?.passengers || { adults: 1, children: 0, infants: 0 });
|
| 38 |
const [cabinClass, setCabinClass] = useState<CabinClass>(initial?.cabinClass || 'economy');
|
| 39 |
|
|
@@ -87,7 +96,8 @@ export default function SearchForm({ initial, onSearch, compact }: Props) {
|
|
| 87 |
<DatePicker
|
| 88 |
label="Departure"
|
| 89 |
value={departureDate}
|
| 90 |
-
onChange={
|
|
|
|
| 91 |
testId="departure-date"
|
| 92 |
/>
|
| 93 |
|
|
@@ -96,6 +106,8 @@ export default function SearchForm({ initial, onSearch, compact }: Props) {
|
|
| 96 |
label="Return"
|
| 97 |
value={returnDate}
|
| 98 |
onChange={setReturnDate}
|
|
|
|
|
|
|
| 99 |
testId="return-date"
|
| 100 |
/>
|
| 101 |
)}
|
|
|
|
| 1 |
import { useState } from 'react';
|
| 2 |
import type { CabinClass, Passengers, TripType } from '../../api/types';
|
| 3 |
+
import { getDefaultDepartureDate, getDefaultReturnDate, getMaxBookingDate } from '../../utils/date';
|
| 4 |
import AirportInput from './AirportInput';
|
| 5 |
import ClassSelector from './ClassSelector';
|
| 6 |
import DatePicker from './DatePicker';
|
|
|
|
| 34 |
const [destinationDisplay, setDestinationDisplay] = useState(initial?.destinationDisplay || '');
|
| 35 |
const [departureDate, setDepartureDate] = useState(initial?.departureDate || getDefaultDepartureDate());
|
| 36 |
const [returnDate, setReturnDate] = useState(initial?.returnDate || getDefaultReturnDate());
|
| 37 |
+
const maxDate = getMaxBookingDate();
|
| 38 |
+
|
| 39 |
+
// Auto-adjust return date if it falls before departure date
|
| 40 |
+
function handleDepartureDateChange(newDate: string) {
|
| 41 |
+
setDepartureDate(newDate);
|
| 42 |
+
if (returnDate < newDate) {
|
| 43 |
+
setReturnDate(newDate);
|
| 44 |
+
}
|
| 45 |
+
}
|
| 46 |
const [passengers, setPassengers] = useState<Passengers>(initial?.passengers || { adults: 1, children: 0, infants: 0 });
|
| 47 |
const [cabinClass, setCabinClass] = useState<CabinClass>(initial?.cabinClass || 'economy');
|
| 48 |
|
|
|
|
| 96 |
<DatePicker
|
| 97 |
label="Departure"
|
| 98 |
value={departureDate}
|
| 99 |
+
onChange={handleDepartureDateChange}
|
| 100 |
+
max={maxDate}
|
| 101 |
testId="departure-date"
|
| 102 |
/>
|
| 103 |
|
|
|
|
| 106 |
label="Return"
|
| 107 |
value={returnDate}
|
| 108 |
onChange={setReturnDate}
|
| 109 |
+
min={departureDate}
|
| 110 |
+
max={maxDate}
|
| 111 |
testId="return-date"
|
| 112 |
/>
|
| 113 |
)}
|
frontend/src/pages/ResultsPage.tsx
CHANGED
|
@@ -70,19 +70,27 @@ export default function ResultsPage() {
|
|
| 70 |
return map;
|
| 71 |
}, [outboundFlights, returnFlights, sameAirlineDiscount, isRoundTrip]);
|
| 72 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 73 |
// Memoized: round-trip total for each return flight (given selected outbound)
|
| 74 |
const returnRoundTripPrices = useMemo(() => {
|
| 75 |
if (!selectedOutbound) return new Map<string, number>();
|
| 76 |
const map = new Map<string, number>();
|
| 77 |
-
for (const ret of
|
| 78 |
map.set(ret.id, roundTripTotal(selectedOutbound, ret, sameAirlineDiscount));
|
| 79 |
}
|
| 80 |
return map;
|
| 81 |
-
}, [
|
| 82 |
|
| 83 |
// Client-side filter + sort the results
|
| 84 |
const filteredFlights = useMemo(() => {
|
| 85 |
-
let flights = showingReturn ?
|
| 86 |
|
| 87 |
if (filters.max_stops !== null && filters.max_stops !== undefined) {
|
| 88 |
flights = flights.filter(f => f.stops <= filters.max_stops!);
|
|
@@ -130,7 +138,7 @@ export default function ResultsPage() {
|
|
| 130 |
}
|
| 131 |
|
| 132 |
return flights;
|
| 133 |
-
}, [outboundFlights,
|
| 134 |
|
| 135 |
// Split into "best" and "other" flights
|
| 136 |
const bestFlights = useMemo(() => filteredFlights.filter(f => f.is_best), [filteredFlights]);
|
|
@@ -231,7 +239,7 @@ export default function ResultsPage() {
|
|
| 231 |
<aside className="hidden lg:block w-64 flex-shrink-0">
|
| 232 |
<div className="sticky top-4 rounded-lg bg-white p-4 shadow-sm">
|
| 233 |
<FilterPanel
|
| 234 |
-
flights={showingReturn ?
|
| 235 |
filters={filters}
|
| 236 |
onChange={setFilters}
|
| 237 |
/>
|
|
|
|
| 70 |
return map;
|
| 71 |
}, [outboundFlights, returnFlights, sameAirlineDiscount, isRoundTrip]);
|
| 72 |
|
| 73 |
+
// Filter return flights: must depart at least 1 hour after outbound arrival
|
| 74 |
+
const eligibleReturnFlights = useMemo(() => {
|
| 75 |
+
if (!selectedOutbound) return returnFlights;
|
| 76 |
+
const outboundArrival = new Date(selectedOutbound.arrival).getTime();
|
| 77 |
+
const minDepartureTime = outboundArrival + 60 * 60 * 1000; // +1 hour
|
| 78 |
+
return returnFlights.filter(f => new Date(f.departure).getTime() >= minDepartureTime);
|
| 79 |
+
}, [returnFlights, selectedOutbound]);
|
| 80 |
+
|
| 81 |
// Memoized: round-trip total for each return flight (given selected outbound)
|
| 82 |
const returnRoundTripPrices = useMemo(() => {
|
| 83 |
if (!selectedOutbound) return new Map<string, number>();
|
| 84 |
const map = new Map<string, number>();
|
| 85 |
+
for (const ret of eligibleReturnFlights) {
|
| 86 |
map.set(ret.id, roundTripTotal(selectedOutbound, ret, sameAirlineDiscount));
|
| 87 |
}
|
| 88 |
return map;
|
| 89 |
+
}, [eligibleReturnFlights, selectedOutbound, sameAirlineDiscount]);
|
| 90 |
|
| 91 |
// Client-side filter + sort the results
|
| 92 |
const filteredFlights = useMemo(() => {
|
| 93 |
+
let flights = showingReturn ? eligibleReturnFlights : outboundFlights;
|
| 94 |
|
| 95 |
if (filters.max_stops !== null && filters.max_stops !== undefined) {
|
| 96 |
flights = flights.filter(f => f.stops <= filters.max_stops!);
|
|
|
|
| 138 |
}
|
| 139 |
|
| 140 |
return flights;
|
| 141 |
+
}, [outboundFlights, eligibleReturnFlights, showingReturn, isRoundTrip, selectedOutbound, outboundMinPrices, returnRoundTripPrices, filters, sortBy]);
|
| 142 |
|
| 143 |
// Split into "best" and "other" flights
|
| 144 |
const bestFlights = useMemo(() => filteredFlights.filter(f => f.is_best), [filteredFlights]);
|
|
|
|
| 239 |
<aside className="hidden lg:block w-64 flex-shrink-0">
|
| 240 |
<div className="sticky top-4 rounded-lg bg-white p-4 shadow-sm">
|
| 241 |
<FilterPanel
|
| 242 |
+
flights={showingReturn ? eligibleReturnFlights : outboundFlights}
|
| 243 |
filters={filters}
|
| 244 |
onChange={setFilters}
|
| 245 |
/>
|
frontend/src/utils/date.ts
CHANGED
|
@@ -16,6 +16,12 @@ export function getDefaultReturnDate(): string {
|
|
| 16 |
return toDateString(addDays(new Date(), 21));
|
| 17 |
}
|
| 18 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
export function getDaysInMonth(year: number, month: number): number {
|
| 20 |
return new Date(year, month, 0).getDate();
|
| 21 |
}
|
|
|
|
| 16 |
return toDateString(addDays(new Date(), 21));
|
| 17 |
}
|
| 18 |
|
| 19 |
+
export function getMaxBookingDate(): string {
|
| 20 |
+
const d = new Date();
|
| 21 |
+
d.setMonth(d.getMonth() + 12);
|
| 22 |
+
return toDateString(d);
|
| 23 |
+
}
|
| 24 |
+
|
| 25 |
export function getDaysInMonth(year: number, month: number): number {
|
| 26 |
return new Date(year, month, 0).getDate();
|
| 27 |
}
|