Added Prettier for TailwindCSS.

.eslintrc.cjs

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

.gitattributes

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

.gitea/workflows/ci.yaml

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

.gitea/workflows/pub-on-tag.yaml

@@ -41,5 +41,5 @@ jobs:
           tags: ${{vars.REGISTRY_INSTANCE}}/somnia/somniaroomsapp:devbuild
           target: final-prod
           platforms: linux/amd64,linux/arm64
-          secrets: | 
+          secrets: |
             GIT_AUTH_TOKEN=${{secrets.REGISTRY_TOKEN}}

.prettierignore

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

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "endOfLine": "lf",
+  "plugins": ["prettier-plugin-tailwindcss"]
+}

.vs/VSWorkspaceState.json

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

Dockerfile

@@ -1,23 +1,23 @@
 # Base Node Environment.
-FROM node:21.7-alpine3.19 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,42 +2,49 @@
 
 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                                          |
@@ -49,12 +56,14 @@ 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 
+### .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

@@ -15,4 +15,4 @@
     "utils": "@/lib/utils",
     "ui": "src/components/ui"
   }
-}
+}

package-lock.json

@@ -40,9 +40,12 @@
         "@vitejs/plugin-react-swc": "^3.5.0",
         "autoprefixer": "^10.4.19",
         "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.6",
         "postcss": "^8.4.38",
+        "prettier": "^3.3.3",
+        "prettier-plugin-tailwindcss": "^0.6.6",
         "tailwindcss": "^3.4.3",
         "tailwindcss-animate": "^1.0.7",
         "typescript": "^5.2.2",
@@ -2395,12 +2398,13 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
+      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -2855,6 +2859,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-config-prettier": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
     "node_modules/eslint-plugin-react-hooks": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
@@ -3053,10 +3070,11 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
+      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3399,6 +3417,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -3579,12 +3598,13 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
+      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -4027,6 +4047,101 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-plugin-tailwindcss": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.6.tgz",
+      "integrity": "sha512-OPva5S7WAsPLEsOuOWXATi13QrCKACCiIonFgIR6V4lYv4QLp++UXVhZSzRbZxXGimkQtQT86CC6fQqTOybGng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.21.3"
+      },
+      "peerDependencies": {
+        "@ianvs/prettier-plugin-sort-imports": "*",
+        "@prettier/plugin-pug": "*",
+        "@shopify/prettier-plugin-liquid": "*",
+        "@trivago/prettier-plugin-sort-imports": "*",
+        "@zackad/prettier-plugin-twig-melody": "*",
+        "prettier": "^3.0",
+        "prettier-plugin-astro": "*",
+        "prettier-plugin-css-order": "*",
+        "prettier-plugin-import-sort": "*",
+        "prettier-plugin-jsdoc": "*",
+        "prettier-plugin-marko": "*",
+        "prettier-plugin-multiline-arrays": "*",
+        "prettier-plugin-organize-attributes": "*",
+        "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-sort-imports": "*",
+        "prettier-plugin-style-order": "*",
+        "prettier-plugin-svelte": "*"
+      },
+      "peerDependenciesMeta": {
+        "@ianvs/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@prettier/plugin-pug": {
+          "optional": true
+        },
+        "@shopify/prettier-plugin-liquid": {
+          "optional": true
+        },
+        "@trivago/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@zackad/prettier-plugin-twig-melody": {
+          "optional": true
+        },
+        "prettier-plugin-astro": {
+          "optional": true
+        },
+        "prettier-plugin-css-order": {
+          "optional": true
+        },
+        "prettier-plugin-import-sort": {
+          "optional": true
+        },
+        "prettier-plugin-jsdoc": {
+          "optional": true
+        },
+        "prettier-plugin-marko": {
+          "optional": true
+        },
+        "prettier-plugin-multiline-arrays": {
+          "optional": true
+        },
+        "prettier-plugin-organize-attributes": {
+          "optional": true
+        },
+        "prettier-plugin-organize-imports": {
+          "optional": true
+        },
+        "prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "prettier-plugin-style-order": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -4670,6 +4785,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },

package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0 && npx prettier . --check",
+    "pretty": "npx prettier . --write",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -42,9 +43,12 @@
     "@vitejs/plugin-react-swc": "^3.5.0",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
     "postcss": "^8.4.38",
+    "prettier": "^3.3.3",
+    "prettier-plugin-tailwindcss": "^0.6.6",
     "tailwindcss": "^3.4.3",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "^5.2.2",

postcss.config.js

@@ -3,4 +3,4 @@ export default {
     tailwindcss: {},
     autoprefixer: {},
   },
-}
+};

src/api/api-booking.tsx

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

src/api/api-roomCategories.tsx

@@ -1,25 +1,28 @@
 import { RoomCategory } from "@/model/RoomCategory";
 import { fetcher, fetcherUnwraper } from "./backend";
-import useSWR from 'swr';
+import useSWR from "swr";
 
 export function useAPIRoomCategories() {
-  const { data, error, isLoading } = useSWR<RoomCategory[]>('/api/room/category', fetcherUnwraper)
+  const { data, error, isLoading } = useSWR<RoomCategory[]>(
+    "/api/room/category",
+    fetcherUnwraper,
+  );
 
   return {
     roomCategoryList: data,
     isLoading,
-    isError: error
+    isError: error,
-  }
+  };
 }
 
 export function useAPIRoomCategoryId(categoryId: number) {
-  const url = categoryId ? '/api/room/category/' + categoryId : null;
+  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,33 +1,49 @@
 import { fetcherUnwraperWithFilter } from "./backend";
-import useSWR from 'swr';
+import useSWR from "swr";
-import { AvailabilityFilter, AvailabilityRequest, FareFilter, FareRequest, RoomAvailabity, RoomPrice } from "@/model/RoomSearch";
+import {
+  AvailabilityFilter,
+  AvailabilityRequest,
+  FareFilter,
+  FareRequest,
+  RoomAvailabity,
+  RoomPrice,
+} from "@/model/RoomSearch";
 
 export function useAPIRoomAvailability(filter: AvailabilityFilter | null) {
+  const request: AvailabilityRequest | null = filter
+    ? {
+        filter: filter,
+      }
+    : null;
 
-    const request: AvailabilityRequest | null = filter ? {
+  const { data, isLoading, error } = useSWR(
-        filter: filter
+    request ? ["/api/search/availability", request] : null,
-    } : null;
+    ([url, request]) =>
+      fetcherUnwraperWithFilter<RoomAvailabity[]>(url, request),
+  );
 
-    const { data, isLoading, error } = useSWR(request ? ['/api/search/availability', request] : null, ([url, request]) => fetcherUnwraperWithFilter<RoomAvailabity[]>(url, request))
+  return {
-
+    roomAvailabilityList: data,
-    return {
+    isLoading,
-        roomAvailabilityList: data,
+    isError: error,
-        isLoading,
+  };
-        isError: error
-    }
 }
 
 export function useAPIRoomPrices(filter: FareFilter | null) {
+  const request: FareRequest | null = filter
+    ? {
+        filter: filter,
+      }
+    : null;
 
-    const request: FareRequest | null = filter ? {
+  const { data, isLoading, error } = useSWR(
-        filter: filter
+    request ? ["/api/search/fares", request] : null,
-    } : null;
+    ([url, request]) => fetcherUnwraperWithFilter<RoomPrice[]>(url, request),
+  );
 
-    const { data, isLoading, error } = useSWR(request ? ['/api/search/fares', request] : null, ([url, request]) => fetcherUnwraperWithFilter<RoomPrice[]>(url, request))
+  return {
-
+    roomPriceList: data,
-    return {
+    isLoading,
-        roomPriceList: data,
+    isError: error,
-        isLoading,
+  };
-        isError: error
+}
-    }
-}

src/api/backend.tsx

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

src/components/Rooms/room-booking.tsx

@@ -1,144 +1,183 @@
-import { useAPIRoomCategoryId } from "@/api/api-roomCategories"
+import { useAPIRoomCategoryId } from "@/api/api-roomCategories";
-import { Card, CardContent, CardHeader } from "../ui/card"
+import { Card, CardContent } from "../ui/card";
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
 import { Typography } from "../ui/typography";
