Small fix pass.

2024-05-13 00:49:54 +02:00
parent b83af1b872
commit 4e825c7ca7
8 changed files with 35 additions and 20 deletions
@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/SR2.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Vite + React + TS</title>
  </head>
@@ -71,11 +71,13 @@ export function SearchFilterCard({ onSearchClick }: { onSearchClick?: funOnSearc

  const datePickerElement = searchFilter == null ? (
    <DatePickerWithRange
-      updateDateRange={updateDateRange}>
+      updateDateRange={updateDateRange}
+      allowPast={false}>
    </DatePickerWithRange>
  ) : (
    <DatePickerWithRange
      updateDateRange={updateDateRange}
+      allowPast={false}
      startDate={searchFilter.dateRange.from}
      endDate={searchFilter.dateRange.to}>
    </DatePickerWithRange>
@@ -9,20 +9,18 @@ function AppHeader() {

  return (
    <Card className="flex items-center mx-10 my-4">
-      <CardContent className="w-full">
+      <CardContent className="w-full py-2">
        <div className="flex justify-around items-center">
          <div className="flex flex-row items-center gap-2 relative">
            <img src="public/SR2.svg" className="w-[64px]"></img>
            <Typography variant={"largeText"}>Somnia Rooms</Typography>
            <a href="https://duck.com" className="absolute w-[100%] h-[100%]"></a>
          </div>
-          <Button variant="ghost">
-            <HomeIcon />
-            <Link to={`home`}>Home</Link>
+          <Button variant="ghost" className="h-15">
+            <Link to={`home`}><HomeIcon className="mx-auto" />Home</Link>
          </Button>
-          <Button variant="ghost">
-            <BookAIcon />
-            <Link to={`search`}>Reservar</Link>
+          <Button variant="ghost" className="h-15">
+            <Link to={`search`}><BookAIcon className="mx-auto" />Reservar</Link>
          </Button>
          <ModeToggle />
        </div>
@@ -7,8 +7,9 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from ".
 import { Button } from "../ui/button";

 type OnBookingClickFunction = () => void;
+type BookingDetailsModes = "Book" | "View"

-export function BookingDetails({ onBookingConfirm }: { onBookingConfirm?: OnBookingClickFunction }) {
+export function BookingDetails({ onBookingConfirm, mode }: { onBookingConfirm?: OnBookingClickFunction, mode: BookingDetailsModes }) {

  const bookingData = useAppStore((state) => state.newBookingData);

@@ -38,6 +39,7 @@ export function BookingDetails({ onBookingConfirm }: { onBookingConfirm?: OnBook
        <TableCell>{room.guestNumber}</TableCell>
        <TableCell>{room.amount}</TableCell>
        <TableCell>{room.price / 100} €</TableCell>
+        <TableCell>{(room.price * room.amount) / 100} €</TableCell>
      </TableRow>
    );
  })
@@ -50,7 +52,8 @@ export function BookingDetails({ onBookingConfirm }: { onBookingConfirm?: OnBook
          <TableHead>Room</TableHead>
          <TableHead>Guests</TableHead>
          <TableHead>Quantity</TableHead>
-          <TableHead>Price</TableHead>
+          <TableHead>Unit price</TableHead>
+          <TableHead>Total price</TableHead>
        </TableRow>
      </TableHeader>
      <TableBody>
@@ -60,7 +63,7 @@ export function BookingDetails({ onBookingConfirm }: { onBookingConfirm?: OnBook
  );


-  const totalPrice = bookingData.rooms.reduce((acc, room) => (acc + room.price), 0);
+  const totalPrice = bookingData.rooms.reduce((acc, room) => (acc + (room.price * room.amount)), 0);

  return (
    <Card>
@@ -80,9 +83,12 @@ export function BookingDetails({ onBookingConfirm }: { onBookingConfirm?: OnBook
        <Separator className="my-2"></Separator>
        <Typography variant={"h3"}>Total Price</Typography>
        <Typography variant={"h3"}>{totalPrice / 100} €</Typography>
+        {
+          mode == "Book" &&
          <Button className="my-2" onClick={onBtBookingClick}>
            <Typography variant={"largeText"} className="text-primary-foreground">Book it!</Typography>
          </Button>
+        }
      </CardContent>
    </Card>
  )
@@ -18,8 +18,11 @@ import { Typography } from "./typography"
 export type UpdateRangeFunction = (newRange: DateRange) => void;

 export function DatePickerWithRange({
-  className, updateDateRange, startDate, endDate
-}: { className?: React.HTMLAttributes<HTMLDivElement> | undefined, updateDateRange: UpdateRangeFunction | undefined , startDate?: Date, endDate?: Date}) {
+  className, updateDateRange, startDate, endDate, allowPast = true
+}: {
+  className?: React.HTMLAttributes<HTMLDivElement> | undefined, updateDateRange: UpdateRangeFunction | undefined,
+  startDate?: Date, endDate?: Date, allowPast?: boolean
+}) {
  // Date Range State.
  const [dateRange, setDateRange] = React.useState<DateRange | undefined>({
    from: startDate,
@@ -61,6 +64,11 @@ export function DatePickerWithRange({
    beforeAndSelected = [beforeMatcher, dateMatcher];
  }

+  let pastMatcher: DateBefore | undefined = undefined;
+  if (!allowPast) {
+    pastMatcher = { before: new Date() };
+  }
+
  return (
    <div className={cn("grid gap-x-2 grid-cols-2 grid-rows-2", className)}>
      <Typography variant={"largeText"} as="p">Desde</Typography>
@@ -91,6 +99,7 @@ export function DatePickerWithRange({
            selected={dateRange?.from}
            onDayClick={handleDayClickFrom}
            numberOfMonths={1}
+            disabled={pastMatcher}
          />
        </PopoverContent>
      </Popover>
@@ -113,7 +113,7 @@ function BookPage() {
        </div>
      </div>
      <Separator className="my-10" />
-      <BookingDetails></BookingDetails>
+      <BookingDetails mode="View"></BookingDetails>
      <Separator className="my-10" />
      <Button onClick={handleOnBookingSubmit} disabled={pageState == PageState.sending}>
        <Typography variant={"h3"} className="text-primary-foreground">Book it now!</Typography>
@@ -26,7 +26,7 @@ function Homepage() {

  return (
    <>
-      <Typography variant={"h1"}>Hostal del Val</Typography>
+      <Typography variant={"h1"}>Somnia Rooms</Typography>
      <Separator className="my-10" />
      <SearchFilterCard onSearchClick={onBtSearchClick}/>
      <Separator className="my-10" />
@@ -85,7 +85,7 @@ function SearchPage() {
        {hasRooms ? roomList : (isSearched && noRoomsAvailable)}
      </div>
      <Separator className="my-10" />
-      <BookingDetails onBookingConfirm={onBookingContinue}></BookingDetails>
+      <BookingDetails onBookingConfirm={onBookingContinue} mode={"Book"}></BookingDetails>
      <Separator className="my-10" />
      <BackendConnectionStatus isLoading={isLoading} isError={isError} />
    </div>