feat: add initial datepicker, no ui/ux
This commit is contained in:
62
components/DatePicker/DatePicker.tsx
Normal file
62
components/DatePicker/DatePicker.tsx
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
"use client"
|
||||||
|
import { da, de, fi, nb, sv } from "date-fns/locale"
|
||||||
|
import { useState } from "react"
|
||||||
|
import { type DateRange, DayPicker } from "react-day-picker"
|
||||||
|
|
||||||
|
import { Lang } from "@/constants/languages"
|
||||||
|
import { dt } from "@/lib/dt"
|
||||||
|
|
||||||
|
import useLang from "@/hooks/useLang"
|
||||||
|
|
||||||
|
import classNames from "react-day-picker/style.module.css"
|
||||||
|
|
||||||
|
const locales = {
|
||||||
|
[Lang.da]: da,
|
||||||
|
[Lang.de]: de,
|
||||||
|
[Lang.fi]: fi,
|
||||||
|
[Lang.no]: nb,
|
||||||
|
[Lang.sv]: sv,
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DatePickerProps {
|
||||||
|
handleOnSelect: (selected: DateRange) => void
|
||||||
|
initialSelected?: DateRange
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function DatePicker({
|
||||||
|
handleOnSelect,
|
||||||
|
initialSelected = {
|
||||||
|
from: undefined,
|
||||||
|
to: undefined,
|
||||||
|
},
|
||||||
|
}: DatePickerProps) {
|
||||||
|
const lang = useLang()
|
||||||
|
const [selectedDate, setSelectedDate] = useState<DateRange>(initialSelected)
|
||||||
|
|
||||||
|
function handleSelectDate(selected: DateRange) {
|
||||||
|
handleOnSelect(selected)
|
||||||
|
setSelectedDate(selected)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** English is default language and doesn't need to be imported */
|
||||||
|
const locale = lang === Lang.en ? undefined : locales[lang]
|
||||||
|
|
||||||
|
const currentDate = dt().toDate()
|
||||||
|
const startOfMonth = dt(currentDate).set("date", 1).toDate()
|
||||||
|
const yesterday = dt(currentDate).subtract(1, "day").toDate()
|
||||||
|
return (
|
||||||
|
<DayPicker
|
||||||
|
classNames={classNames}
|
||||||
|
disabled={{ from: startOfMonth, to: yesterday }}
|
||||||
|
excludeDisabled
|
||||||
|
locale={locale}
|
||||||
|
mode="range"
|
||||||
|
onSelect={handleSelectDate}
|
||||||
|
pagedNavigation
|
||||||
|
required
|
||||||
|
selected={selectedDate}
|
||||||
|
showWeekNumber
|
||||||
|
startMonth={currentDate}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
31
components/DatePicker/date-picker.module.css
Normal file
31
components/DatePicker/date-picker.module.css
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
.container {
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
&[data-isopen="true"] {
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.hideWrapper {
|
||||||
|
background-color: var(--Main-Grey-White);
|
||||||
|
border-radius: var(--Corner-radius-Medium);
|
||||||
|
box-shadow: 0px 16px 24px 0px rgba(0, 0, 0, 0.08);
|
||||||
|
padding: var(--Spacing-x-one-and-half);
|
||||||
|
position: absolute;
|
||||||
|
/** BookingWidget padding + border-width */
|
||||||
|
top: calc(100% + var(--Spacing-x2) + 1px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
outline: none;
|
||||||
|
padding: 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.body {
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
73
components/DatePicker/index.tsx
Normal file
73
components/DatePicker/index.tsx
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
"use client"
|
||||||
|
import { useEffect, useRef, useState } from "react"
|
||||||
|
import { useFormContext, useWatch } from "react-hook-form"
|
||||||
|
|
||||||
|
import { dt } from "@/lib/dt"
|
||||||
|
|
||||||
|
import Body from "@/components/TempDesignSystem/Text/Body"
|
||||||
|
import useLang from "@/hooks/useLang"
|
||||||
|
|
||||||
|
import DatePicker from "./DatePicker"
|
||||||
|
|
||||||
|
import styles from "./date-picker.module.css"
|
||||||
|
|
||||||
|
import type { DateRange } from "react-day-picker"
|
||||||
|
|
||||||
|
import type { DatePickerFormProps } from "@/types/components/datepicker"
|
||||||
|
|
||||||
|
export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
|
||||||
|
const lang = useLang()
|
||||||
|
const [isOpen, setIsOpen] = useState(false)
|
||||||
|
const selectedDate = useWatch({ name })
|
||||||
|
const { register, setValue } = useFormContext()
|
||||||
|
const ref = useRef<HTMLDivElement | null>(null)
|
||||||
|
|
||||||
|
function handleOnClick() {
|
||||||
|
setIsOpen((prevIsOpen) => !prevIsOpen)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSelectDate(selected: DateRange) {
|
||||||
|
setValue(name, {
|
||||||
|
from: dt(selected.from).format("YYYY-MM-DD"),
|
||||||
|
to: dt(selected.to).format("YYYY-MM-DD"),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
function handleClickOutside(evt: Event) {
|
||||||
|
const target = evt.target as HTMLElement
|
||||||
|
if (ref.current && target && !ref.current.contains(target)) {
|
||||||
|
setIsOpen(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener("click", handleClickOutside)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener("click", handleClickOutside)
|
||||||
|
}
|
||||||
|
}, [setIsOpen])
|
||||||
|
|
||||||
|
const selectedFromDate = dt(selectedDate.from)
|
||||||
|
.locale(lang)
|
||||||
|
.format("ddd D MMM")
|
||||||
|
const selectedToDate = dt(selectedDate.to).locale(lang).format("ddd D MMM")
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={styles.container} data-isopen={isOpen} ref={ref}>
|
||||||
|
<button className={styles.btn} onClick={handleOnClick} type="button">
|
||||||
|
<Body className={styles.body}>
|
||||||
|
{selectedFromDate} - {selectedToDate}
|
||||||
|
</Body>
|
||||||
|
</button>
|
||||||
|
<input {...register("date.from")} type="hidden" />
|
||||||
|
<input {...register("date.to")} type="hidden" />
|
||||||
|
<div aria-modal className={styles.hideWrapper} role="dialog">
|
||||||
|
<DatePicker
|
||||||
|
handleOnSelect={handleSelectDate}
|
||||||
|
initialSelected={selectedDate}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
"use client"
|
"use client"
|
||||||
|
import { useWatch } from "react-hook-form"
|
||||||
import { useIntl } from "react-intl"
|
import { useIntl } from "react-intl"
|
||||||
|
|
||||||
|
import { dt } from "@/lib/dt"
|
||||||
|
|
||||||
|
import DatePicker from "@/components/DatePicker"
|
||||||
import Caption from "@/components/TempDesignSystem/Text/Caption"
|
import Caption from "@/components/TempDesignSystem/Text/Caption"
|
||||||
|
|
||||||
import Search from "./Search"
|
import Search from "./Search"
|
||||||
@@ -13,11 +17,15 @@ export default function FormContent({
|
|||||||
locations,
|
locations,
|
||||||
}: BookingWidgetFormContentProps) {
|
}: BookingWidgetFormContentProps) {
|
||||||
const intl = useIntl()
|
const intl = useIntl()
|
||||||
const when = intl.formatMessage({ id: "When" })
|
const selectedDate = useWatch({ name: "date" })
|
||||||
|
|
||||||
const rooms = intl.formatMessage({ id: "Rooms & Guests" })
|
const rooms = intl.formatMessage({ id: "Rooms & Guests" })
|
||||||
const vouchers = intl.formatMessage({ id: "Booking codes and vouchers" })
|
const vouchers = intl.formatMessage({ id: "Booking codes and vouchers" })
|
||||||
const bonus = intl.formatMessage({ id: "Use bonus cheque" })
|
const bonus = intl.formatMessage({ id: "Use bonus cheque" })
|
||||||
const reward = intl.formatMessage({ id: "Book reward night" })
|
const reward = intl.formatMessage({ id: "Book reward night" })
|
||||||
|
|
||||||
|
const nights = dt(selectedDate.to).diff(dt(selectedDate.from), "days")
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.input}>
|
<div className={styles.input}>
|
||||||
<div className={styles.where}>
|
<div className={styles.where}>
|
||||||
@@ -25,9 +33,12 @@ export default function FormContent({
|
|||||||
</div>
|
</div>
|
||||||
<div className={styles.when}>
|
<div className={styles.when}>
|
||||||
<Caption color="red" textTransform="bold">
|
<Caption color="red" textTransform="bold">
|
||||||
{when}
|
{nights}{" "}
|
||||||
|
{nights > 1
|
||||||
|
? intl.formatMessage({ id: "nights" })
|
||||||
|
: intl.formatMessage({ id: "night" })}
|
||||||
</Caption>
|
</Caption>
|
||||||
<input type="text" placeholder={when} />
|
<DatePicker />
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.rooms}>
|
<div className={styles.rooms}>
|
||||||
<Caption color="red" textTransform="bold">
|
<Caption color="red" textTransform="bold">
|
||||||
|
|||||||
@@ -37,11 +37,11 @@ export default function Form({ locations }: BookingWidgetFormProps) {
|
|||||||
location: sessionStorageSearchData
|
location: sessionStorageSearchData
|
||||||
? encodeURIComponent(sessionStorageSearchData)
|
? encodeURIComponent(sessionStorageSearchData)
|
||||||
: undefined,
|
: undefined,
|
||||||
nights: {
|
date: {
|
||||||
// UTC is required to handle requests from far away timezones https://scandichotels.atlassian.net/browse/SWAP-6375 & PET-507
|
// UTC is required to handle requests from far away timezones https://scandichotels.atlassian.net/browse/SWAP-6375 & PET-507
|
||||||
// This is specifically to handle timezones falling in different dates.
|
// This is specifically to handle timezones falling in different dates.
|
||||||
fromDate: dt().utc().format("DD/MM/YYYY"),
|
from: dt().utc().format("YYYY-MM-DD"),
|
||||||
toDate: dt().utc().add(1, "day").format("DD/MM/YYYY"),
|
to: dt().utc().add(1, "day").format("YYYY-MM-DD"),
|
||||||
},
|
},
|
||||||
bookingCode: "",
|
bookingCode: "",
|
||||||
redemption: false,
|
redemption: false,
|
||||||
|
|||||||
@@ -4,10 +4,9 @@ import type { Location } from "@/types/trpc/routers/hotel/locations"
|
|||||||
|
|
||||||
export const bookingWidgetSchema = z.object({
|
export const bookingWidgetSchema = z.object({
|
||||||
search: z.string({ coerce: true }).min(1, "Required"),
|
search: z.string({ coerce: true }).min(1, "Required"),
|
||||||
nights: z.object({
|
date: z.object({
|
||||||
// Update this as required once started working with Date picker in Nights component
|
from: z.string(),
|
||||||
fromDate: z.string(),
|
to: z.string(),
|
||||||
toDate: z.string(),
|
|
||||||
}),
|
}),
|
||||||
location: z.string().refine(
|
location: z.string().refine(
|
||||||
(value) => {
|
(value) => {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ async function initIntl(lang: Lang) {
|
|||||||
export async function getIntl(forceLang?: Lang) {
|
export async function getIntl(forceLang?: Lang) {
|
||||||
const h = headers()
|
const h = headers()
|
||||||
let lang = h.get("x-lang") as Lang
|
let lang = h.get("x-lang") as Lang
|
||||||
|
|
||||||
if (!lang) {
|
if (!lang) {
|
||||||
lang = Lang.en
|
lang = Lang.en
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,13 +53,13 @@ export async function request<T>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// const print = (await import("graphql/language/printer")).print
|
const print = (await import("graphql/language/printer")).print
|
||||||
// const nr = Math.random()
|
const nr = Math.random()
|
||||||
// console.log(`START REQUEST ${nr}`)
|
console.log(`START REQUEST ${nr}`)
|
||||||
// console.time(`OUTGOING REQUEST ${nr}`)
|
console.time(`OUTGOING REQUEST ${nr}`)
|
||||||
// console.log(`Sending reqeust to ${env.CMS_URL}`)
|
console.log(`Sending reqeust to ${env.CMS_URL}`)
|
||||||
// console.log(`Query:`, print(query as DocumentNode))
|
console.log(`Query:`, print(query as DocumentNode))
|
||||||
// console.log(`Variables:`, variables)
|
console.log(`Variables:`, variables)
|
||||||
|
|
||||||
const response = await client.request<T>({
|
const response = await client.request<T>({
|
||||||
document: query,
|
document: query,
|
||||||
@@ -70,8 +70,8 @@ export async function request<T>(
|
|||||||
variables,
|
variables,
|
||||||
})
|
})
|
||||||
|
|
||||||
// console.timeEnd(`OUTGOING REQUEST ${nr}`)
|
console.timeEnd(`OUTGOING REQUEST ${nr}`)
|
||||||
// console.log({ response })
|
console.log({ response })
|
||||||
|
|
||||||
return { data: response }
|
return { data: response }
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
27
package-lock.json
generated
27
package-lock.json
generated
@@ -43,6 +43,7 @@
|
|||||||
"next": "^14.2.7",
|
"next": "^14.2.7",
|
||||||
"next-auth": "^5.0.0-beta.19",
|
"next-auth": "^5.0.0-beta.19",
|
||||||
"react": "^18",
|
"react": "^18",
|
||||||
|
"react-day-picker": "^9.0.8",
|
||||||
"react-dom": "^18",
|
"react-dom": "^18",
|
||||||
"react-feather": "^2.0.10",
|
"react-feather": "^2.0.10",
|
||||||
"react-hook-form": "^7.51.2",
|
"react-hook-form": "^7.51.2",
|
||||||
@@ -8749,6 +8750,16 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/date-fns": {
|
||||||
|
"version": "3.6.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
|
||||||
|
"integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
|
||||||
|
"license": "MIT",
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/kossnocorp"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/dayjs": {
|
"node_modules/dayjs": {
|
||||||
"version": "1.11.10",
|
"version": "1.11.10",
|
||||||
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
|
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
|
||||||
@@ -16082,6 +16093,22 @@
|
|||||||
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
|
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/react-day-picker": {
|
||||||
|
"version": "9.0.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.0.8.tgz",
|
||||||
|
"integrity": "sha512-dZM94abRNnc2jC/wkWn56358GHJcfAHfyC2Th9asyIUQhFIC5D2Ef5qUG9n1b5t8PeCJst7eCWJ6b+XZaAjxhA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"date-fns": "^3.6.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://github.com/sponsors/gpbl"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/react-dom": {
|
"node_modules/react-dom": {
|
||||||
"version": "18.2.0",
|
"version": "18.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
|
||||||
|
|||||||
@@ -59,6 +59,7 @@
|
|||||||
"next": "^14.2.7",
|
"next": "^14.2.7",
|
||||||
"next-auth": "^5.0.0-beta.19",
|
"next-auth": "^5.0.0-beta.19",
|
||||||
"react": "^18",
|
"react": "^18",
|
||||||
|
"react-day-picker": "^9.0.8",
|
||||||
"react-dom": "^18",
|
"react-dom": "^18",
|
||||||
"react-feather": "^2.0.10",
|
"react-feather": "^2.0.10",
|
||||||
"react-hook-form": "^7.51.2",
|
"react-hook-form": "^7.51.2",
|
||||||
|
|||||||
3
types/components/datepicker.ts
Normal file
3
types/components/datepicker.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export interface DatePickerFormProps {
|
||||||
|
name?: string
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user