-import { RoomCategoryPhoto } from "@/model/RoomCategory";
+import {
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../ui/table";
+  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 { NewBookingRoom } from "@/model/Bookings";
+import { NewBooking, NewBookingRoom } from "@/model/Bookings";
+import { RoomItemCard } from "./room-item-card";
+import { IconWithTooltip } from "../ui/icon-number-tooltip";
+import { UserIcon } from "lucide-react";
 
-function RoomBooking({ roomCategoryId, availableAmount }: { roomCategoryId: number, availableAmount: number }) {
+function RoomBooking({
+  roomCategoryId,
+  availableAmount,
+}: {
+  roomCategoryId: number;
+  availableAmount: number;
+}) {
+  const currentDates: DateRange = useAppStore(
+    (state) => state.searchFilter.dateRange,
+  );
+  const addNewRoom = useAppStore((state) => state.addNewBookingRoom);
+  const bookingRooms: NewBooking | null = useAppStore(
+    (state) => state.newBookingData,
+  );
 
-  const [selectedAmount, setSelectedAmount] = useState<Map<number, number>>(new Map());
+  function onSelectedAmountUpdate(
-
+    guestNumber: number,
-  const currentDates: DateRange = useAppStore((state) => (state.searchFilter.dateRange));
+    newCount: number,
-  const addNewRoom = useAppStore((state) => (state.addNewBookingRoom));
+    price: number,
-
+  ) {
-  function onSelectedAmountUpdate(guestNumber: number, newCount: number, price: number) {
+    console.log(
-    console.log("Room " + roomCategoryId + " Guestnumber: " + guestNumber + " Count: " + newCount);
+      "Room " +
-
+        roomCategoryId +
-    const newAmountMap = new Map(selectedAmount);
+        " Guestnumber: " +
-    newAmountMap.set(guestNumber, newCount);
+        guestNumber +
-    setSelectedAmount(newAmountMap)
+        " Count: " +
+        newCount,
+    );
 
     const newRoom: NewBookingRoom = {
       roomCategory: roomCategoryId,
       guestNumber: guestNumber,
       amount: newCount,
-      price: price
+      price: price,
     };
     addNewRoom(newRoom);
   }
 
   const totalSelected = () => {
     let sum = 0;
-    selectedAmount.forEach((v) => sum += v)
+    bookingRooms &&
+      bookingRooms.rooms
+        .filter((v) => v.roomCategory == roomCategoryId)
+        .forEach((v) => (sum += v.amount));
     return sum;
   };
   const canAddMore: boolean = availableAmount > totalSelected();
 
   //This seems a little bit overkill, but IDK.
-  const fareFilter: FareFilter | null = useMemo(
+  const fareFilter: FareFilter | null = useMemo(() => {
-    () => {
+    if (currentDates && currentDates.from && currentDates.to) {
-      if (currentDates && currentDates.from && currentDates.to) {
+      const filter: FareFilter = {
-        const filter: FareFilter = {
+        startDate: currentDates.from?.toDateString(),
-          startDate: currentDates.from?.toDateString(),
+        endDate: currentDates.to?.toDateString(),
-          endDate: currentDates.to?.toDateString(),
+        roomCategory: roomCategoryId,
-          roomCategory: roomCategoryId
+      };
-        }
+      return filter;
-        return filter;
+    }
-      }
+    return null;
-      return null;
+  }, [currentDates, roomCategoryId]);
-    },
-    [currentDates, roomCategoryId]
-  );
 
-  const { roomCategory, isLoading: isLoadingCategory, isError: isErrorCategory } = useAPIRoomCategoryId(roomCategoryId);
+  const {
-  const { roomPriceList, isLoading: isLoadingPrices, isError: isErrorPrices } = useAPIRoomPrices(fareFilter);
+    roomCategory,
+    isLoading: isLoadingCategory,
+    isError: isErrorCategory,
+  } = useAPIRoomCategoryId(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 (
+    return <Skeleton className="mx-auto h-[150px] w-[600px]" />;
-      <Skeleton className="w-[600px] h-[150px] mx-auto" />
-    );
   }
 
   if (isError) {
     return (
-      <Typography variant={"h3"} as="h3">Sorry, there was an error loading data.</Typography>
+      <Typography variant={"h3"} as="h3">
+        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) {
     const tableRows = roomPriceList?.map((el) => {
       return (
         <TableRow key={el.guestNumber}>
-          <TableCell>{el.guestNumber}</TableCell>
+          <TableCell>
+            <IconWithTooltip
+              label={el.guestNumber?.toString()}
+              tooltipText={"Guest Number"}
+              labelPosition={"right"}
+            >
+              <UserIcon></UserIcon>
+            </IconWithTooltip>
+          </TableCell>
           <TableCell>{el.price / 100} €</TableCell>
           <TableCell>
-            <NumberSelector updateCount={(count) => onSelectedAmountUpdate(el.guestNumber, count, el.price)} addEnabled={canAddMore}></NumberSelector>
+            <NumberSelector
+              updateCount={(count) =>
+                onSelectedAmountUpdate(el.guestNumber, count, el.price)
+              }
+              addEnabled={canAddMore}
+            ></NumberSelector>
           </TableCell>
         </TableRow>
       );
     });
 
     priceTable = (
-      <>
+      <Table className="overflow-hidden">
-        <Table>
+        <TableHeader>
-          <TableHeader>
+          <TableRow>
-            <TableRow>
+            <TableHead>Guest number</TableHead>
-              <TableHead>Guest number</TableHead>
+            <TableHead>Price</TableHead>
-              <TableHead>Price</TableHead>
+            <TableHead>Amount</TableHead>
-              <TableHead>Amount</TableHead>
+          </TableRow>
-            </TableRow>
+        </TableHeader>
-          </TableHeader>
+        <TableBody>
-          <TableBody>
+          {isLoadingPrices ? <Skeleton className="h-full w-full" /> : tableRows}
-            {isLoadingPrices ? <Skeleton className="w-[80%] h-[100%]" /> : tableRows}
+        </TableBody>
-          </TableBody>
+      </Table>
-        </Table>
-        <p>Rooms Available: {availableAmount}</p>
-      </>
     );
   }
 
+  let roomCard = null;
+  if (roomCategory) {
+    roomCard = (
+      <RoomItemCard
+        room={roomCategory}
+        key={roomCategoryId}
+        className="z-20 border-4"
+      ></RoomItemCard>
+    );
+  }
 
   return (
-    <Card>
+    <div className="relative sm:grid sm:grid-cols-40/60">
-      <CardHeader>
+      {roomCard}
-        <div className="flex flex-row gap-5 w-full">
+      <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="w-[40%] flex-none">
+        <CardContent className="flex h-full w-full flex-col justify-center gap-4 p-5">
-            {photoElement}
+          {hasPrices ? (
-          </div>
+            priceTable
-          <div>
+          ) : (
-            <Typography variant={"h3"} as="h3">{roomCategory?.name}</Typography>
+            <Typography variant={"largeText"}>No Prices available</Typography>
-            <Typography >{roomCategory?.description}</Typography>
+          )}
-          </div>
+          <p>Rooms Available: {availableAmount}</p>
-        </div>
+        </CardContent>
-      </CardHeader>
+      </Card>
-      <CardContent>
+    </div>
-        {hasPrices ? priceTable : <Typography variant={"largeText"}>No Prices available</Typography>}
-        <div>
-        </div>
-        <p>Selected: {totalSelected()}</p>
-      </CardContent>
-    </Card>
   );
 }
 
-export default RoomBooking
+export default RoomBooking;

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

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

src/components/Search/SearchFilterCard.tsx

@@ -1,35 +1,37 @@
-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 { useEffect, useState } from "react";
+import { useState } from "react";
 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({ onSearchClick }: { onSearchClick?: funOnSearchClick }) {
+export function SearchFilterCard({
-
+  onSearchClick,
+}: {
+  onSearchClick?: funOnSearchClick;
+}) {
   //App filter. Updated on btSearchClick.
-  const appSearchFilter = useAppStore((state) => (state.searchFilter));
+  const appSearchFilter = useAppStore((state) => state.searchFilter);
-  const setAppSearchFilter = useAppStore((state) => (state.setSearchFilter));
+  const setAppSearchFilter = useAppStore((state) => state.setSearchFilter);
 
   //Local Filter state.
-  const [searchFilter, setSearchFilter] = useState<SearchFilter>(appSearchFilter)
+  const [searchFilter, setSearchFilter] =
+    useState<SearchFilter>(appSearchFilter);
 
   //On location change, try to load searchFilter from state.
   //FIXME: Si llegamos sin state, hay que borrar el state global...
-  const location = useLocation();
+  // const location = useLocation();
-  useEffect(() => {
+  // useEffect(() => {
-    setSearchFilter(location.state);
+  //   setSearchFilter(location.state);
-  }, [location]);
+  // }, [location]);
-
 
   const { toast } = useToast();
 
@@ -48,16 +50,17 @@ export function SearchFilterCard({ onSearchClick }: { onSearchClick?: funOnSearc
       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;
     }
 
+    setAppSearchFilter(searchFilter);
+
     if (onSearchClick) {
-      setAppSearchFilter(searchFilter);
       onSearchClick(searchFilter);
     }
-  }
+  };
 
   // Handle Element updates.
   const updateDateRange = (newRange: DateRange) => {
@@ -65,37 +68,40 @@ export function SearchFilterCard({ onSearchClick }: { onSearchClick?: funOnSearc
       ...searchFilter,
       dateRange: newRange,
     });
+  };
 
-    console.log("SearchFilterCard filter UPDATED");
+  const datePickerElement =
-  }
+    searchFilter == null ? (
-
+      <DatePickerWithRange
-  const datePickerElement = searchFilter == null ? (
+        updateDateRange={updateDateRange}
-    <DatePickerWithRange
+        allowPast={false}
-      updateDateRange={updateDateRange}
+      ></DatePickerWithRange>
-      allowPast={false}>
+    ) : (
-    </DatePickerWithRange>
+      <DatePickerWithRange
-  ) : (
+        updateDateRange={updateDateRange}
-    <DatePickerWithRange
+        allowPast={false}
-      updateDateRange={updateDateRange}
+        startDate={searchFilter.dateRange.from}
-      allowPast={false}
+        endDate={searchFilter.dateRange.to}
-      startDate={searchFilter.dateRange.from}
+      ></DatePickerWithRange>
-      endDate={searchFilter.dateRange.to}>
+    );
-    </DatePickerWithRange>
-  );
 
   return (
     <Card>
-      <CardHeader className="p-0 m-0 mb-5">
+      <CardHeader className="m-0 mb-5 p-0">
-        <Typography variant={"h2"} as="h1" className="mx-5 py-2">Reserva ahora</Typography>
+        <Typography variant={"h2"} as="h1" className="mx-5 py-2">
+          Reserva ahora
+        </Typography>
       </CardHeader>
       <CardContent>
         {datePickerElement}
         <Separator className="my-4" />
         <Button size={"lg"} onClick={btSearchClick}>
-          <SearchIcon className="text-primary-foreground me-2" />
+          <SearchIcon className="me-2 text-primary-foreground" />
-          <Typography variant={"h3"} className="text-primary-foreground">Buscar</Typography>
+          <Typography variant={"h3"} className="text-primary-foreground">
+            Buscar
+          </Typography>
         </Button>
       </CardContent>
     </Card>
-  )
+  );
 }

src/components/app-footer.tsx

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

src/components/app-header.tsx

@@ -1,32 +1,40 @@
-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="flex items-center mx-10 my-4">
+    <Card className="mx-10 my-4 flex items-center">
       <CardContent className="w-full py-2">
-        <div className="flex justify-around items-center">
+        <div className="flex items-center justify-around">
-          <div className="flex flex-row items-center gap-2 relative">
+          <div className="relative flex flex-row items-center gap-2">
             <img src="public/SR2.svg" className="w-[64px]"></img>
             <Typography variant={"largeText"}>Somnia Rooms</Typography>
-            <a href="https://duck.com" className="absolute w-[100%] h-[100%]"></a>
+            <a
+              href="https://duck.com"
+              className="absolute h-[100%] w-[100%]"
+            ></a>
           </div>
           <Button variant="ghost" className="h-15">
-            <Link to={`home`}><HomeIcon className="mx-auto" />Home</Link>
+            <Link to={`home`}>
+              <HomeIcon className="mx-auto" />
+              Home
+            </Link>
           </Button>
           <Button variant="ghost" className="h-15">
-            <Link to={`search`}><BookAIcon className="mx-auto" />Reservar</Link>
+            <Link to={`search`}>
+              <BookAIcon className="mx-auto" />
+              Reservar
+            </Link>
           </Button>
           <ModeToggle />
         </div>
       </CardContent>
     </Card>
-  )
+  );
 }
 
-export default AppHeader
+export default AppHeader;

src/components/backend-conection-status.tsx

