Generate Nightly Build - 202405131816

.eslintrc.cjs

@@ -0,0 +1,18 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true, node: false },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+  },
+}

.gitattributes

@@ -1,2 +0,0 @@
-# EOL normalization
-* text=auto

.gitea/workflows/ci.yaml

@@ -12,6 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+
   lint:
     name: Docker Lint
     runs-on: ubuntu-latest

.prettierignore

@@ -1,7 +0,0 @@
-# Ignore artifacts:
-**/dist
-
-**/.git
-**/.svn
-**/.hg
-**/node_modules

.prettierrc

@@ -1,5 +0,0 @@
-{
-  "endOfLine": "lf",
-  "plugins": ["prettier-plugin-tailwindcss"],
-  "tailwindStylesheet": "./src/index.css"
-}

.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

Dockerfile

@@ -1,23 +1,23 @@
 # Base Node Environment.
-FROM node:22-alpine AS app-base
+FROM node:21.7-alpine3.19 as app-base
 WORKDIR /app
-ENV PATH=/app/node_modules/.bin:$PATH
+ENV PATH /app/node_modules/.bin:$PATH
 COPY package.json ./
 COPY package-lock.json ./
 COPY . ./
 
 # Dev environment.
-FROM app-base AS final-dev
+FROM app-base as final-dev
 RUN npm install
 ENV CHOKIDAR_USEPOLLING=true
 CMD ["npm", "run", "dev"]
 
 # Build app for production.
-FROM app-base AS builder
+FROM app-base as builder
 RUN npm ci && npm run build
 
 # production environment
-FROM nginx:stable-alpine AS final-prod
+FROM nginx:stable-alpine as final-prod
 COPY --from=builder /app/dist /usr/share/nginx/html
 COPY /public /usr/share/nginx/html/public
 COPY scripts/env.sh /docker-entrypoint.d/env.sh

README.md

@@ -2,49 +2,42 @@
 
 User app for SomniaRooms.
 
+
 ## Docker Usage:
 
 ### Dev
 
 **Build Image:**
-
 ```
 docker build -t somniarooms-app:dev --target final-dev .
 ```
 
 **Docker Run Image:**
-
 ```
 docker run -d -it --rm -v ${PWD}:/app -v /app/node_modules -p 3000:3000 --name somniarooms-app somniarooms-app:dev
 ```
 
 Notas:
-
 - Usar `-rm` para eliminar el contenedor y sus volúmenes en stop.
 - Usar `-d` para modo detached.
 
 ### Prod:
-
 **Build Image**
-
 ```
 docker build -t somniarooms-app:prod --target final-prod .
 ```
 
 **Docker Run**
-
 ```
 docker run -d -it -p 8080:80 --name somniarooms-app somniarooms-app:prod
 ```
 
 **Docker run with env vars:**
-
 ```
 docker run -d -it -p 8080:80 --name somniarooms-app -e SOMNIAROOMS_BACKEND_HOST=https://somniaapi.example.org/ -e SOMNIAROOMS_BACKEND_PORT=443 somniarooms-app:prod
 ```
 
 ## Env Vars.
-
 As this is distributed as a docker image ready to use, you must set some env variables to configure the app:
 
 |            Var             |         Default Value          |                                         Description                                          |
@@ -57,13 +50,11 @@ As this is distributed as a docker image ready to use, you must set some env var
 This project uses .env files to configure the app. As Vite only supports compile-time vars, we use some tricks to allow setting variables from container env variables.
 
 ### .env 
-
 Contains default values. It is just an example configuration.
 
 For development is recomended to create a `.env.local` file based on `.env`.
 
 ### .env.production
-
 Set varibles to certains placeholder, that are replace on container startup.
 
 (We are using this solution: https://stackoverflow.com/a/77454537)

components.json

@@ -4,7 +4,7 @@
   "rsc": false,
   "tsx": true,
   "tailwind": {
-    "config": "",
+    "config": "tailwind.config.js",
     "css": "src/index.css",
     "baseColor": "stone",
     "cssVariables": true,
@@ -13,9 +13,6 @@
   "aliases": {
     "components": "@/components",
     "utils": "@/lib/utils",
-    "ui": "@/components/ui",
+    "ui": "src/components/ui"
-    "lib": "@/lib",
+  }
-    "hooks": "@/hooks"
-  },
-  "iconLibrary": "lucide"
 }

eslint.config.cjs

@@ -1,55 +0,0 @@
-const { defineConfig, globalIgnores } = require("eslint/config");
-
-const globals = require("globals");
-
-const { fixupConfigRules } = require("@eslint/compat");
-
-const tsParser = require("@typescript-eslint/parser");
-const reactRefresh = require("eslint-plugin-react-refresh");
-const js = require("@eslint/js");
-
-const { FlatCompat } = require("@eslint/eslintrc");
-
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
-});
-
-module.exports = defineConfig([
-  {
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...Object.fromEntries(
-          Object.entries(globals.node).map(([key]) => [key, "off"]),
-        ),
-      },
-
-      parser: tsParser,
-    },
-
-    extends: fixupConfigRules(
-      compat.extends(
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:react-hooks/recommended",
-        "prettier",
-      ),
-    ),
-
-    plugins: {
-      "react-refresh": reactRefresh,
-    },
-
-    rules: {
-      "react-refresh/only-export-components": [
-        "warn",
-        {
-          allowConstantExport: true,
-        },
-      ],
-    },
-  },
-  globalIgnores(["**/dist", "eslint.config.cjs"]),
-]);

package.json

@@ -6,60 +6,48 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0 && npx prettier . --check",
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "pretty": "npx prettier . --write",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@hookform/resolvers": "^5.1.1",
+    "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-checkbox": "^1.3.2",
+    "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@radix-ui/react-dropdown-menu": "^2.1.15",
+    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-label": "^2.1.7",
+    "@radix-ui/react-label": "^2.0.2",
-    "@radix-ui/react-popover": "^1.1.14",
+    "@radix-ui/react-popover": "^1.0.7",
-    "@radix-ui/react-separator": "^1.1.7",
+    "@radix-ui/react-separator": "^1.0.3",
-    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-slot": "^1.0.2",
-    "@radix-ui/react-toast": "^1.2.14",
+    "@radix-ui/react-toast": "^1.1.5",
-    "@radix-ui/react-tooltip": "^1.2.7",
+    "@radix-ui/react-tooltip": "^1.0.7",
-    "@tailwindcss/vite": "^4.1.8",
+    "class-variance-authority": "^0.7.0",
-    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "date-fns": "^4.1.0",
+    "date-fns": "^3.6.0",
-    "embla-carousel-react": "^8.6.0",
+    "embla-carousel-react": "^8.0.2",
-    "lucide-react": "^0.513.0",
+    "lucide-react": "^0.378.0",
     "react": "^18.2.0",
-    "react-day-picker": "^9.7.0",
+    "react-day-picker": "^8.10.1",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.57.0",
     "react-router-dom": "^6.23.0",
-    "swr": "^2.3.3",
+    "swr": "^2.2.5",
-    "tailwind-merge": "^3.3.0",
+    "tailwind-merge": "^2.3.0",
-    "zod": "^3.25.57",
+    "zustand": "^4.5.2"
-    "zustand": "^5.0.5"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.9",
+    "@types/node": "^20.12.8",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.28.0",
-    "@iconify-icon/react": "^3.0.0",
-    "@tailwindcss/postcss": "^4.1.8",
-    "@types/node": "^22.15.30",
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18.2.22",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^8.34.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^8.34.0",
+    "@typescript-eslint/parser": "^7.2.0",
-    "@vitejs/plugin-react-swc": "^3.10.1",
+    "@vitejs/plugin-react-swc": "^3.5.0",
-    "eslint": "^9.28.0",
+    "autoprefixer": "^10.4.19",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint": "^8.57.0",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.20",
+    "eslint-plugin-react-refresh": "^0.4.6",
-    "globals": "^16.2.0",
+    "postcss": "^8.4.38",
-    "postcss": "^8.5.4",
+    "tailwindcss": "^3.4.3",
-    "prettier": "^3.5.3",
+    "tailwindcss-animate": "^1.0.7",
-    "prettier-plugin-tailwindcss": "^0.6.12",
+    "typescript": "^5.2.2",
-    "tailwindcss": "^4.1.8",
+    "vite": "^5.2.0"
-    "tw-animate-css": "^1.3.4",
-    "typescript": "^5.8.3",
-    "vite": "^6.3.5"
   }
 }

postcss.config.js

@@ -1,5 +1,6 @@
 export default {
   plugins: {
-    '@tailwindcss/postcss': {},
+    tailwindcss: {},
+    autoprefixer: {},
   },
-};
+}

src/api/api-booking.tsx

@@ -2,20 +2,18 @@ import { NewBooking, NewBookingResponse } from "@/model/Bookings";
 import { fetcherWithFilter } from "./backend";
 
 export async function APISendCreateBooking(bookingData: NewBooking | null) {
+
     if (!bookingData) {
         return {
             bookingResponse: null,
-      isError: true,
+            isError: true
-    };
+        }
     }
 
-  const rs = await fetcherWithFilter<NewBookingResponse>(
+    const rs = await fetcherWithFilter<NewBookingResponse>("/api/booking/create", bookingData);
-    "/api/booking/create",
-    bookingData,
-  );
 
     return {
         bookingResponse: rs,
-    isError: false,
+        isError: false
-  };
+    }
 }

src/api/api-roomCategories.tsx

@@ -1,28 +1,25 @@
 import { RoomCategory } from "@/model/RoomCategory";
 import { fetcher, fetcherUnwraper } from "./backend";
-import useSWR from "swr";
+import useSWR from 'swr';
 
-export function useAPIRoomCategoryList() {
+export function useAPIRoomCategories() {
-  const { data, error, isLoading } = useSWR<RoomCategory[]>(
+  const { data, error, isLoading } = useSWR<RoomCategory[]>('/api/room/category', fetcherUnwraper)
-    "/api/room/category",
-    fetcherUnwraper,
-  );
 
   return {
     roomCategoryList: data,
     isLoading,
-    isError: error,
+    isError: error
-  };
+  }
 }
 
-export function useAPIRoomCategory(categoryId: number) {
+export function useAPIRoomCategoryId(categoryId: number) {
-  const url = `/api/room/category/${categoryId}`;
+  const url = categoryId ? '/api/room/category/' + categoryId : null;
 
-  const { data, error, isLoading } = useSWR<RoomCategory>(url, fetcher);
+  const { data, error, isLoading } = useSWR<RoomCategory>(url, fetcher)
 
   return {
     roomCategory: data,
     isLoading,
-    isError: error,
+    isError: error
-  };
+  }
 }

src/api/api-roomSearch.tsx

@@ -1,52 +1,33 @@
 import { fetcherUnwraperWithFilter } from "./backend";
-import useSWR from "swr";
+import useSWR from 'swr';
-import {
+import { AvailabilityFilter, AvailabilityRequest, FareFilter, FareRequest, RoomAvailabity, RoomPrice } from "@/model/RoomSearch";
-  AvailabilityFilter,
-  AvailabilityRequest,
-  FareFilter,
-  FareRequest,
-  RoomAvailabity,
-  RoomPrice,
-} from "@/model/RoomSearch";
 
 export function useAPIRoomAvailability(filter: AvailabilityFilter | null) {
-  const request: AvailabilityRequest | null = filter
-    ? {
-        startDate: filter.startDate,
-        endDate: filter.endDate,
-      }
-    : null;
 
-  const { data, isLoading, error } = useSWR(
+    const request: AvailabilityRequest | null = filter ? {
-    request ? ["/api/search/availability", request] : null,
+        filter: filter
-    ([url, request]) =>
+    } : null;
-      fetcherUnwraperWithFilter<RoomAvailabity[]>(url, request),
+
-  );
+    const { data, isLoading, error } = useSWR(request ? ['/api/search/availability', request] : null, ([url, request]) => fetcherUnwraperWithFilter<RoomAvailabity[]>(url, request))
 
     return {
         roomAvailabilityList: data,
         isLoading,
-    isError: error,
+        isError: error
-  };
+    }
 }
 
 export function useAPIRoomPrices(filter: FareFilter | null) {
-  const request: FareRequest | null = filter
-    ? {
-        roomCategory: filter.roomCategory,
-        startDate: filter.startDate,
-        endDate: filter.endDate,
-      }
-    : null;
 
-  const { data, isLoading, error } = useSWR(
+    const request: FareRequest | null = filter ? {
-    request ? ["/api/search/prices", request] : null,
+        filter: filter
-    ([url, request]) => fetcherUnwraperWithFilter<RoomPrice[]>(url, request),
+    } : null;
-  );
+
+    const { data, isLoading, error } = useSWR(request ? ['/api/search/fares', request] : null, ([url, request]) => fetcherUnwraperWithFilter<RoomPrice[]>(url, request))
 
     return {
         roomPriceList: data,
         isLoading,
-    isError: error,
+        isError: error
-  };
+    }
 }

src/api/backend.tsx

@@ -1,57 +1,36 @@
+
 const BACKEND_HOST = import.meta.env.VITE_BACKEND_HOST;
 const BACKEND_PORT = import.meta.env.VITE_BACKEND_PORT;
 
