Browse Source

feat: add authentication page and custom trip order detail management with API services

develop
parent
commit
9a03e6c7aa
  1. 22
      src/features/auth/LoginPage.tsx
  2. 34
      src/features/custom-trip/CustomTripOrderDetailPage.tsx
  3. 16
      src/features/custom-trip/components/CustomTripOrderReviewDialog.tsx
  4. 9
      src/features/custom-trip/components/CustomTripOrdersTab.tsx
  5. 15
      src/features/custom-trip/services/custom-trip-api.ts
  6. 2
      src/features/custom-trip/types.ts
  7. 11
      src/locales/ar.json
  8. 11
      src/locales/en.json
  9. 11
      src/locales/fa.json
  10. 2
      vite.config.ts

22
src/features/auth/LoginPage.tsx

@ -43,11 +43,6 @@ export default function LoginPage() {
loginMutation.mutate({ email: email.trim(), password })
}
const fillDemo = () => {
setEmail('admin@gmail.com')
setPassword('admin')
}
const errorMessage =
loginMutation.error instanceof ApiError
? loginMutation.error.message
@ -78,23 +73,6 @@ export default function LoginPage() {
onSubmit={submit}
className="space-y-4 rounded-2xl border border-border-soft bg-card/60 p-6 shadow-2xl backdrop-blur"
>
{/* راهنمای لاگین دمو */}
<div className="flex items-center justify-between rounded-xl border border-primary/20 bg-primary/10 p-3 text-xs">
<div>
<span className="font-bold text-primary block">{t('auth.demoBoxTitle')}</span>
<span dir="ltr" className="text-[11px] text-grey-2 font-mono">admin@gmail.com / admin</span>
</div>
<Button
type="button"
variant="outline"
size="sm"
onClick={fillDemo}
className="h-7 text-[11px]"
>
{t('auth.autoFill')}
</Button>
</div>
<Field label={t('auth.emailLabel')}>
<Input
type="email"

34
src/features/custom-trip/CustomTripOrderDetailPage.tsx

@ -226,7 +226,7 @@ export default function CustomTripOrderDetailPage() {
const normalized = normalizeLegsChain(
baseOrigin,
orderData.legs || [],
orderData.legs?.[0]?.departureDate || orderData.created
orderData.startDate || orderData.legs?.[0]?.departureDate || orderData.created
)
setEditLegs(normalized)
setEditPrice(Number(orderData.finalPrice ?? orderData.priceEstimate ?? 0))
@ -530,6 +530,8 @@ export default function CustomTripOrderDetailPage() {
try {
const updated = await updateCustomTripOrder(order.id, {
originCity: editOriginCity,
startDate: editLegs[0]?.departureDate || order.startDate || null,
travelDateText: order.travelDateText || editLegs[0]?.departureDate || '',
legs: editLegs,
priceEstimate: editPrice,
adminNotes: editNotes,
@ -563,6 +565,8 @@ export default function CustomTripOrderDetailPage() {
try {
const updated = await updateCustomTripOrder(order.id, {
originCity: editOriginCity,
startDate: editLegs[0]?.departureDate || order.startDate || null,
travelDateText: order.travelDateText || editLegs[0]?.departureDate || '',
legs: editLegs,
priceEstimate: editPrice,
adminNotes: editNotes,
@ -1708,6 +1712,34 @@ export default function CustomTripOrderDetailPage() {
</span>
</div>
<div className="flex items-start justify-between gap-2 pb-2 border-b border-border/50">
<span className="text-muted-foreground text-xs shrink-0">{t('customTrip.tripStartDate')}:</span>
<div className="text-end">
<span className="font-mono font-bold text-primary block">
{(editLegs[0]?.departureDate || order.startDate)
? formatDualDate((editLegs[0]?.departureDate || order.startDate) as string, language)
: '—'}
</span>
{order.travelDateText && !/^\d{4}-\d{2}-\d{2}/.test(order.travelDateText) && (
<span className="text-[11px] text-muted-foreground block mt-0.5">
({order.travelDateText === 'This Month'
? t('customTrip.quickDateThisMonth')
: order.travelDateText === 'Next Month'
? t('customTrip.quickDateNextMonth')
: order.travelDateText === 'Arbaeen Pilgrimage Season'
? t('customTrip.quickDateArbaeen')
: order.travelDateText === 'Arafah & Eid al-Adha'
? t('customTrip.quickDateArafah')
: order.travelDateText === 'Nisfu Shaban Season'
? t('customTrip.quickDateShaban')
: order.travelDateText === 'Date Not Decided Yet'
? t('customTrip.quickDateUndecided')
: order.travelDateText})
</span>
)}
</div>
</div>
<div className="flex items-center justify-between">
<span className="text-muted-foreground text-xs">{t('customTrip.createdDate')}:</span>
<span className="font-mono text-foreground">

16
src/features/custom-trip/components/CustomTripOrderReviewDialog.tsx

@ -248,7 +248,7 @@ export function CustomTripOrderReviewDialog({
useEffect(() => {
if (order) {
const orig = order.originCity || ''
const defaultStart = getDefaultBaseDate(order.created)
const defaultStart = order.startDate || order.legs?.[0]?.departureDate || getDefaultBaseDate(order.created)
setEditOriginCity(orig)
const initialLegs: CustomTripLeg[] =
order.legs && order.legs.length > 0
@ -594,6 +594,8 @@ export function CustomTripOrderReviewDialog({
priceEstimate: Number(editPrice),
adminNotes: editNotes,
originCity: editOriginCity,
startDate: editLegs[0]?.departureDate || order.startDate || null,
travelDateText: order.travelDateText || editLegs[0]?.departureDate || '',
legs: editLegs,
transferToBilling: false,
})
@ -625,6 +627,8 @@ export function CustomTripOrderReviewDialog({
priceEstimate: finalAmount,
adminNotes: editNotes,
originCity: editOriginCity,
startDate: editLegs[0]?.departureDate || order.startDate || null,
travelDateText: order.travelDateText || editLegs[0]?.departureDate || '',
legs: editLegs,
transferToBilling: true,
})
@ -751,7 +755,7 @@ export function CustomTripOrderReviewDialog({
</div>
{/* Customer Info Card */}
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3 p-3.5 rounded-xl bg-muted/40 border border-border/60 text-xs sm:text-sm">
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-3 p-3.5 rounded-xl bg-muted/40 border border-border/60 text-xs sm:text-sm">
<div>
<span className="text-muted-foreground text-xs block">{t('customTrip.passengerName')}:</span>
<span className="font-bold text-foreground">
@ -772,6 +776,14 @@ export function CustomTripOrderReviewDialog({
{order.infantsCount > 0 && `، ${toFa(order.infantsCount)} ${t('customTrip.infants')}`}
</span>
</div>
<div>
<span className="text-muted-foreground text-xs block">{t('customTrip.tripStartDate')}:</span>
<span className="font-mono font-bold text-primary">
{(editLegs[0]?.departureDate || order.startDate)
? formatDualDate((editLegs[0]?.departureDate || order.startDate) as string, language)
: '—'}
</span>
</div>
</div>
{/* Origin City Selector */}

9
src/features/custom-trip/components/CustomTripOrdersTab.tsx

@ -392,6 +392,15 @@ export function CustomTripOrdersTab({
.join(' | ')}
</div>
)}
{(order.startDate || order.legs?.[0]?.departureDate) && (
<div className="text-[11px] text-primary font-mono font-medium mt-1 flex items-center gap-1">
<Ic name="calendar" className="size-3 shrink-0" />
<span>
{t('customTrip.tripStartDate')}:{' '}
{formatDateByLanguage((order.startDate || order.legs?.[0]?.departureDate) as string, language)}
</span>
</div>
)}
</TableCell>
<TableCell className="px-4 py-3.5 text-center">
<span className="inline-flex items-center gap-1.5 text-xs font-medium px-2.5 py-1 rounded-xl bg-card border border-border/70 text-foreground">

15
src/features/custom-trip/services/custom-trip-api.ts

@ -64,6 +64,8 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem {
const rawServices = Array.isArray(raw.services) ? raw.services : []
const originCity = raw.origin_city || raw.originCity || ''
const destinations: string[] = Array.isArray(raw.destinations) ? raw.destinations : []
const rawStartDate: string | null = raw.start_date || raw.startDate || null
const rawTravelDateText: string = raw.travel_date_text || raw.travelDateText || ''
let legs = rawLegs.map((leg: any, idx: number) => {
const isReturn = Boolean(
@ -145,7 +147,7 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem {
})
}
let curDate = legs[0].departureDate || getDefaultStartDateIso(raw.created)
let curDate = legs[0].departureDate || rawStartDate || getDefaultStartDateIso(raw.created)
legs = legs.map((l, idx) => {
const fromCity = idx === 0 ? originCity || l.fromCity : legs[idx - 1].toCity || l.fromCity
if (l.isReturn) {
@ -224,6 +226,8 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem {
factorId: raw.factor_id ?? null,
factorNumber: raw.factor_number ?? null,
status: (raw.status || 'PENDING') as CustomTripOrderStatus,
startDate: rawStartDate || legs[0]?.departureDate || stays[0]?.check_in || null,
travelDateText: rawTravelDateText || '',
created: raw.created || new Date().toISOString(),
detail: cleanLegacyDetail(raw.detail),
adminNotes: raw.admin_notes || raw.adminNotes || '',
@ -267,6 +271,8 @@ export async function updateCustomTripOrder(
priceEstimate?: number
adminNotes?: string
originCity?: string
startDate?: string | null
travelDateText?: string
legs?: {
fromCity: string
toCity: string
@ -289,6 +295,13 @@ export async function updateCustomTripOrder(
if (data.originCity) {
itineraryPayload.origin_city = data.originCity
}
const effectiveStartDate = data.startDate || data.legs?.[0]?.departureDate || null
if (effectiveStartDate) {
itineraryPayload.start_date = String(effectiveStartDate).slice(0, 10)
}
if (data.travelDateText !== undefined) {
itineraryPayload.travel_date_text = data.travelDateText
}
if (Array.isArray(data.legs) && data.legs.length > 0) {
itineraryPayload.legs = data.legs.map((leg, idx) => ({
sequence: idx + 1,

2
src/features/custom-trip/types.ts

@ -64,6 +64,8 @@ export interface CustomTripOrderItem {
factorId?: number | null
factorNumber?: number | null
status: CustomTripOrderStatus
startDate?: string | null
travelDateText?: string
created: string
detail?: string
adminNotes?: string

11
src/locales/ar.json

@ -60,8 +60,6 @@
"auth": {
"loginTitle": "تسجيل الدخول إلى لوحة الإدارة",
"loginDescription": "أدخل بيانات الاعتماد الخاصة بك للوصول إلى بوابة الإدارة",
"demoBoxTitle": "حساب تجريبي جاهز:",
"autoFill": "تعبئة تلقائية",
"emailLabel": "البريد الإلكتروني للحساب",
"emailPlaceholder": "you@example.com",
"passwordLabel": "كلمة المرور",
@ -965,7 +963,14 @@
"originStartAndEnd": "(نقطة انطلاق ونهاية الرحلة)",
"selectReturnDestinationPlaceholder": "يرجى اختيار مدينة الوجهة في مسار العودة.",
"viewInBilling": "عرض في القسم المالي",
"nightsCountLabel": "عدد ليالي الإقامة"
"nightsCountLabel": "عدد ليالي الإقامة",
"tripStartDate": "تاريخ بدء الرحلة",
"quickDateThisMonth": "هذا الشهر",
"quickDateNextMonth": "الشهر القادم",
"quickDateArbaeen": "موسم زيارة الأربعين",
"quickDateArafah": "موسم عرفة وعيد الأضحى",
"quickDateShaban": "موسم النصف من شعبان",
"quickDateUndecided": "لم أحدد التاريخ بعد (مرن)"
},
"languages": {
"fa": "فارسی",

11
src/locales/en.json

@ -60,8 +60,6 @@
"auth": {
"loginTitle": "Login to Admin Dashboard",
"loginDescription": "Enter your credentials to access the management portal",
"demoBoxTitle": "Demo Ready Account:",
"autoFill": "Auto Fill",
"emailLabel": "Account Email",
"emailPlaceholder": "you@example.com",
"passwordLabel": "Password",
@ -965,7 +963,14 @@
"originStartAndEnd": "(Origin & final endpoint of journey)",
"selectReturnDestinationPlaceholder": "Please select the destination city for the return leg.",
"viewInBilling": "View in Billing",
"nightsCountLabel": "Stay Nights"
"nightsCountLabel": "Stay Nights",
"tripStartDate": "Trip Start Date",
"quickDateThisMonth": "This Month",
"quickDateNextMonth": "Next Month",
"quickDateArbaeen": "Arbaeen Pilgrimage Season",
"quickDateArafah": "Arafah & Eid al-Adha",
"quickDateShaban": "Nisfu Shaban Season",
"quickDateUndecided": "Date Not Decided Yet (Flexible)"
},
"languages": {
"fa": "فارسی",

11
src/locales/fa.json

@ -60,8 +60,6 @@
"auth": {
"loginTitle": "ورود به پنل مدیریت و داشبورد",
"loginDescription": "برای دسترسی به پرتال مدیریت، اطلاعات ورود خود را وارد نمایید",
"demoBoxTitle": "حساب آزمایشی آماده:",
"autoFill": "پر کردن خودکار",
"emailLabel": "ایمیل حساب کاربری",
"emailPlaceholder": "you@example.com",
"passwordLabel": "رمز عبور",
@ -965,7 +963,14 @@
"originStartAndEnd": "(مبدأ آغاز و پایان سفر)",
"selectReturnDestinationPlaceholder": "لطفاً شهر مقصد در مسیر بازگشت را انتخاب نمایید.",
"viewInBilling": "مشاهده در بخش مالی",
"nightsCountLabel": "تعداد شب اقامت"
"nightsCountLabel": "تعداد شب اقامت",
"tripStartDate": "تاریخ شروع سفر",
"quickDateThisMonth": "همین ماه",
"quickDateNextMonth": "ماه آینده",
"quickDateArbaeen": "ایام اربعین حسینی",
"quickDateArafah": "ایام عرفه و عید قربان",
"quickDateShaban": "ایام نیمه شعبان",
"quickDateUndecided": "هنوز مشخص نکرده‌ام (انعطاف‌پذیر)"
},
"languages": {
"fa": "فارسی",

2
vite.config.ts

@ -316,6 +316,8 @@ export default defineConfig(({ mode }) => {
alias: { '@': path.resolve(__dirname, './src') },
},
server: {
/* پورت پیش‌فرض خارج از بازهٔ ephemeral و پورت رزرو ۵۳۵۷ ویندوز تا با تداخل پورت کرش نکند. */
port: Number(env.VITE_DEV_PORT) || 15173,
proxy: {
'/api': {
target: apiTarget,

Loading…
Cancel
Save