@@ -1,6 +1,10 @@
-
+function BackendConnectionStatus({
-function BackendConnectionStatus({ isLoading, isError }: { isLoading?: boolean, isError?: boolean }) {
+  isLoading,
-
+  isError,
+}: {
+  isLoading?: boolean;
+  isError?: boolean;
+}) {
   const BACKEND_HOST = import.meta.env.VITE_BACKEND_HOST;
   const BACKEND_PORT = import.meta.env.VITE_BACKEND_PORT;
 
@@ -10,10 +14,10 @@ function BackendConnectionStatus({ isLoading, isError }: { isLoading?: boolean,
         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,29 +1,39 @@
-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 { useAPIRoomCategories } 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({ onBookingConfirm, mode }: { onBookingConfirm?: OnBookingClickFunction, mode: BookingDetailsModes }) {
 
+export function BookingDetails({
+  onBookingConfirm,
+  mode,
+}: {
+  onBookingConfirm?: OnBookingClickFunction;
+  mode: BookingDetailsModes;
+}) {
   const bookingData = useAppStore((state) => state.newBookingData);
+  const roomCategoryList = useAPIRoomCategories();
 
   const onBtBookingClick = () => {
     if (onBookingConfirm) {
       onBookingConfirm();
     }
-  }
+  };
 
   if (!bookingData || bookingData.rooms.length <= 0) {
     return (
       <Card>
         <CardHeader>
-          <Typography variant={"h2"} as="h2">Your Booking</Typography>
+          <Typography variant={"h2"} as="h2">
+            Your Booking
+          </Typography>
         </CardHeader>
         <CardContent>
           <Typography variant={"h3"}>No rooms added yet</Typography>
@@ -33,63 +43,86 @@ export function BookingDetails({ onBookingConfirm, mode }: { onBookingConfirm?:
   }
 
   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 (
-      <TableRow key={room.roomCategory + "_" + room.guestNumber}>
+      <Card
-        <TableCell>{room.roomCategory}</TableCell>
+        key={room.roomCategory.toString() + room.guestNumber.toString()}
-        <TableCell>{room.guestNumber}</TableCell>
+        className="my-3 flex flex-row bg-accent"
-        <TableCell>{room.amount}</TableCell>
+      >
-        <TableCell>{room.price / 100} €</TableCell>
+        {photo && (
-        <TableCell>{(room.price * room.amount) / 100} €</TableCell>
+          <img
-      </TableRow>
+            src={photo.path}
+            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(
-  const roomTable = (
+    (acc, room) => acc + room.price * room.amount,
-    <Table>
+    0,
-      <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">Your Booking</Typography>
+        <Typography variant={"h2"} as="h2">
+          Your Booking
+        </Typography>
       </CardHeader>
       <CardContent>
         <Typography variant={"h3"}>Your Dates</Typography>
         <Typography variant={"largeText"}>
-          Arrival: {bookingData.arrivalDate.toLocaleDateString()}  -
+          Arrival: {bookingData.arrivalDate.toLocaleDateString()} - Departure:{" "}
-          Departure: {bookingData.departureDate.toLocaleDateString()} <br></br>
+          {bookingData.departureDate.toLocaleDateString()} <br></br>
-          Number of nights: {differenceInDays(bookingData.departureDate, bookingData.arrivalDate)}
+          Number of nights:{" "}
+          {differenceInDays(
+            bookingData.departureDate,
+            bookingData.arrivalDate,
+          ) + 1}
         </Typography>
         <Separator className="my-2"></Separator>
         <Typography variant={"h3"}>Your Rooms</Typography>
-        {roomTable}
+        <div className="">{roomList}</div>
         <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 variant={"largeText"} className="text-primary-foreground">Book it!</Typography>
+            <Typography
+              variant={"largeText"}
+              className="text-primary-foreground"
+            >
+              Book it!
+            </Typography>
           </Button>
-        }
+        )}
       </CardContent>
     </Card>
-  )
+  );
 }

src/components/mode-toggle.tsx

@@ -1,16 +1,16 @@
-import { MoonIcon, SunIcon } from "@radix-ui/react-icons"
+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>
@@ -33,5 +33,5 @@ export function ModeToggle() {
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
-  )
+  );
 }

src/components/theme-provider.tsx

@@ -1,74 +1,74 @@
-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",
+  theme: "system",
-    setTheme: () => null,
+  setTheme: () => null,
-}
+};
 
-const ThemeProviderContext = createContext<ThemeProviderState>(initialState)
+const ThemeProviderContext = createContext<ThemeProviderState>(initialState);
 
 export function ThemeProvider({
-    children,
+  children,
-    defaultTheme = "system",
+  defaultTheme = "system",
-    storageKey = "vite-ui-theme",
+  storageKey = "vite-ui-theme",
-    ...props
+  ...props
 }: ThemeProviderProps) {
-    const [theme, setTheme] = useState<Theme>(
+  const [theme, setTheme] = useState<Theme>(
-        () => (localStorage.getItem(storageKey) as Theme) || defaultTheme
+    () => (localStorage.getItem(storageKey) as Theme) || defaultTheme,
-    )
+  );
 
-    useEffect(() => {
+  useEffect(() => {
-        const root = window.document.documentElement
+    const root = window.document.documentElement;
 
-        root.classList.remove("light", "dark")
+    root.classList.remove("light", "dark");
 
-        if (theme === "system") {
+    if (theme === "system") {
-            const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
+      const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
-                .matches
+        .matches
-                ? "dark"
+        ? "dark"
-                : "light"
+        : "light";
 
-            root.classList.add(systemTheme)
+      root.classList.add(systemTheme);
-            return
+      return;
-        }
-
-        root.classList.add(theme)
-    }, [theme])
-
-    const value = {
-        theme,
-        setTheme: (theme: Theme) => {
-            localStorage.setItem(storageKey, theme)
-            setTheme(theme)
-        },
     }
 
-    return (
+    root.classList.add(theme);
-        <ThemeProviderContext.Provider {...props} value={value}>
+  }, [theme]);
-            {children}
+
-        </ThemeProviderContext.Provider>
+  const value = {
-    )
+    theme,
+    setTheme: (theme: Theme) => {
+      localStorage.setItem(storageKey, 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)
+  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,7 +1,7 @@
-import * as React from "react"
+import * as React from "react";
-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 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",
@@ -20,8 +20,8 @@ const badgeVariants = cva(
     defaultVariants: {
       variant: "default",
     },
-  }
+  },
-)
+);
 
 export interface BadgeProps
   extends React.HTMLAttributes<HTMLDivElement>,
@@ -30,7 +30,7 @@ export interface BadgeProps
 function Badge({ className, variant, ...props }: BadgeProps) {
   return (
     <div className={cn(badgeVariants({ variant }), className)} {...props} />
-  )
+  );
 }
 
-export { Badge, badgeVariants }
+export { Badge };

src/components/ui/button.tsx

@@ -1,8 +1,8 @@
-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 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",
@@ -31,27 +31,28 @@ const buttonVariants = cva(
       variant: "default",
       size: "default",
     },
-  }
+  },
-)
+);
 
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
-  asChild?: boolean
+  asChild?: boolean;
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : "button"
+    const Comp = asChild ? Slot : "button";
     return (
       <Comp
         className={cn(buttonVariants({ variant, size, className }))}
         ref={ref}
         {...props}
       />
-    )
+    );
-  }
+  },
-)
+);
-Button.displayName = "Button"
+Button.displayName = "Button";
 
-export { Button, buttonVariants }
+// eslint-disable-next-line react-refresh/only-export-components
+export { Button, buttonVariants };

src/components/ui/calendar.tsx

@@ -1,11 +1,11 @@
-import * as React from "react"
+import * as React from "react";
-import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons"
+import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons";
-import { DayPicker } from "react-day-picker"
+import { DayPicker } from "react-day-picker";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-import { buttonVariants } from "@/components/ui/button"
+import { buttonVariants } from "@/components/ui/button";
 
-export type CalendarProps = React.ComponentProps<typeof DayPicker>
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
 
 function Calendar({
   className,
@@ -25,7 +25,7 @@ function Calendar({
         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"
+          "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
         ),
         nav_button_previous: "absolute left-1",
         nav_button_next: "absolute right-1",
@@ -38,11 +38,11 @@ function Calendar({
           "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"
             ? "[&: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"
-            : "[&:has([aria-selected])]:rounded-md"
+            : "[&:has([aria-selected])]:rounded-md",
         ),
         day: cn(
           buttonVariants({ variant: "ghost" }),
-          "h-8 w-8 p-0 font-normal aria-selected:opacity-100"
+          "h-8 w-8 p-0 font-normal aria-selected:opacity-100",
         ),
         day_range_start: "day-range-start",
         day_range_end: "day-range-end",
@@ -63,8 +63,8 @@ function Calendar({
       }}
       {...props}
     />
-  )
+  );
 }
-Calendar.displayName = "Calendar"
+Calendar.displayName = "Calendar";
 
-export { Calendar }
+export { Calendar };

src/components/ui/card.tsx

@@ -1,6 +1,6 @@
-import * as React from "react"
+import * as React from "react";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const Card = React.forwardRef<
   HTMLDivElement,
@@ -10,12 +10,12 @@ const Card = React.forwardRef<
     ref={ref}
     className={cn(
       "rounded-xl border bg-card text-card-foreground shadow",
-      className
+      className,
     )}
     {...props}
   />
-))
+));
-Card.displayName = "Card"
+Card.displayName = "Card";
 
 const CardHeader = React.forwardRef<
   HTMLDivElement,
@@ -26,8 +26,8 @@ const CardHeader = React.forwardRef<
     className={cn("flex flex-col space-y-1.5 p-6", className)}
     {...props}
   />
-))
+));
-CardHeader.displayName = "CardHeader"
+CardHeader.displayName = "CardHeader";
 
 const CardTitle = React.forwardRef<
   HTMLParagraphElement,
@@ -38,8 +38,8 @@ const CardTitle = React.forwardRef<
     className={cn("font-semibold leading-none tracking-tight", className)}
     {...props}
   />
-))
+));
-CardTitle.displayName = "CardTitle"
+CardTitle.displayName = "CardTitle";
 
 const CardDescription = React.forwardRef<
   HTMLParagraphElement,
@@ -50,16 +50,16 @@ const CardDescription = React.forwardRef<
     className={cn("text-sm text-muted-foreground", className)}
     {...props}
   />
-))
+));
-CardDescription.displayName = "CardDescription"
+CardDescription.displayName = "CardDescription";
 
 const CardContent = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
-))
+));
-CardContent.displayName = "CardContent"
+CardContent.displayName = "CardContent";
 
 const CardFooter = React.forwardRef<
   HTMLDivElement,
@@ -70,7 +70,14 @@ const CardFooter = React.forwardRef<
     className={cn("flex items-center p-6 pt-0", className)}
     {...props}
   />
-))
+));
-CardFooter.displayName = "CardFooter"
+CardFooter.displayName = "CardFooter";
 
-export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
+export {
+  Card,
+  CardHeader,
+  CardFooter,
+  CardTitle,
+  CardDescription,
+  CardContent,
+};