-const url =
+const url = BACKEND_HOST + (BACKEND_PORT == 443 || BACKEND_PORT == 80 ? "" : ":" + BACKEND_PORT)
-  BACKEND_HOST +
-  (BACKEND_PORT == 443 || BACKEND_PORT == 80 ? "" : ":" + BACKEND_PORT);
 
 export function fetcher<T>(endpoint: string): Promise<T> {
     return fetch(url + endpoint, {
-    method: "GET",
+        method: "GET"
-  }).then((r) => {
+    })
+        .then(r => {
             if (!r.ok) {
-      throw new Error(r.statusText);
+                throw new Error(r.statusText)
             }
             const data = r.json();
             return data as Promise<T>;
-  });
+        })
 }
 
 export function fetcherUnwraper<T>(endpoint: string): Promise<T> {
     return fetch(url + endpoint)
-    .then((response) => {
+        .then(response => {
             if (!response.ok) {
-        throw new Error(response.statusText);
+                throw new Error(response.statusText)
             }
-      return response.json() as Promise<{ results: T }>;
+            return response.json() as Promise<{ results: T }>
+        })
+        .then(data => {
+            return data.results
         })
-    .then((data) => {
-      return data.results;
-    });
 }
 
-export function fetcherWithFilter<T>(
+export function fetcherWithFilter<T>(endpoint: string, body: NonNullable<unknown>): Promise<T> {
-  endpoint: string,
-  body: NonNullable<unknown>,
-): Promise<T> {
-  return fetch(url + endpoint, {
-    method: "POST",
-    body: JSON.stringify(body),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  }).then((response) => {
-    if (!response.ok) {
-      throw new Error(response.statusText);
-    }
-    return response.json() as Promise<T>;
-  });
-}
-
-export function fetcherUnwraperWithFilter<T>(
-  endpoint: string,
-  body: NonNullable<unknown>,
-): Promise<T> {
     return fetch(url + endpoint, {
         method: "POST",
         body: JSON.stringify(body),
@@ -59,13 +38,29 @@ export function fetcherUnwraperWithFilter<T>(
             "Content-Type": "application/json",
         },
     })
-    .then((response) => {
+        .then(response => {
             if (!response.ok) {
-        throw new Error(response.statusText);
+                throw new Error(response.statusText)
             }
-      return response.json() as Promise<{ results: T }>;
+            return response.json() as Promise<T>
+        })
+}
+
+export function fetcherUnwraperWithFilter<T>(endpoint: string, body: NonNullable<unknown>): Promise<T> {
+    return fetch(url + endpoint, {
+        method: "POST",
+        body: JSON.stringify(body),
+        headers: {
+            "Content-Type": "application/json",
+        },
+    })
+        .then(response => {
+            if (!response.ok) {
+                throw new Error(response.statusText)
+            }
+            return response.json() as Promise<{ results: T }>
+        })
+        .then(data => {
+            return data.results
         })
-    .then((data) => {
-      return data.results;
-    });
 }

src/components/Rooms/room-booking.tsx

@@ -1,152 +1,106 @@
-import { useAPIRoomCategory } from "@/api/api-roomCategories";
+import { useAPIRoomCategoryId } from "@/api/api-roomCategories"
-import { Card, CardContent } from "../ui/card";
+import { Card, CardContent, CardHeader } from "../ui/card"
+import { useMemo, useState } from "react";
 import { Typography } from "../ui/typography";
-import {
+import { RoomCategoryPhoto } from "@/model/RoomCategory";
-  Table,
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../ui/table";
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "../ui/table";
 import { Skeleton } from "../ui/skeleton";
 import { useAppStore } from "@/store";
+import { DateRange } from "react-day-picker";
+import { FareFilter } from "@/model/RoomSearch";
 import { useAPIRoomPrices } from "@/api/api-roomSearch";
 import { NumberSelector } from "../ui/number-selector";
-import { NewBooking, NewBookingRoom } from "@/model/Bookings";
+import { NewBookingRoom } from "@/model/Bookings";
-import { RoomItemCard } from "./room-item-card";
-import { IconWithTooltip } from "../ui/icon-number-tooltip";
-import { UserIcon } from "lucide-react";
-import { makeFareFilterFromSearchFilter } from "@/utils/utils";
-import { SearchFilter } from "@/model/InternalTypes";
 
-function RoomBooking({
+function RoomBooking({ roomCategoryId, availableAmount }: { roomCategoryId: number, availableAmount: number }) {
-  roomCategoryId,
-  availableAmount,
-}: {
-  roomCategoryId: number;
-  availableAmount: number;
-}) {
-  const appSearchFilter: SearchFilter = useAppStore(
-    (state) => state.searchFilter,
-  );
-  const addNewRoom = useAppStore((state) => state.currentBookingAddRoom);
-  const bookingRooms: NewBooking | null = useAppStore(
-    (state) => state.currentBooking,
-  );
 
-  function onSelectedAmountUpdate(
+  const [selectedAmount, setSelectedAmount] = useState<Map<number, number>>(new Map());
-    guestNumber: number,
+
-    newCount: number,
+  const currentDates: DateRange = useAppStore((state) => (state.searchFilter.dateRange));
-    price: number,
+  const addNewRoom = useAppStore((state) => (state.addNewBookingRoom));
-  ) {
+
-    console.log(
+  function onSelectedAmountUpdate(guestNumber: number, newCount: number, price: number) {
-      "Room " +
+    console.log("Room " + roomCategoryId + " Guestnumber: " + guestNumber + " Count: " + newCount);
-        roomCategoryId +
+
-        " Guestnumber: " +
+    const newAmountMap = new Map(selectedAmount);
-        guestNumber +
+    newAmountMap.set(guestNumber, newCount);
-        " Count: " +
+    setSelectedAmount(newAmountMap)
-        newCount,
-    );
 
     const newRoom: NewBookingRoom = {
       roomCategory: roomCategoryId,
       guestNumber: guestNumber,
       amount: newCount,
-      price: price,
+      price: price
     };
     addNewRoom(newRoom);
   }
 
-  const getSelectedRoomAmount = (guestNumber: number | null) => {
+  const totalSelected = () => {
     let sum = 0;
-    if (bookingRooms) {
+    selectedAmount.forEach((v) => sum += v)
-      //Rooms with same category and, if guestNumber is set, rooms with same guestNumber.
-      bookingRooms.rooms
-        .filter((v) => {
-          const isSameCat = v.roomCategory == roomCategoryId;
-          const isSameGuestNum =
-            guestNumber != null ? v.guestNumber == guestNumber : true;
-          return isSameCat && isSameGuestNum;
-        })
-        .forEach((v) => (sum += v.amount));
-    }
     return sum;
   };
-  const totalSelectAmount = getSelectedRoomAmount(null);
+  const canAddMore: boolean = availableAmount > totalSelected();
-  const canAddMoreRooms: boolean = availableAmount > totalSelectAmount;
 
   //This seems a little bit overkill, but IDK.
-  const fareFilter = makeFareFilterFromSearchFilter(
+  const fareFilter: FareFilter | null = useMemo(
-    appSearchFilter,
+    () => {
-    roomCategoryId,
+      if (currentDates && currentDates.from && currentDates.to) {
+        const filter: FareFilter = {
+          startDate: currentDates.from?.toDateString(),
+          endDate: currentDates.to?.toDateString(),
+          roomCategory: roomCategoryId
+        }
+        return filter;
+      }
+      return null;
+    },
+    [currentDates, roomCategoryId]
   );
 
-  const {
+  const { roomCategory, isLoading: isLoadingCategory, isError: isErrorCategory } = useAPIRoomCategoryId(roomCategoryId);
-    roomCategory,
+  const { roomPriceList, isLoading: isLoadingPrices, isError: isErrorPrices } = useAPIRoomPrices(fareFilter);
-    isLoading: isLoadingCategory,
-    isError: isErrorCategory,
-  } = useAPIRoomCategory(roomCategoryId);
-  const {
-    roomPriceList,
-    isLoading: isLoadingPrices,
-    isError: isErrorPrices,
-  } = useAPIRoomPrices(fareFilter);
 
+
+  //TODOME: Gestionar también los estados al cargar los precios.
   const isLoading = isLoadingCategory || isLoadingPrices;
   const isError = isErrorCategory || isErrorPrices;
 
   if (isLoading) {
-    return <Skeleton className="mx-auto h-[150px] w-[600px]" />;
+    return (
+      <Skeleton className="w-[600px] h-[150px] mx-auto" />
+    );
   }
 
   if (isError) {
     return (
-      <Typography variant={"h3"} as="h3">
+      <Typography variant={"h3"} as="h3">Sorry, there was an error loading data.</Typography>
-        Sorry, there was an error loading data.
-      </Typography>
     );
   }
 
+  const mainPhoto: RoomCategoryPhoto | undefined = roomCategory?.roomCategoryPhotos.filter((p) => p.kind == "main")[0];
+  const photoElement = mainPhoto && (
+    <img src={mainPhoto.path} alt={mainPhoto.altText} className="rounded-md mx-0 px-0"></img>
+  );
+
   const hasPrices = roomPriceList != null && roomPriceList?.length > 0;
   let priceTable = null;
   if (hasPrices) {
-    //A row for each room guestNumber.
+    const tableRows = roomPriceList?.map((el) => {
-    let tableRows = null;
-    if (!isLoadingPrices) {
-      tableRows = roomPriceList?.map((el) => {
-        const selectedRoomAmount =
-          totalSelectAmount > 0 ? getSelectedRoomAmount(el.guestNumber) : 0;
-
       return (
-          <TableRow key={roomCategoryId + "-" + el.guestNumber}>
+        <TableRow key={el.guestNumber}>
-            <TableCell>
+          <TableCell>{el.guestNumber}</TableCell>
-              <IconWithTooltip
-                label={el.guestNumber?.toString()}
-                tooltipText={"Guest Number"}
-                labelPosition={"right"}
-              >
-                <UserIcon></UserIcon>
-              </IconWithTooltip>
-            </TableCell>
           <TableCell>{el.price / 100} €</TableCell>
           <TableCell>
-              <NumberSelector
+            <NumberSelector updateCount={(count) => onSelectedAmountUpdate(el.guestNumber, count, el.price)} addEnabled={canAddMore}></NumberSelector>
-                updateCount={(count) =>
-                  onSelectedAmountUpdate(el.guestNumber, count, el.price)
-                }
-                addEnabled={canAddMoreRooms}
-                initialValue={selectedRoomAmount}
-              ></NumberSelector>
           </TableCell>
         </TableRow>
       );
     });
-    }
 
-    //Element for
     priceTable = (
-      <Table className="overflow-hidden">
+      <>
+        <Table>
           <TableHeader>
             <TableRow>
               <TableHead>Guest number</TableHead>
@@ -155,38 +109,36 @@ function RoomBooking({
             </TableRow>
           </TableHeader>
           <TableBody>
-          {isLoadingPrices ? <Skeleton className="h-full w-full" /> : tableRows}
+            {isLoadingPrices ? <Skeleton className="w-[80%] h-[100%]" /> : tableRows}
           </TableBody>
         </Table>
+        <p>Rooms Available: {availableAmount}</p>
+      </>
     );
   }
 
-  let roomCard = null;
-  if (roomCategory) {
-    roomCard = (
-      <RoomItemCard
-        room={roomCategory}
-        key={roomCategoryId}
-        className="z-20 border-4"
-      ></RoomItemCard>
-    );
-  }
 
   return (
-    <div className="relative sm:grid sm:grid-cols-40/60">
+    <Card>
-      {roomCard}
+      <CardHeader>
-      <Card className="relative mx-auto w-[95%] -translate-y-2 self-center rounded-none rounded-b-xl sm:mx-0 sm:h-4/5 sm:w-full sm:-translate-x-2 sm:translate-y-0 sm:rounded-e-xl">
+        <div className="flex flex-row gap-5 w-full">
-        <CardContent className="flex h-full w-full flex-col justify-center gap-4 p-5">
+          <div className="w-[40%] flex-none">
-          {hasPrices ? (
+            {photoElement}
-            priceTable
+          </div>
-          ) : (
+          <div>
-            <Typography variant={"largeText"}>No Prices available</Typography>
+            <Typography variant={"h3"} as="h3">{roomCategory?.name}</Typography>
-          )}
+            <Typography >{roomCategory?.description}</Typography>
-          <p>Rooms Available: {availableAmount}</p>
+          </div>
+        </div>
+      </CardHeader>
+      <CardContent>
+        {hasPrices ? priceTable : <Typography variant={"largeText"}>No Prices available</Typography>}
+        <div>
+        </div>
+        <p>Selected: {totalSelected()}</p>
       </CardContent>
     </Card>
-    </div>
   );
 }
 
-export default RoomBooking;
+export default RoomBooking

src/components/Rooms/room-item-card.tsx

@@ -1,88 +1,65 @@
-import { Separator } from "../ui/separator";
+import { Separator } from "../ui/separator"
-import { Card, CardContent } from "../ui/card";
+import { Card, CardContent, CardHeader } from "../ui/card"
-import { Typography } from "../ui/typography";
+import { Typography } from "../ui/typography"
-import { UserIcon } from "lucide-react";
+import { BedDoubleIcon, BedSingleIcon, UserIcon } from "lucide-react"
-import { RoomCategory, RoomCategoryPhoto } from "@/model/RoomCategory";
+import { RoomCategory, RoomCategoryPhoto } from "@/model/RoomCategory"
-import { IconWithTooltip } from "../ui/icon-number-tooltip";
+import { IconWithTooltipNumber } from "../ui/icon-number-tooltip"
-import roomImg from "@/res/SomniaRoomImage.svg";
-import { cn } from "@/lib/utils";
-import { Icon } from "@iconify-icon/react";
 
 interface RoomItemCardProps {
-  room: RoomCategory;
+  room: RoomCategory
-  className?: string;
 }
 
 const defaultRoom: RoomCategory = {
   id: -1,
   name: "Sample Room",
   description: "Lorem Ipsum",
+  bedType: "0,1",
   maxGuestNum: 2,
-  orderHomePage: undefined,
+  roomCategoryDetails: [],
-  roomCategoryPhotos: [],
+  roomCategoryPhotos: []
-  roomCategoryBedTypes: [],
+}
-};
 
-export function RoomItemCard({
+export function RoomItemCard({ room = defaultRoom }: RoomItemCardProps) {
-  room = defaultRoom,
-  className,
-}: RoomItemCardProps) {
-  //FIXME: Use PhotoOrder.
-  const mainPhoto: RoomCategoryPhoto | undefined =
-    room.roomCategoryPhotos.length > 0
-      ? room.roomCategoryPhotos.at(0)
-      : undefined;
 
-  const bedTypeIconList = room.roomCategoryBedTypes.map((e) => {
+  const mainPhoto: RoomCategoryPhoto | undefined = room.roomCategoryPhotos.find((element) => {
-    return (
+    return element.kind = "main"
-      <IconWithTooltip
-        key={room.id.toString() + e.bedTypeIcon}
-        tooltipText={e.bedTypeName}
-        label={e.amount.toString()}
-      >
-        <Icon icon={e.bedTypeIcon} height="auto" />
-      </IconWithTooltip>
-    );
   });
+  const bedTypeList: number[] = room.bedType.split(",").map((e) => Number.parseInt(e));
+  const hasSingleBed: boolean = (bedTypeList.at(0) !== undefined && bedTypeList[0] > 0);
+  const hasDoubleBed: boolean = (bedTypeList.at(1) !== undefined && bedTypeList[1] > 0);
 
   return (
-    <Card key={room.id} className={cn(className, "relative", "py-0")}>
+    <Card id={room.id.toString()}>
-      {/* <CardHeader className="p-0 m-0 mb-5">
+      <CardHeader className="p-0 m-0 mb-5">
-        </CardHeader> */}
+        <img src={mainPhoto?.path ?? "https://images.unsplash.com/photo-1618773928121-c32242e63f39"} className="rounded-md"></img>
-      <CardContent className="flex h-full w-full flex-col p-0">
+        <Typography variant={"h2"} as="h1" className="mx-5 py-2">{room.name}</Typography>
-        <div className="">
+      </CardHeader>
-          <img
+      <CardContent>
-            src={mainPhoto?.path ?? roomImg}
+        <Typography variant={"p"} as="p">
-            className="aspect-4/3 w-full rounded-t-md object-cover"
-          ></img>
-          <Separator className="my-0 border-2" />
-        </div>
-        <div>
-          <Typography variant={"h2"} as="h2" className="border-none px-4 pt-4">
-            {room.name}
-          </Typography>
-        </div>
-        <div>
-          <Typography variant={"p"} as="h2" className="px-5">
           {room.description}
         </Typography>
-        </div>
-        <div className="mt-auto pb-4">
         <Separator className="my-4" />
         <div className="flex justify-around">
-            <div className="flex flex-row gap-2">{bedTypeIconList}</div>
+          <div className="flex flex-row gap-2">
-            <div className="flex flex-row">
+            {hasSingleBed && (
-              <IconWithTooltip
+              <IconWithTooltipNumber altText="Single bed" amount={bedTypeList[0]}>
-                tooltipText="Max. gests"
+                <BedSingleIcon />
-                label={room.maxGuestNum?.toString()}
+              </IconWithTooltipNumber>
-                labelPosition={"right"}
+            )}
-              >
+            {hasDoubleBed && (
-                <UserIcon />
+              <>
-              </IconWithTooltip>
+                <IconWithTooltipNumber altText="Double bed" amount={bedTypeList[1]}>
+                  <BedDoubleIcon />
+                </IconWithTooltipNumber>
+              </>
+            )}
           </div>
+          <div className="flex flex-row">
+            <UserIcon />
+            <Typography variant={"p_inline"} className="ml-3">{room.maxGuestNum}</Typography>
           </div>
         </div>
       </CardContent>
     </Card>
-  );
+  )
 }

src/components/Search/SearchFilterCard.tsx

@@ -1,33 +1,40 @@
-import { Separator } from "../ui/separator";
+import { Separator } from "../ui/separator"
-import { Card, CardContent, CardHeader } from "../ui/card";
+import { Card, CardContent, CardHeader } from "../ui/card"
-import { Typography } from "../ui/typography";
+import { Typography } from "../ui/typography"
-import "react-day-picker/dist/style.css";
+import 'react-day-picker/dist/style.css';
 import { DatePickerWithRange } from "../ui/dateRange-picker";
 import { Button } from "../ui/button";
 import { SearchIcon } from "lucide-react";
-import { useState } from "react";
+import { useEffect, useState } from "react";
-import { SearchFilter } from "@/model/InternalTypes";
+import { SearchFilter } from "@/model/SearchFilter";
 import { DateRange } from "react-day-picker";
 import { useToast } from "../ui/use-toast";
+import { useAppStore } from "@/store";
+import { useLocation } from "react-router-dom";
 
 type funOnSearchClick = (newFilter: SearchFilter) => void;
 
-export function SearchFilterCard({
+export function SearchFilterCard({ onSearchClick }: { onSearchClick?: funOnSearchClick }) {
-  onSearchClick,
+
-  initialsearchFilter,
+  //App filter. Updated on btSearchClick.
-}: {
+  const appSearchFilter = useAppStore((state) => (state.searchFilter));
-  onSearchClick?: funOnSearchClick;
+  const setAppSearchFilter = useAppStore((state) => (state.setSearchFilter));
-  initialsearchFilter?: SearchFilter;
+
-}) {
   //Local Filter state.
-  const [searchFilter, setSearchFilter] = useState<SearchFilter | null>(
+  const [searchFilter, setSearchFilter] = useState<SearchFilter>(appSearchFilter)
-    initialsearchFilter ?? null,
+
-  );
+  //On location change, try to load searchFilter from state.
+  //FIXME: Si llegamos sin state, hay que borrar el state global...
+  const location = useLocation();
+  useEffect(() => {
+    setSearchFilter(location.state);
+  }, [location]);
+
 
   const { toast } = useToast();
 
   // Validate and call callback on btSearch click.
-  //TODOME: Add data validations and show messages as form instead of toasts.
+  //TODOME: Add data validations and show messages.
   const btSearchClick = () => {
     if (!searchFilter || !searchFilter.dateRange) {
       toast({
@@ -41,15 +48,16 @@ export function SearchFilterCard({
       toast({
         variant: "destructive",
         title: "Uh oh! Invalid Search.",
-        description: "You should select a 'from' and 'to' dates",
+        description: "You should select a 'from' and 'to' dates"
-      });
+      })
       return;
     }
 
     if (onSearchClick) {
+      setAppSearchFilter(searchFilter);
       onSearchClick(searchFilter);
     }
-  };
+  }
 
   // Handle Element updates.
   const updateDateRange = (newRange: DateRange) => {
@@ -57,40 +65,37 @@ export function SearchFilterCard({
       ...searchFilter,
       dateRange: newRange,
     });
-  };
 
-  const datePickerElement =
+    console.log("SearchFilterCard filter UPDATED");
-    searchFilter == null ? (
+  }
+
+  const datePickerElement = searchFilter == null ? (
     <DatePickerWithRange
       updateDateRange={updateDateRange}
-        allowPast={false}
+      allowPast={false}>
-      ></DatePickerWithRange>
+    </DatePickerWithRange>
   ) : (
     <DatePickerWithRange
       updateDateRange={updateDateRange}
       allowPast={false}
       startDate={searchFilter.dateRange.from}
-        endDate={searchFilter.dateRange.to}
+      endDate={searchFilter.dateRange.to}>
-      ></DatePickerWithRange>
+    </DatePickerWithRange>
   );
 
   return (
     <Card>
-      <CardHeader className="m-0 mb-5 p-0">
+      <CardHeader className="p-0 m-0 mb-5">
-        <Typography variant={"h2"} as="h1" className="mx-5 py-2">
+        <Typography variant={"h2"} as="h1" className="mx-5 py-2">Reserva ahora</Typography>
-          Reserva ahora
-        </Typography>
       </CardHeader>
       <CardContent>
         {datePickerElement}
         <Separator className="my-4" />
         <Button size={"lg"} onClick={btSearchClick}>
-          <SearchIcon className="me-2 text-primary-foreground" />
+          <SearchIcon className="text-primary-foreground me-2" />
-          <Typography variant={"h3"} className="text-primary-foreground">
+          <Typography variant={"h3"} className="text-primary-foreground">Buscar</Typography>
-            Buscar
-          </Typography>
         </Button>
       </CardContent>
     </Card>
-  );
+  )
 }

src/components/app-footer.tsx

@@ -1,7 +1,11 @@
+
 function AppFooter() {
+
   return (
-    <div className="hidden flex-col bg-secondary">
+    <div className="bg-secondary flex-col hidden">
-      <div className="">Created with Love by me :)</div>
+        <div className="">
+            Created with Love by me :)
+        </div>
         <div className="">
             <p>Más información</p>
             <ul className="list-outside">
@@ -11,7 +15,7 @@ function AppFooter() {
             </ul>
         </div>
     </div>
-  );
+  )
 }
 
-export default AppFooter;
+export default AppFooter

src/components/app-header.tsx

@@ -1,40 +1,32 @@
-import { ModeToggle } from "./mode-toggle";
+import { ModeToggle } from "./mode-toggle"
-import { Button } from "./ui/button";
+import { Button } from "./ui/button"
-import { Card, CardContent } from "./ui/card";
+import { Card, CardContent } from "./ui/card"
-import { Typography } from "./ui/typography";
+import { Typography } from "./ui/typography"
-import { Link } from "react-router-dom";
+import { Link } from "react-router-dom"
-import { BookAIcon, HomeIcon } from "lucide-react";
+import { BookAIcon, HomeIcon } from "lucide-react"
 
 function AppHeader() {
+
   return (
-    <Card className="mx-10 my-4 flex items-center py-0">
+    <Card className="flex items-center mx-10 my-4">
       <CardContent className="w-full py-2">
-        <div className="flex items-center justify-around">
+        <div className="flex justify-around items-center">
-          <div className="relative flex flex-row items-center gap-2">
+          <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
+            <a href="https://duck.com" className="absolute w-[100%] h-[100%]"></a>
-              href="https://duck.com"
-              className="absolute h-full w-full"
-            ></a>
           </div>
           <Button variant="ghost" className="h-15">
-            <Link to={`home`}>
+            <Link to={`home`}><HomeIcon className="mx-auto" />Home</Link>
-              <HomeIcon className="mx-auto" />
-              Home
-            </Link>
           </Button>
           <Button variant="ghost" className="h-15">
-            <Link to={`search`}>
+            <Link to={`search`}><BookAIcon className="mx-auto" />Reservar</Link>
-              <BookAIcon className="mx-auto" />
-              Reservar
-            </Link>
           </Button>
           <ModeToggle />
         </div>
       </CardContent>
     </Card>
-  );
+  )
 }
 
-export default AppHeader;
+export default AppHeader

src/components/backend-conection-status.tsx

@@ -1,10 +1,6 @@
-function BackendConnectionStatus({
+
-  isLoading,
+function BackendConnectionStatus({ isLoading, isError }: { isLoading?: boolean, isError?: boolean }) {
-  isError,
+
-}: {
-  isLoading?: boolean;
-  isError?: boolean;
-}) {
   const BACKEND_HOST = import.meta.env.VITE_BACKEND_HOST;
   const BACKEND_PORT = import.meta.env.VITE_BACKEND_PORT;
 
@@ -14,10 +10,10 @@ function BackendConnectionStatus({
         Conected to Back-End at: {BACKEND_HOST} - {BACKEND_PORT}
       </p>
       <p>
-        Conection Status: {isError ? "ERROR" : isLoading ? "LOADING" : "LOADED"}
+        Conection Status: {isError ? "ERROR" : (isLoading ? "LOADING" : "LOADED")}
       </p>
     </div>
-  );
+  )
 }
 
-export default BackendConnectionStatus;
+export default BackendConnectionStatus

src/components/booking/booking-details.tsx

@@ -1,39 +1,29 @@
-import { useAppStore } from "@/store";
+import { useAppStore } from "@/store"
-import { Card, CardContent, CardHeader } from "../ui/card";
+import { Card, CardContent, CardHeader } from "../ui/card"
-import { Typography } from "../ui/typography";
+import { Typography } from "../ui/typography"
 import { differenceInDays } from "date-fns";
 import { Separator } from "../ui/separator";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../ui/table";
 import { Button } from "../ui/button";
-import { useAPIRoomCategoryList } from "@/api/api-roomCategories";
-import { IconWithTooltip } from "../ui/icon-number-tooltip";
-import { UserIcon } from "lucide-react";
 
 type OnBookingClickFunction = () => void;
-type BookingDetailsModes = "Book" | "View";
+type BookingDetailsModes = "Book" | "View"
 
-export function BookingDetails({
+export function BookingDetails({ onBookingConfirm, mode }: { onBookingConfirm?: OnBookingClickFunction, mode: BookingDetailsModes }) {
-  onBookingConfirm,
+
-  mode,
+  const bookingData = useAppStore((state) => state.newBookingData);
-}: {
-  onBookingConfirm?: OnBookingClickFunction;
-  mode: BookingDetailsModes;
-}) {
-  const bookingData = useAppStore((state) => state.currentBooking);
-  const roomCategoryList = useAPIRoomCategoryList();
 
   const onBtBookingClick = () => {
     if (onBookingConfirm) {
       onBookingConfirm();
     }
-  };
+  }
 
   if (!bookingData || bookingData.rooms.length <= 0) {
     return (
       <Card>
         <CardHeader>
-          <Typography variant={"h2"} as="h2">
+          <Typography variant={"h2"} as="h2">Your Booking</Typography>
-            Your Booking
-          </Typography>
         </CardHeader>
         <CardContent>
           <Typography variant={"h3"}>No rooms added yet</Typography>
@@ -43,86 +33,63 @@ export function BookingDetails({
   }
 
   const roomList = bookingData.rooms.map((room) => {
-    const category = roomCategoryList.roomCategoryList
-      ?.filter((c) => c.id == room.roomCategory)
-      .at(0);
-    const photo = category?.roomCategoryPhotos.at(0);
-
     return (
-      <Card
+      <TableRow key={room.roomCategory + "_" + room.guestNumber}>
-        key={room.roomCategory.toString() + room.guestNumber.toString()}
+        <TableCell>{room.roomCategory}</TableCell>
-        className="my-3 flex flex-row bg-accent py-0"
+        <TableCell>{room.guestNumber}</TableCell>
-      >
+        <TableCell>{room.amount}</TableCell>
-        {photo && (
+        <TableCell>{room.price / 100} €</TableCell>
-          <img
+        <TableCell>{(room.price * room.amount) / 100} €</TableCell>
-            src={photo.path}
+      </TableRow>
-            className="max-w-[30%] rounded-s-xl object-cover"
-          />
-        )}
-        <div className="w-full p-3">
-          <Typography variant={"h3"} as="h3" className="m-2 text-center">
-            {category?.name}
-          </Typography>
-          <div className="flex w-full flex-row justify-around">
-            <IconWithTooltip
-              label={room.guestNumber.toString()}
-              labelPosition={"right"}
-              tooltipText={"Guest Number"}
-            >
-              <UserIcon />
-            </IconWithTooltip>
-            <Typography variant={"largeText"}>
-              {room.amount} x {room.price / 100}€
-            </Typography>
-            <Typography variant={"largeText"}>
-              {(room.amount * room.price) / 100}€
-            </Typography>
-          </div>
-        </div>
-      </Card>
     );
-  });
+  })
 
-  const totalPrice = bookingData.rooms.reduce(
+
-    (acc, room) => acc + room.price * room.amount,
+  const roomTable = (
-    0,
+    <Table>
+      <TableHeader>
+        <TableRow>
+          <TableHead>Room</TableHead>
+          <TableHead>Guests</TableHead>
+          <TableHead>Quantity</TableHead>
+          <TableHead>Unit price</TableHead>
+          <TableHead>Total price</TableHead>
+        </TableRow>
+      </TableHeader>
+      <TableBody>
+        {roomList}
+      </TableBody>
+    </Table>
   );
 
+
+  const totalPrice = bookingData.rooms.reduce((acc, room) => (acc + (room.price * room.amount)), 0);
+
   return (
     <Card>
       <CardHeader>
-        <Typography variant={"h2"} as="h2">
+        <Typography variant={"h2"} as="h2">Your Booking</Typography>
-          Your Booking
-        </Typography>
       </CardHeader>
       <CardContent>
         <Typography variant={"h3"}>Your Dates</Typography>
         <Typography variant={"largeText"}>
-          Arrival: {bookingData.arrivalDate.toLocaleDateString()} - Departure:{" "}
+          Arrival: {bookingData.arrivalDate.toLocaleDateString()}  -
-          {bookingData.departureDate.toLocaleDateString()} <br></br>
+          Departure: {bookingData.departureDate.toLocaleDateString()} <br></br>
-          Number of nights:{" "}
+          Number of nights: {differenceInDays(bookingData.departureDate, bookingData.arrivalDate)}
-          {differenceInDays(
-            bookingData.departureDate,
-            bookingData.arrivalDate,
-          ) + 1}
         </Typography>
         <Separator className="my-2"></Separator>
         <Typography variant={"h3"}>Your Rooms</Typography>
-        <div className="">{roomList}</div>
+        {roomTable}
         <Separator className="my-2"></Separator>
         <Typography variant={"h3"}>Total Price</Typography>
         <Typography variant={"h3"}>{totalPrice / 100} €</Typography>
-        {mode == "Book" && (
+        {
+          mode == "Book" &&
           <Button className="my-2" onClick={onBtBookingClick}>
-            <Typography
+            <Typography variant={"largeText"} className="text-primary-foreground">Book it!</Typography>
-              variant={"largeText"}
-              className="text-primary-foreground"
-            >
-              Book it!
-            </Typography>
           </Button>
-        )}
+        }
       </CardContent>
     </Card>
-  );
+  )
 }

src/components/mode-toggle.tsx

@@ -1,20 +1,20 @@
-import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
+import { MoonIcon, SunIcon } from "@radix-ui/react-icons"
 
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/button"
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/dropdown-menu"
-import { useTheme } from "@/components/theme-provider";
+import { useTheme } from "@/components/theme-provider"
 
 export function ModeToggle() {
-  const { setTheme } = useTheme();
+  const { setTheme } = useTheme()
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
+      <DropdownMenuTrigger asChild>
         <Button variant="outline" size="icon">
           <SunIcon className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
           <MoonIcon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
@@ -23,18 +23,15 @@ export function ModeToggle() {
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
         <DropdownMenuItem onClick={() => setTheme("light")}>
-          <SunIcon className="h-[1.2rem] w-[1.2rem] scale-100" />
           Light
         </DropdownMenuItem>
         <DropdownMenuItem onClick={() => setTheme("dark")}>
-          <MoonIcon className="h-[1.2rem] w-[1.2rem] scale-100" />
           Dark
         </DropdownMenuItem>
         <DropdownMenuItem onClick={() => setTheme("system")}>
-          <MonitorIcon className="h-[1.2rem] w-[1.2rem] scale-100" />
           System
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
-  );
+  )
 }

src/components/theme-provider.tsx

@@ -1,24 +1,24 @@
-import { createContext, useContext, useEffect, useState } from "react";
+import { createContext, useContext, useEffect, useState } from "react"
 
-type Theme = "dark" | "light" | "system";
+type Theme = "dark" | "light" | "system"
 
 type ThemeProviderProps = {
-  children: React.ReactNode;
+    children: React.ReactNode
-  defaultTheme?: Theme;
+    defaultTheme?: Theme
-  storageKey?: string;
+    storageKey?: string
-};
+}
 
 type ThemeProviderState = {
-  theme: Theme;
+    theme: Theme
-  setTheme: (theme: Theme) => void;
+    setTheme: (theme: Theme) => void
-};
+}
 
 const initialState: ThemeProviderState = {
     theme: "system",
     setTheme: () => null,
-};
+}
 
-const ThemeProviderContext = createContext<ThemeProviderState>(initialState);
+const ThemeProviderContext = createContext<ThemeProviderState>(initialState)
 
 export function ThemeProvider({
     children,
@@ -27,48 +27,48 @@ export function ThemeProvider({
     ...props
 }: ThemeProviderProps) {
     const [theme, setTheme] = useState<Theme>(
-    () => (localStorage.getItem(storageKey) as Theme) || defaultTheme,
+        () => (localStorage.getItem(storageKey) as Theme) || defaultTheme
-  );
+    )
 
     useEffect(() => {
-    const root = window.document.documentElement;
+        const root = window.document.documentElement
 
-    root.classList.remove("light", "dark");
+        root.classList.remove("light", "dark")
 
         if (theme === "system") {
             const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
                 .matches
                 ? "dark"
-        : "light";
+                : "light"
 
-      root.classList.add(systemTheme);
+            root.classList.add(systemTheme)
-      return;
+            return
         }
 
-    root.classList.add(theme);
+        root.classList.add(theme)
-  }, [theme]);
+    }, [theme])
 
     const value = {
         theme,
         setTheme: (theme: Theme) => {
-      localStorage.setItem(storageKey, theme);
+            localStorage.setItem(storageKey, theme)
-      setTheme(theme);
+            setTheme(theme)
         },
-  };
+    }
 
     return (
         <ThemeProviderContext.Provider {...props} value={value}>
             {children}
         </ThemeProviderContext.Provider>
-  );
+    )
 }
 
 // eslint-disable-next-line react-refresh/only-export-components
 export const useTheme = () => {
-  const context = useContext(ThemeProviderContext);
+    const context = useContext(ThemeProviderContext)
 
     if (context === undefined)
-    throw new Error("useTheme must be used within a ThemeProvider");
+        throw new Error("useTheme must be used within a ThemeProvider")
 
-  return context;
+    return context
-};
+}

src/components/ui/badge.tsx

@@ -1,47 +1,36 @@
-import * as React from "react";
+import * as React from "react"
-import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority"
-import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
 const badgeVariants = cva(
-  "inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden",
+  "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
   {
     variants: {
       variant: {
         default:
-          "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
+          "border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
         secondary:
-          "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
+          "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
         destructive:
-          "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+          "border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
-        outline:
+        outline: "text-foreground",
-          "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
       },
     },
     defaultVariants: {
       variant: "default",
     },
-  },
+  }
-);
+)
 
-function Badge({
+export interface BadgeProps
-  className,
+  extends React.HTMLAttributes<HTMLDivElement>,
-  variant,
+    VariantProps<typeof badgeVariants> {}
-  asChild = false,
-  ...props
-}: React.ComponentProps<"span"> &
-  VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot : "span";
 
+function Badge({ className, variant, ...props }: BadgeProps) {
   return (
-    <Comp
+    <div className={cn(badgeVariants({ variant }), className)} {...props} />
-      data-slot="badge"
+  )
-      className={cn(badgeVariants({ variant }), className)}
-      {...props}
-    />
-  );
 }
 
-// eslint-disable-next-line react-refresh/only-export-components
+export { Badge, badgeVariants }
-export { Badge, badgeVariants };

src/components/ui/button.tsx

@@ -1,60 +1,57 @@
-import * as React from "react";
+import * as React from "react"
-import { Slot } from "@radix-ui/react-slot";
+import { Slot } from "@radix-ui/react-slot"
-import { cva, type VariantProps } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
   {
     variants: {
       variant: {
         default:
-          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+          "bg-primary text-primary-foreground shadow hover:bg-primary/90",
         destructive:
-          "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+          "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
         outline:
-          "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
+          "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
         secondary:
-          "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
+          "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
-        ghost:
+        ghost: "hover:bg-accent hover:text-accent-foreground",
-          "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
         link: "text-primary underline-offset-4 hover:underline",
       },
       size: {
-        default: "h-9 px-4 py-2 has-[>svg]:px-3",
+        default: "h-9 px-4 py-2",
-        sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
+        sm: "h-8 rounded-md px-3 text-xs",
-        lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
+        lg: "h-10 rounded-md px-8",
-        icon: "size-9",
+        icon: "h-9 w-9",
       },
     },
     defaultVariants: {
       variant: "default",
       size: "default",
     },
-  },
+  }
-);
+)
 
-function Button({
+export interface ButtonProps
-  className,
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-  variant,
+    VariantProps<typeof buttonVariants> {
-  size,
+  asChild?: boolean
-  asChild = false,
-  ...props
-}: React.ComponentProps<"button"> &
-  VariantProps<typeof buttonVariants> & {
-    asChild?: boolean;
-  }) {
-  const Comp = asChild ? Slot : "button";
-
-  return (
-    <Comp
-      data-slot="button"
-      className={cn(buttonVariants({ variant, size, className }))}
-      {...props}
-    />
-  );
 }
 
-// eslint-disable-next-line react-refresh/only-export-components
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-export { Button, buttonVariants };
+  ({ className, variant, size, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : "button"
+    return (
+      <Comp
+        className={cn(buttonVariants({ variant, size, className }))}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Button.displayName = "Button"
+
+export { Button, buttonVariants }

src/components/ui/calendar.tsx

@@ -1,208 +1,70 @@
-import * as React from "react";
+import * as React from "react"
-import {
+import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons"
-  ChevronDownIcon,
+import { DayPicker } from "react-day-picker"
-  ChevronLeftIcon,
-  ChevronRightIcon,
-} from "lucide-react";
-import { DayButton, DayPicker, getDefaultClassNames } from "react-day-picker";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
-import { Button, buttonVariants } from "@/components/ui/button";
+import { buttonVariants } from "@/components/ui/button"
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>
 
 function Calendar({
   className,
   classNames,
   showOutsideDays = true,
-  captionLayout = "label",
-  buttonVariant = "ghost",
-  formatters,
-  components,
   ...props
-}: React.ComponentProps<typeof DayPicker> & {
+}: CalendarProps) {
-  buttonVariant?: React.ComponentProps<typeof Button>["variant"];
-}) {
-  const defaultClassNames = getDefaultClassNames();
-
   return (
     <DayPicker
       showOutsideDays={showOutsideDays}
-      className={cn(
+      className={cn("p-3", className)}
-        "group/calendar bg-background p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
-        String.raw`rtl:**:[.rdp-button\_next>svg]:rotate-180`,
-        String.raw`rtl:**:[.rdp-button\_previous>svg]:rotate-180`,
-        className,
-      )}
-      captionLayout={captionLayout}
-      formatters={{
-        formatMonthDropdown: (date) =>
-          date.toLocaleString("default", { month: "short" }),
-        ...formatters,
-      }}
       classNames={{
-        root: cn("w-fit", defaultClassNames.root),
+        months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
-        months: cn(
+        month: "space-y-4",
-          "flex gap-4 flex-col md:flex-row relative",
+        caption: "flex justify-center pt-1 relative items-center",
-          defaultClassNames.months,
+        caption_label: "text-sm font-medium",
+        nav: "space-x-1 flex items-center",
+        nav_button: cn(
+          buttonVariants({ variant: "outline" }),
+          "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100"
         ),
-        month: cn("flex flex-col w-full gap-4", defaultClassNames.month),
+        nav_button_previous: "absolute left-1",
-        nav: cn(
+        nav_button_next: "absolute right-1",
-          "flex items-center gap-1 w-full absolute top-0 inset-x-0 justify-between",
+        table: "w-full border-collapse space-y-1",
-          defaultClassNames.nav,
+        head_row: "flex",
-        ),
+        head_cell:
-        button_previous: cn(
+          "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
-          buttonVariants({ variant: buttonVariant }),
+        row: "flex w-full mt-2",
-          "size-(--cell-size) aria-disabled:opacity-50 p-0 select-none",
+        cell: cn(
-          defaultClassNames.button_previous,
+          "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",
-        ),
+          props.mode === "range"
-        button_next: cn(
+            ? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
-          buttonVariants({ variant: buttonVariant }),
+            : "[&:has([aria-selected])]:rounded-md"
-          "size-(--cell-size) aria-disabled:opacity-50 p-0 select-none",
-          defaultClassNames.button_next,
-        ),
-        month_caption: cn(
-          "flex items-center justify-center h-(--cell-size) w-full px-(--cell-size)",
-          defaultClassNames.month_caption,
-        ),
-        dropdowns: cn(
-          "w-full flex items-center text-sm font-medium justify-center h-(--cell-size) gap-1.5",
-          defaultClassNames.dropdowns,
-        ),
-        dropdown_root: cn(
-          "relative has-focus:border-ring border border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] rounded-md",
-          defaultClassNames.dropdown_root,
-        ),
-        dropdown: cn("absolute inset-0 opacity-0", defaultClassNames.dropdown),
-        caption_label: cn(
-          "select-none font-medium",
-          captionLayout === "label"
-            ? "text-sm"
-            : "rounded-md pl-2 pr-1 flex items-center gap-1 text-sm h-8 [&>svg]:text-muted-foreground [&>svg]:size-3.5",
-          defaultClassNames.caption_label,
-        ),
-        table: "w-full border-collapse",
-        weekdays: cn("flex", defaultClassNames.weekdays),
-        weekday: cn(
-          "text-muted-foreground rounded-md flex-1 font-normal text-[0.8rem] select-none",
-          defaultClassNames.weekday,
-        ),
-        week: cn("flex w-full mt-2", defaultClassNames.week),
-        week_number_header: cn(
-          "select-none w-(--cell-size)",
-          defaultClassNames.week_number_header,
-        ),
-        week_number: cn(
-          "text-[0.8rem] select-none text-muted-foreground",
-          defaultClassNames.week_number,
         ),
         day: cn(
-          "relative w-full h-full p-0 text-center [&:first-child[data-selected=true]_button]:rounded-l-md [&:last-child[data-selected=true]_button]:rounded-r-md group/day aspect-square select-none",
+          buttonVariants({ variant: "ghost" }),
-          defaultClassNames.day,
+          "h-8 w-8 p-0 font-normal aria-selected:opacity-100"
         ),
-        range_start: cn(
+        day_range_start: "day-range-start",
-          "rounded-l-md bg-accent",
+        day_range_end: "day-range-end",
-          defaultClassNames.range_start,
+        day_selected:
-        ),
+          "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
-        range_middle: cn("rounded-none", defaultClassNames.range_middle),
+        day_today: "bg-accent text-accent-foreground",
-        range_end: cn("rounded-r-md bg-accent", defaultClassNames.range_end),
+        day_outside:
-        today: cn(
+          "day-outside text-muted-foreground opacity-50  aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30",
-          "bg-accent text-accent-foreground rounded-md data-[selected=true]:rounded-none",
+        day_disabled: "text-muted-foreground opacity-50",
-          defaultClassNames.today,
+        day_range_middle:
-        ),
+          "aria-selected:bg-accent aria-selected:text-accent-foreground",
-        outside: cn(
+        day_hidden: "invisible",
-          "text-muted-foreground aria-selected:text-muted-foreground",
-          defaultClassNames.outside,
-        ),
-        disabled: cn(
-          "text-muted-foreground opacity-50",
-          defaultClassNames.disabled,
-        ),
-        hidden: cn("invisible", defaultClassNames.hidden),
         ...classNames,
       }}
       components={{
-        Root: ({ className, rootRef, ...props }) => {
+        IconLeft: () => <ChevronLeftIcon className="h-4 w-4" />,
-          return (
+        IconRight: () => <ChevronRightIcon className="h-4 w-4" />,
-            <div
-              data-slot="calendar"
-              ref={rootRef}
-              className={cn(className)}
-              {...props}
-            />
-          );
-        },
-        Chevron: ({ className, orientation, ...props }) => {
-          if (orientation === "left") {
-            return (
-              <ChevronLeftIcon className={cn("size-4", className)} {...props} />
-            );
-          }
-
-          if (orientation === "right") {
-            return (
-              <ChevronRightIcon
-                className={cn("size-4", className)}
-                {...props}
-              />
-            );
-          }
-
-          return (
-            <ChevronDownIcon className={cn("size-4", className)} {...props} />
-          );
-        },
-        DayButton: CalendarDayButton,
-        WeekNumber: ({ children, ...props }) => {
-          return (
-            <td {...props}>
-              <div className="flex size-(--cell-size) items-center justify-center text-center">
-                {children}
-              </div>
-            </td>
-          );
-        },
-        ...components,
       }}
       {...props}
     />
-  );
+  )
 }
+Calendar.displayName = "Calendar"
 
-function CalendarDayButton({
+export { Calendar }
-  className,
-  day,
-  modifiers,
-  ...props
-}: React.ComponentProps<typeof DayButton>) {
-  const defaultClassNames = getDefaultClassNames();
-
-  const ref = React.useRef<HTMLButtonElement>(null);
-  React.useEffect(() => {
-    if (modifiers.focused) ref.current?.focus();
-  }, [modifiers.focused]);
-
-  return (
-    <Button
-      ref={ref}
-      variant="ghost"
-      size="icon"
-      data-day={day.date.toLocaleDateString()}
-      data-selected-single={
-        modifiers.selected &&
-        !modifiers.range_start &&
-        !modifiers.range_end &&
-        !modifiers.range_middle
-      }
-      data-range-start={modifiers.range_start}
-      data-range-end={modifiers.range_end}
-      data-range-middle={modifiers.range_middle}
-      className={cn(
-        "flex aspect-square size-auto w-full min-w-(--cell-size) flex-col gap-1 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-[3px] group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:rounded-none data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground dark:hover:text-accent-foreground [&>span]:text-xs [&>span]:opacity-70",
-        defaultClassNames.day,
-        className,
-      )}
-      {...props}
-    />
-  );
-}
-
-export { Calendar, CalendarDayButton };

src/components/ui/card.tsx

@@ -1,92 +1,76 @@
-import * as React from "react";
+import * as React from "react"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Card({ className, ...props }: React.ComponentProps<"div">) {
+const Card = React.forwardRef<
-  return (
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
   <div
-      data-slot="card"
+    ref={ref}
     className={cn(
-        "flex flex-col gap-6 rounded-xl border bg-card py-6 text-card-foreground shadow-sm",
+      "rounded-xl border bg-card text-card-foreground shadow",
-        className,
+      className
     )}
     {...props}
   />
-  );
+))
-}
+Card.displayName = "Card"
 
-function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
+const CardHeader = React.forwardRef<
-  return (
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
   <div
-      data-slot="card-header"
+    ref={ref}
-      className={cn(
+    className={cn("flex flex-col space-y-1.5 p-6", className)}
-        "@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
-        className,
-      )}
     {...props}
   />
-  );
+))
-}
+CardHeader.displayName = "CardHeader"
 
-function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
+const CardTitle = React.forwardRef<
-  return (
+  HTMLParagraphElement,
-    <div
+  React.HTMLAttributes<HTMLHeadingElement>
-      data-slot="card-title"
+>(({ className, ...props }, ref) => (
-      className={cn("leading-none font-semibold", className)}
+  <h3
+    ref={ref}
+    className={cn("font-semibold leading-none tracking-tight", className)}
     {...props}
   />
-  );
+))
-}
+CardTitle.displayName = "CardTitle"
 
