mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 13:21:46 +00:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a6ea73eab6 | |||
| 4ba6005ca3 | |||
| 09ab829b17 | |||
| 66a057a070 | |||
| f2ffea5ba4 | |||
| b0dee4dafb | |||
| beb48af8ed | |||
| e2be3ec191 | |||
| 68a1f9683e | |||
| 5c57116a68 | |||
| 48508b9df4 | |||
| c8250256a7 |
@@ -161,6 +161,7 @@ services:
|
|||||||
# - ADMIN_EMAIL=admin@trek.local # Initial admin e-mail — only used on first boot when no users exist
|
# - ADMIN_EMAIL=admin@trek.local # Initial admin e-mail — only used on first boot when no users exist
|
||||||
# - ADMIN_PASSWORD=changeme # Initial admin password — only used on first boot when no users exist
|
# - ADMIN_PASSWORD=changeme # Initial admin password — only used on first boot when no users exist
|
||||||
# - MCP_RATE_LIMIT=60 # Max MCP API requests per user per minute (default: 60)
|
# - MCP_RATE_LIMIT=60 # Max MCP API requests per user per minute (default: 60)
|
||||||
|
# - MCP_MAX_SESSION_PER_USER=5 # Max concurrent MCP sessions per user (default: 5)
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
- ./uploads:/app/uploads
|
- ./uploads:/app/uploads
|
||||||
@@ -303,6 +304,7 @@ trek.yourdomain.com {
|
|||||||
| **Other** | | |
|
| **Other** | | |
|
||||||
| `DEMO_MODE` | Enable demo mode (hourly data resets) | `false` |
|
| `DEMO_MODE` | Enable demo mode (hourly data resets) | `false` |
|
||||||
| `MCP_RATE_LIMIT` | Max MCP API requests per user per minute | `60` |
|
| `MCP_RATE_LIMIT` | Max MCP API requests per user per minute | `60` |
|
||||||
|
| `MCP_MAX_SESSION_PER_USER` | Max concurrent MCP sessions per user | `5` |
|
||||||
|
|
||||||
## Optional API Keys
|
## Optional API Keys
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ env:
|
|||||||
# Enable demo mode (hourly data resets).
|
# Enable demo mode (hourly data resets).
|
||||||
# MCP_RATE_LIMIT: "60"
|
# MCP_RATE_LIMIT: "60"
|
||||||
# Max MCP API requests per user per minute. Defaults to 60.
|
# Max MCP API requests per user per minute. Defaults to 60.
|
||||||
|
# MCP_MAX_SESSION_PER_USER: "5"
|
||||||
|
# Max concurrent MCP sessions per user. Defaults to 5.
|
||||||
|
|
||||||
|
|
||||||
# Secret environment variables stored in a Kubernetes Secret.
|
# Secret environment variables stored in a Kubernetes Secret.
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "trek-client",
|
"name": "trek-client",
|
||||||
"version": "2.9.4",
|
"version": "2.9.10",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "trek-client",
|
"name": "trek-client",
|
||||||
"version": "2.9.4",
|
"version": "2.9.10",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@react-pdf/renderer": "^4.3.2",
|
"@react-pdf/renderer": "^4.3.2",
|
||||||
"axios": "^1.6.7",
|
"axios": "^1.6.7",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "trek-client",
|
"name": "trek-client",
|
||||||
"version": "2.9.4",
|
"version": "2.9.10",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -248,8 +248,10 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({
|
|||||||
const getTransportForDay = (dayId: number) => {
|
const getTransportForDay = (dayId: number) => {
|
||||||
const day = days.find(d => d.id === dayId)
|
const day = days.find(d => d.id === dayId)
|
||||||
if (!day?.date) return []
|
if (!day?.date) return []
|
||||||
|
const dayAssignmentIds = (assignments[String(dayId)] || []).map(a => a.id)
|
||||||
return reservations.filter(r => {
|
return reservations.filter(r => {
|
||||||
if (!r.reservation_time || r.type === 'hotel') return false
|
if (!r.reservation_time || r.type === 'hotel') return false
|
||||||
|
if (r.assignment_id && dayAssignmentIds.includes(r.assignment_id)) return false
|
||||||
const startDate = r.reservation_time.split('T')[0]
|
const startDate = r.reservation_time.split('T')[0]
|
||||||
const endDate = getEndDate(r)
|
const endDate = getEndDate(r)
|
||||||
|
|
||||||
@@ -341,14 +343,13 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({
|
|||||||
initTransportPositions(dayId)
|
initTransportPositions(dayId)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build base list: ALL places (timed and untimed) + notes sorted by order_index/sort_order
|
// All places keep their order_index — untimed can be freely moved, timed auto-sort when time is set
|
||||||
// Places keep their order_index ordering — only transports are inserted based on time.
|
|
||||||
const baseItems = [
|
const baseItems = [
|
||||||
...da.map(a => ({ type: 'place' as const, sortKey: a.order_index, data: a })),
|
...da.map(a => ({ type: 'place' as const, sortKey: a.order_index, data: a })),
|
||||||
...dn.map(n => ({ type: 'note' as const, sortKey: n.sort_order, data: n })),
|
...dn.map(n => ({ type: 'note' as const, sortKey: n.sort_order, data: n })),
|
||||||
].sort((a, b) => a.sortKey - b.sortKey)
|
].sort((a, b) => a.sortKey - b.sortKey)
|
||||||
|
|
||||||
// Only transports are inserted among base items based on time/position
|
// Transports are inserted among places based on time
|
||||||
const timedTransports = transport.map(r => ({
|
const timedTransports = transport.map(r => ({
|
||||||
type: 'transport' as const,
|
type: 'transport' as const,
|
||||||
data: r,
|
data: r,
|
||||||
@@ -360,22 +361,20 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({
|
|||||||
return timedTransports.map((item, i) => ({ ...item, sortKey: i }))
|
return timedTransports.map((item, i) => ({ ...item, sortKey: i }))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert transports among base items using persisted position or time-to-position mapping.
|
// Insert transports among places based on per-day position or time
|
||||||
const result = [...baseItems]
|
const result = [...baseItems]
|
||||||
for (let ti = 0; ti < timedTransports.length; ti++) {
|
for (let ti = 0; ti < timedTransports.length; ti++) {
|
||||||
const timed = timedTransports[ti]
|
const timed = timedTransports[ti]
|
||||||
const minutes = timed.minutes
|
const minutes = timed.minutes
|
||||||
|
|
||||||
// Use per-day position if available, fallback to global position
|
// Use per-day position if explicitly set by user reorder
|
||||||
const dayObj = days.find(d => d.id === dayId)
|
|
||||||
const perDayPos = timed.data.day_positions?.[dayId] ?? timed.data.day_positions?.[String(dayId)]
|
const perDayPos = timed.data.day_positions?.[dayId] ?? timed.data.day_positions?.[String(dayId)]
|
||||||
const effectivePos = perDayPos ?? timed.data.day_plan_position
|
if (perDayPos != null) {
|
||||||
if (effectivePos != null) {
|
result.push({ type: timed.type, sortKey: perDayPos, data: timed.data })
|
||||||
result.push({ type: timed.type, sortKey: effectivePos, data: timed.data })
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find insertion position: after the last base item with time <= this transport's time
|
// Find insertion position: after the last place with time <= this transport's time
|
||||||
let insertAfterKey = -Infinity
|
let insertAfterKey = -Infinity
|
||||||
for (const item of result) {
|
for (const item of result) {
|
||||||
if (item.type === 'place') {
|
if (item.type === 'place') {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { useToast } from '../shared/Toast'
|
|||||||
import { useTranslation } from '../../i18n'
|
import { useTranslation } from '../../i18n'
|
||||||
import { CustomDatePicker } from '../shared/CustomDateTimePicker'
|
import { CustomDatePicker } from '../shared/CustomDateTimePicker'
|
||||||
import CustomTimePicker from '../shared/CustomTimePicker'
|
import CustomTimePicker from '../shared/CustomTimePicker'
|
||||||
|
import { getAuthUrl } from '../../api/authUrl'
|
||||||
import type { Day, Place, Reservation, TripFile, AssignmentsMap, Accommodation } from '../../types'
|
import type { Day, Place, Reservation, TripFile, AssignmentsMap, Accommodation } from '../../types'
|
||||||
|
|
||||||
const TYPE_OPTIONS = [
|
const TYPE_OPTIONS = [
|
||||||
@@ -113,6 +114,9 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
|
|||||||
if (rawEnd.includes('T')) {
|
if (rawEnd.includes('T')) {
|
||||||
endDate = rawEnd.split('T')[0]
|
endDate = rawEnd.split('T')[0]
|
||||||
endTime = rawEnd.split('T')[1]?.slice(0, 5) || ''
|
endTime = rawEnd.split('T')[1]?.slice(0, 5) || ''
|
||||||
|
} else if (/^\d{4}-\d{2}-\d{2}$/.test(rawEnd)) {
|
||||||
|
endDate = rawEnd
|
||||||
|
endTime = ''
|
||||||
}
|
}
|
||||||
setForm({
|
setForm({
|
||||||
title: reservation.title || '',
|
title: reservation.title || '',
|
||||||
@@ -166,6 +170,22 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
|
|||||||
const startDate = form.reservation_time.split('T')[0]
|
const startDate = form.reservation_time.split('T')[0]
|
||||||
const startTime = form.reservation_time.split('T')[1] || '00:00'
|
const startTime = form.reservation_time.split('T')[1] || '00:00'
|
||||||
const endTime = form.reservation_end_time || '00:00'
|
const endTime = form.reservation_end_time || '00:00'
|
||||||
|
// For flights, compare in UTC using timezone offsets
|
||||||
|
if (form.type === 'flight') {
|
||||||
|
const parseOffset = (tz: string): number | null => {
|
||||||
|
if (!tz) return null
|
||||||
|
const m = tz.trim().match(/^(?:UTC|GMT)?\s*([+-])(\d{1,2})(?::(\d{2}))?$/i)
|
||||||
|
if (!m) return null
|
||||||
|
const sign = m[1] === '+' ? 1 : -1
|
||||||
|
return sign * (parseInt(m[2]) * 60 + parseInt(m[3] || '0'))
|
||||||
|
}
|
||||||
|
const depOffset = parseOffset(form.meta_departure_timezone)
|
||||||
|
const arrOffset = parseOffset(form.meta_arrival_timezone)
|
||||||
|
if (depOffset === null || arrOffset === null) return false
|
||||||
|
const depMinutes = new Date(`${startDate}T${startTime}`).getTime() - depOffset * 60000
|
||||||
|
const arrMinutes = new Date(`${form.end_date}T${endTime}`).getTime() - arrOffset * 60000
|
||||||
|
return arrMinutes <= depMinutes
|
||||||
|
}
|
||||||
const startFull = `${startDate}T${startTime}`
|
const startFull = `${startDate}T${startTime}`
|
||||||
const endFull = `${form.end_date}T${endTime}`
|
const endFull = `${form.end_date}T${endTime}`
|
||||||
return endFull <= startFull
|
return endFull <= startFull
|
||||||
@@ -204,7 +224,8 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
|
|||||||
}
|
}
|
||||||
const saveData: Record<string, any> = {
|
const saveData: Record<string, any> = {
|
||||||
title: form.title, type: form.type, status: form.status,
|
title: form.title, type: form.type, status: form.status,
|
||||||
reservation_time: form.reservation_time, reservation_end_time: combinedEndTime,
|
reservation_time: form.type === 'hotel' ? null : form.reservation_time,
|
||||||
|
reservation_end_time: form.type === 'hotel' ? null : combinedEndTime,
|
||||||
location: form.location, confirmation_number: form.confirmation_number,
|
location: form.location, confirmation_number: form.confirmation_number,
|
||||||
notes: form.notes,
|
notes: form.notes,
|
||||||
assignment_id: form.assignment_id || null,
|
assignment_id: form.assignment_id || null,
|
||||||
@@ -364,7 +385,8 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
|
|||||||
value={(() => { const [, t] = (form.reservation_time || '').split('T'); return t || '' })()}
|
value={(() => { const [, t] = (form.reservation_time || '').split('T'); return t || '' })()}
|
||||||
onChange={t => {
|
onChange={t => {
|
||||||
const [d] = (form.reservation_time || '').split('T')
|
const [d] = (form.reservation_time || '').split('T')
|
||||||
const date = d || new Date().toISOString().split('T')[0]
|
const selectedDay = days.find(dy => dy.id === selectedDayId)
|
||||||
|
const date = d || selectedDay?.date || new Date().toISOString().split('T')[0]
|
||||||
set('reservation_time', t ? `${date}T${t}` : date)
|
set('reservation_time', t ? `${date}T${t}` : date)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
@@ -565,7 +587,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
|
|||||||
<div key={f.id} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '5px 10px', background: 'var(--bg-secondary)', borderRadius: 8 }}>
|
<div key={f.id} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '5px 10px', background: 'var(--bg-secondary)', borderRadius: 8 }}>
|
||||||
<FileText size={12} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
|
<FileText size={12} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
|
||||||
<span style={{ flex: 1, fontSize: 12, color: 'var(--text-secondary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
|
<span style={{ flex: 1, fontSize: 12, color: 'var(--text-secondary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
|
||||||
<a href={f.url} target="_blank" rel="noreferrer" style={{ color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }}><ExternalLink size={11} /></a>
|
<a href="#" onClick={async (e) => { e.preventDefault(); const u = await getAuthUrl(f.url, 'download'); window.open(u, '_blank', 'noreferrer') }} style={{ color: 'var(--text-faint)', display: 'flex', flexShrink: 0, cursor: 'pointer' }}><ExternalLink size={11} /></a>
|
||||||
<button type="button" onClick={async () => {
|
<button type="button" onClick={async () => {
|
||||||
// Always unlink, never delete the file
|
// Always unlink, never delete the file
|
||||||
// Clear primary reservation_id if it points to this reservation
|
// Clear primary reservation_id if it points to this reservation
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
Calendar, Hash, CheckCircle2, Circle, Pencil, Trash2, Plus, ChevronDown, ChevronRight, Users,
|
Calendar, Hash, CheckCircle2, Circle, Pencil, Trash2, Plus, ChevronDown, ChevronRight, Users,
|
||||||
ExternalLink, BookMarked, Lightbulb, Link2, Clock,
|
ExternalLink, BookMarked, Lightbulb, Link2, Clock,
|
||||||
} from 'lucide-react'
|
} from 'lucide-react'
|
||||||
|
import { getAuthUrl } from '../../api/authUrl'
|
||||||
import type { Reservation, Day, TripFile, AssignmentsMap } from '../../types'
|
import type { Reservation, Day, TripFile, AssignmentsMap } from '../../types'
|
||||||
|
|
||||||
interface AssignmentLookupEntry {
|
interface AssignmentLookupEntry {
|
||||||
@@ -138,7 +139,7 @@ function ReservationCard({ r, tripId, onEdit, onDelete, files = [], onNavigateTo
|
|||||||
<div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.date')}</div>
|
<div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.date')}</div>
|
||||||
<div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>
|
<div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>
|
||||||
{fmtDate(r.reservation_time)}
|
{fmtDate(r.reservation_time)}
|
||||||
{r.reservation_end_time?.includes('T') && r.reservation_end_time.split('T')[0] !== r.reservation_time.split('T')[0] && (
|
{r.reservation_end_time && (r.reservation_end_time.includes('T') ? r.reservation_end_time.split('T')[0] : r.reservation_end_time) !== r.reservation_time.split('T')[0] && (
|
||||||
<> – {fmtDate(r.reservation_end_time)}</>
|
<> – {fmtDate(r.reservation_end_time)}</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -252,7 +253,7 @@ function ReservationCard({ r, tripId, onEdit, onDelete, files = [], onNavigateTo
|
|||||||
<div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('files.title')}</div>
|
<div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('files.title')}</div>
|
||||||
<div style={{ padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', display: 'flex', flexDirection: 'column', gap: 3 }}>
|
<div style={{ padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', display: 'flex', flexDirection: 'column', gap: 3 }}>
|
||||||
{attachedFiles.map(f => (
|
{attachedFiles.map(f => (
|
||||||
<a key={f.id} href={f.url} target="_blank" rel="noreferrer" style={{ display: 'flex', alignItems: 'center', gap: 4, textDecoration: 'none', cursor: 'pointer' }}>
|
<a key={f.id} href="#" onClick={async (e) => { e.preventDefault(); const u = await getAuthUrl(f.url, 'download'); window.open(u, '_blank', 'noreferrer') }} style={{ display: 'flex', alignItems: 'center', gap: 4, textDecoration: 'none', cursor: 'pointer' }}>
|
||||||
<FileText size={9} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
|
<FileText size={9} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
|
||||||
<span style={{ fontSize: 10, color: 'var(--text-muted)', flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
|
<span style={{ fontSize: 10, color: 'var(--text-muted)', flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -480,15 +480,13 @@ export default function AtlasPage(): React.ReactElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Match feature by ISO code OR region name
|
// Match feature by ISO code OR region name (native or English)
|
||||||
const isVisitedFeature = (f: any) => {
|
const isVisitedFeature = (f: any) => {
|
||||||
if (visitedRegionCodes.has(f.properties?.iso_3166_2)) return true
|
if (visitedRegionCodes.has(f.properties?.iso_3166_2)) return true
|
||||||
const name = (f.properties?.name || '').toLowerCase()
|
const name = (f.properties?.name || '').toLowerCase()
|
||||||
if (visitedRegionNames.has(name)) return true
|
if (visitedRegionNames.has(name)) return true
|
||||||
// Fuzzy: check if any visited name is contained in feature name or vice versa
|
const nameEn = (f.properties?.name_en || '').toLowerCase()
|
||||||
for (const vn of visitedRegionNames) {
|
if (nameEn && visitedRegionNames.has(nameEn)) return true
|
||||||
if (name.includes(vn) || vn.includes(name)) return true
|
|
||||||
}
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -535,15 +533,16 @@ export default function AtlasPage(): React.ReactElement {
|
|||||||
},
|
},
|
||||||
onEachFeature: (feature, layer) => {
|
onEachFeature: (feature, layer) => {
|
||||||
const regionName = feature?.properties?.name || ''
|
const regionName = feature?.properties?.name || ''
|
||||||
|
const regionNameEn = feature?.properties?.name_en || ''
|
||||||
const countryName = feature?.properties?.admin || ''
|
const countryName = feature?.properties?.admin || ''
|
||||||
const regionCode = feature?.properties?.iso_3166_2 || ''
|
const regionCode = feature?.properties?.iso_3166_2 || ''
|
||||||
const countryA2 = (feature?.properties?.iso_a2 || '').toUpperCase()
|
const countryA2 = (feature?.properties?.iso_a2 || '').toUpperCase()
|
||||||
const visited = isVisitedFeature(feature)
|
const visited = isVisitedFeature(feature)
|
||||||
const count = regionPlaceCounts[regionCode] || regionPlaceCounts[regionName.toLowerCase()] || 0
|
const count = regionPlaceCounts[regionCode] || regionPlaceCounts[regionName.toLowerCase()] || regionPlaceCounts[regionNameEn.toLowerCase()] || 0
|
||||||
layer.on('click', () => {
|
layer.on('click', () => {
|
||||||
if (!countryA2) return
|
if (!countryA2) return
|
||||||
if (visited) {
|
if (visited) {
|
||||||
const regionEntry = visitedRegions[countryA2]?.find(r => r.code === regionCode)
|
const regionEntry = visitedRegions[countryA2]?.find(r => r.code === regionCode || r.name.toLowerCase() === regionNameEn.toLowerCase())
|
||||||
if (regionEntry?.manuallyMarked) {
|
if (regionEntry?.manuallyMarked) {
|
||||||
setConfirmActionRef.current({
|
setConfirmActionRef.current({
|
||||||
type: 'unmark-region',
|
type: 'unmark-region',
|
||||||
|
|||||||
@@ -431,7 +431,7 @@ export default function TripPlannerPage(): React.ReactElement | null {
|
|||||||
const handleSaveReservation = async (data) => {
|
const handleSaveReservation = async (data) => {
|
||||||
try {
|
try {
|
||||||
if (editingReservation) {
|
if (editingReservation) {
|
||||||
const r = await tripActions.updateReservation(tripId, editingReservation.id, data)
|
const r = await tripActions.updateReservation(tripId, editingReservation.id, { ...data, day_id: selectedDayId || null })
|
||||||
toast.success(t('trip.toast.reservationUpdated'))
|
toast.success(t('trip.toast.reservationUpdated'))
|
||||||
setShowReservationModal(false)
|
setShowReservationModal(false)
|
||||||
if (data.type === 'hotel') {
|
if (data.type === 'hotel') {
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ services:
|
|||||||
# - ADMIN_EMAIL=admin@trek.local # Initial admin e-mail — only used on first boot when no users exist
|
# - ADMIN_EMAIL=admin@trek.local # Initial admin e-mail — only used on first boot when no users exist
|
||||||
# - ADMIN_PASSWORD=changeme # Initial admin password — only used on first boot when no users exist
|
# - ADMIN_PASSWORD=changeme # Initial admin password — only used on first boot when no users exist
|
||||||
# - MCP_RATE_LIMIT=60 # Max MCP API requests per user per minute (default: 60)
|
# - MCP_RATE_LIMIT=60 # Max MCP API requests per user per minute (default: 60)
|
||||||
|
# - MCP_MAX_SESSION_PER_USER=5 # Max concurrent MCP sessions per user (default: 5)
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
- ./uploads:/app/uploads
|
- ./uploads:/app/uploads
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ OIDC_SCOPE=openid email profile # Fully overrides the default. Add extra scopes
|
|||||||
DEMO_MODE=false # Demo mode - resets data hourly
|
DEMO_MODE=false # Demo mode - resets data hourly
|
||||||
|
|
||||||
# MCP_RATE_LIMIT=60 # Max MCP API requests per user per minute (default: 60)
|
# MCP_RATE_LIMIT=60 # Max MCP API requests per user per minute (default: 60)
|
||||||
|
# MCP_MAX_SESSION_PER_USER=5 # Max concurrent MCP sessions per user (default: 5)
|
||||||
|
|
||||||
# Initial admin account — only used on first boot when no users exist yet.
|
# Initial admin account — only used on first boot when no users exist yet.
|
||||||
# If both are set the admin account is created with these credentials.
|
# If both are set the admin account is created with these credentials.
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "trek-server",
|
"name": "trek-server",
|
||||||
"version": "2.9.4",
|
"version": "2.9.10",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "trek-server",
|
"name": "trek-server",
|
||||||
"version": "2.9.4",
|
"version": "2.9.10",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@modelcontextprotocol/sdk": "^1.28.0",
|
"@modelcontextprotocol/sdk": "^1.28.0",
|
||||||
"archiver": "^6.0.1",
|
"archiver": "^6.0.1",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "trek-server",
|
"name": "trek-server",
|
||||||
"version": "2.9.4",
|
"version": "2.9.10",
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node --import tsx src/index.ts",
|
"start": "node --import tsx src/index.ts",
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ interface McpSession {
|
|||||||
const sessions = new Map<string, McpSession>();
|
const sessions = new Map<string, McpSession>();
|
||||||
|
|
||||||
const SESSION_TTL_MS = 60 * 60 * 1000; // 1 hour
|
const SESSION_TTL_MS = 60 * 60 * 1000; // 1 hour
|
||||||
const MAX_SESSIONS_PER_USER = 5;
|
const sessionParsed = Number.parseInt(process.env.MCP_MAX_SESSION_PER_USER ?? "");
|
||||||
|
const MAX_SESSIONS_PER_USER = Number.isFinite(sessionParsed) && sessionParsed > 0 ? sessionParsed : 5;
|
||||||
const RATE_LIMIT_WINDOW_MS = 60 * 1000; // 1 minute
|
const RATE_LIMIT_WINDOW_MS = 60 * 1000; // 1 minute
|
||||||
const parsed = Number.parseInt(process.env.MCP_RATE_LIMIT ?? "");
|
const parsed = Number.parseInt(process.env.MCP_RATE_LIMIT ?? "");
|
||||||
const RATE_LIMIT_MAX = Number.isFinite(parsed) && parsed > 0 ? parsed : 60; // requests per minute per user
|
const RATE_LIMIT_MAX = Number.isFinite(parsed) && parsed > 0 ? parsed : 60; // requests per minute per user
|
||||||
|
|||||||
@@ -168,6 +168,34 @@ export function getParticipants(assignmentId: string | number) {
|
|||||||
export function updateTime(id: string | number, placeTime: string | null, endTime: string | null) {
|
export function updateTime(id: string | number, placeTime: string | null, endTime: string | null) {
|
||||||
db.prepare('UPDATE day_assignments SET assignment_time = ?, assignment_end_time = ? WHERE id = ?')
|
db.prepare('UPDATE day_assignments SET assignment_time = ?, assignment_end_time = ? WHERE id = ?')
|
||||||
.run(placeTime ?? null, endTime ?? null, id);
|
.run(placeTime ?? null, endTime ?? null, id);
|
||||||
|
|
||||||
|
// Auto-sort: reorder timed assignments chronologically within the day
|
||||||
|
if (placeTime) {
|
||||||
|
const assignment = db.prepare('SELECT day_id FROM day_assignments WHERE id = ?').get(id) as { day_id: number } | undefined;
|
||||||
|
if (assignment) {
|
||||||
|
const dayAssignments = db.prepare(`
|
||||||
|
SELECT da.id, COALESCE(da.assignment_time, p.place_time) as effective_time
|
||||||
|
FROM day_assignments da
|
||||||
|
JOIN places p ON da.place_id = p.id
|
||||||
|
WHERE da.day_id = ?
|
||||||
|
ORDER BY da.order_index ASC
|
||||||
|
`).all(assignment.day_id) as { id: number; effective_time: string | null }[];
|
||||||
|
|
||||||
|
// Separate timed and untimed, sort timed by time
|
||||||
|
const timed = dayAssignments.filter(a => a.effective_time).sort((a, b) => {
|
||||||
|
const ta = a.effective_time!.includes(':') ? a.effective_time! : '99:99';
|
||||||
|
const tb = b.effective_time!.includes(':') ? b.effective_time! : '99:99';
|
||||||
|
return ta.localeCompare(tb);
|
||||||
|
});
|
||||||
|
const untimed = dayAssignments.filter(a => !a.effective_time);
|
||||||
|
|
||||||
|
// Interleave: timed in chronological order, untimed keep relative position
|
||||||
|
const reordered = [...timed, ...untimed];
|
||||||
|
const update = db.prepare('UPDATE day_assignments SET order_index = ? WHERE id = ?');
|
||||||
|
reordered.forEach((a, i) => update.run(i, a.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return getAssignmentWithPlace(Number(id));
|
return getAssignmentWithPlace(Number(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -421,7 +421,7 @@ async function reverseGeocodeRegion(lat: number, lng: number): Promise<RegionInf
|
|||||||
if (regionCode && /^[A-Z]{2}-\d+[A-Z]$/i.test(regionCode)) {
|
if (regionCode && /^[A-Z]{2}-\d+[A-Z]$/i.test(regionCode)) {
|
||||||
regionCode = regionCode.replace(/[A-Z]$/i, '');
|
regionCode = regionCode.replace(/[A-Z]$/i, '');
|
||||||
}
|
}
|
||||||
const regionName = data.address?.county || data.address?.state || data.address?.province || data.address?.region || data.address?.city || null;
|
const regionName = data.address?.state || data.address?.province || data.address?.region || data.address?.county || data.address?.city || null;
|
||||||
if (!countryCode || !regionName) { regionCache.set(key, null); return null; }
|
if (!countryCode || !regionName) { regionCache.set(key, null); return null; }
|
||||||
const info: RegionInfo = {
|
const info: RegionInfo = {
|
||||||
country_code: countryCode,
|
country_code: countryCode,
|
||||||
|
|||||||
@@ -178,7 +178,10 @@ export async function pipeAsset(url: string, response: Response, headers?: Recor
|
|||||||
await pipeline(Readable.fromWeb(resp.body as any), response);
|
await pipeline(Readable.fromWeb(resp.body as any), response);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (response.headersSent) return;
|
if (response.headersSent) {
|
||||||
|
response.end();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (error instanceof SsrfBlockedError) {
|
if (error instanceof SsrfBlockedError) {
|
||||||
response.status(400).json({ error: error.message });
|
response.status(400).json({ error: error.message });
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -234,8 +234,8 @@ export function updateReservation(id: string | number, tripId: string | number,
|
|||||||
WHERE id = ?
|
WHERE id = ?
|
||||||
`).run(
|
`).run(
|
||||||
title || null,
|
title || null,
|
||||||
reservation_time !== undefined ? (reservation_time || null) : current.reservation_time,
|
(type ?? current.type) === 'hotel' ? null : (reservation_time !== undefined ? (reservation_time || null) : current.reservation_time),
|
||||||
reservation_end_time !== undefined ? (reservation_end_time || null) : current.reservation_end_time,
|
(type ?? current.type) === 'hotel' ? null : (reservation_end_time !== undefined ? (reservation_end_time || null) : current.reservation_end_time),
|
||||||
location !== undefined ? (location || null) : current.location,
|
location !== undefined ? (location || null) : current.location,
|
||||||
confirmation_number !== undefined ? (confirmation_number || null) : current.confirmation_number,
|
confirmation_number !== undefined ? (confirmation_number || null) : current.confirmation_number,
|
||||||
notes !== undefined ? (notes || null) : current.notes,
|
notes !== undefined ? (notes || null) : current.notes,
|
||||||
|
|||||||
@@ -202,3 +202,184 @@ describe('Bucket list', () => {
|
|||||||
expect(res.status).toBe(404);
|
expect(res.status).toBe(404);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Mark/unmark region', () => {
|
||||||
|
it('ATLAS-009 — POST /region/:code/mark marks a region as visited', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect(res.body.success).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-009 — POST /region/:code/mark without name returns 400', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ country_code: 'DE' });
|
||||||
|
|
||||||
|
expect(res.status).toBe(400);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-009 — POST /region/:code/mark without country_code returns 400', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen' });
|
||||||
|
|
||||||
|
expect(res.status).toBe(400);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-009 — marking a region also auto-marks the parent country', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
const stats = await request(app)
|
||||||
|
.get('/api/addons/atlas/stats')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
||||||
|
expect(codes).toContain('DE');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-009 — marking the same region twice is idempotent', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-010 — GET /regions returns marked regions grouped by country', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-BY/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Bayern', country_code: 'DE' });
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.get('/api/addons/atlas/regions')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect(res.body).toHaveProperty('regions');
|
||||||
|
const deRegions = res.body.regions['DE'] as any[];
|
||||||
|
expect(deRegions).toBeDefined();
|
||||||
|
const codes = deRegions.map((r: any) => r.code);
|
||||||
|
expect(codes).toContain('DE-NW');
|
||||||
|
expect(codes).toContain('DE-BY');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-011 — DELETE /region/:code/mark unmarks a region', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
const del = await request(app)
|
||||||
|
.delete('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
expect(del.status).toBe(200);
|
||||||
|
expect(del.body.success).toBe(true);
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.get('/api/addons/atlas/regions')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
const deRegions = res.body.regions['DE'] as any[] | undefined;
|
||||||
|
const codes = (deRegions || []).map((r: any) => r.code);
|
||||||
|
expect(codes).not.toContain('DE-NW');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-011 — unmark last region in country also unmarks the parent country', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.delete('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
const stats = await request(app)
|
||||||
|
.get('/api/addons/atlas/stats')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
||||||
|
expect(codes).not.toContain('DE');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-011 — unmark one region keeps country when another region remains', async () => {
|
||||||
|
const { user } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-BY/mark')
|
||||||
|
.set('Cookie', authCookie(user.id))
|
||||||
|
.send({ name: 'Bayern', country_code: 'DE' });
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.delete('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
const stats = await request(app)
|
||||||
|
.get('/api/addons/atlas/stats')
|
||||||
|
.set('Cookie', authCookie(user.id));
|
||||||
|
|
||||||
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
||||||
|
expect(codes).toContain('DE');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ATLAS-011 — regions are isolated between users', async () => {
|
||||||
|
const { user: user1 } = createUser(testDb);
|
||||||
|
const { user: user2 } = createUser(testDb);
|
||||||
|
|
||||||
|
await request(app)
|
||||||
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
||||||
|
.set('Cookie', authCookie(user1.id))
|
||||||
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
||||||
|
|
||||||
|
const res = await request(app)
|
||||||
|
.get('/api/addons/atlas/regions')
|
||||||
|
.set('Cookie', authCookie(user2.id));
|
||||||
|
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const deRegions = res.body.regions['DE'] as any[] | undefined;
|
||||||
|
expect(deRegions).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -58,4 +58,5 @@
|
|||||||
<!-- Other -->
|
<!-- Other -->
|
||||||
<Config Name="DEMO_MODE" Target="DEMO_MODE" Default="false" Mode="" Description="Enable demo mode (resets all data hourly). Not intended for regular use." Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
|
<Config Name="DEMO_MODE" Target="DEMO_MODE" Default="false" Mode="" Description="Enable demo mode (resets all data hourly). Not intended for regular use." Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
|
||||||
<Config Name="MCP_RATE_LIMIT" Target="MCP_RATE_LIMIT" Default="60" Mode="" Description="Max MCP API requests per user per minute." Type="Variable" Display="advanced" Required="false" Mask="false">60</Config>
|
<Config Name="MCP_RATE_LIMIT" Target="MCP_RATE_LIMIT" Default="60" Mode="" Description="Max MCP API requests per user per minute." Type="Variable" Display="advanced" Required="false" Mask="false">60</Config>
|
||||||
|
<Config Name="MCP_MAX_SESSION_PER_USER" Target="MCP_MAX_SESSION_PER_USER" Default="5" Mode="" Description="Max concurrent MCP sessions per user." Type="Variable" Display="advanced" Required="false" Mask="false">5</Config>
|
||||||
</Container>
|
</Container>
|
||||||
|
|||||||
Reference in New Issue
Block a user