src/components/ui/carousel.tsx

@@ -1,43 +1,43 @@
-import * as React from "react"
+import * as React from "react";
-import { ArrowLeftIcon, ArrowRightIcon } from "@radix-ui/react-icons"
+import { ArrowLeftIcon, ArrowRightIcon } from "@radix-ui/react-icons";
 import useEmblaCarousel, {
   type UseEmblaCarouselType,
-} from "embla-carousel-react"
+} from "embla-carousel-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]
+  carouselRef: ReturnType<typeof useEmblaCarousel>[0];
-  api: ReturnType<typeof useEmblaCarousel>[1]
+  api: ReturnType<typeof useEmblaCarousel>[1];
-  scrollPrev: () => void
+  scrollPrev: () => void;
-  scrollNext: () => void
+  scrollNext: () => void;
-  canScrollPrev: boolean
+  canScrollPrev: boolean;
-  canScrollNext: boolean
+  canScrollNext: boolean;
-} & CarouselProps
+} & CarouselProps;
 
-const CarouselContext = React.createContext<CarouselContextProps | null>(null)
+const CarouselContext = React.createContext<CarouselContextProps | null>(null);
 
 function useCarousel() {
-  const context = React.useContext(CarouselContext)
+  const context = React.useContext(CarouselContext);
 
   if (!context) {
-    throw new Error("useCarousel must be used within a <Carousel />")
+    throw new Error("useCarousel must be used within a <Carousel />");
   }
 
-  return context
+  return context;
 }
 
 const Carousel = React.forwardRef<
@@ -54,69 +54,69 @@ const Carousel = React.forwardRef<
       children,
       ...props
     },
-    ref
+    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
+        return;
       }
 
-      setCanScrollPrev(api.canScrollPrev())
+      setCanScrollPrev(api.canScrollPrev());
-      setCanScrollNext(api.canScrollNext())
+      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
+        return;
       }
 
-      setApi(api)
+      setApi(api);
-    }, [api, setApi])
+    }, [api, setApi]);
 
     React.useEffect(() => {
       if (!api) {
-        return
+        return;
       }
 
-      onSelect(api)
+      onSelect(api);
-      api.on("reInit", onSelect)
+      api.on("reInit", onSelect);
-      api.on("select", onSelect)
+      api.on("select", onSelect);
 
       return () => {
-        api?.off("select", onSelect)
+        api?.off("select", onSelect);
-      }
+      };
-    }, [api, onSelect])
+    }, [api, onSelect]);
 
     return (
       <CarouselContext.Provider
@@ -143,16 +143,16 @@ const Carousel = React.forwardRef<
           {children}
         </div>
       </CarouselContext.Provider>
-    )
+    );
-  }
+  },
-)
+);
-Carousel.displayName = "Carousel"
+Carousel.displayName = "Carousel";
 
 const CarouselContent = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => {
-  const { carouselRef, orientation } = useCarousel()
+  const { carouselRef, orientation } = useCarousel();
 
   return (
     <div ref={carouselRef} className="overflow-hidden">
@@ -161,20 +161,20 @@ const CarouselContent = React.forwardRef<
         className={cn(
           "flex",
           orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col",
-          className
+          className,
         )}
         {...props}
       />
     </div>
-  )
+  );
-})
+});
-CarouselContent.displayName = "CarouselContent"
+CarouselContent.displayName = "CarouselContent";
 
 const CarouselItem = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => {
-  const { orientation } = useCarousel()
+  const { orientation } = useCarousel();
 
   return (
     <div
@@ -184,19 +184,19 @@ const CarouselItem = React.forwardRef<
       className={cn(
         "min-w-0 shrink-0 grow-0 basis-full",
         orientation === "horizontal" ? "pl-4" : "pt-4",
-        className
+        className,
       )}
       {...props}
     />
-  )
+  );
-})
+});
-CarouselItem.displayName = "CarouselItem"
+CarouselItem.displayName = "CarouselItem";
 
 const CarouselPrevious = React.forwardRef<
   HTMLButtonElement,
   React.ComponentProps<typeof Button>
 >(({ className, variant = "outline", size = "icon", ...props }, ref) => {
-  const { orientation, scrollPrev, canScrollPrev } = useCarousel()
+  const { orientation, scrollPrev, canScrollPrev } = useCarousel();
 
   return (
     <Button
@@ -204,11 +204,11 @@ const CarouselPrevious = React.forwardRef<
       variant={variant}
       size={size}
       className={cn(
-        "absolute  h-8 w-8 rounded-full",
+        "absolute h-8 w-8 rounded-full",
         orientation === "horizontal"
           ? "-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}
@@ -217,15 +217,15 @@ const CarouselPrevious = React.forwardRef<
       <ArrowLeftIcon className="h-4 w-4" />
       <span className="sr-only">Previous slide</span>
     </Button>
-  )
+  );
-})
+});
-CarouselPrevious.displayName = "CarouselPrevious"
+CarouselPrevious.displayName = "CarouselPrevious";
 
 const CarouselNext = React.forwardRef<
   HTMLButtonElement,
   React.ComponentProps<typeof Button>
 >(({ className, variant = "outline", size = "icon", ...props }, ref) => {
-  const { orientation, scrollNext, canScrollNext } = useCarousel()
+  const { orientation, scrollNext, canScrollNext } = useCarousel();
 
   return (
     <Button
@@ -237,7 +237,7 @@ const CarouselNext = React.forwardRef<
         orientation === "horizontal"
           ? "-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}
@@ -246,9 +246,9 @@ const CarouselNext = React.forwardRef<
       <ArrowRightIcon className="h-4 w-4" />
       <span className="sr-only">Next slide</span>
     </Button>
-  )
+  );
-})
+});
-CarouselNext.displayName = "CarouselNext"
+CarouselNext.displayName = "CarouselNext";
 
 export {
   type CarouselApi,
@@ -257,4 +257,4 @@ export {
   CarouselItem,
   CarouselPrevious,
   CarouselNext,
-}
+};

src/components/ui/checkbox.tsx

@@ -1,8 +1,8 @@
-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 "@radix-ui/react-icons"
+import { CheckIcon } from "@radix-ui/react-icons";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,
@@ -12,7 +12,7 @@ const Checkbox = React.forwardRef<
     ref={ref}
     className={cn(
       "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}
   >
@@ -22,7 +22,7 @@ const Checkbox = React.forwardRef<
       <CheckIcon className="h-4 w-4" />
     </CheckboxPrimitive.Indicator>
   </CheckboxPrimitive.Root>
-))
+));
-Checkbox.displayName = CheckboxPrimitive.Root.displayName
+Checkbox.displayName = CheckboxPrimitive.Root.displayName;
 
-export { Checkbox }
+export { Checkbox };

src/components/ui/dateRange-picker.tsx

@@ -1,27 +1,39 @@
-"use client"
+"use client";
 
-import * as React from "react"
+import * as React from "react";
-import { CalendarIcon } from "@radix-ui/react-icons"
+import { CalendarIcon } from "@radix-ui/react-icons";
-import { format } from "date-fns"
+import { format } from "date-fns";
-import { ActiveModifiers, DateBefore, DateRange, Matcher } from "react-day-picker"
+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";
 
 export type UpdateRangeFunction = (newRange: DateRange) => void;
 
 export function DatePickerWithRange({
-  className, updateDateRange, startDate, endDate, allowPast = true
+  className,
+  updateDateRange,
+  startDate,
+  endDate,
+  allowPast = true,
 }: {
-  className?: React.HTMLAttributes<HTMLDivElement> | undefined, updateDateRange: UpdateRangeFunction | undefined,
+  className?: React.HTMLAttributes<HTMLDivElement> | undefined;
-  startDate?: Date, endDate?: Date, allowPast?: boolean
+  updateDateRange: UpdateRangeFunction | undefined;
+  startDate?: Date;
+  endDate?: Date;
+  allowPast?: boolean;
 }) {
   // Date Range State.
   const [dateRange, setDateRange] = React.useState<DateRange | undefined>({
@@ -34,27 +46,27 @@ export function DatePickerWithRange({
   const handleDayClickFrom = (day: Date, mods: ActiveModifiers) => {
     const newDateRange: DateRange = {
       from: mods.selected ? undefined : day,
-      to: dateRange?.to
+      to: undefined,
-    }
+    };
 
-    setDateRange(newDateRange)
+    fnUpdateRange(newDateRange);
-    if (updateDateRange !== undefined) {
+  };
-      updateDateRange(newDateRange)
-    }
-  }
 
   const handleDayClickTo = (day: Date, mods: ActiveModifiers) => {
     const newDateRange: DateRange = {
       from: dateRange?.from,
-      to: mods.selected ? undefined : day
+      to: mods.selected ? undefined : day,
-    }
+    };
 
-    setDateRange(newDateRange)
+    fnUpdateRange(newDateRange);
+  };
 
+  const fnUpdateRange = (range: DateRange) => {
+    setDateRange(range);
     if (updateDateRange !== undefined) {
-      updateDateRange(newDateRange)
+      updateDateRange(range);
     }
-  }
+  };
 
   // Disable days from "To" before "From"
   let beforeAndSelected: Matcher[] = [];
@@ -70,9 +82,13 @@ export function DatePickerWithRange({
   }
 
   return (
-    <div className={cn("grid gap-x-2 grid-cols-2 grid-rows-2", className)}>
+    <div className={cn("grid grid-cols-2 grid-rows-2 gap-x-2", className)}>
-      <Typography variant={"largeText"} as="p">Desde</Typography>
+      <Typography variant={"largeText"} as="p">
-      <Typography variant={"largeText"} as="p">Hasta</Typography>
+        Desde
+      </Typography>
+      <Typography variant={"largeText"} as="p">
+        Hasta
+      </Typography>
       <Popover>
         <PopoverTrigger asChild>
           <Button
@@ -80,7 +96,7 @@ export function DatePickerWithRange({
             variant={"outline"}
             className={cn(
               "justify-start text-left font-normal",
-              !dateRange && "text-muted-foreground"
+              !dateRange && "text-muted-foreground",
             )}
           >
             <CalendarIcon className="mr-2 h-4 w-4" />
@@ -91,7 +107,7 @@ export function DatePickerWithRange({
             )}
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="start">
+        <PopoverContent className="w-auto p-0" align="center">
           <Calendar
             initialFocus
             mode="single"
@@ -110,7 +126,7 @@ export function DatePickerWithRange({
             variant={"outline"}
             className={cn(
               "justify-start text-left font-normal",
-              !dateRange && "text-muted-foreground"
+              !dateRange && "text-muted-foreground",
             )}
           >
             <CalendarIcon className="mr-2 h-4 w-4" />
@@ -121,11 +137,11 @@ export function DatePickerWithRange({
             )}
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="start">
+        <PopoverContent className="w-auto p-0" align="center">
           <Calendar
             initialFocus
             mode="single"
-            defaultMonth={dateRange?.to}
+            defaultMonth={dateRange?.to ?? dateRange?.from}
             selected={dateRange?.to}
             onDayClick={handleDayClickTo}
             numberOfMonths={1}
@@ -134,5 +150,5 @@ export function DatePickerWithRange({
         </PopoverContent>
       </Popover>
     </div>
-  )
+  );
 }

src/components/ui/dropdown-menu.tsx

@@ -1,29 +1,29 @@
-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,
   DotFilledIcon,
-} from "@radix-ui/react-icons"
+} from "@radix-ui/react-icons";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
-const DropdownMenu = DropdownMenuPrimitive.Root
+const DropdownMenu = DropdownMenuPrimitive.Root;
 
-const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger
+const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
 
-const DropdownMenuGroup = DropdownMenuPrimitive.Group
+const DropdownMenuGroup = DropdownMenuPrimitive.Group;
 
-const DropdownMenuPortal = DropdownMenuPrimitive.Portal
+const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
 
-const DropdownMenuSub = DropdownMenuPrimitive.Sub
+const DropdownMenuSub = DropdownMenuPrimitive.Sub;
 
-const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup
+const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
 
 const DropdownMenuSubTrigger = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
-    inset?: boolean
+    inset?: boolean;
   }
 >(({ className, inset, children, ...props }, ref) => (
   <DropdownMenuPrimitive.SubTrigger
@@ -31,16 +31,16 @@ const DropdownMenuSubTrigger = React.forwardRef<
     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
+      className,
     )}
     {...props}
   >
     {children}
     <ChevronRightIcon className="ml-auto h-4 w-4" />
   </DropdownMenuPrimitive.SubTrigger>
-))
+));
 DropdownMenuSubTrigger.displayName =