-function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
+const CardDescription = React.forwardRef<
-  return (
+  HTMLParagraphElement,
-    <div
+  React.HTMLAttributes<HTMLParagraphElement>
-      data-slot="card-description"
+>(({ className, ...props }, ref) => (
+  <p
+    ref={ref}
     className={cn("text-sm text-muted-foreground", className)}
     {...props}
   />
-  );
+))
-}
+CardDescription.displayName = "CardDescription"
 
-function CardAction({ className, ...props }: React.ComponentProps<"div">) {
+const CardContent = React.forwardRef<
-  return (
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
+))
+CardContent.displayName = "CardContent"
+
+const CardFooter = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
   <div
-      data-slot="card-action"
+    ref={ref}
-      className={cn(
+    className={cn("flex items-center p-6 pt-0", className)}
-        "col-start-2 row-span-2 row-start-1 self-start justify-self-end",
-        className,
-      )}
     {...props}
   />
-  );
+))
-}
+CardFooter.displayName = "CardFooter"
 
-function CardContent({ className, ...props }: React.ComponentProps<"div">) {
+export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
-  return (
-    <div
-      data-slot="card-content"
-      className={cn("px-6", className)}
-      {...props}
-    />
-  );
-}
-
-function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-footer"
-      className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
-      {...props}
-    />
-  );
-}
-
-export {
-  Card,
-  CardHeader,
-  CardFooter,
-  CardTitle,
-  CardAction,
-  CardDescription,
-  CardContent,
-};

src/components/ui/carousel.tsx

@@ -1,46 +1,51 @@
-import * as React from "react";
+import * as React from "react"
+import { ArrowLeftIcon, ArrowRightIcon } from "@radix-ui/react-icons"
 import useEmblaCarousel, {
   type UseEmblaCarouselType,
-} from "embla-carousel-react";
+} from "embla-carousel-react"
-import { ArrowLeft, ArrowRight } from "lucide-react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/button"
 