-  DropdownMenuPrimitive.SubTrigger.displayName
+  DropdownMenuPrimitive.SubTrigger.displayName;
 
 const DropdownMenuSubContent = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
@@ -50,13 +50,13 @@ const DropdownMenuSubContent = React.forwardRef<
     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
+      className,
     )}
     {...props}
   />
-))
+));
 DropdownMenuSubContent.displayName =
-  DropdownMenuPrimitive.SubContent.displayName
+  DropdownMenuPrimitive.SubContent.displayName;
 
 const DropdownMenuContent = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.Content>,
@@ -69,18 +69,18 @@ const DropdownMenuContent = React.forwardRef<
       className={cn(
         "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md",
         "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
+        className,
       )}
       {...props}
     />
   </DropdownMenuPrimitive.Portal>
-))
+));
-DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName
+DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
 
 const DropdownMenuItem = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.Item>,
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
-    inset?: boolean
+    inset?: boolean;
   }
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Item
@@ -88,12 +88,12 @@ const DropdownMenuItem = React.forwardRef<
     className={cn(
       "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",
       inset && "pl-8",
-      className
+      className,
     )}
     {...props}
   />
-))
+));
-DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName
+DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
 
 const DropdownMenuCheckboxItem = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
@@ -103,7 +103,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
     ref={ref}
     className={cn(
       "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}
@@ -115,9 +115,9 @@ const DropdownMenuCheckboxItem = React.forwardRef<
     </span>
     {children}
   </DropdownMenuPrimitive.CheckboxItem>
-))
+));
 DropdownMenuCheckboxItem.displayName =
-  DropdownMenuPrimitive.CheckboxItem.displayName
+  DropdownMenuPrimitive.CheckboxItem.displayName;
 
 const DropdownMenuRadioItem = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
@@ -127,7 +127,7 @@ const DropdownMenuRadioItem = React.forwardRef<
     ref={ref}
     className={cn(
       "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}
   >
@@ -138,13 +138,13 @@ const DropdownMenuRadioItem = React.forwardRef<
     </span>
     {children}
   </DropdownMenuPrimitive.RadioItem>
-))
+));
-DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName
+DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;
 
 const DropdownMenuLabel = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.Label>,
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
-    inset?: boolean
+    inset?: boolean;
   }
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Label
@@ -152,12 +152,12 @@ const DropdownMenuLabel = React.forwardRef<
     className={cn(
       "px-2 py-1.5 text-sm font-semibold",
       inset && "pl-8",
-      className
+      className,
     )}
     {...props}
   />
-))
+));
-DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName
+DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
 
 const DropdownMenuSeparator = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
@@ -168,8 +168,8 @@ const DropdownMenuSeparator = React.forwardRef<
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
     {...props}
   />
-))
+));
-DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName
+DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
 
 const DropdownMenuShortcut = ({
   className,
@@ -180,9 +180,9 @@ const DropdownMenuShortcut = ({
       className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
       {...props}
     />
-  )
+  );
-}
+};
-DropdownMenuShortcut.displayName = "DropdownMenuShortcut"
+DropdownMenuShortcut.displayName = "DropdownMenuShortcut";
 
 export {
   DropdownMenu,
@@ -200,4 +200,4 @@ export {
   DropdownMenuSubContent,
   DropdownMenuSubTrigger,
   DropdownMenuRadioGroup,
-}
+};

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

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

src/components/ui/input.tsx

@@ -1,6 +1,6 @@
-import * as React from "react"
+import * as React from "react";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 export interface InputProps
   extends React.InputHTMLAttributes<HTMLInputElement> {}
@@ -12,14 +12,14 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
         type={type}
         className={cn(
           "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",
-          className
+          className,
         )}
         ref={ref}
         {...props}
       />
-    )
+    );
-  }
+  },
-)
+);
-Input.displayName = "Input"
+Input.displayName = "Input";
 
-export { Input }
+export { Input };

src/components/ui/label.tsx

@@ -1,12 +1,12 @@
-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 { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const labelVariants = cva(
-  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
-)
+);
 
 const Label = React.forwardRef<
   React.ElementRef<typeof LabelPrimitive.Root>,
@@ -18,7 +18,7 @@ const Label = React.forwardRef<
     className={cn(labelVariants(), className)}
     {...props}
   />
-))
+));
-Label.displayName = LabelPrimitive.Root.displayName
+Label.displayName = LabelPrimitive.Root.displayName;
 
-export { Label }
+export { Label };

src/components/ui/number-selector.tsx

@@ -1,14 +1,18 @@
-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, addEnabled = true, allowNegative = false }: 
+  updateCount,
-  { updateCount: UpdateSelectedNumberFunction, addEnabled?: boolean, allowNegative?: boolean }) {
+  addEnabled = true,
-
+  allowNegative = false,
+}: {
+  updateCount: UpdateSelectedNumberFunction;
+  addEnabled?: boolean;
+  allowNegative?: boolean;
+}) {
   const [count, setCount] = useState<number>(0);
 
   const counterUpdated = (newAmount: number) => {
@@ -17,17 +21,24 @@ 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 disabled={minusDisabled}
+      <Button
-        onClick={() => counterUpdated(count - 1)}>-</Button>
+        disabled={minusDisabled}
-      <Typography variant={"largeText"} className="mx-2">{count}</Typography>
+        onClick={() => counterUpdated(count - 1)}
-      <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

@@ -1,13 +1,13 @@
-import * as React from "react"
+import * as React from "react";
-import * as PopoverPrimitive from "@radix-ui/react-popover"
+import * as PopoverPrimitive from "@radix-ui/react-popover";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
-const Popover = PopoverPrimitive.Root
+const Popover = PopoverPrimitive.Root;
 
-const PopoverTrigger = PopoverPrimitive.Trigger
+const PopoverTrigger = PopoverPrimitive.Trigger;
 
-const PopoverAnchor = PopoverPrimitive.Anchor
+const PopoverAnchor = PopoverPrimitive.Anchor;
 
 const PopoverContent = React.forwardRef<
   React.ElementRef<typeof PopoverPrimitive.Content>,
@@ -20,12 +20,12 @@ const PopoverContent = React.forwardRef<
       sideOffset={sideOffset}
       className={cn(
         "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
+        className,
       )}
       {...props}
     />
   </PopoverPrimitive.Portal>
-))
+));
-PopoverContent.displayName = PopoverPrimitive.Content.displayName
+PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }
+export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };

src/components/ui/separator.tsx

@@ -1,7 +1,7 @@
-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";
 
 const Separator = React.forwardRef<
   React.ElementRef<typeof SeparatorPrimitive.Root>,
@@ -9,7 +9,7 @@ const Separator = React.forwardRef<
 >(
   (
     { className, orientation = "horizontal", decorative = true, ...props },
-    ref
+    ref,
   ) => (
     <SeparatorPrimitive.Root
       ref={ref}
@@ -18,12 +18,12 @@ const Separator = React.forwardRef<
       className={cn(
         "shrink-0 bg-border",
         orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
-        className
+        className,
       )}
       {...props}
     />
-  )
+  ),
-)
+);
-Separator.displayName = SeparatorPrimitive.Root.displayName
+Separator.displayName = SeparatorPrimitive.Root.displayName;
 
-export { Separator }
+export { Separator };

src/components/ui/skeleton.tsx

@@ -1,4 +1,4 @@
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 function Skeleton({
   className,
@@ -9,7 +9,7 @@ function Skeleton({
       className={cn("animate-pulse rounded-md bg-primary/10", className)}
       {...props}
     />
-  )
+  );
 }
 
-export { Skeleton }
+export { Skeleton };

src/components/ui/table.tsx

@@ -1,6 +1,6 @@
-import * as React from "react"
+import * as React from "react";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const Table = React.forwardRef<
   HTMLTableElement,
@@ -13,16 +13,16 @@ const Table = React.forwardRef<
       {...props}
     />
   </div>
-))
+));
-Table.displayName = "Table"
+Table.displayName = "Table";
 
 const TableHeader = React.forwardRef<
   HTMLTableSectionElement,
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
   <thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} />
-))
+));
-TableHeader.displayName = "TableHeader"
+TableHeader.displayName = "TableHeader";
 
 const TableBody = React.forwardRef<
   HTMLTableSectionElement,
@@ -33,8 +33,8 @@ const TableBody = React.forwardRef<
     className={cn("[&_tr:last-child]:border-0", className)}
     {...props}
   />
-))
+));
-TableBody.displayName = "TableBody"
+TableBody.displayName = "TableBody";
 
 const TableFooter = React.forwardRef<
   HTMLTableSectionElement,
@@ -44,12 +44,12 @@ const TableFooter = React.forwardRef<
     ref={ref}
     className={cn(
       "border-t bg-muted/50 font-medium [&>tr]:last:border-b-0",
-      className
+      className,
     )}
     {...props}
   />
-))
+));
-TableFooter.displayName = "TableFooter"
+TableFooter.displayName = "TableFooter";
 
 const TableRow = React.forwardRef<
   HTMLTableRowElement,
@@ -59,12 +59,12 @@ const TableRow = React.forwardRef<
     ref={ref}
     className={cn(
       "border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
-      className
+      className,
     )}
     {...props}
   />
-))
+));
-TableRow.displayName = "TableRow"
+TableRow.displayName = "TableRow";
 
 const TableHead = React.forwardRef<
   HTMLTableCellElement,
@@ -74,12 +74,12 @@ const TableHead = React.forwardRef<
     ref={ref}
     className={cn(
       "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"
+TableHead.displayName = "TableHead";
 
 const TableCell = React.forwardRef<
   HTMLTableCellElement,
@@ -89,12 +89,12 @@ const TableCell = React.forwardRef<
     ref={ref}
     className={cn(
       "p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
-      className
+      className,
     )}
     {...props}
   />
-))
+));
-TableCell.displayName = "TableCell"
+TableCell.displayName = "TableCell";
 
 const TableCaption = React.forwardRef<
   HTMLTableCaptionElement,
@@ -105,8 +105,8 @@ const TableCaption = React.forwardRef<
     className={cn("mt-4 text-sm text-muted-foreground", className)}
     {...props}
   />
-))
+));
-TableCaption.displayName = "TableCaption"
+TableCaption.displayName = "TableCaption";
 
 export {
   Table,
@@ -117,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 { Cross2Icon } from "@radix-ui/react-icons"
+import { Cross2Icon } from "@radix-ui/react-icons";
-import * as ToastPrimitives from "@radix-ui/react-toast"
+import * as ToastPrimitives from "@radix-ui/react-toast";
-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 ToastProvider = ToastPrimitives.Provider
+const ToastProvider = ToastPrimitives.Provider;
 
 const ToastViewport = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Viewport>,
@@ -15,12 +15,12 @@ const ToastViewport = React.forwardRef<
     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]",
-      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-[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",
@@ -35,8 +35,8 @@ const toastVariants = cva(
     defaultVariants: {
       variant: "default",
     },
-  }
+  },
-)
+);
 
 const Toast = React.forwardRef<
   React.ElementRef<typeof ToastPrimitives.Root>,
@@ -49,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>,
@@ -61,12 +61,12 @@ const ToastAction = React.forwardRef<
     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-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>,
@@ -76,15 +76,15 @@ const ToastClose = React.forwardRef<
     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-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}
   >
     <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>,
@@ -95,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>,
@@ -107,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,
@@ -124,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,13 +1,13 @@
-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";
 
-const TooltipProvider = TooltipPrimitive.Provider
+const TooltipProvider = TooltipPrimitive.Provider;
 
-const Tooltip = TooltipPrimitive.Root
+const Tooltip = TooltipPrimitive.Root;
 
-const TooltipTrigger = TooltipPrimitive.Trigger
+const TooltipTrigger = TooltipPrimitive.Trigger;
 
 const TooltipContent = React.forwardRef<
   React.ElementRef<typeof TooltipPrimitive.Content>,
@@ -18,11 +18,11 @@ const TooltipContent = React.forwardRef<
     sideOffset={sideOffset}
     className={cn(
       "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}
   />
-))
+));
-TooltipContent.displayName = TooltipPrimitive.Content.displayName
+TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };

src/components/ui/typography.tsx

@@ -1,82 +1,82 @@
-'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: {
+  variants: {
-        variant: {
+    variant: {
-            h1: 'scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl',
+      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:
+      inlineCode:
-                'relative rounded bg-muted 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-xl text-muted-foreground',
+      lead: "text-xl text-muted-foreground",
-            largeText: 'text-lg font-semibold',
+      largeText: "text-lg font-semibold",
-            smallText: 'text-sm font-medium leading-none',
+      smallText: "text-sm font-medium leading-none",
-            mutedText: 'text-sm text-muted-foreground',
+      mutedText: "text-sm text-muted-foreground",
-        },
-    },
-    defaultVariants: {
-        variant: "p",
     },
+  },
+  defaultVariants: {
+    variant: "p",
+  },
 });
 
 type VariantPropType = VariantProps<typeof typographyVariants>;
 
 const variantElementMap: Record<
-    NonNullable<VariantPropType['variant']>,
+  NonNullable<VariantPropType["variant"]>,
-    string
+  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
-    extends React.HTMLAttributes<HTMLElement>,
+  extends React.HTMLAttributes<HTMLElement>,
-        VariantProps<typeof typographyVariants> {
+    VariantProps<typeof typographyVariants> {
-    asChild?: boolean;
+  asChild?: boolean;
-    as?: string;
+  as?: string;
 }
 
 const Typography = React.forwardRef<HTMLElement, TypographyProps>(
-    ({ className, variant, as, asChild, ...props }, ref) => {
+  ({ className, variant, as, asChild, ...props }, ref) => {
-        const Comp = asChild
+    const Comp = asChild
-            ? Slot
+      ? Slot
-            : as ?? (variant ? variantElementMap[variant] : undefined) ?? 'div';
+      : (as ?? (variant ? variantElementMap[variant] : undefined) ?? "div");
-        return (
+    return (
-            <Comp
+      <Comp
-                className={cn(typographyVariants({ variant, className }))}
+        className={cn(typographyVariants({ variant, className }))}
-                ref={ref}
+        ref={ref}
-                {...props}
+        {...props}
-            />
+      />
-        );
+    );
-    }
+  },
 );
 
-Typography.displayName = 'Typography';
+Typography.displayName = "Typography";
 
 // eslint-disable-next-line react-refresh/only-export-components
-export { Typography, typographyVariants };
+export { Typography, typographyVariants };

src/components/ui/use-toast.ts

@@ -1,76 +1,73 @@
 // Inspired by react-hot-toast library
-import * as React from "react"
+import * as React from "react";
 
-import type {
+import type { ToastActionElement, ToastProps } from "src/components/ui/toast";
-  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"]
+      type: ActionType["ADD_TOAST"];
-      toast: ToasterToast
+      toast: ToasterToast;
     }
   | {
-      type: ActionType["UPDATE_TOAST"]
+      type: ActionType["UPDATE_TOAST"];
-      toast: Partial<ToasterToast>
+      toast: Partial<ToasterToast>;
     }
   | {
-      type: ActionType["DISMISS_TOAST"]
+      type: ActionType["DISMISS_TOAST"];
-      toastId?: ToasterToast["id"]
+      toastId?: ToasterToast["id"];
     }
   | {
-      type: ActionType["REMOVE_TOAST"]
+      type: ActionType["REMOVE_TOAST"];
-      toastId?: ToasterToast["id"]
+      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,
-    })
+    });
-  }, TOAST_REMOVE_DELAY)
+  }, TOAST_REMOVE_DELAY);
 
-  toastTimeouts.set(toastId, timeout)
+  toastTimeouts.set(toastId, timeout);
-}
+};
 
 export const reducer = (state: State, action: Action): State => {
   switch (action.type) {
@@ -78,27 +75,27 @@ 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 {
@@ -109,46 +106,46 @@ export const reducer = (state: State, action: Action): State => {
                 ...t,
                 open: false,
               }
-            : t
+            : t,
         ),
-      }
+      };
     }
     case "REMOVE_TOAST":
       if (action.toastId === undefined) {
         return {
           ...state,
           toasts: [],
-        }
+        };
       }
       return {
         ...state,
         toasts: state.toasts.filter((t) => t.id !== action.toastId),
-      }
+      };
   }
-}
+};
 
-const listeners: Array<(state: State) => void> = []
+const listeners: Array<(state: State) => void> = [];
 
-let memoryState: State = { toasts: [] }
+let memoryState: State = { toasts: [] };
 
 function dispatch(action: Action) {
-  memoryState = reducer(memoryState, action)
+  memoryState = reducer(memoryState, action);
   listeners.forEach((listener) => {
-    listener(memoryState)
+    listener(memoryState);
-  })
+  });
 }
 
-type Toast = Omit<ToasterToast, "id">
+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 },
-    })
+    });
-  const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id })
+  const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id });
 
   dispatch({
     type: "ADD_TOAST",
@@ -157,36 +154,36 @@ function toast({ ...props }: Toast) {
       id,
       open: true,
       onOpenChange: (open) => {
-        if (!open) dismiss()
+        if (!open) dismiss();
       },
     },
-  })
+  });
 
   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,9 +1,8 @@
 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 (
@@ -15,4 +14,4 @@ export default function ErrorPage() {
       </p>
     </div>
   );
-}
+}

src/index.css

@@ -2,7 +2,6 @@
 @tailwind components;
 @tailwind utilities;
 
-
 @layer base {
   :root {
     --background: 0 0% 100%;
@@ -58,4 +57,4 @@
   body {
     @apply bg-background text-foreground;
   }
-}
+}

src/lib/utils.ts

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

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 './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,32 +17,30 @@ 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,25 +1,24 @@
-
 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/RoomCategory.ts

@@ -1,24 +1,22 @@
-
-
 export type RoomCategory = {
-    id: number,
+  id: number;
-    name: string,
+  name: string;
-    description: string,
+  description: string;
-    bedType: string,
+  bedType: string;
-    maxGuestNum: number,
+  maxGuestNum: number;
-    roomCategoryPhotos: RoomCategoryPhoto[],
+  roomCategoryPhotos: RoomCategoryPhoto[];
-    roomCategoryDetails: RoomCategoryDetails[],
+  roomCategoryDetails: RoomCategoryDetails[];
-}
+};
 
 export type RoomCategoryDetails = {
-    id: number,
+  id: number;
-    detailsSection: string,
+  detailsSection: string;
-    detailValue: string,
+  detailValue: string;
-}
+};
 
 export type RoomCategoryPhoto = {
-    id: number,
+  id: number;
-    path: string,
+  path: string;
-    altText: string | undefined,
+  altText: string | undefined;
-    kind: string,
+  kind: string;
-}
+};

src/model/RoomSearch.ts

@@ -1,30 +1,28 @@
-
-
 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 = {
-    filter: AvailabilityFilter
+  filter: AvailabilityFilter;
-}
+};
 
 export type AvailabilityFilter = {
-    startDate: string,
+  startDate: string;
-    endDate: string
+  endDate: string;
-}
+};
 
 export type FareRequest = {
-    filter: FareFilter
+  filter: FareFilter;
-}
+};
 
 export type FareFilter = {
-    roomCategory: number,
+  roomCategory: number;
-    startDate: string,
+  startDate: string;
-    endDate: string
+  endDate: string;
-}
+};

src/model/SearchFilter.ts

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

src/routes/Root.css

@@ -8,10 +8,9 @@ html {
   box-sizing: inherit;
 }
 