-type CarouselApi = UseEmblaCarouselType[1];
+type CarouselApi = UseEmblaCarouselType[1]
-type UseCarouselParameters = Parameters<typeof useEmblaCarousel>;
+type UseCarouselParameters = Parameters<typeof useEmblaCarousel>
-type CarouselOptions = UseCarouselParameters[0];
+type CarouselOptions = UseCarouselParameters[0]
-type CarouselPlugin = UseCarouselParameters[1];
+type CarouselPlugin = UseCarouselParameters[1]
 
 type CarouselProps = {
-  opts?: CarouselOptions;
+  opts?: CarouselOptions
-  plugins?: CarouselPlugin;
+  plugins?: CarouselPlugin
-  orientation?: "horizontal" | "vertical";
+  orientation?: "horizontal" | "vertical"
-  setApi?: (api: CarouselApi) => void;
+  setApi?: (api: CarouselApi) => void
-};
-
-type CarouselContextProps = {
-  carouselRef: ReturnType<typeof useEmblaCarousel>[0];
-  api: ReturnType<typeof useEmblaCarousel>[1];
-  scrollPrev: () => void;
-  scrollNext: () => void;
-  canScrollPrev: boolean;
-  canScrollNext: boolean;
-} & CarouselProps;
-
-const CarouselContext = React.createContext<CarouselContextProps | null>(null);
-
-function useCarousel() {
-  const context = React.useContext(CarouselContext);
-
-  if (!context) {
-    throw new Error("useCarousel must be used within a <Carousel />");
-  }
-
-  return context;
 }
 
-function Carousel({
+type CarouselContextProps = {
+  carouselRef: ReturnType<typeof useEmblaCarousel>[0]
+  api: ReturnType<typeof useEmblaCarousel>[1]
+  scrollPrev: () => void
+  scrollNext: () => void
+  canScrollPrev: boolean
+  canScrollNext: boolean
+} & CarouselProps
+
+const CarouselContext = React.createContext<CarouselContextProps | null>(null)
+
+function useCarousel() {
+  const context = React.useContext(CarouselContext)
+
+  if (!context) {
+    throw new Error("useCarousel must be used within a <Carousel />")
+  }
+
+  return context
+}
+
+const Carousel = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement> & CarouselProps
+>(
+  (
+    {
       orientation = "horizontal",
       opts,
       setApi,
@@ -48,59 +53,70 @@ function Carousel({
       className,
       children,
       ...props
-}: React.ComponentProps<"div"> & CarouselProps) {
+    },
+    ref
+  ) => {
     const [carouselRef, api] = useEmblaCarousel(
       {
         ...opts,
         axis: orientation === "horizontal" ? "x" : "y",
       },
-    plugins,
+      plugins
-  );
+    )
-  const [canScrollPrev, setCanScrollPrev] = React.useState(false);
+    const [canScrollPrev, setCanScrollPrev] = React.useState(false)
-  const [canScrollNext, setCanScrollNext] = React.useState(false);
+    const [canScrollNext, setCanScrollNext] = React.useState(false)
 
     const onSelect = React.useCallback((api: CarouselApi) => {
-    if (!api) return;
+      if (!api) {
-    setCanScrollPrev(api.canScrollPrev());
+        return
-    setCanScrollNext(api.canScrollNext());
+      }
-  }, []);
+
+      setCanScrollPrev(api.canScrollPrev())
+      setCanScrollNext(api.canScrollNext())
+    }, [])
 
     const scrollPrev = React.useCallback(() => {
-    api?.scrollPrev();
+      api?.scrollPrev()
-  }, [api]);
+    }, [api])
 
     const scrollNext = React.useCallback(() => {
-    api?.scrollNext();
+      api?.scrollNext()
-  }, [api]);
+    }, [api])
 
     const handleKeyDown = React.useCallback(
       (event: React.KeyboardEvent<HTMLDivElement>) => {
         if (event.key === "ArrowLeft") {
-        event.preventDefault();
+          event.preventDefault()
-        scrollPrev();
+          scrollPrev()
         } else if (event.key === "ArrowRight") {
-        event.preventDefault();
+          event.preventDefault()
-        scrollNext();
+          scrollNext()
         }
       },
-    [scrollPrev, scrollNext],
+      [scrollPrev, scrollNext]
-  );
+    )
 
     React.useEffect(() => {
-    if (!api || !setApi) return;
+      if (!api || !setApi) {
-    setApi(api);
+        return
-  }, [api, setApi]);
+      }
+
+      setApi(api)
+    }, [api, setApi])
 
     React.useEffect(() => {
-    if (!api) return;
+      if (!api) {
-    onSelect(api);
+        return
-    api.on("reInit", onSelect);
+      }
-    api.on("select", onSelect);
+
+      onSelect(api)
+      api.on("reInit", onSelect)
+      api.on("select", onSelect)
 
       return () => {
-      api?.off("select", onSelect);
+        api?.off("select", onSelect)
-    };
+      }
-  }, [api, onSelect]);
+    }, [api, onSelect])
 
     return (
       <CarouselContext.Provider
@@ -117,117 +133,122 @@ function Carousel({
         }}
       >
         <div
+          ref={ref}
           onKeyDownCapture={handleKeyDown}
           className={cn("relative", className)}
           role="region"
           aria-roledescription="carousel"
-        data-slot="carousel"
           {...props}
         >
           {children}
         </div>
       </CarouselContext.Provider>
-  );
+    )
-}
+  }
+)
+Carousel.displayName = "Carousel"
 
-function CarouselContent({ className, ...props }: React.ComponentProps<"div">) {
+const CarouselContent = React.forwardRef<
-  const { carouselRef, orientation } = useCarousel();
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => {
+  const { carouselRef, orientation } = useCarousel()
 
   return (
+    <div ref={carouselRef} className="overflow-hidden">
       <div
-      ref={carouselRef}
+        ref={ref}
-      className="overflow-hidden"
-      data-slot="carousel-content"
-    >
-      <div
         className={cn(
           "flex",
           orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col",
-          className,
+          className
         )}
         {...props}
       />
     </div>
-  );
+  )
-}
+})
+CarouselContent.displayName = "CarouselContent"
 
-function CarouselItem({ className, ...props }: React.ComponentProps<"div">) {
+const CarouselItem = React.forwardRef<
-  const { orientation } = useCarousel();
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => {
+  const { orientation } = useCarousel()
 
   return (
     <div
+      ref={ref}
       role="group"
       aria-roledescription="slide"
-      data-slot="carousel-item"
       className={cn(
         "min-w-0 shrink-0 grow-0 basis-full",
         orientation === "horizontal" ? "pl-4" : "pt-4",
-        className,
+        className
       )}
       {...props}
     />
-  );
+  )
-}
+})
+CarouselItem.displayName = "CarouselItem"
 
-function CarouselPrevious({
+const CarouselPrevious = React.forwardRef<
-  className,
+  HTMLButtonElement,
-  variant = "outline",
+  React.ComponentProps<typeof Button>
-  size = "icon",
+>(({ className, variant = "outline", size = "icon", ...props }, ref) => {
-  ...props
+  const { orientation, scrollPrev, canScrollPrev } = useCarousel()
-}: React.ComponentProps<typeof Button>) {
-  const { orientation, scrollPrev, canScrollPrev } = useCarousel();
 
   return (
     <Button
-      data-slot="carousel-previous"
+      ref={ref}
       variant={variant}
       size={size}
       className={cn(
-        "absolute size-8 rounded-full",
+        "absolute  h-8 w-8 rounded-full",
         orientation === "horizontal"
-          ? "top-1/2 -left-12 -translate-y-1/2"
+          ? "-left-12 top-1/2 -translate-y-1/2"
           : "-top-12 left-1/2 -translate-x-1/2 rotate-90",
-        className,
+        className
       )}
       disabled={!canScrollPrev}
       onClick={scrollPrev}
       {...props}
     >
-      <ArrowLeft />
+      <ArrowLeftIcon className="h-4 w-4" />
       <span className="sr-only">Previous slide</span>
     </Button>
-  );
+  )
-}
+})
+CarouselPrevious.displayName = "CarouselPrevious"
 
-function CarouselNext({
+const CarouselNext = React.forwardRef<
-  className,
+  HTMLButtonElement,
-  variant = "outline",
+  React.ComponentProps<typeof Button>
-  size = "icon",
+>(({ className, variant = "outline", size = "icon", ...props }, ref) => {
-  ...props
+  const { orientation, scrollNext, canScrollNext } = useCarousel()
-}: React.ComponentProps<typeof Button>) {
-  const { orientation, scrollNext, canScrollNext } = useCarousel();
 
   return (
     <Button
-      data-slot="carousel-next"
+      ref={ref}
       variant={variant}
       size={size}
       className={cn(
-        "absolute size-8 rounded-full",
+        "absolute h-8 w-8 rounded-full",
         orientation === "horizontal"
-          ? "top-1/2 -right-12 -translate-y-1/2"
+          ? "-right-12 top-1/2 -translate-y-1/2"
           : "-bottom-12 left-1/2 -translate-x-1/2 rotate-90",
-        className,
+        className
       )}
       disabled={!canScrollNext}
       onClick={scrollNext}
       {...props}
     >
-      <ArrowRight />
+      <ArrowRightIcon className="h-4 w-4" />
       <span className="sr-only">Next slide</span>
     </Button>
-  );
+  )
-}
+})
+CarouselNext.displayName = "CarouselNext"
 
 export {
   type CarouselApi,
@@ -236,4 +257,4 @@ export {
   CarouselItem,
   CarouselPrevious,
   CarouselNext,
-};
+}

src/components/ui/checkbox.tsx

@@ -1,30 +1,28 @@
-import * as React from "react";
+import * as React from "react"
-import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
-import { CheckIcon } from "lucide-react";
+import { CheckIcon } from "@radix-ui/react-icons"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Checkbox({
+const Checkbox = React.forwardRef<
-  className,
+  React.ElementRef<typeof CheckboxPrimitive.Root>,
-  ...props
+  React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
-}: React.ComponentProps<typeof CheckboxPrimitive.Root>) {
+>(({ className, ...props }, ref) => (
-  return (
   <CheckboxPrimitive.Root
-      data-slot="checkbox"
+    ref={ref}
     className={cn(
-        "peer size-4 shrink-0 rounded-[4px] border border-input shadow-xs transition-shadow outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 data-[state=checked]:border-primary data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:bg-input/30 dark:aria-invalid:ring-destructive/40 dark:data-[state=checked]:bg-primary",
+      "peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
-        className,
+      className
     )}
     {...props}
   >
     <CheckboxPrimitive.Indicator
-        data-slot="checkbox-indicator"
+      className={cn("flex items-center justify-center text-current")}
-        className="flex items-center justify-center text-current transition-none"
     >
-        <CheckIcon className="size-3.5" />
+      <CheckIcon className="h-4 w-4" />
     </CheckboxPrimitive.Indicator>
   </CheckboxPrimitive.Root>
-  );
+))
-}
+Checkbox.displayName = CheckboxPrimitive.Root.displayName
 
-export { Checkbox };
+export { Checkbox }

src/components/ui/dateRange-picker.tsx

@@ -1,34 +1,27 @@
-"use client";
+"use client"
 
-import * as React from "react";
+import * as React from "react"
-import { format } from "date-fns";
+import { CalendarIcon } from "@radix-ui/react-icons"
-import { DateBefore, DateRange, Matcher, Modifiers } from "react-day-picker";
+import { format } from "date-fns"
+import { ActiveModifiers, DateBefore, DateRange, Matcher } from "react-day-picker"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/button"
-import { Calendar } from "@/components/ui/calendar";
+import { Calendar } from "@/components/ui/calendar"
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
-} from "@/components/ui/popover";
+} from "@/components/ui/popover"
-import { Typography } from "./typography";
+import { Typography } from "./typography"
-import { CalendarIcon } from "lucide-react";
 
 export type UpdateRangeFunction = (newRange: DateRange) => void;
 
 export function DatePickerWithRange({
-  className,
+  className, updateDateRange, startDate, endDate, allowPast = true
-  updateDateRange,
-  startDate,
-  endDate,
-  allowPast = true,
 }: {
-  className?: React.HTMLAttributes<HTMLDivElement> | undefined;
+  className?: React.HTMLAttributes<HTMLDivElement> | undefined, updateDateRange: UpdateRangeFunction | undefined,
-  updateDateRange: UpdateRangeFunction | undefined;
+  startDate?: Date, endDate?: Date, allowPast?: boolean
-  startDate?: Date;
-  endDate?: Date;
-  allowPast?: boolean;
 }) {
   // Date Range State.
   const [dateRange, setDateRange] = React.useState<DateRange | undefined>({
@@ -38,30 +31,30 @@ export function DatePickerWithRange({
 
   //TODOME: Si el día es mods.outside, navegar al mes correspondiente.
   // Handle Day change events.
-  const handleDayClickFrom = (day: Date, mods: Modifiers) => {
+  const handleDayClickFrom = (day: Date, mods: ActiveModifiers) => {
     const newDateRange: DateRange = {
       from: mods.selected ? undefined : day,
-      to: undefined,
+      to: dateRange?.to
-    };
+    }
 
-    fnUpdateRange(newDateRange);
+    setDateRange(newDateRange)
-  };
+    if (updateDateRange !== undefined) {
+      updateDateRange(newDateRange)
+    }
+  }
 
-  const handleDayClickTo = (day: Date, mods: Modifiers) => {
+  const handleDayClickTo = (day: Date, mods: ActiveModifiers) => {
     const newDateRange: DateRange = {
       from: dateRange?.from,
-      to: mods.selected ? undefined : day,
+      to: mods.selected ? undefined : day
-    };
+    }
 
-    fnUpdateRange(newDateRange);
+    setDateRange(newDateRange)
-  };
 
-  const fnUpdateRange = (range: DateRange) => {
-    setDateRange(range);
     if (updateDateRange !== undefined) {
-      updateDateRange(range);
+      updateDateRange(newDateRange)
+    }
   }
-  };
 
   // Disable days from "To" before "From"
   let beforeAndSelected: Matcher[] = [];
@@ -77,31 +70,30 @@ export function DatePickerWithRange({
   }
 
   return (
-    <div className={cn("grid grid-cols-2 grid-rows-2 gap-x-2", className)}>
+    <div className={cn("grid gap-x-2 grid-cols-2 grid-rows-2", className)}>
-      <Typography variant={"largeText"} as="p">
+      <Typography variant={"largeText"} as="p">Desde</Typography>
-        Desde
+      <Typography variant={"largeText"} as="p">Hasta</Typography>
-      </Typography>
-      <Typography variant={"largeText"} as="p">
-        Hasta
-      </Typography>
       <Popover>
-        <PopoverTrigger>
+        <PopoverTrigger asChild>
           <Button
             id="dateFrom"
-            variant="outline"
+            variant={"outline"}
-            data-empty={!dateRange}
+            className={cn(
-            className="w-[100%] justify-start text-left font-normal data-[empty=true]:text-muted-foreground"
+              "justify-start text-left font-normal",
+              !dateRange && "text-muted-foreground"
+            )}
           >
-            <CalendarIcon />
+            <CalendarIcon className="mr-2 h-4 w-4" />
             {dateRange?.from ? (
-              format(dateRange.from, "PPP")
+              format(dateRange.from, "LLL dd, y")
             ) : (
               <span>Pick a date</span>
             )}
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="center">
+        <PopoverContent className="w-auto p-0" align="start">
           <Calendar
+            initialFocus
             mode="single"
             defaultMonth={dateRange?.from}
             selected={dateRange?.from}
@@ -112,12 +104,14 @@ export function DatePickerWithRange({
         </PopoverContent>
       </Popover>
       <Popover>
-        <PopoverTrigger>
+        <PopoverTrigger asChild>
           <Button
             id="dateTo"
             variant={"outline"}
-            data-empty={!dateRange}
+            className={cn(
-            className="w-[100%] justify-start text-left font-normal data-[empty=true]:text-muted-foreground"
+              "justify-start text-left font-normal",
+              !dateRange && "text-muted-foreground"
+            )}
           >
             <CalendarIcon className="mr-2 h-4 w-4" />
             {dateRange?.to ? (
@@ -127,11 +121,11 @@ export function DatePickerWithRange({
             )}
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="center">
+        <PopoverContent className="w-auto p-0" align="start">
           <Calendar
-            autoFocus
+            initialFocus
             mode="single"
-            defaultMonth={dateRange?.to ?? dateRange?.from}
+            defaultMonth={dateRange?.to}
             selected={dateRange?.to}
             onDayClick={handleDayClickTo}
             numberOfMonths={1}
@@ -140,5 +134,5 @@ export function DatePickerWithRange({
         </PopoverContent>
       </Popover>
     </div>
-  );
+  )
 }

src/components/ui/dropdown-menu.tsx

@@ -1,255 +1,203 @@
-import * as React from "react";
+import * as React from "react"
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
-import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";
+import {
+  CheckIcon,
+  ChevronRightIcon,
+  DotFilledIcon,
+} from "@radix-ui/react-icons"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function DropdownMenu({
+const DropdownMenu = DropdownMenuPrimitive.Root
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
-  return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
-}
 
-function DropdownMenuPortal({
+const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
-  return (
-    <DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
-  );
-}
 
-function DropdownMenuTrigger({
+const DropdownMenuGroup = DropdownMenuPrimitive.Group
-  ...props
+
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
+const DropdownMenuPortal = DropdownMenuPrimitive.Portal
-  return (
+
-    <DropdownMenuPrimitive.Trigger
+const DropdownMenuSub = DropdownMenuPrimitive.Sub
-      data-slot="dropdown-menu-trigger"
+
+const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup
+
+const DropdownMenuSubTrigger = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
+    inset?: boolean
+  }
+>(({ className, inset, children, ...props }, ref) => (
+  <DropdownMenuPrimitive.SubTrigger
+    ref={ref}
+    className={cn(
+      "flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent",
+      inset && "pl-8",
+      className
+    )}
+    {...props}
+  >
+    {children}
+    <ChevronRightIcon className="ml-auto h-4 w-4" />
+  </DropdownMenuPrimitive.SubTrigger>
+))
+DropdownMenuSubTrigger.displayName =
+  DropdownMenuPrimitive.SubTrigger.displayName
+
+const DropdownMenuSubContent = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.SubContent
+    ref={ref}
+    className={cn(
+      "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+      className
+    )}
     {...props}
   />
-  );
+))
-}
+DropdownMenuSubContent.displayName =
+  DropdownMenuPrimitive.SubContent.displayName
 
-function DropdownMenuContent({
+const DropdownMenuContent = React.forwardRef<
-  className,
+  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
-  sideOffset = 4,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
-  ...props
+>(({ className, sideOffset = 4, ...props }, ref) => (
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
-  return (
   <DropdownMenuPrimitive.Portal>
     <DropdownMenuPrimitive.Content
-        data-slot="dropdown-menu-content"
+      ref={ref}
       sideOffset={sideOffset}
       className={cn(
-          "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md",
+        "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md",
-          className,
+        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        className
       )}
       {...props}
     />
   </DropdownMenuPrimitive.Portal>
-  );
+))
-}
+DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName
 
-function DropdownMenuGroup({
+const DropdownMenuItem = React.forwardRef<
-  ...props
+  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
-  return (
+    inset?: boolean
-    <DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
+  }
-  );
+>(({ className, inset, ...props }, ref) => (
-}
-
-function DropdownMenuItem({
-  className,
-  inset,
-  variant = "default",
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
-  inset?: boolean;
-  variant?: "default" | "destructive";
-}) {
-  return (
   <DropdownMenuPrimitive.Item
-      data-slot="dropdown-menu-item"
+    ref={ref}
-      data-inset={inset}
-      data-variant={variant}
     className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:*:[svg]:!text-destructive",
+      "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-        className,
+      inset && "pl-8",
+      className
     )}
     {...props}
   />
-  );
+))
-}
+DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName
 
-function DropdownMenuCheckboxItem({
+const DropdownMenuCheckboxItem = React.forwardRef<
-  className,
+  React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
-  children,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
-  checked,
+>(({ className, children, checked, ...props }, ref) => (
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
-  return (
   <DropdownMenuPrimitive.CheckboxItem
-      data-slot="dropdown-menu-checkbox-item"
+    ref={ref}
     className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-        className,
+      className
     )}
     checked={checked}
     {...props}
   >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
       <DropdownMenuPrimitive.ItemIndicator>
-          <CheckIcon className="size-4" />
+        <CheckIcon className="h-4 w-4" />
       </DropdownMenuPrimitive.ItemIndicator>
     </span>
     {children}
   </DropdownMenuPrimitive.CheckboxItem>
-  );
+))
-}
+DropdownMenuCheckboxItem.displayName =
+  DropdownMenuPrimitive.CheckboxItem.displayName
 
-function DropdownMenuRadioGroup({
+const DropdownMenuRadioItem = React.forwardRef<
-  ...props
+  React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
-}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
-  return (
+>(({ className, children, ...props }, ref) => (
-    <DropdownMenuPrimitive.RadioGroup
-      data-slot="dropdown-menu-radio-group"
-      {...props}
-    />
-  );
-}
-
-function DropdownMenuRadioItem({
-  className,
-  children,
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
-  return (
   <DropdownMenuPrimitive.RadioItem
-      data-slot="dropdown-menu-radio-item"
+    ref={ref}
     className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-        className,
+      className
     )}
     {...props}
   >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
       <DropdownMenuPrimitive.ItemIndicator>
-          <CircleIcon className="size-2 fill-current" />
+        <DotFilledIcon className="h-4 w-4 fill-current" />
       </DropdownMenuPrimitive.ItemIndicator>
     </span>
     {children}
   </DropdownMenuPrimitive.RadioItem>
-  );
+))
-}
+DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName
 
-function DropdownMenuLabel({
+const DropdownMenuLabel = React.forwardRef<
-  className,
+  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
-  inset,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
-  ...props
+    inset?: boolean
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
+  }
-  inset?: boolean;
+>(({ className, inset, ...props }, ref) => (
-}) {
-  return (
   <DropdownMenuPrimitive.Label
-      data-slot="dropdown-menu-label"
+    ref={ref}
-      data-inset={inset}
     className={cn(
-        "px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
+      "px-2 py-1.5 text-sm font-semibold",
-        className,
+      inset && "pl-8",
+      className
     )}
     {...props}
   />
-  );
+))
-}
+DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName
 
-function DropdownMenuSeparator({
+const DropdownMenuSeparator = React.forwardRef<
-  className,
+  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
-  ...props
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
+>(({ className, ...props }, ref) => (
-  return (
   <DropdownMenuPrimitive.Separator
-      data-slot="dropdown-menu-separator"
+    ref={ref}
-      className={cn("-mx-1 my-1 h-px bg-border", className)}
+    className={cn("-mx-1 my-1 h-px bg-muted", className)}
     {...props}
   />
-  );
+))
-}
+DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName
 
-function DropdownMenuShortcut({
+const DropdownMenuShortcut = ({
   className,
   ...props
-}: React.ComponentProps<"span">) {
+}: React.HTMLAttributes<HTMLSpanElement>) => {
   return (
     <span
-      data-slot="dropdown-menu-shortcut"
+      className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
-      className={cn(
-        "ml-auto text-xs tracking-widest text-muted-foreground",
-        className,
-      )}
       {...props}
     />
-  );
+  )
-}
-
-function DropdownMenuSub({
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
-  return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
-}
-
-function DropdownMenuSubTrigger({
-  className,
-  inset,
-  children,
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
-  inset?: boolean;
-}) {
-  return (
-    <DropdownMenuPrimitive.SubTrigger
-      data-slot="dropdown-menu-sub-trigger"
-      data-inset={inset}
-      className={cn(
-        "flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[inset]:pl-8 data-[state=open]:bg-accent data-[state=open]:text-accent-foreground",
-        className,
-      )}
-      {...props}
-    >
-      {children}
-      <ChevronRightIcon className="ml-auto size-4" />
-    </DropdownMenuPrimitive.SubTrigger>
-  );
-}
-
-function DropdownMenuSubContent({
-  className,
-  ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
-  return (
-    <DropdownMenuPrimitive.SubContent
-      data-slot="dropdown-menu-sub-content"
-      className={cn(
-        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg",
-        className,
-      )}
-      {...props}
-    />
-  );
 }
+DropdownMenuShortcut.displayName = "DropdownMenuShortcut"
 
 export {
   DropdownMenu,
-  DropdownMenuPortal,
   DropdownMenuTrigger,
   DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuLabel,
   DropdownMenuItem,
   DropdownMenuCheckboxItem,
-  DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
+  DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuShortcut,
+  DropdownMenuGroup,
+  DropdownMenuPortal,
   DropdownMenuSub,
-  DropdownMenuSubTrigger,
   DropdownMenuSubContent,
-};
+  DropdownMenuSubTrigger,
+  DropdownMenuRadioGroup,
+}

src/components/ui/form.tsx

@@ -1,167 +0,0 @@
-import * as React from "react";
-import * as LabelPrimitive from "@radix-ui/react-label";
-import { Slot } from "@radix-ui/react-slot";
-import {
-  Controller,
-  FormProvider,
-  useFormContext,
-  useFormState,
-  type ControllerProps,
-  type FieldPath,
-  type FieldValues,
-} from "react-hook-form";
-
-import { cn } from "@/lib/utils";
-import { Label } from "@/components/ui/label";
-
-const Form = FormProvider;
-
-type FormFieldContextValue<
-  TFieldValues extends FieldValues = FieldValues,
-  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
-> = {
-  name: TName;
-};
-
-const FormFieldContext = React.createContext<FormFieldContextValue>(
-  {} as FormFieldContextValue,
-);
-
-const FormField = <
-  TFieldValues extends FieldValues = FieldValues,
-  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
->({
-  ...props
-}: ControllerProps<TFieldValues, TName>) => {
-  return (
-    <FormFieldContext.Provider value={{ name: props.name }}>
-      <Controller {...props} />
-    </FormFieldContext.Provider>
-  );
-};
-
-const useFormField = () => {
-  const fieldContext = React.useContext(FormFieldContext);
-  const itemContext = React.useContext(FormItemContext);
-  const { getFieldState } = useFormContext();
-  const formState = useFormState({ name: fieldContext.name });
-  const fieldState = getFieldState(fieldContext.name, formState);
-
-  if (!fieldContext) {
-    throw new Error("useFormField should be used within <FormField>");
-  }
-
-  const { id } = itemContext;
-
-  return {
-    id,
-    name: fieldContext.name,
-    formItemId: `${id}-form-item`,
-    formDescriptionId: `${id}-form-item-description`,
-    formMessageId: `${id}-form-item-message`,
-    ...fieldState,
-  };
-};
-
-type FormItemContextValue = {
-  id: string;
-};
-
-const FormItemContext = React.createContext<FormItemContextValue>(
-  {} as FormItemContextValue,
-);
-
-function FormItem({ className, ...props }: React.ComponentProps<"div">) {
-  const id = React.useId();
-
-  return (
-    <FormItemContext.Provider value={{ id }}>
-      <div
-        data-slot="form-item"
-        className={cn("grid gap-2", className)}
-        {...props}
-      />
-    </FormItemContext.Provider>
-  );
-}
-
-function FormLabel({
-  className,
-  ...props
-}: React.ComponentProps<typeof LabelPrimitive.Root>) {
-  const { error, formItemId } = useFormField();
-
-  return (
-    <Label
-      data-slot="form-label"
-      data-error={!!error}
-      className={cn("data-[error=true]:text-destructive", className)}
-      htmlFor={formItemId}
-      {...props}
-    />
-  );
-}
-
-function FormControl({ ...props }: React.ComponentProps<typeof Slot>) {
-  const { error, formItemId, formDescriptionId, formMessageId } =
-    useFormField();
-
-  return (
-    <Slot
-      data-slot="form-control"
-      id={formItemId}
-      aria-describedby={
-        !error
-          ? `${formDescriptionId}`
-          : `${formDescriptionId} ${formMessageId}`
-      }
-      aria-invalid={!!error}
-      {...props}
-    />
-  );
-}
-
-function FormDescription({ className, ...props }: React.ComponentProps<"p">) {
-  const { formDescriptionId } = useFormField();
-
-  return (
-    <p
-      data-slot="form-description"
-      id={formDescriptionId}
-      className={cn("text-sm text-muted-foreground", className)}
-      {...props}
-    />
-  );
-}
-
-function FormMessage({ className, ...props }: React.ComponentProps<"p">) {
-  const { error, formMessageId } = useFormField();
-  const body = error ? String(error?.message ?? "") : props.children;
-
-  if (!body) {
-    return null;
-  }
-
-  return (
-    <p
-      data-slot="form-message"
-      id={formMessageId}
-      className={cn("text-sm text-destructive", className)}
-      {...props}
-    >
-      {body}
-    </p>
-  );
-}
-
-export {
-  // eslint-disable-next-line react-refresh/only-export-components
-  useFormField,
-  Form,
-  FormItem,
-  FormLabel,
-  FormControl,
-  FormDescription,
-  FormMessage,
-  FormField,
-};

src/components/ui/icon-number-tooltip.tsx

@@ -1,47 +1,35 @@
 import { Typography } from "./typography";
-import {
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./tooltip";
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "./tooltip";
 import { PropsWithChildren } from "react";
 
 interface IconWithTooltipNumberProps {
-  label?: string | null | undefined;
+  amount?: number | null |undefined,
-  labelPosition?: "left" | "right" | null | undefined;
+  altText?: string | null | undefined
-  tooltipText?: string | null | undefined;
 }
 
-export function IconWithTooltip({
+export function IconWithTooltipNumber({ amount = undefined, altText = undefined, children }: PropsWithChildren<IconWithTooltipNumberProps>) {
-  label = undefined,
+
-  labelPosition = "left",
+  const iconElement = altText ? (
-  tooltipText = undefined,
-  children,
-}: PropsWithChildren<IconWithTooltipNumberProps>) {
-  const iconElement = tooltipText ? (
     <TooltipProvider>
       <Tooltip>
-        <TooltipTrigger asChild>{children}</TooltipTrigger>
+        <TooltipTrigger asChild>
+          {children}
+        </TooltipTrigger>
         <TooltipContent>
-          <p className="inline">{tooltipText}</p>
+          <p>{altText}</p>
         </TooltipContent>
       </Tooltip>
     </TooltipProvider>
   ) : (
-    <>{children}</>
+    <>
+      {children}
+    </>
   );
 
-  const labelElement = (
-    <Typography variant={"p_inline"} className="px-1">
-      {label}
-    </Typography>
-  );
   return (
-    <div className="flex flex-row items-center gap-1">
+    <>
-      {label && labelPosition == "left" && labelElement}
+      {amount && <Typography variant={"p_inline"}>{amount}</Typography>}
       {iconElement}
-      {label && labelPosition == "right" && labelElement}
+    </>
-    </div>
+  )
-  );
 }

src/components/ui/input.tsx

@@ -1,21 +1,25 @@
-import * as React from "react";
+import * as React from "react"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Input({ className, type, ...props }: React.ComponentProps<"input">) {
+export interface InputProps
+  extends React.InputHTMLAttributes<HTMLInputElement> {}
+
+const Input = React.forwardRef<HTMLInputElement, InputProps>(
+  ({ className, type, ...props }, ref) => {
     return (
       <input
         type={type}
-      data-slot="input"
         className={cn(
-        "flex h-9 w-full min-w-0 rounded-md border border-input bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none selection:bg-primary selection:text-primary-foreground file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:bg-input/30",
+          "flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
-        "focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50",
+          className
-        "aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40",
-        className,
         )}
+        ref={ref}
         {...props}
       />
-  );
+    )
-}
+  }
+)
+Input.displayName = "Input"
 
-export { Input };
+export { Input }

src/components/ui/label.tsx

@@ -1,22 +1,24 @@
-import * as React from "react";
+import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label";
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Label({
+const labelVariants = cva(
-  className,
+  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-  ...props
+)
-}: React.ComponentProps<typeof LabelPrimitive.Root>) {
+
-  return (
+const Label = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
+    VariantProps<typeof labelVariants>
+>(({ className, ...props }, ref) => (
   <LabelPrimitive.Root
-      data-slot="label"
+    ref={ref}
-      className={cn(
+    className={cn(labelVariants(), className)}
-        "flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
-        className,
-      )}
     {...props}
   />
-  );
+))
-}
+Label.displayName = LabelPrimitive.Root.displayName
 
-export { Label };
+export { Label }

src/components/ui/number-selector.tsx

@@ -1,21 +1,15 @@
-import { useState } from "react";
+import { useState } from "react"
 import { Button } from "./button";
 import { Typography } from "./typography";
 
+
 export type UpdateSelectedNumberFunction = (newCount: number) => void;
 
-export function NumberSelector({
+export function NumberSelector(
-  updateCount,
+  { updateCount, addEnabled = true, allowNegative = false }: 
-  addEnabled = true,
+  { updateCount: UpdateSelectedNumberFunction, addEnabled?: boolean, allowNegative?: boolean }) {
-  allowNegative = false,
+
-  initialValue = 0,
+  const [count, setCount] = useState<number>(0);
-}: {
-  updateCount: UpdateSelectedNumberFunction;
-  addEnabled?: boolean;
-  allowNegative?: boolean;
-  initialValue?: number;
-}) {
-  const [count, setCount] = useState<number>(initialValue);
 
   const counterUpdated = (newAmount: number) => {
     setCount(newAmount);
@@ -23,24 +17,17 @@ export function NumberSelector({
     if (updateCount != undefined) {
       updateCount(newAmount);
     }
-  };
+  }
 
-  const minusDisabled = !allowNegative && count <= 0;
+  const minusDisabled = (!allowNegative && count <= 0)
 
   return (
     <div className="flex flex-row items-center gap-2">
-      <Button
+      <Button disabled={minusDisabled}
-        disabled={minusDisabled}
+        onClick={() => counterUpdated(count - 1)}>-</Button>
-        onClick={() => counterUpdated(count - 1)}
+      <Typography variant={"largeText"} className="mx-2">{count}</Typography>
-      >
+      <Button disabled={!addEnabled}
-        -
+        onClick={() => counterUpdated(count + 1)}>+</Button>
-      </Button>
-      <Typography variant={"largeText"} className="mx-2">
-        {count}
-      </Typography>
-      <Button disabled={!addEnabled} onClick={() => counterUpdated(count + 1)}>
-        +
-      </Button>
     </div>
-  );
+  )
 }

src/components/ui/popover.tsx

@@ -3,44 +3,29 @@ import * as PopoverPrimitive from "@radix-ui/react-popover"
 
 import { cn } from "@/lib/utils"
 
-function Popover({
+const Popover = PopoverPrimitive.Root
-  ...props
-}: React.ComponentProps<typeof PopoverPrimitive.Root>) {
-  return <PopoverPrimitive.Root data-slot="popover" {...props} />
-}
 
-function PopoverTrigger({
+const PopoverTrigger = PopoverPrimitive.Trigger
-  ...props
-}: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {
-  return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />
-}
 
-function PopoverContent({
+const PopoverAnchor = PopoverPrimitive.Anchor
-  className,
+
-  align = "center",
+const PopoverContent = React.forwardRef<
-  sideOffset = 4,
+  React.ElementRef<typeof PopoverPrimitive.Content>,
-  ...props
+  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
-}: React.ComponentProps<typeof PopoverPrimitive.Content>) {
+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
-  return (
   <PopoverPrimitive.Portal>
     <PopoverPrimitive.Content
-        data-slot="popover-content"
+      ref={ref}
       align={align}
       sideOffset={sideOffset}
       className={cn(
-          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",
+        "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
         className
       )}
       {...props}
     />
   </PopoverPrimitive.Portal>
-  )
+))
-}
+PopoverContent.displayName = PopoverPrimitive.Content.displayName
-
-function PopoverAnchor({
-  ...props
-}: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {
-  return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />
-}
 
 export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }

src/components/ui/separator.tsx

@@ -1,26 +1,29 @@
-import * as React from "react";
+import * as React from "react"
-import * as SeparatorPrimitive from "@radix-ui/react-separator";
+import * as SeparatorPrimitive from "@radix-ui/react-separator"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Separator({
+const Separator = React.forwardRef<
-  className,
+  React.ElementRef<typeof SeparatorPrimitive.Root>,
-  orientation = "horizontal",
+  React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
-  decorative = true,
+>(
-  ...props
+  (
-}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
+    { className, orientation = "horizontal", decorative = true, ...props },
-  return (
+    ref
+  ) => (
     <SeparatorPrimitive.Root
-      data-slot="separator"
+      ref={ref}
       decorative={decorative}
       orientation={orientation}
       className={cn(
-        "shrink-0 bg-border data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
+        "shrink-0 bg-border",
-        className,
+        orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+        className
       )}
       {...props}
     />
-  );
+  )
-}
+)
+Separator.displayName = SeparatorPrimitive.Root.displayName
 
-export { Separator };
+export { Separator }

src/components/ui/skeleton.tsx

@@ -1,13 +1,15 @@
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
+function Skeleton({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) {
   return (
     <div
-      data-slot="skeleton"
+      className={cn("animate-pulse rounded-md bg-primary/10", className)}
-      className={cn("animate-pulse rounded-md bg-accent", className)}
       {...props}
     />
-  );
+  )
 }
 
-export { Skeleton };
+export { Skeleton }

src/components/ui/table.tsx

@@ -1,106 +1,112 @@
-import * as React from "react";
+import * as React from "react"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function Table({ className, ...props }: React.ComponentProps<"table">) {
+const Table = React.forwardRef<
-  return (
+  HTMLTableElement,
-    <div
+  React.HTMLAttributes<HTMLTableElement>
-      data-slot="table-container"
+>(({ className, ...props }, ref) => (
-      className="relative w-full overflow-x-auto"
+  <div className="relative w-full overflow-auto">
-    >
     <table
-        data-slot="table"
+      ref={ref}
       className={cn("w-full caption-bottom text-sm", className)}
       {...props}
     />
   </div>
-  );
+))
-}
+Table.displayName = "Table"
 
-function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {
+const TableHeader = React.forwardRef<
-  return (
+  HTMLTableSectionElement,
-    <thead
+  React.HTMLAttributes<HTMLTableSectionElement>
-      data-slot="table-header"
+>(({ className, ...props }, ref) => (
-      className={cn("[&_tr]:border-b", className)}
+  <thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} />
-      {...props}
+))
-    />
+TableHeader.displayName = "TableHeader"
-  );
-}
 
-function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
+const TableBody = React.forwardRef<
-  return (
+  HTMLTableSectionElement,
+  React.HTMLAttributes<HTMLTableSectionElement>
+>(({ className, ...props }, ref) => (
   <tbody
-      data-slot="table-body"
+    ref={ref}
     className={cn("[&_tr:last-child]:border-0", className)}
     {...props}
   />
-  );
+))
-}
+TableBody.displayName = "TableBody"
 
-function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
+const TableFooter = React.forwardRef<
-  return (
+  HTMLTableSectionElement,
+  React.HTMLAttributes<HTMLTableSectionElement>
+>(({ className, ...props }, ref) => (
   <tfoot
-      data-slot="table-footer"
+    ref={ref}
     className={cn(
       "border-t bg-muted/50 font-medium [&>tr]:last:border-b-0",
-        className,
+      className
     )}
     {...props}
   />
-  );
+))
-}
+TableFooter.displayName = "TableFooter"
 
-function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
+const TableRow = React.forwardRef<
-  return (
+  HTMLTableRowElement,
+  React.HTMLAttributes<HTMLTableRowElement>
+>(({ className, ...props }, ref) => (
   <tr
-      data-slot="table-row"
+    ref={ref}
     className={cn(
       "border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
-        className,
+      className
     )}
     {...props}
   />
-  );
+))
-}
+TableRow.displayName = "TableRow"
 
-function TableHead({ className, ...props }: React.ComponentProps<"th">) {
+const TableHead = React.forwardRef<
-  return (
+  HTMLTableCellElement,
+  React.ThHTMLAttributes<HTMLTableCellElement>
+>(({ className, ...props }, ref) => (
   <th
-      data-slot="table-head"
+    ref={ref}
     className={cn(
-        "h-10 px-2 text-left align-middle font-medium whitespace-nowrap text-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+      "h-10 px-2 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
-        className,
+      className
     )}
     {...props}
   />
-  );
+))
-}
+TableHead.displayName = "TableHead"
 
-function TableCell({ className, ...props }: React.ComponentProps<"td">) {
+const TableCell = React.forwardRef<
-  return (
+  HTMLTableCellElement,
+  React.TdHTMLAttributes<HTMLTableCellElement>
+>(({ className, ...props }, ref) => (
   <td
-      data-slot="table-cell"
+    ref={ref}
     className={cn(
-        "p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+      "p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
-        className,
+      className
     )}
     {...props}
   />
-  );
+))
-}
+TableCell.displayName = "TableCell"
 
-function TableCaption({
+const TableCaption = React.forwardRef<
-  className,
+  HTMLTableCaptionElement,
-  ...props
+  React.HTMLAttributes<HTMLTableCaptionElement>
-}: React.ComponentProps<"caption">) {
+>(({ className, ...props }, ref) => (
-  return (
   <caption
-      data-slot="table-caption"
+    ref={ref}
     className={cn("mt-4 text-sm text-muted-foreground", className)}
     {...props}
   />
-  );
+))
-}
+TableCaption.displayName = "TableCaption"
 
 export {
   Table,
@@ -111,4 +117,4 @@ export {
   TableRow,
   TableCell,
   TableCaption,
-};
+}

src/components/ui/toast.tsx

@@ -1,11 +1,11 @@
-import * as React from "react";
+import * as React from "react"
-import * as ToastPrimitives from "@radix-ui/react-toast";
+import { Cross2Icon } from "@radix-ui/react-icons"
-import { cva, type VariantProps } from "class-variance-authority";
+import * as ToastPrimitives from "@radix-ui/react-toast"
+import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
-import { XIcon } from "lucide-react";
 
-const ToastProvider = ToastPrimitives.Provider;
+const ToastProvider = ToastPrimitives.Provider
 
 const ToastViewport = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Viewport>,
@@ -14,16 +14,16 @@ const ToastViewport = React.forwardRef<
   <ToastPrimitives.Viewport
     ref={ref}
     className={cn(
-      "fixed top-0 z-100 flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
+      "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
-      className,
+      className
     )}
     {...props}
   />
-));
+))
-ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
+ToastViewport.displayName = ToastPrimitives.Viewport.displayName
 
 const toastVariants = cva(
-  "group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-(--radix-toast-swipe-end-x) data-[swipe=move]:translate-x-(--radix-toast-swipe-move-x) data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full sm:data-[state=open]:slide-in-from-bottom-full",
+  "group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
   {
     variants: {
       variant: {
@@ -32,9 +32,11 @@ const toastVariants = cva(
           "destructive group border-destructive bg-destructive text-destructive-foreground",
       },
     },
-    defaultVariants: { variant: "default" },
+    defaultVariants: {
+      variant: "default",
     },
-);
+  }
+)
 
 const Toast = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Root>,
@@ -47,9 +49,9 @@ const Toast = React.forwardRef<
       className={cn(toastVariants({ variant }), className)}
       {...props}
     />
-  );
+  )
-});
+})
-Toast.displayName = ToastPrimitives.Root.displayName;
+Toast.displayName = ToastPrimitives.Root.displayName
 
 const ToastAction = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Action>,