-
 .appPage {
   width: 80%;
   margin: 0 auto;
   padding: 2rem;
   text-align: center;
-}
+}

src/routes/Root.tsx

@@ -1,24 +1,23 @@
-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='appPage bg-background text-foreground'>
+        <div className="mx-auto w-full bg-background p-8 text-center text-foreground sm:w-[90%] md:w-[80%]">
           <Outlet />
         </div>
         <Toaster />
         <AppFooter />
       </ThemeProvider>
     </>
-  )
+  );
 }
 
-export default Root
+export default Root;

src/routes/book-page.tsx

@@ -1,23 +1,26 @@
-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 { Input } from "@/components/ui/input"
+import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label"
+import { Label } from "@/components/ui/label";
-import { Separator } from "@/components/ui/separator"
+import { Separator } from "@/components/ui/separator";
-import { Typography } from "@/components/ui/typography"
+import { Typography } from "@/components/ui/typography";
-import { useToast } from "@/components/ui/use-toast"
+import { useToast } from "@/components/ui/use-toast";
-import { useAppStore } from "@/store"
+import { useAppStore } from "@/store";
-import { ChangeEvent, useState } from "react"
+import { ChangeEvent, useState } from "react";
-import { useNavigate } from "react-router-dom"
+import { useNavigate } from "react-router-dom";
 
 enum PageState {
-  noData, showForm, sending, created, error
+  noData,
+  showForm,
+  sending,
+  created,
+  error,
 }
 