@@ -58,13 +60,13 @@ const ToastAction = React.forwardRef<
   <ToastPrimitives.Action
     ref={ref}
     className={cn(
-      "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-hidden focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 hover:group-[.destructive]:border-destructive/30 hover:group-[.destructive]:bg-destructive hover:group-[.destructive]:text-destructive-foreground focus:group-[.destructive]:ring-destructive",
+      "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
-      className,
+      className
     )}
     {...props}
   />
-));
+))
-ToastAction.displayName = ToastPrimitives.Action.displayName;
+ToastAction.displayName = ToastPrimitives.Action.displayName
 
 const ToastClose = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Close>,
@@ -73,16 +75,16 @@ const ToastClose = React.forwardRef<
   <ToastPrimitives.Close
     ref={ref}
     className={cn(
-      "absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-hidden focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 hover:group-[.destructive]:text-red-50 focus:group-[.destructive]:ring-red-400 focus:group-[.destructive]:ring-offset-red-600",
+      "absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
-      className,
+      className
     )}
     toast-close=""
     {...props}
   >
-    <XIcon className="h-4 w-4" />
+    <Cross2Icon className="h-4 w-4" />
   </ToastPrimitives.Close>
-));
+))
-ToastClose.displayName = ToastPrimitives.Close.displayName;
+ToastClose.displayName = ToastPrimitives.Close.displayName
 
 const ToastTitle = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Title>,
@@ -93,8 +95,8 @@ const ToastTitle = React.forwardRef<
     className={cn("text-sm font-semibold [&+div]:text-xs", className)}
     {...props}
   />
-));
+))
-ToastTitle.displayName = ToastPrimitives.Title.displayName;
+ToastTitle.displayName = ToastPrimitives.Title.displayName
 
 const ToastDescription = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Description>,
@@ -105,12 +107,12 @@ const ToastDescription = React.forwardRef<
     className={cn("text-sm opacity-90", className)}
     {...props}
   />
-));
+))
-ToastDescription.displayName = ToastPrimitives.Description.displayName;
+ToastDescription.displayName = ToastPrimitives.Description.displayName
 
-type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
+type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>
 
-type ToastActionElement = React.ReactElement<typeof ToastAction>;
+type ToastActionElement = React.ReactElement<typeof ToastAction>
 
 export {
   type ToastProps,
@@ -122,4 +124,4 @@ export {
   ToastDescription,
   ToastClose,
   ToastAction,
-};
+}

src/components/ui/toaster.tsx

@@ -5,11 +5,11 @@ import {
   ToastProvider,
   ToastTitle,
   ToastViewport,
-} from "@/components/ui/toast";
+} from "@/components/ui/toast"
-import { useToast } from "@/components/ui/use-toast";
+import { useToast } from "@/components/ui/use-toast"
 
 export function Toaster() {
-  const { toasts } = useToast();
+  const { toasts } = useToast()
 
   return (
     <ToastProvider>
@@ -25,9 +25,9 @@ export function Toaster() {
             {action}
             <ToastClose />
           </Toast>
-        );
+        )
       })}
       <ToastViewport />
     </ToastProvider>
-  );
+  )
 }

src/components/ui/tooltip.tsx

@@ -1,59 +1,28 @@
-import * as React from "react";
+import * as React from "react"
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-function TooltipProvider({
+const TooltipProvider = TooltipPrimitive.Provider
-  delayDuration = 0,
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
-  return (
-    <TooltipPrimitive.Provider
-      data-slot="tooltip-provider"
-      delayDuration={delayDuration}
-      {...props}
-    />
-  );
-}
 
-function Tooltip({
+const Tooltip = TooltipPrimitive.Root
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
-  return (
-    <TooltipProvider>
-      <TooltipPrimitive.Root data-slot="tooltip" {...props} />
-    </TooltipProvider>
-  );
-}
 
-function TooltipTrigger({
+const TooltipTrigger = TooltipPrimitive.Trigger
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
-  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
-}
 
-function TooltipContent({
+const TooltipContent = React.forwardRef<
-  className,
+  React.ElementRef<typeof TooltipPrimitive.Content>,
-  sideOffset = 0,
+  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
-  children,
+>(({ className, sideOffset = 4, ...props }, ref) => (
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
-  return (
-    <TooltipPrimitive.Portal>
   <TooltipPrimitive.Content
-        data-slot="tooltip-content"
+    ref={ref}
     sideOffset={sideOffset}
     className={cn(
-          "animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md bg-primary px-3 py-1.5 text-xs text-balance text-primary-foreground",
+      "z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-          className,
+      className
     )}
     {...props}
-      >
+  />
-        {children}
+))
-        <TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px] bg-primary fill-primary" />
+TooltipContent.displayName = TooltipPrimitive.Content.displayName
-      </TooltipPrimitive.Content>
-    </TooltipPrimitive.Portal>
-  );
-}
 
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }

src/components/ui/typography.tsx

@@ -1,29 +1,29 @@
-"use client";
+'use client';
 
-import * as React from "react";
+import * as React from 'react';
-import { VariantProps, cva } from "class-variance-authority";
+import { VariantProps, cva } from 'class-variance-authority';
-import { cn } from "@/lib/utils";
+import { cn } from '@/lib/utils';
-import { Slot } from "@radix-ui/react-slot";
+import { Slot } from '@radix-ui/react-slot';
 
-const typographyVariants = cva("text-foreground", {
+const typographyVariants = cva('text-foreground', {
     variants: {
         variant: {
-      h1: "scroll-m-20 text-center text-4xl font-extrabold tracking-tight text-balance",
+            h1: 'scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl',
-      h2: "scroll-m-20 border-b pb-2 text-3xl font-semibold tracking-tight first:mt-0",
+            h2: 'scroll-m-20 border-b pb-2 text-3xl font-semibold tracking-tight first:mt-0',
-      h3: "scroll-m-20 text-2xl font-semibold tracking-tight",
+            h3: 'scroll-m-20 text-2xl font-semibold tracking-tight',
-      h4: "scroll-m-20 text-xl font-semibold tracking-tight",
+            h4: 'scroll-m-20 text-xl font-semibold tracking-tight',
-      h5: "scroll-m-20 text-lg font-semibold tracking-tight",
+            h5: 'scroll-m-20 text-lg font-semibold tracking-tight',
-      h6: "scroll-m-20 text-base font-semibold tracking-tight",
+            h6: 'scroll-m-20 text-base font-semibold tracking-tight',
-      p: "leading-7 [&:not(:first-child)]:mt-6",
+            p: 'leading-7 [&:not(:first-child)]:mt-6',
-      p_inline: "leading-7",
+            p_inline: 'leading-7',
-      blockquote: "mt-6 border-l-2 pl-6 italic",
+            blockquote: 'mt-6 border-l-2 pl-6 italic',
-      ul: "my-6 ml-6 list-disc [&>li]:mt-2",
+            ul: 'my-6 ml-6 list-disc [&>li]:mt-2',
             inlineCode:
-        "bg-muted relative rounded px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold",
+                'relative rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold',
-      lead: "text-muted-foreground text-xl",
+            lead: 'text-xl text-muted-foreground',
-      largeText: "text-lg font-semibold",
+            largeText: 'text-lg font-semibold',
-      smallText: "text-sm leading-none font-medium",
+            smallText: 'text-sm font-medium leading-none',
-      mutedText: "text-muted-foreground text-sm",
+            mutedText: 'text-sm text-muted-foreground',
         },
     },
     defaultVariants: {
@@ -34,24 +34,24 @@ const typographyVariants = cva("text-foreground", {
 type VariantPropType = VariantProps<typeof typographyVariants>;
 
 const variantElementMap: Record<
-  NonNullable<VariantPropType["variant"]>,
+    NonNullable<VariantPropType['variant']>,
     string
 > = {
-  h1: "h1",
+    h1: 'h1',
-  h2: "h2",
+    h2: 'h2',
-  h3: "h3",
+    h3: 'h3',
-  h4: "h4",
+    h4: 'h4',
-  h5: "h5",
+    h5: 'h5',
-  h6: "h6",
+    h6: 'h6',
-  p: "p",
+    p: 'p',
-  p_inline: "p",
+    p_inline: 'p',
-  blockquote: "blockquote",
+    blockquote: 'blockquote',
-  inlineCode: "code",
+    inlineCode: 'code',
-  largeText: "div",
+    largeText: 'div',
-  smallText: "small",
+    smallText: 'small',
-  lead: "p",
+    lead: 'p',
-  mutedText: "p",
+    mutedText: 'p',
-  ul: "ul",
+    ul: 'ul',
 };
 
 export interface TypographyProps
@@ -65,7 +65,7 @@ const Typography = React.forwardRef<HTMLElement, TypographyProps>(
     ({ className, variant, as, asChild, ...props }, ref) => {
         const Comp = asChild
             ? Slot
-      : (as ?? (variant ? variantElementMap[variant] : undefined) ?? "div");
+            : as ?? (variant ? variantElementMap[variant] : undefined) ?? 'div';
         return (
             <Comp
                 className={cn(typographyVariants({ variant, className }))}
@@ -73,10 +73,10 @@ const Typography = React.forwardRef<HTMLElement, TypographyProps>(
                 {...props}
             />
         );
-  },
+    }
 );
 
-Typography.displayName = "Typography";
+Typography.displayName = 'Typography';
 
 // eslint-disable-next-line react-refresh/only-export-components
 export { Typography, typographyVariants };

src/components/ui/use-toast.ts

@@ -1,57 +1,76 @@
-import * as React from "react";
+// Inspired by react-hot-toast library
+import * as React from "react"
 
-import type { ToastActionElement, ToastProps } from "src/components/ui/toast";
+import type {
+  ToastActionElement,
+  ToastProps,
+} from "src/components/ui/toast"
 
-const TOAST_LIMIT = 1;
+const TOAST_LIMIT = 1
-const TOAST_REMOVE_DELAY = 1000000;
+const TOAST_REMOVE_DELAY = 1000000
 
 type ToasterToast = ToastProps & {
-  id: string;
+  id: string
-  title?: React.ReactNode;
+  title?: React.ReactNode
-  description?: React.ReactNode;
+  description?: React.ReactNode
-  action?: ToastActionElement;
+  action?: ToastActionElement
-};
+}
 
 const actionTypes = {
   ADD_TOAST: "ADD_TOAST",
   UPDATE_TOAST: "UPDATE_TOAST",
   DISMISS_TOAST: "DISMISS_TOAST",
   REMOVE_TOAST: "REMOVE_TOAST",
-} as const;
+} as const
 
-let count = 0;
+let count = 0
 
 function genId() {
-  count = (count + 1) % Number.MAX_SAFE_INTEGER;
+  count = (count + 1) % Number.MAX_SAFE_INTEGER
-  return count.toString();
+  return count.toString()
 }
 
-type ActionType = typeof actionTypes;
+type ActionType = typeof actionTypes
 
 type Action =
-  | { type: ActionType["ADD_TOAST"]; toast: ToasterToast }
+  | {
-  | { type: ActionType["UPDATE_TOAST"]; toast: Partial<ToasterToast> }
+      type: ActionType["ADD_TOAST"]
-  | { type: ActionType["DISMISS_TOAST"]; toastId?: ToasterToast["id"] }
+      toast: ToasterToast
-  | { type: ActionType["REMOVE_TOAST"]; toastId?: ToasterToast["id"] };
+    }
+  | {
+      type: ActionType["UPDATE_TOAST"]
+      toast: Partial<ToasterToast>
+    }
+  | {
+      type: ActionType["DISMISS_TOAST"]
+      toastId?: ToasterToast["id"]
+    }
+  | {
+      type: ActionType["REMOVE_TOAST"]
+      toastId?: ToasterToast["id"]
+    }
 
 interface State {
-  toasts: ToasterToast[];
+  toasts: ToasterToast[]
 }
 
-const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>();
+const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
 
 const addToRemoveQueue = (toastId: string) => {
   if (toastTimeouts.has(toastId)) {
-    return;
+    return
   }
 
   const timeout = setTimeout(() => {
-    toastTimeouts.delete(toastId);
+    toastTimeouts.delete(toastId)
-    dispatch({ type: "REMOVE_TOAST", toastId: toastId });
+    dispatch({
-  }, TOAST_REMOVE_DELAY);
+      type: "REMOVE_TOAST",
+      toastId: toastId,
+    })
+  }, TOAST_REMOVE_DELAY)
 
-  toastTimeouts.set(toastId, timeout);
+  toastTimeouts.set(toastId, timeout)
-};
+}
 
 export const reducer = (state: State, action: Action): State => {
   switch (action.type) {
@@ -59,66 +78,77 @@ export const reducer = (state: State, action: Action): State => {
       return {
         ...state,
         toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
-      };
+      }
 
     case "UPDATE_TOAST":
       return {
         ...state,
         toasts: state.toasts.map((t) =>
-          t.id === action.toast.id ? { ...t, ...action.toast } : t,
+          t.id === action.toast.id ? { ...t, ...action.toast } : t
         ),
-      };
+      }
 
     case "DISMISS_TOAST": {
-      const { toastId } = action;
+      const { toastId } = action
 
       // ! Side effects ! - This could be extracted into a dismissToast() action,
       // but I'll keep it here for simplicity
       if (toastId) {
-        addToRemoveQueue(toastId);
+        addToRemoveQueue(toastId)
       } else {
         state.toasts.forEach((toast) => {
-          addToRemoveQueue(toast.id);
+          addToRemoveQueue(toast.id)
-        });
+        })
       }
 
       return {
         ...state,
         toasts: state.toasts.map((t) =>
-          t.id === toastId || toastId === undefined ? { ...t, open: false } : t,
+          t.id === toastId || toastId === undefined
+            ? {
+                ...t,
+                open: false,
+              }
+            : t
         ),
-      };
+      }
     }
     case "REMOVE_TOAST":
       if (action.toastId === undefined) {
-        return { ...state, toasts: [] };
+        return {
+          ...state,
+          toasts: [],
+        }
       }
       return {
         ...state,
         toasts: state.toasts.filter((t) => t.id !== action.toastId),
-      };
       }
-};
+  }
-
-const listeners: Array<(state: State) => void> = [];
-
-let memoryState: State = { toasts: [] };
-
-function dispatch(action: Action) {
-  memoryState = reducer(memoryState, action);
-  listeners.forEach((listener) => {
-    listener(memoryState);
-  });
 }
 
-type Toast = Omit<ToasterToast, "id">;
+const listeners: Array<(state: State) => void> = []
+
+let memoryState: State = { toasts: [] }
+
+function dispatch(action: Action) {
+  memoryState = reducer(memoryState, action)
+  listeners.forEach((listener) => {
+    listener(memoryState)
+  })
+}
+
+type Toast = Omit<ToasterToast, "id">
 
 function toast({ ...props }: Toast) {
-  const id = genId();
+  const id = genId()
 
   const update = (props: ToasterToast) =>
-    dispatch({ type: "UPDATE_TOAST", toast: { ...props, id } });
+    dispatch({
-  const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id });
+      type: "UPDATE_TOAST",
+      toast: { ...props, id },
+    })
+  const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id })
 
   dispatch({
     type: "ADD_TOAST",
@@ -127,32 +157,36 @@ function toast({ ...props }: Toast) {
       id,
       open: true,
       onOpenChange: (open) => {
-        if (!open) dismiss();
+        if (!open) dismiss()
       },
     },
-  });
+  })
 
-  return { id: id, dismiss, update };
+  return {
+    id: id,
+    dismiss,
+    update,
+  }
 }
 
 function useToast() {
-  const [state, setState] = React.useState<State>(memoryState);
+  const [state, setState] = React.useState<State>(memoryState)
 
   React.useEffect(() => {
-    listeners.push(setState);
+    listeners.push(setState)
     return () => {
-      const index = listeners.indexOf(setState);
+      const index = listeners.indexOf(setState)
       if (index > -1) {
-        listeners.splice(index, 1);
+        listeners.splice(index, 1)
       }
-    };
+    }
-  }, [state]);
+  }, [state])
 
   return {
     ...state,
     toast,
     dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
-  };
+  }
 }
 
-export { useToast, toast };
+export { useToast, toast }

src/error-page.tsx

@@ -1,8 +1,9 @@
 import { useRouteError } from "react-router-dom";
 
 export default function ErrorPage() {
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const error: any = useRouteError();
+  const error : any = useRouteError();
   console.error(error);
 
   return (

src/index.css

@@ -1,228 +1,61 @@
-@import 'tailwindcss';
+@tailwind base;
-@import "tw-animate-css";
+@tailwind components;
-
+@tailwind utilities;
-@custom-variant dark (&:is(.dark *));
+
-
+
-
+@layer base {
-@theme inline {
+  :root {
-
+    --background: 0 0% 100%;
-  --radius-sm: calc(var(--radius) - 4px);
+    --foreground: 240 10% 3.9%;
-
+    --card: 0 0% 100%;
-  --radius-md: calc(var(--radius) - 2px);
+    --card-foreground: 240 10% 3.9%;
-
+    --popover: 0 0% 100%;
-  --radius-lg: var(--radius);
+    --popover-foreground: 240 10% 3.9%;
-
+    --primary: 142.1 76.2% 36.3%;
-  --radius-xl: calc(var(--radius) + 4px);
+    --primary-foreground: 355.7 100% 97.3%;
-
+    --secondary: 240 4.8% 95.9%;
-  --color-background: var(--background);
+    --secondary-foreground: 240 5.9% 10%;
-
+    --muted: 240 4.8% 95.9%;
-  --color-foreground: var(--foreground);
+    --muted-foreground: 240 3.8% 46.1%;
-
+    --accent: 240 4.8% 95.9%;
-  --color-card: var(--card);
+    --accent-foreground: 240 5.9% 10%;
-
+    --destructive: 0 84.2% 60.2%;
-  --color-card-foreground: var(--card-foreground);
+    --destructive-foreground: 0 0% 98%;
-
+    --border: 240 5.9% 90%;
-  --color-popover: var(--popover);
+    --input: 240 5.9% 90%;
-
+    --ring: 142.1 76.2% 36.3%;
-  --color-popover-foreground: var(--popover-foreground);
+    --radius: 0.75rem;
-
+  }
-  --color-primary: var(--primary);
+
-
+  .dark {
-  --color-primary-foreground: var(--primary-foreground);
+    --background: 20 14.3% 4.1%;
-
+    --foreground: 0 0% 95%;
-  --color-secondary: var(--secondary);
+    --card: 24 9.8% 10%;
-
+    --card-foreground: 0 0% 95%;
-  --color-secondary-foreground: var(--secondary-foreground);
+    --popover: 0 0% 9%;
-
+    --popover-foreground: 0 0% 95%;
-  --color-muted: var(--muted);
+    --primary: 142.1 70.6% 45.3%;
-
+    --primary-foreground: 144.9 80.4% 10%;
-  --color-muted-foreground: var(--muted-foreground);
+    --secondary: 240 3.7% 15.9%;
-
+    --secondary-foreground: 0 0% 98%;
-  --color-accent: var(--accent);
+    --muted: 0 0% 15%;
-
+    --muted-foreground: 240 5% 64.9%;
-  --color-accent-foreground: var(--accent-foreground);
+    --accent: 12 6.5% 15.1%;
-
+    --accent-foreground: 0 0% 98%;
-  --color-destructive: var(--destructive);
+    --destructive: 0 62.8% 30.6%;
-
+    --destructive-foreground: 0 85.7% 97.3%;
-  --color-border: var(--border);
+    --border: 240 3.7% 15.9%;
-
+    --input: 240 3.7% 15.9%;
-  --color-input: var(--input);
+    --ring: 142.4 71.8% 29.2%;
-
+  }
-  --color-ring: var(--ring);
-
-  --color-chart-1: var(--chart-1);
-
-  --color-chart-2: var(--chart-2);
-
-  --color-chart-3: var(--chart-3);
-
-  --color-chart-4: var(--chart-4);
-
-  --color-chart-5: var(--chart-5);
-
-  --color-sidebar: var(--sidebar);
-
-  --color-sidebar-foreground: var(--sidebar-foreground);
-
-  --color-sidebar-primary: var(--sidebar-primary);
-
-  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
-
-  --color-sidebar-accent: var(--sidebar-accent);
-
-  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
-
-  --color-sidebar-border: var(--sidebar-border);
-
-  --color-sidebar-ring: var(--sidebar-ring);
-}
-
-:root {
-
-  --radius: 0.625rem;
-
-  --background: oklch(1 0 0);
-
-  --foreground: oklch(0.147 0.004 49.25);
-
-  --card: oklch(1 0 0);
-
-  --card-foreground: oklch(0.147 0.004 49.25);
-
-  --popover: oklch(1 0 0);
-
-  --popover-foreground: oklch(0.147 0.004 49.25);
-
-  --primary: oklch(0.216 0.006 56.043);
-
-  --primary-foreground: oklch(0.985 0.001 106.423);
-
-  --secondary: oklch(0.97 0.001 106.424);
-
-  --secondary-foreground: oklch(0.216 0.006 56.043);
-
-  --muted: oklch(0.97 0.001 106.424);
-
-  --muted-foreground: oklch(0.553 0.013 58.071);
-
-  --accent: oklch(0.97 0.001 106.424);
-
-  --accent-foreground: oklch(0.216 0.006 56.043);
-
-  --destructive: oklch(0.577 0.245 27.325);
-
-  --border: oklch(0.923 0.003 48.717);
-
-  --input: oklch(0.923 0.003 48.717);
-
-  --ring: oklch(0.709 0.01 56.259);
-
-  --chart-1: oklch(0.646 0.222 41.116);
-
-  --chart-2: oklch(0.6 0.118 184.704);
-
-  --chart-3: oklch(0.398 0.07 227.392);
-
-  --chart-4: oklch(0.828 0.189 84.429);
-
-  --chart-5: oklch(0.769 0.188 70.08);
-
-  --sidebar: oklch(0.985 0.001 106.423);
-
-  --sidebar-foreground: oklch(0.147 0.004 49.25);
-
-  --sidebar-primary: oklch(0.216 0.006 56.043);
-
-  --sidebar-primary-foreground: oklch(0.985 0.001 106.423);
-
-  --sidebar-accent: oklch(0.97 0.001 106.424);
-
-  --sidebar-accent-foreground: oklch(0.216 0.006 56.043);
-
-  --sidebar-border: oklch(0.923 0.003 48.717);
-
-  --sidebar-ring: oklch(0.709 0.01 56.259);
-}
-
-.dark {
-
-  --background: oklch(0.147 0.004 49.25);
-
-  --foreground: oklch(0.985 0.001 106.423);
-
-  --card: oklch(0.216 0.006 56.043);
-
-  --card-foreground: oklch(0.985 0.001 106.423);
-
-  --popover: oklch(0.216 0.006 56.043);
-
-  --popover-foreground: oklch(0.985 0.001 106.423);
-
-  --primary: oklch(0.923 0.003 48.717);
-
-  --primary-foreground: oklch(0.216 0.006 56.043);
-
-  --secondary: oklch(0.268 0.007 34.298);
-
-  --secondary-foreground: oklch(0.985 0.001 106.423);
-
-  --muted: oklch(0.268 0.007 34.298);
-
-  --muted-foreground: oklch(0.709 0.01 56.259);
-
-  --accent: oklch(0.268 0.007 34.298);
-
-  --accent-foreground: oklch(0.985 0.001 106.423);
-
-  --destructive: oklch(0.704 0.191 22.216);
-
-  --border: oklch(1 0 0 / 10%);
-
-  --input: oklch(1 0 0 / 15%);
-
-  --ring: oklch(0.553 0.013 58.071);
-
-  --chart-1: oklch(0.488 0.243 264.376);
-
-  --chart-2: oklch(0.696 0.17 162.48);
-
-  --chart-3: oklch(0.769 0.188 70.08);
-
-  --chart-4: oklch(0.627 0.265 303.9);
-
-  --chart-5: oklch(0.645 0.246 16.439);
-
-  --sidebar: oklch(0.216 0.006 56.043);
-
-  --sidebar-foreground: oklch(0.985 0.001 106.423);
-
-  --sidebar-primary: oklch(0.488 0.243 264.376);
-
-  --sidebar-primary-foreground: oklch(0.985 0.001 106.423);
-
-  --sidebar-accent: oklch(0.268 0.007 34.298);
-
-  --sidebar-accent-foreground: oklch(0.985 0.001 106.423);
-
-  --sidebar-border: oklch(1 0 0 / 10%);
-
-  --sidebar-ring: oklch(0.553 0.013 58.071);
 }
 
 @layer base {
   * {
-    @apply border-border outline-ring/50;
+    @apply border-border;
   }
+
   body {
     @apply bg-background text-foreground;
   }
 }
-
-/* SomniaRooms Extended CSS */
-
-@utility grid-cols-40/60 {
-   grid-template-columns: 40% 60%;
-}
-@utility grid-cols-60/40 {
-   grid-template-columns: 60% 40%;
-}

src/lib/utils.ts

@@ -1,4 +1,4 @@
-import { clsx, type ClassValue } from "clsx"
+import { type ClassValue, clsx } from "clsx"
 import { twMerge } from "tailwind-merge"
 
 export function cn(...inputs: ClassValue[]) {

src/main.tsx

@@ -1,13 +1,13 @@
-import React from "react";
+import React from 'react'
-import ReactDOM from "react-dom/client";
+import ReactDOM from 'react-dom/client'
-import "./index.css";
+import './index.css'
-import { RouterProvider, createBrowserRouter } from "react-router-dom";
+import { RouterProvider, createBrowserRouter } from 'react-router-dom';
-import Root from "./routes/Root";
+import Root from './routes/Root';
-import ErrorPage from "./routes/error-page";
+import ErrorPage from './error-page';
-import Homepage from "./routes/home-page";
+import Homepage from './routes/home-page';
-import SearchPage from "./routes/search-page";
+import SearchPage from './routes/search-page';
-import BookPage from "./routes/book-page";
+import BookPage from './routes/book-page';
-import SuccessPage from "./routes/success-page";
+import SuccessPage from './routes/success-page';
 
 const router = createBrowserRouter([
   {
@@ -17,30 +17,32 @@ const router = createBrowserRouter([
     children: [
       {
         path: "/",
-        element: <Homepage />,
+        element: <Homepage />
       },
       {
         path: "/home",
-        element: <Homepage />,
+        element: <Homepage />
       },
       {
         path: "/search",
-        element: <SearchPage />,
+        element: <SearchPage />
       },
       {
         path: "/book",
-        element: <BookPage />,
+        element: <BookPage />
       },
       {
         path: "/success",
-        element: <SuccessPage />,
+        element: <SuccessPage />
-      },
+      }
-    ],
+    ]
   },
 ]);
 
-ReactDOM.createRoot(document.getElementById("root")!).render(
+
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <RouterProvider router={router} />
   </React.StrictMode>,
-);
+)

src/model/Bookings.ts

@@ -1,24 +1,25 @@
+
 export type NewBooking = {
-  arrivalDate: Date;
+    arrivalDate: Date,
-  departureDate: Date;
+    departureDate: Date,
-  customerDetails: NewBookingCustomerDetails;
+    customerDetails: NewBookingCustomerDetails,
-  rooms: NewBookingRoom[];
+    rooms: NewBookingRoom[]
 };
 
 export type NewBookingCustomerDetails = {
-  name: string | null;
+    name: string | null,
-  surname: string | null;
+    surname: string | null,
-  email: string | null;
+    email: string | null,
-  phoneNumber: string | null;
+    phoneNumber: string | null
 };
 
 export type NewBookingRoom = {
-  roomCategory: number;
+    roomCategory: number,
-  guestNumber: number;
+    guestNumber: number,
-  amount: number;
+    amount: number,
-  price: number;
+    price: number
 };
 
 export type NewBookingResponse = {
-  refNumber: number;
+    refNumber: number,
-};
+}

src/model/FormSchema.ts

@@ -1,10 +0,0 @@
-"use client";
-
-import { z } from "zod/v4";
-
-export const BookingFormSchema = z.object({
-  name: z.string().min(2).max(50),
-  surname: z.string().min(2).max(50),
-  email: z.email(),
-  phone: z.string().min(8),
-});

src/model/InternalTypes.ts

@@ -1,5 +0,0 @@
-import { DateRange } from "react-day-picker";
-
-export type SearchFilter = {
-  dateRange: DateRange;
-};

src/model/RoomCategory.ts

@@ -1,21 +1,24 @@
+
+
 export type RoomCategory = {
-  id: number;
+    id: number,
-  name: string;
+    name: string,
-  description: string | undefined;
+    description: string,
-  maxGuestNum: number;
+    bedType: string,
-  orderHomePage: number | undefined;
+    maxGuestNum: number,
-  roomCategoryPhotos: RoomCategoryPhoto[];
+    roomCategoryPhotos: RoomCategoryPhoto[],
-  roomCategoryBedTypes: RoomCategoryBedType[];
+    roomCategoryDetails: RoomCategoryDetails[],
-};
+}
+
+export type RoomCategoryDetails = {
+    id: number,
+    detailsSection: string,
+    detailValue: string,
+}
 
 export type RoomCategoryPhoto = {
-  path: string;
+    id: number,
-  altText: string | undefined;
+    path: string,
-  photoOrder: string | undefined;
+    altText: string | undefined,
-};
+    kind: string,
-
-export type RoomCategoryBedType = {
-  amount: number;
-  bedTypeName: string;
-  bedTypeIcon: string;
 }

src/model/RoomSearch.ts

@@ -1,31 +1,30 @@
+
+
 export type RoomAvailabity = {
-  roomCategory: number;
+    roomCategory: number,
-  availability: number;
+    availability: number
-};
+}
 
 export type RoomPrice = {
-  guestNumber: number;
+    guestNumber: number,
-  price: number;
+    price: number
-};
+}
 
 export type AvailabilityRequest = {
-  startDate: string;
+    filter: AvailabilityFilter
-  endDate: string;
+}
-};
 
 export type AvailabilityFilter = {
-  startDate: string;
+    startDate: string,
-  endDate: string;
+    endDate: string
-};
+}
 
 export type FareRequest = {
-  roomCategory: number;
+    filter: FareFilter
-  startDate: string;
+}
-  endDate: string;
-};
 
 export type FareFilter = {
-  roomCategory: number;
+    roomCategory: number,
-  startDate: string;
+    startDate: string,
-  endDate: string;
+    endDate: string
-};
+}

src/model/SearchFilter.ts

@@ -0,0 +1,5 @@
+import { DateRange } from "react-day-picker"
+
+export type SearchFilter = {
+    dateRange: DateRange
+}

src/routes/Root.css

@@ -8,15 +8,10 @@ html {
   box-sizing: inherit;
 }
 
+
 .appPage {
   width: 80%;
   margin: 0 auto;
   padding: 2rem;
   text-align: center;
 }
-
-iconify-icon {
-  display: inline-block;
-  min-width: 1em;
-  min-height: 1em;
-}

src/routes/Root.tsx

@@ -1,23 +1,24 @@
-import { Outlet } from "react-router-dom";
+import { Outlet } from 'react-router-dom'
-import "./Root.css";
+import './Root.css'
-import AppHeader from "../components/app-header";
+import AppHeader from '../components/app-header'
-import AppFooter from "../components/app-footer";
+import AppFooter from '../components/app-footer'
-import { ThemeProvider } from "@/components/theme-provider";
+import { ThemeProvider } from '@/components/theme-provider'
-import { Toaster } from "@/components/ui/toaster";
+import { Toaster } from '@/components/ui/toaster'
 
 function Root() {
+
   return (
     <>
       <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
         <AppHeader />
-        <div className="mx-auto w-full bg-background p-8 text-center text-foreground sm:w-[90%] md:w-[80%]">
+        <div className='appPage bg-background text-foreground'>
           <Outlet />
         </div>
         <Toaster />
         <AppFooter />
       </ThemeProvider>
     </>
-  );
+  )
 }
 
-export default Root;
+export default Root

src/routes/book-page.tsx

@@ -1,60 +1,71 @@
-import { APISendCreateBooking } from "@/api/api-booking";
+import { APISendCreateBooking } from "@/api/api-booking"
-import { BookingDetails } from "@/components/booking/booking-details";
+import { BookingDetails } from "@/components/booking/booking-details"
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/button"
-import {
+import { Input } from "@/components/ui/input"
-  Form,
+import { Label } from "@/components/ui/label"
-  FormControl,
+import { Separator } from "@/components/ui/separator"
-  FormField,
+import { Typography } from "@/components/ui/typography"
-  FormItem,
+import { useToast } from "@/components/ui/use-toast"
-  FormLabel,
+import { useAppStore } from "@/store"
-  FormMessage,
+import { ChangeEvent, useState } from "react"
-} from "@/components/ui/form";
+import { useNavigate } from "react-router-dom"
-import { Input } from "@/components/ui/input";
-import { Separator } from "@/components/ui/separator";
-import { Typography } from "@/components/ui/typography";
-import { BookingFormSchema } from "@/model/FormSchema";
-import { useAppStore } from "@/store";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { useNavigate } from "react-router-dom";
-import { z } from "zod/v4";
-import { zodResolver } from "@hookform/resolvers/zod";
 
 enum PageState {
-  noData,
+  noData, showForm, sending, created, error
-  showForm,
-  sending,
-  created,
-  error,
 }
 