-
 function BookPage() {
   const [pageState, setPageState] = useState<PageState>(PageState.showForm);
-  const bookingData = useAppStore((state) => state.newBookingData)
+  const bookingData = useAppStore((state) => state.newBookingData);
   const setCustomerData = useAppStore((state) => state.setBookingCustomer);
   const { toast } = useToast();
   const navigate = useNavigate();
@@ -25,7 +28,7 @@ function BookPage() {
   if (!bookingData || !bookingData.customerDetails) {
     return (
       <Typography variant={"h2"}>You must select some rooms...</Typography>
-    )
+    );
   }
 
   function handleOnChange(e: ChangeEvent<HTMLInputElement>) {
@@ -58,8 +61,13 @@ function BookPage() {
   function handleOnBookingSubmit() {
     const customerDetails = bookingData?.customerDetails;
 
-    if (!customerDetails ||
+    if (
-      customerDetails.name == "" || customerDetails.surname == "" || customerDetails.phoneNumber == "" || customerDetails.email == "") {
+      !customerDetails ||
+      customerDetails.name == "" ||
+      customerDetails.surname == "" ||
+      customerDetails.phoneNumber == "" ||
+      customerDetails.email == ""
+    ) {
       toast({
         variant: "destructive",
         title: "Uh oh! You must fill all fields.",
@@ -78,10 +86,9 @@ function BookPage() {
     if (rs.isError) {
       setPageState(PageState.error);
     } else {
-      navigate("/success", { state: rs.bookingResponse })
+      navigate("/success", { state: rs.bookingResponse });
     }
-  }
+  };
-
 
   return (
     <>
@@ -92,34 +99,63 @@ function BookPage() {
         <div>
           <div>
             <Label htmlFor="name">Name</Label>
-            <Input type="text" name="name" id="name" placeholder="Name" value={bookingData.customerDetails.name ?? ""}
+            <Input
-              onChange={handleOnChange} />
+              type="text"
+              name="name"
+              id="name"
+              placeholder="Name"
+              value={bookingData.customerDetails.name ?? ""}
+              onChange={handleOnChange}
+            />
           </div>
           <div>
             <Label htmlFor="surname">Surname</Label>
-            <Input type="text" name="surname" id="surname" placeholder="Surname" value={bookingData.customerDetails.surname ?? ""}
+            <Input
-              onChange={handleOnChange} />
+              type="text"
+              name="surname"
+              id="surname"
+              placeholder="Surname"
+              value={bookingData.customerDetails.surname ?? ""}
+              onChange={handleOnChange}
+            />
           </div>
           <div>
             <Label htmlFor="email">Email</Label>
-            <Input type="email" name="email" id="email" placeholder="Email" value={bookingData.customerDetails.email ?? ""}
+            <Input
-              onChange={handleOnChange} />
+              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 ?? ""}
+            <Input
-              onChange={handleOnChange} />
+              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>
       <Separator className="my-10" />
-      <Button onClick={handleOnBookingSubmit} disabled={pageState == PageState.sending}>
+      <Button
-        <Typography variant={"h3"} className="text-primary-foreground">Book it now!</Typography>
+        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

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

src/routes/home-page.tsx

@@ -1,48 +1,49 @@
-import { useAPIRoomCategories } 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/SearchFilter"
+import { SearchFilter } from "@/model/SearchFilter";
-import { useNavigate } from "react-router-dom"
+import { useNavigate } from "react-router-dom";
+import { LoaderIcon } from "lucide-react";
+import "./home-page.css";
 
 function Homepage() {
-
   const { roomCategoryList, isLoading, isError } = useAPIRoomCategories();
   const navigate = useNavigate();
 
   const onBtSearchClick = (filter: SearchFilter) => {
-    navigate("/search", {state: filter})
+    navigate("/search", { state: filter });
-  }
+  };
 
   const roomList = roomCategoryList?.map((element: RoomCategory) => {
-    return (
+    return <RoomItemCard key={element.id} room={element} />;
-      <RoomItemCard key={element.id} room={element} />
-    );
   });
 
   return (
     <>
       <Typography variant={"h1"}>Somnia Rooms</Typography>
       <Separator className="my-10" />
-      <SearchFilterCard onSearchClick={onBtSearchClick}/>
+      <SearchFilterCard onSearchClick={onBtSearchClick} />
       <Separator className="my-10" />
-      <div className="grid grid-cols-2 gap-4">
+      <div className="homePageRoomGrid grid gap-4">{roomList}</div>
-        {roomList}
-      </div>
       {isLoading && (
         <>
-          <Typography variant={"h3"} as="h2">Loading...</Typography>
+          <Skeleton className="mx-auto flex h-[200px] w-full flex-col items-center justify-center">
-          <Skeleton className="w-[400px] h-[200px] mx-auto" />
+            <LoaderIcon />
+            <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,95 +1,127 @@
-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 { AvailabilityFilter } from "@/model/RoomSearch"
+import { AvailabilityFilter } from "@/model/RoomSearch";
-import { SearchFilter } from "@/model/SearchFilter"
+import { SearchFilter } from "@/model/SearchFilter";
-import { useAppStore } from "@/store"
+import { useAppStore } from "@/store";
-import { useMemo, useState } from "react"
+import { useMemo, useState } from "react";
-import { useNavigate } from "react-router-dom"
+import { useNavigate } from "react-router-dom";
 
 //TODOME: Igual podemos crear un StateMachine conjunta para los siguiente estados de la página: Sin Buscar, Sin disponibilidad, error, cargando.
 function SearchPage() {
-
   //const [availabilityFilter, setAvailabilityFilter] = useState<AvailabilityFilter>();
-  const searchFilter = useAppStore((state) => (state.searchFilter));
+  const searchFilter = useAppStore((state) => state.searchFilter);
-  const resetBooking = useAppStore((state) => (state.resetBookingState));
+  const resetBooking = useAppStore((state) => state.resetBookingState);
   const navigate = useNavigate();
 
   const [isSearched, setIsSearched] = useState<boolean>(false);
 
+  //This seems a little bit overkill, but IDK.
+  const availabilityFilter: AvailabilityFilter | null = useMemo(() => {
+    if (
+      searchFilter &&
+      searchFilter.dateRange &&
+      searchFilter.dateRange.from &&
+      searchFilter.dateRange.to
+    ) {
+      const newAvailabilityFilter: AvailabilityFilter = {
+        startDate: searchFilter.dateRange.from.toDateString(),
+        endDate: searchFilter.dateRange.to.toDateString(),
+      };
+      return newAvailabilityFilter;
+    }
+    return null;
+  }, [searchFilter]);
+
+  const {
+    roomAvailabilityList,
+    isLoading: isLoadingAvailability,
+    isError: isErrorAvailability,
+  } = useAPIRoomAvailability(availabilityFilter ?? null);
+
+  const isLoading = isLoadingAvailability;
+  const isError = isErrorAvailability;
+
   const onBtSearchClick = (newFilter: SearchFilter) => {
     console.log("onBtSearchClick: ");
     console.log(newFilter);
 
-    if (newFilter.dateRange && newFilter.dateRange.from && newFilter.dateRange.to) {
+    if (
+      newFilter.dateRange &&
+      newFilter.dateRange.from &&
+      newFilter.dateRange.to
+    ) {
       setIsSearched(true);
 
       resetBooking(newFilter.dateRange.from, newFilter.dateRange.to);
     }
-  }
+  };
 
   const onBookingContinue = () => {
     navigate("/book");
-  }
+  };
-
-  //This seems a little bit overkill, but IDK.
-  const availabilityFilter: AvailabilityFilter | null = useMemo(
-    () => {
-      if (searchFilter && searchFilter.dateRange && searchFilter.dateRange.from && searchFilter.dateRange.to) {
-        const newAvailabilityFilter: AvailabilityFilter = {
-          startDate: searchFilter.dateRange.from.toDateString(),
-          endDate: searchFilter.dateRange.to.toDateString()
-        };
-        return newAvailabilityFilter;
-      }
-      return null;
-    },
-    [searchFilter]
-  );
-
-  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} />
+      <RoomBooking
+        key={element.roomCategory}
+        availableAmount={element.availability}
+        roomCategoryId={element.roomCategory}
+      />
     );
   });
   const noRoomsAvailable = (
     <>
-      <Typography variant={"h3"} as="h3">Sorry 😔, there aren't rooms available for selected period.
+      <Typography variant={"h3"} as="h3">
-        You can contact us for more info.</Typography>
+        Sorry 😔, there aren't rooms available for selected period. You can
+        contact us for more info.
+      </Typography>
     </>
   );
-  const hasRooms = (roomAvailabilityList?.length && roomAvailabilityList?.length > 0);
+  const hasRooms =
+    roomAvailabilityList?.length && roomAvailabilityList?.length > 0;
   console.log(hasRooms);
 
+  const pageContent = isLoading ? (
+    <>
+      <Typography variant={"h3"} as="h2">
+        Loading...
+      </Typography>
+      <Skeleton className="mx-auto h-[200px] w-full" />
+    </>
+  ) : (
+    <div className="2xl:grid 2xl:grid-cols-60/40 2xl:gap-6">
+      <div className="flex flex-col gap-5">
+        {hasRooms ? roomList : isSearched && noRoomsAvailable}
+      </div>
+      <Separator className="my-10 2xl:hidden" />
+      <BookingDetails
+        onBookingConfirm={onBookingContinue}
+        mode={"Book"}
+      ></BookingDetails>
+    </div>
+  );
+
   return (
     <div className="bg-background text-foreground">
       <SearchFilterCard onSearchClick={onBtSearchClick} />
       <Separator className="my-10" />
-      {isLoading && (
+      {hasRooms ? (
-        <>
+        pageContent
-          <Typography variant={"h3"} as="h2">Loading...</Typography>
+      ) : (
-          <Skeleton className="w-[400px] h-[200px] mx-auto" />
+        <Typography>
-        </>
+          Realiza una búsqueda para ver la disponibilidad y los precios.
+        </Typography>
       )}
-      <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,47 +1,48 @@
-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 { addDays } from "date-fns"
+import { addDays } from "date-fns";
-import { useEffect, useState } from "react"
+import { useEffect, useState } from "react";
-import { useLocation, useNavigate } from "react-router-dom"
+import { useLocation, useNavigate } from "react-router-dom";
 
 function SuccessPage() {
+  const [pageState, setPageState] = useState<NewBookingResponse | null>(null);
+  const resetBookingState = useAppStore((state) => state.resetBookingState);
 
-    const [pageState, setPageState] = useState<NewBookingResponse|null>(null)
+  const location = useLocation();
-    const resetBookingState = useAppStore((state) => state.resetBookingState);
+  const navigate = useNavigate();
 
-    const location = useLocation();
+  useEffect(() => {
-    const navigate = useNavigate();
+    if (location.state == null) {
-
+      navigate("/home");
-    useEffect(() => {
-        if(location.state == null) {
-            navigate("/home");
-        }
-        setPageState(location.state);
-
-    }, [location, navigate])
-
-    const handleBtBackClick = () => {
-        resetBookingState(new Date(), addDays(new Date(), 2));
-        navigate("/home");
     }
+    setPageState(location.state);
+  }, [location, navigate]);
 
+  const handleBtBackClick = () => {
+    resetBookingState(new Date(), addDays(new Date(), 2));
+    navigate("/home");
+  };
 
   return (
     <Card>
-        <CardHeader>
+      <CardHeader>
-            <Typography variant={"h2"}>Booking Completed</Typography>
+        <Typography variant={"h2"}>Booking Completed</Typography>
-        </CardHeader>
+      </CardHeader>
-        <CardContent>
+      <CardContent>
-            <Typography variant={"largeText"}>Booking ref: {pageState?.refNumber}</Typography>
+        <Typography variant={"largeText"}>
-            <Button className="my-4" onClick={handleBtBackClick}>
+          Booking ref: {pageState?.refNumber}
-                <Typography variant={"largeText"} className="text-primary-foreground">Go Back</Typography>
+        </Typography>
-            </Button>
+        <Button className="my-4" onClick={handleBtBackClick}>
-        </CardContent>
+          <Typography variant={"largeText"} className="text-primary-foreground">
+            Go Back
+          </Typography>
+        </Button>
+      </CardContent>
     </Card>
-  )
+  );
 }
 
-export default SuccessPage
+export default SuccessPage;

src/store.ts

@@ -1,95 +1,110 @@
-import { create } from 'zustand'
+import { create } from "zustand";
-import { SearchFilter } from './model/SearchFilter'
+import { SearchFilter } from "./model/SearchFilter";
-import { NewBooking, NewBookingCustomerDetails, NewBookingRoom } from './model/Bookings'
+import {
+  NewBooking,
+  NewBookingCustomerDetails,
+  NewBookingRoom,
+} from "./model/Bookings";
 
 interface AppState {
-    searchFilter: SearchFilter
+  searchFilter: SearchFilter;
-    setSearchFilter: (newFilter: SearchFilter) => void
+  setSearchFilter: (newFilter: SearchFilter) => void;
-    newBookingData: NewBooking | null
+  newBookingData: NewBooking | null;
-    setNewBooking: (newBooking: NewBooking) => void
+  setNewBooking: (newBooking: NewBooking) => void;
-    resetBookingState: (arrival: Date, departure: Date) => void
+  resetBookingState: (arrival: Date, departure: Date) => void;
-    addNewBookingRoom: (newRoom: NewBookingRoom) => void
+  addNewBookingRoom: (newRoom: NewBookingRoom) => void;
-    setBookingCustomer: (newCustomer: NewBookingCustomerDetails) => void
+  setBookingCustomer: (newCustomer: NewBookingCustomerDetails) => void;
 }
 
 const defaultSearchFilter: SearchFilter = {
-    dateRange: { from: new Date() }
+  dateRange: { from: new Date() },
-}
+};
 
 const defaultNewBooking: NewBooking = {
-    arrivalDate: new Date(),
+  arrivalDate: new Date(),
-    departureDate: new Date(),
+  departureDate: new Date(),
-    customerDetails: {
+  customerDetails: {
-        name: null,
+    name: null,
-        surname: null,
+    surname: null,
-        email: null,
+    email: null,
-        phoneNumber: null
+    phoneNumber: null,
-    },
+  },
-    rooms: []
+  rooms: [],
-}
+};
 
 function getDefaultBookingData(arrivalDate: Date, departureDate: Date) {
-    return {
+  return {
-        ...defaultNewBooking,
+    ...defaultNewBooking,
-        arrivalDate: arrivalDate,
+    arrivalDate: arrivalDate,
-        departureDate: departureDate
+    departureDate: departureDate,
-    }
+  };
 }
 
-function addNewBookingRoomToCurrentState(newRoom: NewBookingRoom, currentState: NewBooking | null): NewBooking | null {
+function addNewBookingRoomToCurrentState(
+  newRoom: NewBookingRoom,
+  currentState: NewBooking | null,
+): NewBooking | null {
+  if (currentState == null) {
+    return currentState;
+  }
 
-    if (currentState == null) {
+  //Remove rooms with "same key".
-        return currentState;
+  const filteredRooms = currentState.rooms.filter((room) => {
+    const diffRoom = room.roomCategory != newRoom.roomCategory;
+    const diffAmount = room.guestNumber != newRoom.guestNumber;
+    if (diffRoom || (!diffRoom && diffAmount)) {
+      return true;
     }
+    return false;
+  });
+  console.log(filteredRooms);
 
-    //Remove rooms with "same key".
+  if (newRoom.amount > 0) {
-    const filteredRooms = currentState.rooms.filter((room) => {
+    filteredRooms.push(newRoom);
-        const diffRoom = room.roomCategory != newRoom.roomCategory;
+  }
-        const diffAmount = room.guestNumber != newRoom.guestNumber;
-        if(diffRoom || (!diffRoom && diffAmount)) {
-            return true;
-        }
-        return false;
-    })
-    console.log(filteredRooms);
 
-    if (newRoom.amount > 0) {
+  const newState: NewBooking = {
-        filteredRooms.push(newRoom);
+    ...currentState,
-    }
+    rooms: filteredRooms ?? [],
+  };
 
+  console.log("AddRoomNewState:");
+  console.log(newState);
 
-    const newState: NewBooking = {
+  return newState;
-        ...currentState,
-        rooms: filteredRooms ?? []
-    }
-
-    console.log("AddRoomNewState:");
-    console.log(newState);
-
-    return newState;
 }
 
-function setBookingCustomer(newCustomer: NewBookingCustomerDetails, currentState: NewBooking | null) {
+function setBookingCustomer(
-    if(currentState == null) {
+  newCustomer: NewBookingCustomerDetails,
-        return currentState;
+  currentState: NewBooking | null,
-    }
+) {
+  if (currentState == null) {
+    return currentState;
+  }
 
-    const newState: NewBooking = {
+  const newState: NewBooking = {
-        ...currentState,
+    ...currentState,
-        customerDetails: newCustomer
+    customerDetails: newCustomer,
-    };
+  };
-    return newState;
+  return newState;
 }
 
 export const useAppStore = create<AppState>()((set) => ({
-    searchFilter: defaultSearchFilter,
+  searchFilter: defaultSearchFilter,
-    setSearchFilter: (newFilter) => set(() => ({ searchFilter: newFilter })),
+  setSearchFilter: (newFilter) => set(() => ({ searchFilter: newFilter })),
-    newBookingData: null,
+  newBookingData: null,
-    setNewBooking: (newBooking) => set(() => ({ newBookingData: newBooking })),
+  setNewBooking: (newBooking) => set(() => ({ newBookingData: newBooking })),
-    resetBookingState: (arrival, departure) =>
+  resetBookingState: (arrival, departure) =>
-        set(() => ({ newBookingData: getDefaultBookingData(arrival, departure) })),
+    set(() => ({ newBookingData: getDefaultBookingData(arrival, departure) })),
-    addNewBookingRoom: (newRoom: NewBookingRoom) =>
+  addNewBookingRoom: (newRoom: NewBookingRoom) =>
-        set((state) => ({ newBookingData: addNewBookingRoomToCurrentState(newRoom, state.newBookingData) })),
+    set((state) => ({
-    setBookingCustomer: (newCustomer: NewBookingCustomerDetails) => 
+      newBookingData: addNewBookingRoomToCurrentState(
-        set((state) => ({newBookingData: setBookingCustomer(newCustomer, state.newBookingData)}))
+        newRoom,
-}))
+        state.newBookingData,
+      ),
+    })),
+  setBookingCustomer: (newCustomer: NewBookingCustomerDetails) =>
+    set((state) => ({
+      newBookingData: setBookingCustomer(newCustomer, state.newBookingData),
+    })),
+}));

tailwind.config.js

@@ -1,13 +1,13 @@
-import plugin from 'tailwindcss-animate';
+import plugin from "tailwindcss-animate";
 
 /** @type {import('tailwindcss').Config} */
 export default {
   darkMode: ["class"],
   content: [
-    './pages/**/*.{ts,tsx}',
+    "./pages/**/*.{ts,tsx}",
-    './components/**/*.{ts,tsx}',
+    "./components/**/*.{ts,tsx}",
-    './app/**/*.{ts,tsx}',
+    "./app/**/*.{ts,tsx}",
-    './src/**/*.{ts,tsx}',
+    "./src/**/*.{ts,tsx}",
   ],
   prefix: "",
   theme: {
@@ -73,7 +73,13 @@ export default {
         "accordion-down": "accordion-down 0.2s ease-out",
         "accordion-up": "accordion-up 0.2s ease-out",
       },
+
+      //SomniaRooms Extends
+      gridTemplateColumns: {
+        "60/40": "60% 40%",
+        "40/60": "40% 60%",
+      },
     },
   },
   plugins: [plugin],
-}
+};

tsconfig.json

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

vite.config.ts

@@ -1,6 +1,6 @@
-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";
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -14,4 +14,4 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
     },
   },
-})
+});