+
 function BookPage() {
   const [pageState, setPageState] = useState<PageState>(PageState.showForm);
-  const bookingData = useAppStore((state) => state.currentBooking);
+  const bookingData = useAppStore((state) => state.newBookingData)
-  const setCustomerData = useAppStore((state) => state.currentBookingSetCustomer);
+  const setCustomerData = useAppStore((state) => state.setBookingCustomer);
+  const { toast } = useToast();
   const navigate = useNavigate();
 
-  const bookingForm = useForm<z.infer<typeof BookingFormSchema>>({
+  if (!bookingData || !bookingData.customerDetails) {
-    resolver: zodResolver(BookingFormSchema),
+    return (
-    defaultValues: {
+      <Typography variant={"h2"}>You must select some rooms...</Typography>
-      email: "",
+    )
-      name: "",
+  }
-      surname: "",
-      phone: "",
-    },
-  });
 
-  function onSubmit(values: z.infer<typeof BookingFormSchema>) {
+  function handleOnChange(e: ChangeEvent<HTMLInputElement>) {
     if (bookingData == null) {
       return;
     }
+
     const newCustomerData = bookingData.customerDetails;
-    newCustomerData.name = values.name;
+
-    newCustomerData.surname = values.surname;
+    switch (e.target.name) {
-    newCustomerData.email = values.email;
+      case "name":
-    newCustomerData.phoneNumber = values.phone;
+        newCustomerData.name = e.target.value;
+        break;
+      case "surname":
+        newCustomerData.surname = e.target.value;
+        break;
+      case "email":
+        newCustomerData.email = e.target.value;
+        break;
+      case "phoneNumber":
+        newCustomerData.phoneNumber = e.target.value;
+        break;
+      default:
+        break;
+    }
 
     setCustomerData(newCustomerData);
+  }
+
+  function handleOnBookingSubmit() {
+    const customerDetails = bookingData?.customerDetails;
+
+    if (!customerDetails ||
+      customerDetails.name == "" || customerDetails.surname == "" || customerDetails.phoneNumber == "" || customerDetails.email == "") {
+      toast({
+        variant: "destructive",
+        title: "Uh oh! You must fill all fields.",
+      });
+      return;
+    }
 
     setPageState(PageState.sending);
     console.log(bookingData);
@@ -67,95 +78,48 @@ function BookPage() {
     if (rs.isError) {
       setPageState(PageState.error);
     } else {
-      navigate("/success", { state: rs.bookingResponse });
+      navigate("/success", { state: rs.bookingResponse })
+    }
   }
-  };
 
-  if (!bookingData || !bookingData.customerDetails) {
-    return (
-      <Typography variant={"h2"}>You must select some rooms...</Typography>
-    );
-  }
 
   return (
     <>
       <Typography variant={"h1"}>Booking Details</Typography>
       <Separator className="my-10" />
-      <div className="lg:grid lg:grid-cols-40/60 lg:gap-x-10">
       <div>
-          <Typography variant={"h3"} className="my-4">
+        <Typography variant={"h3"}>Personal Details</Typography>
-            Personal Details
+        <div>
-          </Typography>
+          <div>
-          <Form {...bookingForm}>
+            <Label htmlFor="name">Name</Label>
-            <form
+            <Input type="text" name="name" id="name" placeholder="Name" value={bookingData.customerDetails.name ?? ""}
-              onSubmit={bookingForm.handleSubmit(onSubmit)}
+              onChange={handleOnChange} />
-              className="space-y-8"
-            >
-              <div className="flex w-full flex-row gap-x-3">
-                <FormField
-                  control={bookingForm.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem className="flex-1">
-                      <FormLabel>Name</FormLabel>
-                      <FormControl>
-                        <Input {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                ></FormField>
-                <FormField
-                  control={bookingForm.control}
-                  name="surname"
-                  render={({ field }) => (
-                    <FormItem className="flex-1">
-                      <FormLabel>Surname</FormLabel>
-                      <FormControl>
-                        <Input {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                ></FormField>
           </div>
-              <FormField
+          <div>
-                control={bookingForm.control}
+            <Label htmlFor="surname">Surname</Label>
-                name="email"
+            <Input type="text" name="surname" id="surname" placeholder="Surname" value={bookingData.customerDetails.surname ?? ""}
-                render={({ field }) => (
+              onChange={handleOnChange} />
-                  <FormItem>
-                    <FormLabel>Email</FormLabel>
-                    <FormControl>
-                      <Input {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              ></FormField>
-              <FormField
-                control={bookingForm.control}
-                name="phone"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Phone</FormLabel>
-                    <FormControl>
-                      <Input {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              ></FormField>
-              <Button type="submit" disabled={pageState == PageState.sending}>
-                Submit
-              </Button>
-            </form>
-          </Form>
           </div>
-        <Separator className="my-10 lg:hidden" />
+          <div>
+            <Label htmlFor="email">Email</Label>
+            <Input type="email" name="email" id="email" placeholder="Email" value={bookingData.customerDetails.email ?? ""}
+              onChange={handleOnChange} />
+          </div>
+          <div>
+            <Label htmlFor="phone">Phone Number</Label>
+            <Input type="tel" name="phoneNumber" id="phone" placeholder="Number" value={bookingData.customerDetails.phoneNumber ?? ""}
+              onChange={handleOnChange} />
+          </div>
+        </div>
+      </div>
+      <Separator className="my-10" />
       <BookingDetails mode="View"></BookingDetails>
-      </div>
+      <Separator className="my-10" />
+      <Button onClick={handleOnBookingSubmit} disabled={pageState == PageState.sending}>
+        <Typography variant={"h3"} className="text-primary-foreground">Book it now!</Typography>
+      </Button>
     </>
-  );
+  )
 }
 
-export default BookPage;
+export default BookPage

src/routes/home-page.css

@@ -1,3 +0,0 @@
-.homePageRoomGrid {
-  grid-template-columns: repeat(auto-fit, minmax(300px, 3fr));
-}

src/routes/home-page.tsx

@@ -1,71 +1,48 @@
-import { useAPIRoomCategoryList } from "@/api/api-roomCategories";
+import { useAPIRoomCategories } from "@/api/api-roomCategories"
-import { RoomItemCard } from "@/components/Rooms/room-item-card";
+import { RoomItemCard } from "@/components/Rooms/room-item-card"
-import { SearchFilterCard } from "@/components/Search/SearchFilterCard";
+import { SearchFilterCard } from "@/components/Search/SearchFilterCard"
-import BackendConnectionStatus from "@/components/backend-conection-status";
+import BackendConnectionStatus from "@/components/backend-conection-status"
-import { Separator } from "@/components/ui/separator";
+import { Separator } from "@/components/ui/separator"
-import { Skeleton } from "@/components/ui/skeleton";
+import { Skeleton } from "@/components/ui/skeleton"
-import { Typography } from "@/components/ui/typography";
+import { Typography } from "@/components/ui/typography"
-import { RoomCategory } from "@/model/RoomCategory";
+import { RoomCategory } from "@/model/RoomCategory"
-import { SearchFilter } from "@/model/InternalTypes";
+import { SearchFilter } from "@/model/SearchFilter"
-import { eBookingState } from "@/utils/AppStateManager";
+import { useNavigate } from "react-router-dom"
-import { useNavigate } from "react-router-dom";
-import { LoaderIcon } from "lucide-react";
-import "./home-page.css";
-import { useAppStore } from "@/store";
-import { isValidSearchFilter, makeDayUTCDate } from "@/utils/utils";
 
 function Homepage() {
-  const appSearchFilter = useAppStore((state) => state.searchFilter);
-  const setAppSearchFilter = useAppStore((state) => state.setSearchFilter);
-  const setAppBookingState = useAppStore((state) => state.setBookingState);
-  const initAppBooking = useAppStore((state) => state.initCurrentBooking);
 
-  const { roomCategoryList, isLoading, isError } = useAPIRoomCategoryList();
+  const { roomCategoryList, isLoading, isError } = useAPIRoomCategories();
   const navigate = useNavigate();
 
   const onBtSearchClick = (filter: SearchFilter) => {
-    if (!isValidSearchFilter(filter)) {
+    navigate("/search", {state: filter})
-      return;
   }
 
-    setAppSearchFilter(filter);
-    setAppBookingState(eBookingState.Searched);
-
-    initAppBooking(
-      makeDayUTCDate(filter.dateRange.from),
-      makeDayUTCDate(filter.dateRange.to),
-    );
-
-    navigate("/search", { state: filter });
-  };
-
   const roomList = roomCategoryList?.map((element: RoomCategory) => {
-    return <RoomItemCard key={element.id} room={element} />;
+    return (
+      <RoomItemCard key={element.id} room={element} />
+    );
   });
+
   return (
     <>
       <Typography variant={"h1"}>Somnia Rooms</Typography>
       <Separator className="my-10" />
-      <SearchFilterCard
+      <SearchFilterCard onSearchClick={onBtSearchClick}/>
-        onSearchClick={onBtSearchClick}
-        initialsearchFilter={appSearchFilter}
-      />
       <Separator className="my-10" />
-      <div className="homePageRoomGrid grid gap-4">{roomList}</div>
+      <div className="grid grid-cols-2 gap-4">
+        {roomList}
+      </div>
       {isLoading && (
         <>
-          <Skeleton className="mx-auto flex h-[200px] w-full flex-col items-center justify-center">
+          <Typography variant={"h3"} as="h2">Loading...</Typography>
-            <LoaderIcon />
+          <Skeleton className="w-[400px] h-[200px] mx-auto" />
-            <Typography variant={"h3"} as="h2">
-              Loading...
-            </Typography>
-          </Skeleton>
         </>
       )}
       <Separator className="my-10" />
       <BackendConnectionStatus isLoading={isLoading} isError={isError} />
     </>
-  );
+  )
 }
 
-export default Homepage;
+export default Homepage

src/routes/search-page.tsx

@@ -1,132 +1,95 @@
-import { useAPIRoomAvailability } from "@/api/api-roomSearch";
+import { useAPIRoomAvailability } from "@/api/api-roomSearch"
-import RoomBooking from "@/components/Rooms/room-booking";
+import RoomBooking from "@/components/Rooms/room-booking"
-import { SearchFilterCard } from "@/components/Search/SearchFilterCard";
+import { SearchFilterCard } from "@/components/Search/SearchFilterCard"
-import BackendConnectionStatus from "@/components/backend-conection-status";
+import BackendConnectionStatus from "@/components/backend-conection-status"
-import { BookingDetails } from "@/components/booking/booking-details";
+import { BookingDetails } from "@/components/booking/booking-details"
-import { Separator } from "@/components/ui/separator";
+import { Separator } from "@/components/ui/separator"
-import { Skeleton } from "@/components/ui/skeleton";
+import { Skeleton } from "@/components/ui/skeleton"
-import { Typography } from "@/components/ui/typography";
+import { Typography } from "@/components/ui/typography"
-import { SearchFilter } from "@/model/InternalTypes";
+import { AvailabilityFilter } from "@/model/RoomSearch"
-import { eBookingState } from "@/utils/AppStateManager";
+import { SearchFilter } from "@/model/SearchFilter"
-import { useAppStore } from "@/store";
+import { useAppStore } from "@/store"
-import {
+import { useMemo, useState } from "react"
-  isValidSearchFilter,
+import { useNavigate } from "react-router-dom"
-  makeAvailabilityFilterFromSearchFilter,
-  makeDayUTCDate,
-} from "@/utils/utils";
-import { useNavigate } from "react-router-dom";
 
-//TODOME: Al pulsar el botón "buscar", si ya existen datos en la reserva (se han añadido habitaciones) mostrar un cuadro de aviso de que si se busca se borrará la selección actual.
+//TODOME: Igual podemos crear un StateMachine conjunta para los siguiente estados de la página: Sin Buscar, Sin disponibilidad, error, cargando.
-//TODOME: Mediante los estados globales de la reserva, si ya está en estado "booking" añadiendo los datos, mostrar un mensaje y permitir redirigir directamente para que continue donde lo dejó.
 function SearchPage() {
-  const appBookingState = useAppStore((state) => state.bookingState);
+
-  const setAppBookingState = useAppStore((state) => state.setBookingState);
+  //const [availabilityFilter, setAvailabilityFilter] = useState<AvailabilityFilter>();
-  const appSearchFilter = useAppStore((state) => state.searchFilter);
+  const searchFilter = useAppStore((state) => (state.searchFilter));
-  const setAppSearchFilter = useAppStore((state) => state.setSearchFilter);
+  const resetBooking = useAppStore((state) => (state.resetBookingState));
-  const initAppBooking = useAppStore((state) => state.initCurrentBooking);
   const navigate = useNavigate();
 
-  const {
+  const [isSearched, setIsSearched] = useState<boolean>(false);
-    roomAvailabilityList,
-    isLoading: isLoadingAvailability,
-    isError: isErrorAvailability,
-  } = useAPIRoomAvailability(
-    makeAvailabilityFilterFromSearchFilter(appSearchFilter) ?? null,
-  );
-  const isLoading = isLoadingAvailability;
-  const isError = isErrorAvailability;
 
-  const hasRooms =
-    roomAvailabilityList?.length && roomAvailabilityList?.length > 0;
-
-  //TODOME: Hay que ver para mover esto a un método común.
   const onBtSearchClick = (newFilter: SearchFilter) => {
-    if (!isValidSearchFilter(newFilter)) {
+    console.log("onBtSearchClick: ");
-      return;
+    console.log(newFilter);
+
+    if (newFilter.dateRange && newFilter.dateRange.from && newFilter.dateRange.to) {
+      setIsSearched(true);
+
+      resetBooking(newFilter.dateRange.from, newFilter.dateRange.to);
+    }
   }
-
-    setAppSearchFilter(newFilter);
-    setAppBookingState(eBookingState.Searched);
-
-    initAppBooking(
-      makeDayUTCDate(newFilter.dateRange.from),
-      makeDayUTCDate(newFilter.dateRange.to),
-    );
-  };
 
   const onBookingContinue = () => {
     navigate("/book");
-  };
+  }
 
-  const roomList =
+  //This seems a little bit overkill, but IDK.
-    roomAvailabilityList?.map((element) => {
+  const availabilityFilter: AvailabilityFilter | null = useMemo(
-      return (
+    () => {
-        <RoomBooking
+      if (searchFilter && searchFilter.dateRange && searchFilter.dateRange.from && searchFilter.dateRange.to) {
-          key={element.roomCategory + "-" + appBookingState.lastSearchDate}
+        const newAvailabilityFilter: AvailabilityFilter = {
-          availableAmount={element.availability}
+          startDate: searchFilter.dateRange.from.toDateString(),
-          roomCategoryId={element.roomCategory}
+          endDate: searchFilter.dateRange.to.toDateString()
-        />
+        };
+        return newAvailabilityFilter;
+      }
+      return null;
+    },
+    [searchFilter]
   );
-    }) ?? null;
+
+  const { roomAvailabilityList, isLoading: isLoadingAvailability, isError: isErrorAvailability } = useAPIRoomAvailability(availabilityFilter ?? null);
+
+  const isLoading = isLoadingAvailability;
+  const isError = isErrorAvailability;
+
+  const roomList = roomAvailabilityList?.map((element) => {
+    return (
+      <RoomBooking key={element.roomCategory} availableAmount={element.availability} roomCategoryId={element.roomCategory} />
+    );
+  });
   const noRoomsAvailable = (
     <>
-      <Typography variant={"h3"} as="h3">
+      <Typography variant={"h3"} as="h3">Sorry 😔, there aren't rooms available for selected period.
-        Sorry 😔, there aren't rooms available for selected period. You can
+        You can contact us for more info.</Typography>
-        contact us for more info.
-      </Typography>
     </>
   );
-
+  const hasRooms = (roomAvailabilityList?.length && roomAvailabilityList?.length > 0);
-  const pageContentSearch = (
+  console.log(hasRooms);
-    <Typography>
-      Realiza una búsqueda para ver la disponibilidad y los precios.
-    </Typography>
-  );
-  const pageContentLoading = (
-    <>
-      <Typography variant={"h3"} as="h2">
-        Loading...
-      </Typography>
-      <Skeleton className="mx-auto h-[200px] w-full" />
-    </>
-  );
-  const pageContentLoaded = (
-    <div className="2xl:grid 2xl:grid-cols-60/40 2xl:gap-6">
-      <div className="flex flex-col gap-5">{roomList}</div>
-      <Separator className="my-10 2xl:hidden" />
-      <BookingDetails
-        onBookingConfirm={onBookingContinue}
-        mode={"Book"}
-      ></BookingDetails>
-    </div>
-  );
-
-  const getPageContent = () => {
-    const isSearched = appBookingState.state == eBookingState.Searched;
-    if (!isSearched) {
-      return pageContentSearch;
-    }
-    if (isLoading) {
-      return pageContentLoading;
-    }
-    if (!hasRooms) {
-      return noRoomsAvailable;
-    }
-    return pageContentLoaded;
-  };
 
   return (
     <div className="bg-background text-foreground">
-      <SearchFilterCard
+      <SearchFilterCard onSearchClick={onBtSearchClick} />
-        onSearchClick={onBtSearchClick}
-        initialsearchFilter={appSearchFilter}
-      />
       <Separator className="my-10" />
-      {getPageContent()}
+      {isLoading && (
+        <>
+          <Typography variant={"h3"} as="h2">Loading...</Typography>
+          <Skeleton className="w-[400px] h-[200px] mx-auto" />
+        </>
+      )}
+      <div className="flex flex-col gap-5">
+        {hasRooms ? roomList : (isSearched && noRoomsAvailable)}
+      </div>
+      <Separator className="my-10" />
+      <BookingDetails onBookingConfirm={onBookingContinue} mode={"Book"}></BookingDetails>
       <Separator className="my-10" />
       <BackendConnectionStatus isLoading={isLoading} isError={isError} />
     </div>
-  );
+  )
 }
 
-export default SearchPage;
+export default SearchPage

src/routes/success-page.tsx

@@ -1,29 +1,33 @@
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/button"
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { Card, CardContent, CardHeader } from "@/components/ui/card"
-import { Typography } from "@/components/ui/typography";
+import { Typography } from "@/components/ui/typography"
-import { NewBookingResponse } from "@/model/Bookings";
+import { NewBookingResponse } from "@/model/Bookings"
-import { useAppStore } from "@/store";
+import { useAppStore } from "@/store"
-import { useEffect, useState } from "react";
+import { addDays } from "date-fns"
-import { useLocation, useNavigate } from "react-router-dom";
+import { useEffect, useState } from "react"
+import { useLocation, useNavigate } from "react-router-dom"
 
 function SuccessPage() {
-  const [pageState, setPageState] = useState<NewBookingResponse | null>(null);
+
-  const resetBookingState = useAppStore((state) => state.resetCurrentBooking);
+    const [pageState, setPageState] = useState<NewBookingResponse|null>(null)
+    const resetBookingState = useAppStore((state) => state.resetBookingState);
 
     const location = useLocation();
     const navigate = useNavigate();
 
     useEffect(() => {
-    if (location.state == null) {
+        if(location.state == null) {
             navigate("/home");
         }
         setPageState(location.state);
-  }, [location, navigate]);
+
+    }, [location, navigate])
 
     const handleBtBackClick = () => {
-    resetBookingState();
+        resetBookingState(new Date(), addDays(new Date(), 2));
         navigate("/home");
-  };
+    }
+
 
   return (
     <Card>
@@ -31,17 +35,13 @@ function SuccessPage() {
             <Typography variant={"h2"}>Booking Completed</Typography>
         </CardHeader>
         <CardContent>
-        <Typography variant={"largeText"}>
+            <Typography variant={"largeText"}>Booking ref: {pageState?.refNumber}</Typography>
-          Booking ref: {pageState?.refNumber}
-        </Typography>
             <Button className="my-4" onClick={handleBtBackClick}>
-          <Typography variant={"largeText"} className="text-primary-foreground">
+                <Typography variant={"largeText"} className="text-primary-foreground">Go Back</Typography>
-            Go Back
-          </Typography>
             </Button>
         </CardContent>
     </Card>
-  );
+  )
 }
 
-export default SuccessPage;
+export default SuccessPage

src/store.ts

@@ -1,36 +1,20 @@
-import { create } from "zustand";
+import { create } from 'zustand'
-import { SearchFilter } from "@/model/InternalTypes";
+import { SearchFilter } from './model/SearchFilter'
-import {
+import { NewBooking, NewBookingCustomerDetails, NewBookingRoom } from './model/Bookings'
-  BookingState,
-  eBookingState,
-  SetBookingState,
-} from "./utils/AppStateManager";
-import {
-  NewBooking,
-  NewBookingCustomerDetails,
-  NewBookingRoom,
-} from "./model/Bookings";
 
-interface State {
+interface AppState {
-  searchFilter: SearchFilter;
+    searchFilter: SearchFilter
-  currentBooking: NewBooking | null;
+    setSearchFilter: (newFilter: SearchFilter) => void
-  bookingState: BookingState;
+    newBookingData: NewBooking | null
-}
+    setNewBooking: (newBooking: NewBooking) => void
-
+    resetBookingState: (arrival: Date, departure: Date) => void
-interface Actions {
+    addNewBookingRoom: (newRoom: NewBookingRoom) => void
-  setSearchFilter: (newFilter: SearchFilter) => void;
+    setBookingCustomer: (newCustomer: NewBookingCustomerDetails) => void
-  resetSearchFilter: () => void;
-  setCurrentBooking: (newBooking: NewBooking) => void;
-  resetCurrentBooking: () => void;
-  initCurrentBooking: (arrival: Date, departure: Date) => void;
-  currentBookingAddRoom: (newRoom: NewBookingRoom) => void;
-  currentBookingSetCustomer: (newCustomer: NewBookingCustomerDetails) => void;
-  setBookingState: (newState: eBookingState) => void;
 }
 
 const defaultSearchFilter: SearchFilter = {
-  dateRange: { from: new Date() },
+    dateRange: { from: new Date() }
-};
+}
 
 const defaultNewBooking: NewBooking = {
     arrivalDate: new Date(),
@@ -39,97 +23,73 @@ const defaultNewBooking: NewBooking = {
         name: null,
         surname: null,
         email: null,
-    phoneNumber: null,
+        phoneNumber: null
     },
-  rooms: [],
+    rooms: []
-};
+}
 
-const defaultBookingState: BookingState = {
+function getDefaultBookingData(arrivalDate: Date, departureDate: Date) {
-  state: eBookingState.None,
-  lastSearchDate: new Date(),
-};
-
-function getDefaultBooking(arrivalDate: Date, departureDate: Date) {
     return {
         ...defaultNewBooking,
         arrivalDate: arrivalDate,
-    departureDate: departureDate,
+        departureDate: departureDate
-  };
+    }
 }
 
-function addNewBookingRoom(
+function addNewBookingRoomToCurrentState(newRoom: NewBookingRoom, currentState: NewBooking | null): NewBooking | null {
-  newRoom: NewBookingRoom,
+
-  currentBookingState: NewBooking | null,
+    if (currentState == null) {
-): NewBooking | null {
+        return currentState;
-  if (currentBookingState == null) {
-    return currentBookingState;
     }
 
     //Remove rooms with "same key".
-  const filteredRooms = currentBookingState.rooms.filter((room) => {
+    const filteredRooms = currentState.rooms.filter((room) => {
-    const isDiffRoom = room.roomCategory != newRoom.roomCategory;
+        const diffRoom = room.roomCategory != newRoom.roomCategory;
-    const isDiffAmount = room.guestNumber != newRoom.guestNumber;
+        const diffAmount = room.guestNumber != newRoom.guestNumber;
-    if (isDiffRoom || (!isDiffRoom && isDiffAmount)) {
+        if(diffRoom || (!diffRoom && diffAmount)) {
             return true;
         }
         return false;
-  });
+    })
     console.log(filteredRooms);
 
     if (newRoom.amount > 0) {
         filteredRooms.push(newRoom);
     }
 
-  const newState: NewBooking = {
-    ...currentBookingState,
-    rooms: filteredRooms ?? [],
-  };
 
-  console.log("Updated 'currentBooking' state:");
+    const newState: NewBooking = {
+        ...currentState,
+        rooms: filteredRooms ?? []
+    }
+
+    console.log("AddRoomNewState:");
     console.log(newState);
 
     return newState;
 }
 
-function setBookingCustomer(
+function setBookingCustomer(newCustomer: NewBookingCustomerDetails, currentState: NewBooking | null) {
-  newCustomer: NewBookingCustomerDetails,
+    if(currentState == null) {
-  currentBookingState: NewBooking | null,
+        return currentState;
-) {
-  if (currentBookingState == null) {
-    return currentBookingState;
     }
 
     const newState: NewBooking = {
-    ...currentBookingState,
+        ...currentState,
-    customerDetails: newCustomer,
+        customerDetails: newCustomer
     };
     return newState;
 }
 
-export const useAppStore = create<State & Actions>()((set) => ({
+export const useAppStore = create<AppState>()((set) => ({
     searchFilter: defaultSearchFilter,
-  currentBooking: null,
-  bookingState: defaultBookingState,
-
     setSearchFilter: (newFilter) => set(() => ({ searchFilter: newFilter })),
-  resetSearchFilter: () => set(() => ({ searchFilter: defaultSearchFilter })),
+    newBookingData: null,
-
+    setNewBooking: (newBooking) => set(() => ({ newBookingData: newBooking })),
-  setCurrentBooking: (newBooking) =>
+    resetBookingState: (arrival, departure) =>
-    set(() => ({ currentBooking: newBooking })),
+        set(() => ({ newBookingData: getDefaultBookingData(arrival, departure) })),
-  resetCurrentBooking: () => set(() => ({ currentBooking: null })),
+    addNewBookingRoom: (newRoom: NewBookingRoom) =>
-  initCurrentBooking: (arrival, departure) =>
+        set((state) => ({ newBookingData: addNewBookingRoomToCurrentState(newRoom, state.newBookingData) })),
-    set(() => ({ currentBooking: getDefaultBooking(arrival, departure) })),
+    setBookingCustomer: (newCustomer: NewBookingCustomerDetails) => 
-  currentBookingAddRoom: (newRoom) =>
+        set((state) => ({newBookingData: setBookingCustomer(newCustomer, state.newBookingData)}))
-    set((state) => ({
+}))
-      currentBooking: addNewBookingRoom(newRoom, state.currentBooking),
-    })),
-  currentBookingSetCustomer: (newCustomer) =>
-    set((state) => ({
-      currentBooking: setBookingCustomer(newCustomer, state.currentBooking),
-    })),
-
-  setBookingState: (newState) =>
-    set((state) => ({
-      bookingState: SetBookingState(newState, state.bookingState),
-    })),
-}));

src/utils/AppStateManager.ts

@@ -1,27 +0,0 @@
-export type BookingState = {
-  state: eBookingState;
-  lastSearchDate: Date;
-};
-
-export enum eBookingState {
-  None = "NONE",
-  Searched = "SEARCHED",
-  Booking = "BOOKING",
-  Booked = "BOOKED",
-}
-
-export function SetBookingState(
-  newState: eBookingState,
-  currentAppBookingState: BookingState,
-) {
-  const newAppState: BookingState = {
-    ...currentAppBookingState,
-    state: newState,
-  };
-
-  if (newState == eBookingState.Searched) {
-    newAppState.lastSearchDate = new Date();
-  }
-
-  return newAppState;
-}

src/utils/utils.ts

@@ -1,52 +0,0 @@
-import { AvailabilityFilter, FareFilter } from "@/model/RoomSearch";
-import { SearchFilter } from "@/model/InternalTypes";
-
-export function makeDayUTCDate(date: Date | undefined): Date {
-  if (!date) {
-    return new Date();
-  }
-
-  return new Date(
-    date.getFullYear(),
-    date.getMonth(),
-    date.getDate(),
-    23,
-    59,
-    59,
-    999,
-  );
-}
-
-export function isValidSearchFilter(sf: SearchFilter): boolean {
-  if (sf?.dateRange?.from && sf?.dateRange?.to) {
-    return true;
-  }
-  return false;
-}
-
-export function makeAvailabilityFilterFromSearchFilter(
-  sf: SearchFilter,
-): AvailabilityFilter | null {
-  if (!isValidSearchFilter(sf)) {
-    return null;
-  }
-  return {
-    startDate: sf.dateRange.from!.toISOString(),
-    endDate: sf.dateRange.to!.toISOString(),
-  };
-}
-
-export function makeFareFilterFromSearchFilter(
-  sf: SearchFilter,
-  roomCategoryId: number,
-): FareFilter | null {
-  if (!isValidSearchFilter(sf) || roomCategoryId < 0) {
-    return null;
-  }
-
-  return {
-    startDate: sf.dateRange.from!.toISOString(),
-    endDate: sf.dateRange.to!.toISOString(),
-    roomCategory: roomCategoryId,
-  };
-}

tailwind.config.js

@@ -0,0 +1,79 @@
+import plugin from 'tailwindcss-animate';
+
+/** @type {import('tailwindcss').Config} */
+export default {
+  darkMode: ["class"],
+  content: [
+    './pages/**/*.{ts,tsx}',
+    './components/**/*.{ts,tsx}',
+    './app/**/*.{ts,tsx}',
+    './src/**/*.{ts,tsx}',
+  ],
+  prefix: "",
+  theme: {
+    container: {
+      center: true,
+      padding: "2rem",
+      screens: {
+        "2xl": "1400px",
+      },
+    },
+    extend: {
+      colors: {
+        border: "hsl(var(--border))",
+        input: "hsl(var(--input))",
+        ring: "hsl(var(--ring))",
+        background: "hsl(var(--background))",
+        foreground: "hsl(var(--foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
+        },
+        destructive: {
+          DEFAULT: "hsl(var(--destructive))",
+          foreground: "hsl(var(--destructive-foreground))",
+        },
+        muted: {
+          DEFAULT: "hsl(var(--muted))",
+          foreground: "hsl(var(--muted-foreground))",
+        },
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
+        popover: {
+          DEFAULT: "hsl(var(--popover))",
+          foreground: "hsl(var(--popover-foreground))",
+        },
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
+        },
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
+      keyframes: {
+        "accordion-down": {
+          from: { height: "0" },
+          to: { height: "var(--radix-accordion-content-height)" },
+        },
+        "accordion-up": {
+          from: { height: "var(--radix-accordion-content-height)" },
+          to: { height: "0" },
+        },
+      },
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+      },
+    },
+  },
+  plugins: [plugin],
+}

tsconfig.app.json

@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    // ...
-    "baseUrl": ".",
-    "paths": {
-      "@/*": [
-        "./src/*"
-      ]
-    }
-    // ...
-  }
-}

tsconfig.json

@@ -2,7 +2,9 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": [
+        "./src/*"
+      ]
     },
     "target": "ES2020",
     "useDefineForClassFields": true,

vite.config.ts

@@ -1,11 +1,10 @@
-import { defineConfig } from "vite";
+import { defineConfig } from 'vite'
-import react from "@vitejs/plugin-react-swc";
+import react from '@vitejs/plugin-react-swc'
-import path from "path";
+import path from "path"
-import tailwindcss from "@tailwindcss/vite"
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react(), tailwindcss()],
+  plugins: [react()],
   server: {
     host: true,
     port: 3000,
@@ -15,4 +14,4 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
     },
   },
-});
+})