Compare commits

...
46 Commits
Author SHA1 Message Date
Daniel-Garmig 4a3378573b Booking page - Migrated from Shadcn Form to Shadcn Field components 2026-01-13 21:18:06 +01:00
Daniel-Garmig 25364deb8e Updated Libs - Zod v3 to v4 2026-01-13 20:15:35 +01:00
Daniel-Garmig 53ddf1e73c Updated Libs - React-Router v6 to v7 2026-01-13 20:03:01 +01:00
Daniel-Garmig 899d27f468 Updated Prettier formatting 2026-01-13 15:00:22 +01:00
Daniel-Garmig 90fa82234d Removed Toast component 2026-01-13 14:14:22 +01:00
Daniel-Garmig b8ec6f7bdd General improvements:
- Search control - Improved error messages.
- Fixed lint errors.
2026-01-13 14:12:58 +01:00
Daniel-Garmig 94312de6e2 Contact flow:
- Added contact page for bookings over API limit.
- Added ContactUs dialog to redirect customers to contact page.
2026-01-07 22:25:27 +01:00
Daniel-Garmig d4094d09c6 Updated shadcn-ui components. 2026-01-05 22:01:53 +01:00
Daniel-Garmig 42437881c4 Updated deps (minor) 2026-01-05 20:35:39 +01:00
Daniel-Garmig 5d2eb2e635 General improvements in booking state management. 2026-01-05 20:11:42 +01:00
Daniel-Garmig 2b3d1eafd3 API - Use the new Prices API. 2026-01-05 15:08:05 +01:00
Daniel-Garmig 70e483bc45 API - Prices - Updated endpoint for prices "by RoomCategory". 2025-10-13 14:58:27 +02:00
Daniel-Garmig 99653371a8 Added config var usage: Use SomniaRooms config vars.
Improvements to app footer and header.
2025-10-13 13:51:27 +02:00
Daniel-Garmig 3e77426d1d Config Vars - Get config vars from API 2025-09-22 20:52:23 +02:00
Daniel-Garmig 550beffba8 Booking page state improvements. 2025-09-08 19:45:46 +02:00
Daniel-Garmig 590d7f6fa1 State Management - Improve state management for searchs. 2025-09-08 14:36:50 +02:00
Daniel-Garmig 4c21dc2764 Update Libs - Fixed TailwindCSS Animate not found 2025-06-12 22:07:48 +02:00
Daniel-Garmig 4d01112006 Update Libs - Updated Zustand v4 to v5 2025-06-12 21:38:39 +02:00
Daniel-Garmig 984c386588 Updated libs - Updated Zod v3 to v4. 2025-06-10 21:06:54 +02:00
Daniel-Garmig 0efe5bfa9e Update libs - Updated eslint v8 to v9 2025-06-09 19:48:33 +02:00
Daniel-Garmig 7ba7c4b04b Updated Libs - Updated shadcn UI components (again) after Tailwindcss 4 update. 2025-06-07 21:25:32 +02:00
Daniel-Garmig bb53ba6cb4 Update Libs - Updated Tailwindcss 3 to 4. 2025-06-07 21:23:24 +02:00
Daniel-Garmig 57dcbdec14 Update libs - Updated shadcn UI components. 2025-06-07 14:54:30 +02:00
Daniel-Garmig 825dc4365f Update Libs - Updated Vite v5.2.0 to 6.3.5 2025-06-07 14:54:03 +02:00
Daniel-Garmig 67f9e19eb8 Added Iconify "Icon" web component for dynamic icons. 2025-06-03 21:34:46 +02:00
Daniel-Garmig 06c1af92b3 Update API requests to last API changes. 2025-06-03 20:56:10 +02:00
Daniel-Garmig 532337a46a Improve booking form. 2024-09-09 09:27:09 +02:00
Daniel-Garmig 191379ed03 Included shadcn/UI form component. 2024-09-03 20:03:51 +02:00
Daniel-Garmig f476f4307a Added Prettier for TailwindCSS. 2024-09-03 19:05:45 +02:00
Daniel-Garmig dedfc1cdd8 Redesign some more pages and other improvements. 2024-09-03 18:58:47 +02:00
Daniel-Garmig 2d2992593a Refactor HomePage and more! 2024-08-30 21:20:40 +02:00
Daniel-Garmig b034d2e9c9 Add Prettier support. 2024-08-12 20:59:51 +02:00
Daniel-Garmig d4458e8f00 Little cleaning and fixes 2024-08-12 20:56:14 +02:00
Daniel-Garmig d3358c7c58 Fix Actions - Change image repository for push.
CI / Docker Lint (push) Successful in 22s
2024-05-13 01:18:26 +02:00
Daniel-Garmig 4e825c7ca7 Small fix pass. 2024-05-13 00:49:54 +02:00
Daniel-Garmig b83af1b872 Copy "/public" to image on prod build. 2024-05-13 00:37:57 +02:00
Daniel-Garmig f8365e05af Env Vars - Support for container env vars.
Now you can configure your container using Environmet vars.
2024-05-12 13:21:28 +02:00
Daniel-Garmig 0039b09d98 Gitea Actions support (#1)
Add Gitea Actions support.

Reviewed-on: Somnia/SomniaRoomsApp#1
Co-authored-by: Daniel García <[email protected]>
Co-committed-by: Daniel García <[email protected]>
2024-05-12 02:33:16 +02:00
Daniel-Garmig e9b67efd46 Fix build error. 2024-05-11 23:05:45 +02:00
Daniel-Garmig 0047099742 Booking lifecycle:
- Create bookings :)
2024-05-10 20:04:37 +02:00
Daniel-Garmig c753d1e9fa Add routes & navigation. 2024-05-09 22:45:34 +02:00
Daniel-Garmig fe7122b107 Booking process - Add and remove rooms from booking. 2024-05-09 21:47:12 +02:00
Daniel-Garmig 630d5cb708 State Management & RoomPrices
- Added zustand for global state management.
- New Component - NumberSelector.
- Implement Prices API.
2024-05-09 18:32:18 +02:00
Daniel-Garmig d6a9ac8d7c Search Page - Initial Implementation.
- Added components.
- Query API to get availability for selected period.
2024-05-05 22:45:15 +02:00
Daniel-Garmig e81660914f Homepage - Initial implementation. 2024-05-05 12:45:59 +02:00
Daniel-Garmig 391f2fb3ae Basic components and migration to Shadcn/ui. 2024-05-03 23:47:25 +02:00
90 changed files with 14549 additions and 3247 deletions
+2
View File
@@ -2,3 +2,5 @@ node_modules
build build
.dockerignore .dockerignore
Dockerfile Dockerfile
.env
.env.local
+3
View File
@@ -0,0 +1,3 @@
# App config Variables (Will be visible by client):
VITE_BACKEND_HOST=https://somniaapi.example.org/
VITE_BACKEND_PORT=443
+3
View File
@@ -0,0 +1,3 @@
# App config Variables (Will be visible by client):
VITE_BACKEND_HOST=SOMNIAROOMS_BACKEND_HOST
VITE_BACKEND_PORT=SOMNIAROOMS_BACKEND_PORT
-18
View File
@@ -1,18 +0,0 @@
module.exports = {
root: true,
env: { browser: true, es2020: true, node: false },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
}
+2
View File
@@ -0,0 +1,2 @@
# EOL normalization
* text=auto
+22
View File
@@ -0,0 +1,22 @@
name: CI
on:
push:
branches:
- main
pull_request: ~
workflow_dispatch: ~
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
lint:
name: Docker Lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Lint Dockerfile
uses: hadolint/[email protected]
+45
View File
@@ -0,0 +1,45 @@
name: Publish_on_Tag
on:
push:
tags:
- devbuild_*
workflow_dispatch: ~
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
build:
name: Build and Push
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to local registry
uses: docker/login-action@v3
with:
registry: ${{vars.REGISTRY_INSTANCE}}
username: ${{gitea.repository_owner}}
password: ${{secrets.REGISTRY_TOKEN}} # It should be a user/org token with package perms.
- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: ${{vars.REGISTRY_INSTANCE}}/somnia/somniaroomsapp:devbuild
target: final-prod
platforms: linux/amd64,linux/arm64
secrets: |
GIT_AUTH_TOKEN=${{secrets.REGISTRY_TOKEN}}
+7
View File
@@ -0,0 +1,7 @@
# Ignore artifacts:
**/dist
**/.git
**/.svn
**/.hg
**/node_modules
+5
View File
@@ -0,0 +1,5 @@
{
"endOfLine": "auto",
"plugins": ["prettier-plugin-tailwindcss"],
"tailwindStylesheet": "./src/index.css"
}
Binary file not shown.
-6
View File
@@ -1,6 +0,0 @@
{
"ExpandedNodes": [
""
],
"PreviewInSolutionExplorer": false
}
BIN
View File
Binary file not shown.
+9 -7
View File
@@ -1,24 +1,26 @@
# Base Node Environment. # Base Node Environment.
FROM node:21.7-alpine3.19 as app-base FROM node:22-alpine AS app-base
WORKDIR /app WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH ENV PATH=/app/node_modules/.bin:$PATH
COPY package.json ./ COPY package.json ./
COPY package-lock.json ./ COPY package-lock.json ./
COPY . ./ COPY . ./
# Dev environment. # Dev environment.
FROM app-base as final-dev FROM app-base AS final-dev
RUN npm install RUN npm install
ENV CHOKIDAR_USEPOLLING=true ENV CHOKIDAR_USEPOLLING=true
CMD ["npm", "run", "dev"] CMD ["npm", "run", "dev"]
# Build app for production. # Build app for production.
FROM app-base as builder FROM app-base AS builder
RUN npm ci RUN npm ci && npm run build
RUN npm run build
# production environment # 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 --from=builder /app/dist /usr/share/nginx/html
COPY /public /usr/share/nginx/html/public
COPY scripts/env.sh /docker-entrypoint.d/env.sh
EXPOSE 80 EXPOSE 80
RUN chmod +x /docker-entrypoint.d/env.sh
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]
+44 -8
View File
@@ -2,32 +2,68 @@
User app for SomniaRooms. User app for SomniaRooms.
## Podman Usage:
## Docker Usage:
### Dev ### Dev
**Build Image:** **Build Image:**
``` ```
docker build -t somniarooms-app:dev --target final-dev . podman build -t somniarooms-app:dev --target final-dev .
``` ```
**Docker Run Image:** **Podman Run Image:**
``` ```
docker run -d -it --rm -v ${PWD}:/app -v /app/node_modules -p 3000:3000 --name somniarooms-app somniarooms-app:dev podman run -d -it --rm -v ${PWD}:/app -v /app/node_modules -p 3000:3000 --name somniarooms-app somniarooms-app:dev
``` ```
Notas: Notas:
- Usar `-rm` para eliminar el contenedor y sus volúmenes en stop. - Usar `-rm` para eliminar el contenedor y sus volúmenes en stop.
- Usar `-d` para modo detached. - Usar `-d` para modo detached.
### Prod: ### Prod:
**Build Image** **Build Image**
``` ```
docker build -t somniarooms-app:prod --target final-prod . podman build -t somniarooms-app:prod --target final-prod .
``` ```
**Docker Run** **Podman Run**
``` ```
docker run -d -it -p 8080:80 --name somniarooms-app somniarooms-app:prod podman run -d -it -p 8080:80 --name somniarooms-app somniarooms-app:prod
``` ```
**Podman run with env vars:**
```
podman 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 image ready to use, you must set some env variables to configure the app:
| Var | Default Value | Description |
| :------------------------: | :----------------------------: | :------------------------------------------------------------------------------------------: |
| `SOMNIAROOMS_BACKEND_HOST` | https://somniaapi.example.org/ | Host where uses can connect to the SomniaRoom API. API endpoint should be reachble for uses. |
| `SOMNIAROOMS_BACKEND_PORT` | 443 | Port to SomniarRooms API. |
## .env files
This project uses .env files to configure the app. As Vite only supports compile-time vars, we use some tricks to allow setting variables from container env variables.
### .env
Contains default values. It is just an example configuration.
For development is recomended to create a `.env.local` file based on `.env`.
### .env.production
Set varibles to certains placeholder, that are replace on container startup.
(We are using this solution: https://stackoverflow.com/a/77454537)
+8 -5
View File
@@ -4,15 +4,18 @@
"rsc": false, "rsc": false,
"tsx": true, "tsx": true,
"tailwind": { "tailwind": {
"config": "tailwind.config.js", "config": "",
"css": "src/index.css", "css": "src/index.css",
"baseColor": "stone", "baseColor": "stone",
"cssVariables": true, "cssVariables": true,
"prefix": "" "prefix": ""
}, },
"aliases": { "aliases": {
"components": "src/components", "components": "@/components",
"utils": "src/lib/utils", "utils": "@/lib/utils",
"ui": "src/components/ui" "ui": "@/components/ui",
} "lib": "@/lib",
"hooks": "@/hooks"
},
"iconLibrary": "lucide"
} }
+55
View File
@@ -0,0 +1,55 @@
const { defineConfig, globalIgnores } = require("eslint/config");
const globals = require("globals");
const { fixupConfigRules } = require("@eslint/compat");
const tsParser = require("@typescript-eslint/parser");
const reactRefresh = require("eslint-plugin-react-refresh");
const js = require("@eslint/js");
const { FlatCompat } = require("@eslint/eslintrc");
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});
module.exports = defineConfig([
{
languageOptions: {
globals: {
...globals.browser,
...Object.fromEntries(
Object.entries(globals.node).map(([key]) => [key, "off"]),
),
},
parser: tsParser,
},
extends: fixupConfigRules(
compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react-hooks/recommended",
"prettier",
),
),
plugins: {
"react-refresh": reactRefresh,
},
rules: {
"react-refresh/only-export-components": [
"warn",
{
allowConstantExport: true,
},
],
},
},
globalIgnores(["**/dist", "eslint.config.cjs"]),
]);
+1 -1
View File
@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/SR2.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title> <title>Vite + React + TS</title>
</head> </head>
+3923 -2417
View File
File diff suppressed because it is too large Load Diff
+37 -28
View File
@@ -6,43 +6,52 @@
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "tsc && vite build", "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" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@radix-ui/react-checkbox": "^1.0.4", "@hookform/resolvers": "^5.2.2",
"@radix-ui/react-icons": "^1.3.0", "@tailwindcss/vite": "^4.1.18",
"@radix-ui/react-label": "^2.0.2", "class-variance-authority": "^0.7.1",
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tooltip": "^1.0.7",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"date-fns": "^3.6.0", "date-fns": "^4.1.0",
"embla-carousel-react": "^8.0.2", "embla-carousel-react": "^8.6.0",
"lucide-react": "^0.562.0",
"radix-ui": "^1.4.3",
"react": "^18.2.0", "react": "^18.2.0",
"react-day-picker": "^8.10.1", "react-day-picker": "^9.13.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-router-dom": "^6.23.0", "react-hook-form": "^7.71.0",
"tailwind-merge": "^2.3.0" "react-router": "^7.12.0",
"swr": "^2.3.8",
"tailwind-merge": "^3.4.0",
"zod": "^4.3.5",
"zustand": "^5.0.9"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^20.12.8", "@eslint/compat": "^2.0.0",
"@eslint/eslintrc": "^3.3.3",
"@eslint/js": "^9.39.2",
"@iconify-icon/react": "^3.0.3",
"@tailwindcss/postcss": "^4.1.18",
"@types/node": "^22.15.30",
"@types/react": "^18.2.66", "@types/react": "^18.2.66",
"@types/react-dom": "^18.2.22", "@types/react-dom": "^18.2.22",
"@types/react-router-dom": "^5.3.3", "@typescript-eslint/eslint-plugin": "^8.52.0",
"@typescript-eslint/eslint-plugin": "^7.2.0", "@typescript-eslint/parser": "^8.52.0",
"@typescript-eslint/parser": "^7.2.0", "@vitejs/plugin-react-swc": "^4.2.2",
"@vitejs/plugin-react-swc": "^3.5.0", "eslint": "^9.39.2",
"autoprefixer": "^10.4.19", "eslint-config-prettier": "^10.1.8",
"eslint": "^8.57.0", "eslint-plugin-react-hooks": "^7.0.1",
"eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.26",
"eslint-plugin-react-refresh": "^0.4.6", "globals": "^17.0.0",
"postcss": "^8.4.38", "postcss": "^8.5.6",
"tailwindcss": "^3.4.3", "prettier": "^3.7.4",
"tailwindcss-animate": "^1.0.7", "prettier-plugin-tailwindcss": "^0.7.2",
"typescript": "^5.2.2", "tailwindcss": "^4.1.18",
"vite": "^5.2.0" "tw-animate-css": "^1.4.0",
"typescript": "^5.9.3",
"vite": "^6.4.1"
} }
} }
+2 -3
View File
@@ -1,6 +1,5 @@
export default { export default {
plugins: { plugins: {
tailwindcss: {}, "@tailwindcss/postcss": {},
autoprefixer: {},
}, },
} };
+2121
View File
File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 96 KiB

+12
View File
@@ -0,0 +1,12 @@
#!/bin/sh
for i in $(env | grep SOMNIAROOMS_)
do
key=$(echo $i | cut -d '=' -f 1)
value=$(echo $i | cut -d '=' -f 2-)
echo $key=$value
# sed All files
# find /usr/share/nginx/html -type f -exec sed -i "s|${key}|${value}|g" '{}' +
# sed JS and CSS only
find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|${key}|${value}|g" '{}' +
done
+29
View File
@@ -0,0 +1,29 @@
import { NewBooking, NewBookingResponse } from "@/model/Bookings";
import { fetcherWithFilter } from "./backend";
export async function APISendCreateBooking(bookingData: NewBooking | null) {
if (!bookingData) {
return {
bookingResponse: null,
isError: true,
};
}
try {
const rs = await fetcherWithFilter<NewBookingResponse>(
"/api/booking/create",
bookingData,
);
return {
bookingResponse: rs,
isError: false,
};
} catch (error) {
return {
bookingResponse: null,
isError: true,
errorMessage: error,
};
}
}
+28
View File
@@ -0,0 +1,28 @@
import { ConfigVar } from "@/model/ConfigVar";
import { fetcher, fetcherUnwraper } from "./backend";
import useSWR from "swr";
export function useAPIConfigVarList() {
const { data, error, isLoading } = useSWR<ConfigVar[]>(
"/api/config",
fetcherUnwraper,
);
return {
configVarList: data,
isLoading,
isError: error,
};
}
export function useAPIConfigVar(key: string) {
const url = `/api/config/var/${key}`;
const { data, error, isLoading } = useSWR<ConfigVar>(url, fetcher);
return {
configVar: data,
isLoading,
isError: error,
};
}
+28
View File
@@ -0,0 +1,28 @@
import { RoomCategory } from "@/model/RoomCategory";
import { fetcher, fetcherUnwraper } from "./backend";
import useSWR from "swr";
export function useAPIRoomCategoryList() {
const { data, error, isLoading } = useSWR<RoomCategory[]>(
"/api/room/category",
fetcherUnwraper,
);
return {
roomCategoryList: data,
isLoading,
isError: error,
};
}
export function useAPIRoomCategory(categoryId: number) {
const url = `/api/room/category/${categoryId}`;
const { data, error, isLoading } = useSWR<RoomCategory>(url, fetcher);
return {
roomCategory: data,
isLoading,
isError: error,
};
}
+35
View File
@@ -0,0 +1,35 @@
import { fetcherUnwraperWithFilter } from "./backend";
import useSWR from "swr";
import {
SearchPeriodRequest,
RoomAvailabity,
RoomPriceSearchResponse,
} from "@/model/RoomSearch";
export function useAPIRoomAvailability(filter: SearchPeriodRequest | null) {
const { data, isLoading, error } = useSWR(
filter ? ["/api/search/availability", filter] : null,
([url, request]) =>
fetcherUnwraperWithFilter<RoomAvailabity[]>(url, request),
);
return {
roomAvailabilityList: data,
isLoading,
isError: error,
};
}
export function useAPIRoomPrices(filter: SearchPeriodRequest | null) {
const { data, isLoading, error } = useSWR(
filter ? ["/api/search/prices", filter] : null,
([url, request]) =>
fetcherUnwraperWithFilter<RoomPriceSearchResponse[]>(url, request),
);
return {
roomPriceList: data,
isLoading,
isError: error,
};
}
+71
View File
@@ -0,0 +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);
export function fetcher<T>(endpoint: string): Promise<T> {
return fetch(url + endpoint, {
method: "GET",
}).then((r) => {
if (!r.ok) {
throw new Error(r.statusText);
}
const data = r.json();
return data as Promise<T>;
});
}
export function fetcherUnwraper<T>(endpoint: string): Promise<T> {
return fetch(url + endpoint)
.then((response) => {
if (!response.ok) {
throw new Error(response.statusText);
}
return response.json() as Promise<{ results: T }>;
})
.then((data) => {
return data.results;
});
}
export function fetcherWithFilter<T>(
endpoint: string,
body: NonNullable<unknown>,
): Promise<T> {
return fetch(url + endpoint, {
method: "POST",
body: JSON.stringify(body),
headers: {
"Content-Type": "application/json",
},
}).then((response) => {
if (!response.ok) {
throw new Error(response.statusText);
}
return response.json() as Promise<T>;
});
}
export function fetcherUnwraperWithFilter<T>(
endpoint: string,
body: NonNullable<unknown>,
): Promise<T> {
return fetch(url + endpoint, {
method: "POST",
body: JSON.stringify(body),
headers: {
"Content-Type": "application/json",
},
})
.then((response) => {
if (!response.ok) {
throw new Error(response.statusText);
}
return response.json() as Promise<{ results: T }>;
})
.then((data) => {
return data.results;
});
}
@@ -0,0 +1,65 @@
import { useNavigate } from "react-router";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "../ui/alert-dialog";
import { Button } from "../ui/button";
import { ConstsNav, ConstsTexts } from "@/utils/Consts";
type OnCancelClickFunction = () => void;
export function ContactUsDialog({
onCancelClick,
isOpen,
cancelButtonText = "Cancel",
}: {
cancelButtonText: string;
onCancelClick: OnCancelClickFunction;
isOpen: boolean;
}) {
const navigate = useNavigate();
const navToContactPage = (text: string) => {
navigate(ConstsNav.page_Contact, {
state: text,
});
};
return (
<AlertDialog open={isOpen}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{ConstsTexts.contactUsAlertDialog_title}
</AlertDialogTitle>
<AlertDialogDescription>
{ConstsTexts.contactUsAlertDialog_text}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel asChild>
<Button variant={"secondary"} onClick={onCancelClick}>
{cancelButtonText}
</Button>
</AlertDialogCancel>
<AlertDialogAction asChild>
<Button
variant={"link"}
onClick={() =>
navToContactPage("Contact us for a personalized quote!")
}
>
Go to contact page
</Button>
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
);
}
+175
View File
@@ -0,0 +1,175 @@
import { Card, CardContent } from "../ui/card";
import { Typography } from "../ui/typography";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "../ui/table";
import { Skeleton } from "../ui/skeleton";
import { useAppStore } from "@/store";
import { NumberSelector } from "../ui/number-selector";
import { NewBooking, NewBookingRoom } from "@/model/Bookings";
import { RoomItemCard } from "./room-item-card";
import { IconWithTooltip } from "../ui/icon-number-tooltip";
import { UserIcon } from "lucide-react";
import { makeSearchPeriodRequestFromSearchFilter } from "@/utils/utils";
import { SearchFilter } from "@/model/InternalTypes";
import { useRoomCategory, useRoomPrice } from "@/utils/apiHooks";
function RoomBooking({
roomCategoryId,
availableAmount,
}: {
roomCategoryId: number;
availableAmount: number;
}) {
const appSearchFilter: SearchFilter = useAppStore(
(state) => state.searchFilter,
);
const addNewRoom = useAppStore((state) => state.currentBookingAddRoom);
const bookingRooms: NewBooking | null = useAppStore(
(state) => state.currentBooking,
);
function onSelectedAmountUpdate(
guestNumber: number,
newCount: number,
price: number,
) {
const newRoom: NewBookingRoom = {
roomCategory: roomCategoryId,
guestNumber: guestNumber,
amount: newCount,
price: price,
};
addNewRoom(newRoom);
}
const getSelectedRoomAmount = (guestNumber: number | null) => {
let sum = 0;
if (bookingRooms) {
//Rooms with same category and, if guestNumber is set, rooms with same guestNumber.
bookingRooms.rooms
.filter((v) => {
const isSameCat = v.roomCategory == roomCategoryId;
const isSameGuestNum =
guestNumber != null ? v.guestNumber == guestNumber : true;
return isSameCat && isSameGuestNum;
})
.forEach((v) => (sum += v.amount));
}
return sum;
};
const totalSelectAmount = getSelectedRoomAmount(null);
const canAddMoreRooms: boolean = availableAmount > totalSelectAmount;
//This seems a little bit overkill, but IDK.
const fareFilter = makeSearchPeriodRequestFromSearchFilter(appSearchFilter);
const { value: roomCategory, isLoading: isLoadingCategory } =
useRoomCategory(roomCategoryId);
const { value: roomPriceList, isLoading: isLoadingPrices } = useRoomPrice(
fareFilter,
roomCategoryId,
);
const isLoading = isLoadingCategory || isLoadingPrices;
const isError = roomCategory == null;
if (isLoading) {
return <Skeleton className="mx-auto h-[150px] w-[600px]" />;
}
if (isError) {
return (
<Typography variant={"h3"} as="h3">
Sorry, there was an error loading data.
</Typography>
);
}
const hasPrices = roomPriceList != null && roomPriceList?.length > 0;
let priceTable = null;
if (hasPrices) {
//A row for each room guestNumber.
let tableRows = null;
if (!isLoadingPrices) {
tableRows = roomPriceList?.map((el) => {
const selectedRoomAmount =
totalSelectAmount > 0 ? getSelectedRoomAmount(el.guestNumber) : 0;
return (
<TableRow key={roomCategoryId + "-" + el.guestNumber}>
<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={canAddMoreRooms}
initialValue={selectedRoomAmount}
></NumberSelector>
</TableCell>
</TableRow>
);
});
}
//Element for
priceTable = (
<Table className="overflow-hidden">
<TableHeader>
<TableRow>
<TableHead>Guest number</TableHead>
<TableHead>Price</TableHead>
<TableHead>Amount</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{isLoadingPrices ? <Skeleton className="h-full w-full" /> : tableRows}
</TableBody>
</Table>
);
}
let roomCard = null;
if (roomCategory) {
roomCard = (
<RoomItemCard
room={roomCategory}
key={roomCategoryId}
className="z-20 border-4"
></RoomItemCard>
);
}
return (
<div className="relative sm:grid sm:grid-cols-40/60">
{roomCard}
<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">
<CardContent className="flex h-full w-full flex-col justify-center gap-4 p-5">
{hasPrices ? (
priceTable
) : (
<Typography variant={"largeText"}>No Prices available</Typography>
)}
<p>Rooms Available: {availableAmount}</p>
</CardContent>
</Card>
</div>
);
}
export default RoomBooking;
+100
View File
@@ -0,0 +1,100 @@
import { Separator } from "../ui/separator";
import { Card, CardContent } from "../ui/card";
import { Typography } from "../ui/typography";
import { UserIcon } from "lucide-react";
import { RoomCategory } from "@/model/RoomCategory";
import { IconWithTooltip } from "../ui/icon-number-tooltip";
import defaultRoomImg from "@/res/SomniaRoomImage.svg";
import { cn } from "@/lib/utils";
import { Icon } from "@iconify-icon/react";
import { useConfigVariable } from "@/utils/apiHooks";
import { eConfigVarKeys } from "@/model/ConfigVar";
interface RoomItemCardProps {
room: RoomCategory;
className?: string;
}
const defaultRoom: RoomCategory = {
id: -1,
name: "Sample Room",
description: "Lorem Ipsum",
maxGuestNum: 2,
orderHomePage: undefined,
roomCategoryPhotos: [],
roomCategoryBedTypes: [],
};
export function RoomItemCard({
room = defaultRoom,
className,
}: RoomItemCardProps) {
const { value: varPhotoAspect } = useConfigVariable(
eConfigVarKeys.varPhotoAspectRatio,
"4/3",
);
//FIXME: Use PhotoOrder.
const getRoomMainPhoto = () => {
if (room.roomCategoryPhotos.length < 0) {
return defaultRoomImg;
}
return room.roomCategoryPhotos.at(0)?.path ?? defaultRoomImg;
};
const bedTypeIconList = room.roomCategoryBedTypes.map((e) => {
return (
<IconWithTooltip
key={room.id.toString() + e.bedTypeIcon}
tooltipText={e.bedTypeName}
label={e.amount.toString()}
>
<Icon icon={e.bedTypeIcon} height="auto" />
</IconWithTooltip>
);
});
const photoAspectRationClassName = "aspect-" + varPhotoAspect;
return (
<Card key={room.id} className={cn(className, "relative", "py-0")}>
{/* <CardHeader className="p-0 m-0 mb-5">
</CardHeader> */}
<CardContent className="flex h-full w-full flex-col p-0">
<div className="">
<img
src={getRoomMainPhoto()}
className={
photoAspectRationClassName + " w-full rounded-t-md object-cover"
}
></img>
<Separator className="my-0 border-2" />
</div>
<div>
<Typography variant={"h2"} as="h2" className="border-none px-4 pt-4">
{room.name}
</Typography>
</div>
<div>
<Typography variant={"p"} as="h2" className="px-5">
{room.description}
</Typography>
</div>
<div className="mt-auto pb-4">
<Separator className="my-4" />
<div className="flex justify-around">
<div className="flex flex-row gap-2">{bedTypeIconList}</div>
<div className="flex flex-row">
<IconWithTooltip
tooltipText="Max. gests"
label={room.maxGuestNum?.toString()}
labelPosition={"right"}
>
<UserIcon />
</IconWithTooltip>
</div>
</div>
</div>
</CardContent>
</Card>
);
}
+152
View File
@@ -0,0 +1,152 @@
import { Separator } from "../ui/separator";
import { Card, CardContent, CardHeader } from "../ui/card";
import { Typography } from "../ui/typography";
import "react-day-picker/dist/style.css";
import { DatePickerWithRange } from "../ui/dateRange-picker";
import { Button } from "../ui/button";
import { SearchIcon } from "lucide-react";
import { useState } from "react";
import { SearchFilter } from "@/model/InternalTypes";
import { DateRange } from "react-day-picker";
import { isValidSearchFilter } from "@/utils/utils";
import { useNavigate } from "react-router";
import { ConstsNav, ConstsTexts } from "@/utils/Consts";
import { ContactUsDialog } from "../Dialogs/ContactUsDialog";
import { useCheckForNightCount } from "@/utils/hooks";
type funOnSearchClick = (newFilter: SearchFilter) => void;
export function SearchFilterCard({
onSearchClick,
initialsearchFilter,
}: {
onSearchClick?: funOnSearchClick;
initialsearchFilter?: SearchFilter;
}) {
//Local Filter state.
const [searchFilter, setSearchFilter] = useState<SearchFilter | null>(
initialsearchFilter ?? null,
);
const [errorMsg, setErrorMsg] = useState<string | null>(null);
const [isContactDialogOpen, setIsContactDialogOpen] =
useState<boolean>(false);
const {
isLoading: isNightCountLoading,
isOverApiMax: nightCountCheckIsOverApi,
shouldShowContactDialog: nightCountShowDialog,
} = useCheckForNightCount(searchFilter);
const navigate = useNavigate();
// Validate and call callback on btSearch click.
const btSearchClick = () => {
if (!isValidSearchFilter(searchFilter)) {
setErrorMsg("Select a valid 'from' and 'to' dates!");
return;
}
//Check for max night count.
//API Config vars values must be loaded before this! Unexpected behaviours may happen otherwise.
if (nightCountCheckIsOverApi) {
//Navigate to contact page and show info.
navigate(ConstsNav.page_Contact, {
state: ConstsTexts.navToContact_maxAllowedNightCount,
});
return;
}
if (nightCountShowDialog) {
//Show Alert dialog.
setIsContactDialogOpen(true);
//Page onSearch action will be executed based on the dialog result.
return;
}
//Execute page onSearch action.
if (onSearchClick) {
onSearchClick(searchFilter);
}
};
// Handle internal Searchfilter updates.
const updateDateRange = (newRange: DateRange) => {
const newSearchFilter = {
...searchFilter,
dateRange: newRange,
};
setSearchFilter(newSearchFilter);
if (isValidSearchFilter(newSearchFilter)) {
setErrorMsg(null);
}
};
const onContactDialogClose = () => {
setIsContactDialogOpen(false);
if (!isValidSearchFilter(searchFilter)) {
return;
}
if (onSearchClick) {
onSearchClick(searchFilter);
}
};
const isSearchButtonDisabled = isNightCountLoading;
const datePickerElement =
searchFilter == null ? (
<DatePickerWithRange
updateDateRange={updateDateRange}
allowPast={false}
></DatePickerWithRange>
) : (
<DatePickerWithRange
updateDateRange={updateDateRange}
allowPast={false}
startDate={searchFilter.dateRange.from}
endDate={searchFilter.dateRange.to}
></DatePickerWithRange>
);
const errorMsgLabel = (
<Typography variant={"errorText"} className="mt-2 text-lg">
{errorMsg}
</Typography>
);
const searchHasErrors = errorMsg != null;
return (
<>
<ContactUsDialog
isOpen={isContactDialogOpen}
onCancelClick={onContactDialogClose}
cancelButtonText="Continue Search"
/>
<Card>
<CardHeader className="m-0 mb-5 p-0">
<Typography variant={"h2"} as="h1" className="mx-5 py-2">
Reserva ahora
</Typography>
</CardHeader>
<CardContent>
{datePickerElement}
{searchHasErrors && errorMsgLabel}
<Separator className="my-4" />
<Button
size={"lg"}
onClick={btSearchClick}
disabled={isSearchButtonDisabled}
variant={searchHasErrors ? "destructive" : "default"}
>
<SearchIcon className="me-2 text-primary-foreground" />
<Typography variant={"h3"} className="text-primary-foreground">
Buscar
</Typography>
</Button>
</CardContent>
</Card>
</>
);
}
-19
View File
@@ -1,19 +0,0 @@
.footerComponent {
position: relative;
width: 100vw;
margin-inline: auto;
display: grid;
grid-template-columns: 60% 40%;
align-items: center;
background-color: rgb(0, 71, 71);
border-radius: 10pt;
padding-block: 10px;
left: 0;
bottom: 0;
}
+122 -14
View File
@@ -1,22 +1,130 @@
import "./app-footer.css" import { Separator } from "./ui/separator";
import { Typography } from "./ui/typography";
import { eConfigVarKeys } from "@/model/ConfigVar";
import {
c_sominaRooms_webpage,
c_somniaRooms_notice_text,
} from "@/utils/Consts";
import { Skeleton } from "./ui/skeleton";
import { Mail, Phone } from "lucide-react";
import { Link } from "react-router";
import { useConfigVariable } from "@/utils/apiHooks";
function AppFooter() { function AppFooter() {
const { value: varCompanyLogo, isLoading: isLogoLoading } = useConfigVariable(
eConfigVarKeys.varCompanyLogo,
"public/SR2.svg",
);
const { value: varCompanyLogoSize, isLoading: isLogoSizeLoading } =
useConfigVariable(eConfigVarKeys.varCompanyLogoSize, "64px");
const { value: varCompanyName, isLoading: isNameLoading } = useConfigVariable(
eConfigVarKeys.varCompanyName,
"Somnia Rooms",
);
const { value: varCompanyAddress, isLoading: isAddressLoading } =
useConfigVariable(eConfigVarKeys.varCompanyAddress, "");
const { value: varCompanyPhone, isLoading: isPhoneLoading } =
useConfigVariable(eConfigVarKeys.varCompanyPhone, "");
const { value: varCompanyMail, isLoading: isMailLoading } = useConfigVariable(
eConfigVarKeys.varCompanyEmail,
"",
);
const logoSizeClass = "w-[" + varCompanyLogoSize + "]";
const isLoading =
isLogoLoading ||
isLogoSizeLoading ||
isNameLoading ||
isAddressLoading ||
isPhoneLoading ||
isMailLoading;
const getCompanyElement = () => {
if (isLoading) {
return <Skeleton className="h-16" />;
}
return (
<>
<img
src={varCompanyLogo}
alt="company-logo"
className={logoSizeClass}
/>
<div>
<Typography variant={"p_inline"} className="text-nowrap">
{varCompanyName} - &copy; {new Date().getUTCFullYear()}
</Typography>
<Typography variant={"p_inline"}>{varCompanyAddress}</Typography>
</div>
</>
);
};
const getContactElement = () => {
if (isLoading) {
return <Skeleton className="w-16" />;
}
return (
<>
<li className="flex items-center gap-2">
<Phone size={"1.2em"} />
<Typography variant={"p_inline"}>{varCompanyPhone}</Typography>
</li>
<li className="flex items-center gap-2">
<Mail size={"1.2em"} />
<Typography variant={"p_inline"}>{varCompanyMail}</Typography>
</li>
</>
);
};
return ( return (
<div className="footerComponent"> <footer className="w-full p-8 pt-0">
<div className="footerColumn"> <Separator className="my-4" />
Created with Love by me :) <div className="flex flex-row flex-wrap items-center justify-center gap-x-12 gap-y-6 text-center lg:justify-between">
<div className="flex flex-row items-center gap-2">
{getCompanyElement()}
</div> </div>
<div className="footerColumn"> <ul className="flex flex-wrap items-start gap-x-10 gap-y-2 px-4 py-4">
<p>Más información</p> <li>
<ul> <ul className="text-start">
<li>Info</li> <li>
<li>Info2</li> <Typography variant={"largeText"} className="text-start">
<li>Info3</li> Legal
</Typography>
</li>
<li>
<Typography asChild className="hover:text-blue-500">
<Link to={"terms"}>Terms and conditions</Link>
</Typography>
</li>
<li>
<Typography asChild className="hover:text-blue-500">
<Link to={"privacy"}>Privacy policy</Link>
</Typography>
</li>
</ul> </ul>
</div> </li>
</div> <li>
) <ul>
<li>
<Typography variant={"largeText"} className="text-start">
Contact Us
</Typography>
</li>
{getContactElement()}
</ul>
</li>
</ul>
</div>
<Separator className="my-4" />
<Typography className="text-center" variant={"mutedText"}>
<a href={c_sominaRooms_webpage}>{c_somniaRooms_notice_text}</a>
</Typography>
</footer>
);
} }
export default AppFooter export default AppFooter;
-18
View File
@@ -1,18 +0,0 @@
.headerContainer {
display: flex;
flex-flow: row nowrap;
column-gap: 25px;
justify-content: space-around;
align-items: center;
height: 80px;
margin-inline: auto;
background-color: rgb(0, 71, 71);
border-radius: 10pt;
}
.headerElement {
padding: 6px;
}
+75 -14
View File
@@ -1,20 +1,81 @@
import "./app-header.css" import { ModeToggle } from "./mode-toggle";
import { Button } from "./ui/button";
import { Card, CardContent } from "./ui/card";
import { Typography } from "./ui/typography";
import { Link } from "react-router";
import { Bed, BookAIcon, HomeIcon } from "lucide-react";
import { eConfigVarKeys } from "@/model/ConfigVar";
import { Skeleton } from "./ui/skeleton";
import { useConfigVariable } from "@/utils/apiHooks";
function AppHeader() { function AppHeader() {
const { value: varCompanyLogo, isLoading: isLogoLoading } = useConfigVariable(
eConfigVarKeys.varCompanyLogo,
"public/SR2.svg",
);
const { value: varCompanyLogoSize, isLoading: isLogoSizeLoading } =
useConfigVariable(eConfigVarKeys.varCompanyLogoSize, "64px");
const { value: varCompanyName, isLoading: isNameLoading } = useConfigVariable(
eConfigVarKeys.varCompanyName,
"Somnia Rooms",
);
const { value: varCompanyWeb, isLoading: isWebLoading } = useConfigVariable(
eConfigVarKeys.varCompanyWebsite,
"#",
);
const isLoading =
isLogoLoading || isNameLoading || isWebLoading || isLogoSizeLoading;
const getElementLogo = () => {
if (isLoading) {
return <Skeleton className="w-16" />;
}
const logoSizeClass = "w-[" + varCompanyLogoSize + "]";
return (
<div className="relative flex flex-row items-center gap-2">
<img src={varCompanyLogo} className={logoSizeClass}></img>
<Typography variant={"largeText"} className="text-nowrap">
{varCompanyName}
</Typography>
<a href={varCompanyWeb} className="absolute h-full w-full"></a>
</div>
);
};
return ( return (
<div className="headerContainer"> <header>
<div className="headerElement"> <Card className="mx-10 my-4 items-center py-0">
Hostal del Val <CardContent className="w-full py-2">
</div> <div className="flex flex-col items-center justify-around gap-y-3 md:flex-row">
<div className="headerElement"> {getElementLogo()}
Reservar <div className="flex flex-row items-center">
</div> <Link to={`home`}>
<div className="headerElement"> <Button variant="ghost" className="h-15 hover:cursor-pointer">
Contacto <HomeIcon className="mx-auto" />
</div> Home
</div> </Button>
) </Link>
<Link to={`search`}>
<Button variant="ghost" className="h-15 hover:cursor-pointer">
<BookAIcon className="mx-auto" />
Reservar
</Button>
</Link>
<Link to={`home`}>
<Button variant="ghost" className="h-15 hover:cursor-pointer">
<Bed className="mx-auto" />
Mi reserva
</Button>
</Link>
</div>
<ModeToggle />
</div>
</CardContent>
</Card>
</header>
);
} }
export default AppHeader export default AppHeader;
@@ -0,0 +1,23 @@
function BackendConnectionStatus({
isLoading,
isError,
}: {
isLoading?: boolean;
isError?: boolean;
}) {
const BACKEND_HOST = import.meta.env.VITE_BACKEND_HOST;
const BACKEND_PORT = import.meta.env.VITE_BACKEND_PORT;
return (
<div>
<p>
Conected to Back-End at: {BACKEND_HOST} - {BACKEND_PORT}
</p>
<p>
Conection Status: {isError ? "ERROR" : isLoading ? "LOADING" : "LOADED"}
</p>
</div>
);
}
export default BackendConnectionStatus;
+174
View File
@@ -0,0 +1,174 @@
import { useAppStore } from "@/store";
import { Card, CardContent, CardHeader } from "../ui/card";
import { Typography } from "../ui/typography";
import { differenceInDays } from "date-fns";
import { Separator } from "../ui/separator";
import { Button } from "../ui/button";
import { useAPIRoomCategoryList } from "@/api/api-roomCategories";
import { IconWithTooltip } from "../ui/icon-number-tooltip";
import { UserIcon } from "lucide-react";
import { useCheckForGuestNumber } from "@/utils/hooks";
import { useState } from "react";
import { useNavigate } from "react-router";
import { ConstsNav, ConstsTexts } from "@/utils/Consts";
import { ContactUsDialog } from "../Dialogs/ContactUsDialog";
type OnBookingClickFunction = () => void;
type BookingDetailsModes = "Book" | "View";
export function BookingDetails({
onBookingConfirm,
mode,
}: {
onBookingConfirm?: OnBookingClickFunction;
mode: BookingDetailsModes;
}) {
const [isContactDialogOpen, setIsContactDialogOpen] =
useState<boolean>(false);
const bookingData = useAppStore((state) => state.currentBooking);
const { roomCategoryList } = useAPIRoomCategoryList();
const navigate = useNavigate();
const {
isLoading: isGuestNumberCheckLoading,
isOverApiMax: guestNumberCheckIsOverApi,
shouldShowContactDialog: guestNumberShowDialog,
} = useCheckForGuestNumber(bookingData);
const onBtBookingClick = () => {
//Check for Guest Number limits.
//API Config vars values must be loaded before this! Unexpected behaviours may happen otherwise.
if (guestNumberCheckIsOverApi) {
//Navigate to contact page and show info.
navigate(ConstsNav.page_Contact, {
state: ConstsTexts.navToContact_maxAllowedGuestNumber,
});
return;
}
if (guestNumberShowDialog) {
//Show Alert dialog.
setIsContactDialogOpen(true);
//Page onSearch action will be executed based on the dialog result.
return;
}
if (onBookingConfirm) {
onBookingConfirm();
}
};
const onContactDialogClose = () => {
if (onBookingConfirm) {
onBookingConfirm();
}
};
if (!bookingData || bookingData.rooms.length <= 0) {
return (
<Card>
<CardHeader>
<Typography variant={"h2"} as="h2">
Your Booking
</Typography>
</CardHeader>
<CardContent>
<Typography variant={"h3"}>No rooms added yet</Typography>
</CardContent>
</Card>
);
}
const roomList = bookingData.rooms.map((room) => {
const category = roomCategoryList?.find((c) => c.id == room.roomCategory);
const photo = category?.roomCategoryPhotos.at(0);
return (
<Card
key={room.roomCategory.toString() + room.guestNumber.toString()}
className="my-3 flex flex-row bg-accent py-0"
>
{photo && (
<img
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(
(acc, room) => acc + room.price * room.amount,
0,
);
return (
<>
<ContactUsDialog
isOpen={isContactDialogOpen}
cancelButtonText="Continue booking"
onCancelClick={onContactDialogClose}
/>
<Card>
<CardHeader>
<Typography variant={"h2"} as="h2">
Your Booking
</Typography>
</CardHeader>
<CardContent>
<Typography variant={"h3"}>Your Dates</Typography>
<Typography variant={"largeText"}>
Arrival: {bookingData.arrivalDate.toLocaleDateString()} - Departure:{" "}
{bookingData.departureDate.toLocaleDateString()} <br></br>
Number of nights:{" "}
{differenceInDays(
bookingData.departureDate,
bookingData.arrivalDate,
)}
</Typography>
<Separator className="my-2"></Separator>
<Typography variant={"h3"}>Your Rooms</Typography>
<div className="">{roomList}</div>
<Separator className="my-2"></Separator>
<Typography variant={"h3"}>Total Price</Typography>
<Typography variant={"h3"}>{totalPrice / 100} €</Typography>
{mode == "Book" && (
<Button
className="my-2"
onClick={onBtBookingClick}
disabled={isGuestNumberCheckLoading}
>
<Typography
variant={"largeText"}
className="text-primary-foreground"
>
Book it!
</Typography>
</Button>
)}
</CardContent>
</Card>
</>
);
}
+40
View File
@@ -0,0 +1,40 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { useTheme } from "@/components/theme-provider";
export function ModeToggle() {
const { setTheme } = useTheme();
return (
<DropdownMenu>
<DropdownMenuTrigger>
<Button variant="outline" size="icon">
<SunIcon className="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90" />
<MoonIcon className="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0" />
<span className="sr-only">Toggle theme</span>
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onClick={() => setTheme("light")}>
<SunIcon className="h-[1.2rem] w-[1.2rem] scale-100" />
Light
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme("dark")}>
<MoonIcon className="h-[1.2rem] w-[1.2rem] scale-100" />
Dark
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme("system")}>
<MonitorIcon className="h-[1.2rem] w-[1.2rem] scale-100" />
System
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
);
}
+74
View File
@@ -0,0 +1,74 @@
import { createContext, useContext, useEffect, useState } from "react";
type Theme = "dark" | "light" | "system";
type ThemeProviderProps = {
children: React.ReactNode;
defaultTheme?: Theme;
storageKey?: string;
};
type ThemeProviderState = {
theme: Theme;
setTheme: (theme: Theme) => void;
};
const initialState: ThemeProviderState = {
theme: "system",
setTheme: () => null,
};
const ThemeProviderContext = createContext<ThemeProviderState>(initialState);
export function ThemeProvider({
children,
defaultTheme = "system",
storageKey = "vite-ui-theme",
...props
}: ThemeProviderProps) {
const [theme, setTheme] = useState<Theme>(
() => (localStorage.getItem(storageKey) as Theme) || defaultTheme,
);
useEffect(() => {
const root = window.document.documentElement;
root.classList.remove("light", "dark");
if (theme === "system") {
const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
.matches
? "dark"
: "light";
root.classList.add(systemTheme);
return;
}
root.classList.add(theme);
}, [theme]);
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);
if (context === undefined)
throw new Error("useTheme must be used within a ThemeProvider");
return context;
};
+155
View File
@@ -0,0 +1,155 @@
import * as React from "react";
import { AlertDialog as AlertDialogPrimitive } from "radix-ui";
import { cn } from "@/lib/utils";
import { buttonVariants } from "@/components/ui/button";
function AlertDialog({
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
return <AlertDialogPrimitive.Root data-slot="alert-dialog" {...props} />;
}
function AlertDialogTrigger({
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Trigger>) {
return (
<AlertDialogPrimitive.Trigger data-slot="alert-dialog-trigger" {...props} />
);
}
function AlertDialogPortal({
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Portal>) {
return (
<AlertDialogPrimitive.Portal data-slot="alert-dialog-portal" {...props} />
);
}
function AlertDialogOverlay({
className,
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Overlay>) {
return (
<AlertDialogPrimitive.Overlay
data-slot="alert-dialog-overlay"
className={cn(
"fixed inset-0 z-50 bg-black/50 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0",
className,
)}
{...props}
/>
);
}
function AlertDialogContent({
className,
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Content>) {
return (
<AlertDialogPortal>
<AlertDialogOverlay />
<AlertDialogPrimitive.Content
data-slot="alert-dialog-content"
className={cn(
"fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border bg-background p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95 sm:max-w-lg",
className,
)}
{...props}
/>
</AlertDialogPortal>
);
}
function AlertDialogHeader({
className,
...props
}: React.ComponentProps<"div">) {
return (
<div
data-slot="alert-dialog-header"
className={cn("flex flex-col gap-2 text-center sm:text-left", className)}
{...props}
/>
);
}
function AlertDialogFooter({
className,
...props
}: React.ComponentProps<"div">) {
return (
<div
data-slot="alert-dialog-footer"
className={cn(
"flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
className,
)}
{...props}
/>
);
}
function AlertDialogTitle({
className,
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Title>) {
return (
<AlertDialogPrimitive.Title
data-slot="alert-dialog-title"
className={cn("text-lg font-semibold", className)}
{...props}
/>
);
}
function AlertDialogDescription({
className,
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Description>) {
return (
<AlertDialogPrimitive.Description
data-slot="alert-dialog-description"
className={cn("text-sm text-muted-foreground", className)}
{...props}
/>
);
}
function AlertDialogAction({
className,
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Action>) {
return (
<AlertDialogPrimitive.Action
className={cn(buttonVariants(), className)}
{...props}
/>
);
}
function AlertDialogCancel({
className,
...props
}: React.ComponentProps<typeof AlertDialogPrimitive.Cancel>) {
return (
<AlertDialogPrimitive.Cancel
className={cn(buttonVariants({ variant: "outline" }), className)}
{...props}
/>
);
}
export {
AlertDialog,
AlertDialogPortal,
AlertDialogOverlay,
AlertDialogTrigger,
AlertDialogContent,
AlertDialogHeader,
AlertDialogFooter,
AlertDialogTitle,
AlertDialogDescription,
AlertDialogAction,
AlertDialogCancel,
};
-36
View File
@@ -1,36 +0,0 @@
import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority"
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",
{
variants: {
variant: {
default:
"border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
secondary:
"border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
destructive:
"border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
outline: "text-foreground",
},
},
defaultVariants: {
variant: "default",
},
}
)
export interface BadgeProps
extends React.HTMLAttributes<HTMLDivElement>,
VariantProps<typeof badgeVariants> {}
function Badge({ className, variant, ...props }: BadgeProps) {
return (
<div className={cn(badgeVariants({ variant }), className)} {...props} />
)
}
export { Badge, badgeVariants }
+42 -36
View File
@@ -1,57 +1,63 @@
import * as React from "react" import * as React from "react";
import { Slot } from "@radix-ui/react-slot" import { Slot as SlotPrimitive } from "radix-ui";
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( 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", "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
{ {
variants: { variants: {
variant: { variant: {
default: default: "bg-primary text-primary-foreground hover:bg-primary/90",
"bg-primary text-primary-foreground shadow hover:bg-primary/90",
destructive: destructive:
"bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90", "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
outline: outline:
"border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground", "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
secondary: secondary:
"bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80", "bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground", ghost:
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
link: "text-primary underline-offset-4 hover:underline", link: "text-primary underline-offset-4 hover:underline",
}, },
size: { size: {
default: "h-9 px-4 py-2", default: "h-9 px-4 py-2 has-[>svg]:px-3",
sm: "h-8 rounded-md px-3 text-xs", sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
lg: "h-10 rounded-md px-8", lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
icon: "h-9 w-9", icon: "size-9",
"icon-sm": "size-8",
"icon-lg": "size-10",
}, },
}, },
defaultVariants: { defaultVariants: {
variant: "default", variant: "default",
size: "default", size: "default",
}, },
} },
) );
export interface ButtonProps function Button({
extends React.ButtonHTMLAttributes<HTMLButtonElement>, className,
VariantProps<typeof buttonVariants> { variant = "default",
asChild?: boolean size = "default",
asChild = false,
...props
}: React.ComponentProps<"button"> &
VariantProps<typeof buttonVariants> & {
asChild?: boolean;
}) {
const Comp = asChild ? SlotPrimitive.Slot : "button";
return (
<Comp
data-slot="button"
data-variant={variant}
data-size={size}
className={cn(buttonVariants({ variant, size, className }))}
{...props}
/>
);
} }
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>( // eslint-disable-next-line react-refresh/only-export-components
({ className, variant, size, asChild = false, ...props }, ref) => { export { Button, buttonVariants };
const Comp = asChild ? Slot : "button"
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
)
}
)
Button.displayName = "Button"
export { Button, buttonVariants }
+195 -48
View File
@@ -1,71 +1,218 @@
/* eslint-disable @typescript-eslint/no-unused-vars */ import * as React from "react";
import * as React from "react" import {
import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons" ChevronDownIcon,
import { DayPicker } from "react-day-picker" ChevronLeftIcon,
ChevronRightIcon,
} from "lucide-react";
import {
DayPicker,
getDefaultClassNames,
type DayButton,
} from "react-day-picker";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
import { buttonVariants } from "@/components/ui/button" import { Button, buttonVariants } from "@/components/ui/button";
export type CalendarProps = React.ComponentProps<typeof DayPicker>
function Calendar({ function Calendar({
className, className,
classNames, classNames,
showOutsideDays = true, showOutsideDays = true,
captionLayout = "label",
buttonVariant = "ghost",
formatters,
components,
...props ...props
}: CalendarProps) { }: React.ComponentProps<typeof DayPicker> & {
buttonVariant?: React.ComponentProps<typeof Button>["variant"];
}) {
const defaultClassNames = getDefaultClassNames();
return ( return (
<DayPicker <DayPicker
showOutsideDays={showOutsideDays} showOutsideDays={showOutsideDays}
className={cn("p-3", className)} className={cn(
"group/calendar bg-background p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
String.raw`rtl:**:[.rdp-button\_next>svg]:rotate-180`,
String.raw`rtl:**:[.rdp-button\_previous>svg]:rotate-180`,
className,
)}
captionLayout={captionLayout}
formatters={{
formatMonthDropdown: (date) =>
date.toLocaleString("default", { month: "short" }),
...formatters,
}}
classNames={{ classNames={{
months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0", root: cn("w-fit", defaultClassNames.root),
month: "space-y-4", months: cn(
caption: "flex justify-center pt-1 relative items-center", "flex gap-4 flex-col md:flex-row relative",
caption_label: "text-sm font-medium", defaultClassNames.months,
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"
), ),
nav_button_previous: "absolute left-1", month: cn("flex flex-col w-full gap-4", defaultClassNames.month),
nav_button_next: "absolute right-1", nav: cn(
table: "w-full border-collapse space-y-1", "flex items-center gap-1 w-full absolute top-0 inset-x-0 justify-between",
head_row: "flex", defaultClassNames.nav,
head_cell: ),
"text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]", button_previous: cn(
row: "flex w-full mt-2", buttonVariants({ variant: buttonVariant }),
cell: cn( "size-(--cell-size) aria-disabled:opacity-50 p-0 select-none",
"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", defaultClassNames.button_previous,
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" button_next: cn(
: "[&:has([aria-selected])]:rounded-md" buttonVariants({ variant: buttonVariant }),
"size-(--cell-size) aria-disabled:opacity-50 p-0 select-none",
defaultClassNames.button_next,
),
month_caption: cn(
"flex items-center justify-center h-(--cell-size) w-full px-(--cell-size)",
defaultClassNames.month_caption,
),
dropdowns: cn(
"w-full flex items-center text-sm font-medium justify-center h-(--cell-size) gap-1.5",
defaultClassNames.dropdowns,
),
dropdown_root: cn(
"relative has-focus:border-ring border border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] rounded-md",
defaultClassNames.dropdown_root,
),
dropdown: cn(
"absolute bg-popover inset-0 opacity-0",
defaultClassNames.dropdown,
),
caption_label: cn(
"select-none font-medium",
captionLayout === "label"
? "text-sm"
: "rounded-md pl-2 pr-1 flex items-center gap-1 text-sm h-8 [&>svg]:text-muted-foreground [&>svg]:size-3.5",
defaultClassNames.caption_label,
),
table: "w-full border-collapse",
weekdays: cn("flex", defaultClassNames.weekdays),
weekday: cn(
"text-muted-foreground rounded-md flex-1 font-normal text-[0.8rem] select-none",
defaultClassNames.weekday,
),
week: cn("flex w-full mt-2", defaultClassNames.week),
week_number_header: cn(
"select-none w-(--cell-size)",
defaultClassNames.week_number_header,
),
week_number: cn(
"text-[0.8rem] select-none text-muted-foreground",
defaultClassNames.week_number,
), ),
day: cn( day: cn(
buttonVariants({ variant: "ghost" }), "relative w-full h-full p-0 text-center [&:last-child[data-selected=true]_button]:rounded-r-md group/day aspect-square select-none",
"h-8 w-8 p-0 font-normal aria-selected:opacity-100" props.showWeekNumber
? "[&:nth-child(2)[data-selected=true]_button]:rounded-l-md"
: "[&:first-child[data-selected=true]_button]:rounded-l-md",
defaultClassNames.day,
), ),
day_range_start: "day-range-start", range_start: cn(
day_range_end: "day-range-end", "rounded-l-md bg-accent",
day_selected: defaultClassNames.range_start,
"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground", ),
day_today: "bg-accent text-accent-foreground", range_middle: cn("rounded-none", defaultClassNames.range_middle),
day_outside: range_end: cn("rounded-r-md bg-accent", defaultClassNames.range_end),
"day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30", today: cn(
day_disabled: "text-muted-foreground opacity-50", "bg-accent text-accent-foreground rounded-md data-[selected=true]:rounded-none",
day_range_middle: defaultClassNames.today,
"aria-selected:bg-accent aria-selected:text-accent-foreground", ),
day_hidden: "invisible", outside: cn(
"text-muted-foreground aria-selected:text-muted-foreground",
defaultClassNames.outside,
),
disabled: cn(
"text-muted-foreground opacity-50",
defaultClassNames.disabled,
),
hidden: cn("invisible", defaultClassNames.hidden),
...classNames, ...classNames,
}} }}
components={{ components={{
IconLeft: ({ ...props }) => <ChevronLeftIcon className="h-4 w-4" />, Root: ({ className, rootRef, ...props }) => {
IconRight: ({ ...props }) => <ChevronRightIcon className="h-4 w-4" />, return (
<div
data-slot="calendar"
ref={rootRef}
className={cn(className)}
{...props}
/>
);
},
Chevron: ({ className, orientation, ...props }) => {
if (orientation === "left") {
return (
<ChevronLeftIcon className={cn("size-4", className)} {...props} />
);
}
if (orientation === "right") {
return (
<ChevronRightIcon
className={cn("size-4", className)}
{...props}
/>
);
}
return (
<ChevronDownIcon className={cn("size-4", className)} {...props} />
);
},
DayButton: CalendarDayButton,
WeekNumber: ({ children, ...props }) => {
return (
<td {...props}>
<div className="flex size-(--cell-size) items-center justify-center text-center">
{children}
</div>
</td>
);
},
...components,
}} }}
{...props} {...props}
/> />
) );
} }
Calendar.displayName = "Calendar"
export { Calendar } function CalendarDayButton({
className,
day,
modifiers,
...props
}: React.ComponentProps<typeof DayButton>) {
const defaultClassNames = getDefaultClassNames();
const ref = React.useRef<HTMLButtonElement>(null);
React.useEffect(() => {
if (modifiers.focused) ref.current?.focus();
}, [modifiers.focused]);
return (
<Button
ref={ref}
variant="ghost"
size="icon"
data-day={day.date.toLocaleDateString()}
data-selected-single={
modifiers.selected &&
!modifiers.range_start &&
!modifiers.range_end &&
!modifiers.range_middle
}
data-range-start={modifiers.range_start}
data-range-end={modifiers.range_end}
data-range-middle={modifiers.range_middle}
className={cn(
"flex aspect-square size-auto w-full min-w-(--cell-size) flex-col gap-1 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-[3px] group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:rounded-none data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground dark:hover:text-accent-foreground [&>span]:text-xs [&>span]:opacity-70",
defaultClassNames.day,
className,
)}
{...props}
/>
);
}
export { Calendar, CalendarDayButton };
+84 -68
View File
@@ -1,76 +1,92 @@
import * as React from "react" import * as React from "react";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
const Card = React.forwardRef< function Card({ className, ...props }: React.ComponentProps<"div">) {
HTMLDivElement, return (
React.HTMLAttributes<HTMLDivElement> <div
>(({ className, ...props }, ref) => ( data-slot="card"
<div className={cn(
ref={ref} "flex flex-col gap-6 rounded-xl border bg-card py-6 text-card-foreground shadow-sm",
className={cn( className,
"rounded-xl border bg-card text-card-foreground shadow", )}
className {...props}
)} />
{...props} );
/> }
))
Card.displayName = "Card"
const CardHeader = React.forwardRef< function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
HTMLDivElement, return (
React.HTMLAttributes<HTMLDivElement> <div
>(({ className, ...props }, ref) => ( data-slot="card-header"
<div className={cn(
ref={ref} "@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-2 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
className={cn("flex flex-col space-y-1.5 p-6", className)} className,
{...props} )}
/> {...props}
)) />
CardHeader.displayName = "CardHeader" );
}
const CardTitle = React.forwardRef< function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
HTMLParagraphElement, return (
React.HTMLAttributes<HTMLHeadingElement> <div
>(({ className, ...props }, ref) => ( data-slot="card-title"
<h3 className={cn("leading-none font-semibold", className)}
ref={ref} {...props}
className={cn("font-semibold leading-none tracking-tight", className)} />
{...props} );
/> }
))
CardTitle.displayName = "CardTitle"
const CardDescription = React.forwardRef< function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
HTMLParagraphElement, return (
React.HTMLAttributes<HTMLParagraphElement> <div
>(({ className, ...props }, ref) => ( data-slot="card-description"
<p className={cn("text-sm text-muted-foreground", className)}
ref={ref} {...props}
className={cn("text-sm text-muted-foreground", className)} />
{...props} );
/> }
))
CardDescription.displayName = "CardDescription"
const CardContent = React.forwardRef< function CardAction({ className, ...props }: React.ComponentProps<"div">) {
HTMLDivElement, return (
React.HTMLAttributes<HTMLDivElement> <div
>(({ className, ...props }, ref) => ( data-slot="card-action"
<div ref={ref} className={cn("p-6 pt-0", className)} {...props} /> className={cn(
)) "col-start-2 row-span-2 row-start-1 self-start justify-self-end",
CardContent.displayName = "CardContent" className,
)}
{...props}
/>
);
}
const CardFooter = React.forwardRef< function CardContent({ className, ...props }: React.ComponentProps<"div">) {
HTMLDivElement, return (
React.HTMLAttributes<HTMLDivElement> <div
>(({ className, ...props }, ref) => ( data-slot="card-content"
<div className={cn("px-6", className)}
ref={ref} {...props}
className={cn("flex items-center p-6 pt-0", className)} />
{...props} );
/> }
))
CardFooter.displayName = "CardFooter"
export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent } function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
data-slot="card-footer"
className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
{...props}
/>
);
}
export {
Card,
CardHeader,
CardFooter,
CardTitle,
CardAction,
CardDescription,
CardContent,
};
+153 -174
View File
@@ -1,254 +1,233 @@
import * as React from "react" import * as React from "react";
import { ArrowLeftIcon, ArrowRightIcon } from "@radix-ui/react-icons"
import useEmblaCarousel, { import useEmblaCarousel, {
type UseEmblaCarouselType, type UseEmblaCarouselType,
} from "embla-carousel-react" } from "embla-carousel-react";
import { ArrowLeft, ArrowRight } from "lucide-react";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button";
type CarouselApi = UseEmblaCarouselType[1] type CarouselApi = UseEmblaCarouselType[1];
type UseCarouselParameters = Parameters<typeof useEmblaCarousel> type UseCarouselParameters = Parameters<typeof useEmblaCarousel>;
type CarouselOptions = UseCarouselParameters[0] type CarouselOptions = UseCarouselParameters[0];
type CarouselPlugin = UseCarouselParameters[1] type CarouselPlugin = UseCarouselParameters[1];
type CarouselProps = { 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 = { 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() { function useCarousel() {
const context = React.useContext(CarouselContext) const context = React.useContext(CarouselContext);
if (!context) { 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< function Carousel({
HTMLDivElement, orientation = "horizontal",
React.HTMLAttributes<HTMLDivElement> & CarouselProps opts,
>( setApi,
( plugins,
className,
children,
...props
}: React.ComponentProps<"div"> & CarouselProps) {
const [carouselRef, api] = useEmblaCarousel(
{ {
orientation = "horizontal", ...opts,
opts, axis: orientation === "horizontal" ? "x" : "y",
setApi,
plugins,
className,
children,
...props
}, },
ref plugins,
) => { );
const [carouselRef, api] = useEmblaCarousel( const [canScrollPrev, setCanScrollPrev] = React.useState(false);
{ const [canScrollNext, setCanScrollNext] = React.useState(false);
...opts,
axis: orientation === "horizontal" ? "x" : "y",
},
plugins
)
const [canScrollPrev, setCanScrollPrev] = React.useState(false)
const [canScrollNext, setCanScrollNext] = React.useState(false)
const onSelect = React.useCallback((api: CarouselApi) => { const onSelect = React.useCallback((api: CarouselApi) => {
if (!api) { if (!api) return;
return setCanScrollPrev(api.canScrollPrev());
setCanScrollNext(api.canScrollNext());
}, []);
const scrollPrev = React.useCallback(() => {
api?.scrollPrev();
}, [api]);
const scrollNext = React.useCallback(() => {
api?.scrollNext();
}, [api]);
const handleKeyDown = React.useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => {
if (event.key === "ArrowLeft") {
event.preventDefault();
scrollPrev();
} else if (event.key === "ArrowRight") {
event.preventDefault();
scrollNext();
} }
},
[scrollPrev, scrollNext],
);
setCanScrollPrev(api.canScrollPrev()) React.useEffect(() => {
setCanScrollNext(api.canScrollNext()) if (!api || !setApi) return;
}, []) setApi(api);
}, [api, setApi]);
const scrollPrev = React.useCallback(() => { React.useEffect(() => {
api?.scrollPrev() if (!api) return;
}, [api]) onSelect(api);
api.on("reInit", onSelect);
api.on("select", onSelect);
const scrollNext = React.useCallback(() => { return () => {
api?.scrollNext() api?.off("select", onSelect);
}, [api]) };
}, [api, onSelect]);
const handleKeyDown = React.useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => {
if (event.key === "ArrowLeft") {
event.preventDefault()
scrollPrev()
} else if (event.key === "ArrowRight") {
event.preventDefault()
scrollNext()
}
},
[scrollPrev, scrollNext]
)
React.useEffect(() => {
if (!api || !setApi) {
return
}
setApi(api)
}, [api, setApi])
React.useEffect(() => {
if (!api) {
return
}
onSelect(api)
api.on("reInit", onSelect)
api.on("select", onSelect)
return () => {
api?.off("select", onSelect)
}
}, [api, onSelect])
return (
<CarouselContext.Provider
value={{
carouselRef,
api: api,
opts,
orientation:
orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
scrollPrev,
scrollNext,
canScrollPrev,
canScrollNext,
}}
>
<div
ref={ref}
onKeyDownCapture={handleKeyDown}
className={cn("relative", className)}
role="region"
aria-roledescription="carousel"
{...props}
>
{children}
</div>
</CarouselContext.Provider>
)
}
)
Carousel.displayName = "Carousel"
const CarouselContent = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => {
const { carouselRef, orientation } = useCarousel()
return ( return (
<div ref={carouselRef} className="overflow-hidden"> <CarouselContext.Provider
value={{
carouselRef,
api: api,
opts,
orientation:
orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
scrollPrev,
scrollNext,
canScrollPrev,
canScrollNext,
}}
>
<div
onKeyDownCapture={handleKeyDown}
className={cn("relative", className)}
role="region"
aria-roledescription="carousel"
data-slot="carousel"
{...props}
>
{children}
</div>
</CarouselContext.Provider>
);
}
function CarouselContent({ className, ...props }: React.ComponentProps<"div">) {
const { carouselRef, orientation } = useCarousel();
return (
<div
ref={carouselRef}
className="overflow-hidden"
data-slot="carousel-content"
>
<div <div
ref={ref}
className={cn( className={cn(
"flex", "flex",
orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col", orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col",
className className,
)} )}
{...props} {...props}
/> />
</div> </div>
) );
}) }
CarouselContent.displayName = "CarouselContent"
const CarouselItem = React.forwardRef< function CarouselItem({ className, ...props }: React.ComponentProps<"div">) {
HTMLDivElement, const { orientation } = useCarousel();
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => {
const { orientation } = useCarousel()
return ( return (
<div <div
ref={ref}
role="group" role="group"
aria-roledescription="slide" aria-roledescription="slide"
data-slot="carousel-item"
className={cn( className={cn(
"min-w-0 shrink-0 grow-0 basis-full", "min-w-0 shrink-0 grow-0 basis-full",
orientation === "horizontal" ? "pl-4" : "pt-4", orientation === "horizontal" ? "pl-4" : "pt-4",
className className,
)} )}
{...props} {...props}
/> />
) );
}) }
CarouselItem.displayName = "CarouselItem"
const CarouselPrevious = React.forwardRef< function CarouselPrevious({
HTMLButtonElement, className,
React.ComponentProps<typeof Button> variant = "outline",
>(({ className, variant = "outline", size = "icon", ...props }, ref) => { size = "icon",
const { orientation, scrollPrev, canScrollPrev } = useCarousel() ...props
}: React.ComponentProps<typeof Button>) {
const { orientation, scrollPrev, canScrollPrev } = useCarousel();
return ( return (
<Button <Button
ref={ref} data-slot="carousel-previous"
variant={variant} variant={variant}
size={size} size={size}
className={cn( className={cn(
"absolute h-8 w-8 rounded-full", "absolute size-8 rounded-full",
orientation === "horizontal" orientation === "horizontal"
? "-left-12 top-1/2 -translate-y-1/2" ? "top-1/2 -left-12 -translate-y-1/2"
: "-top-12 left-1/2 -translate-x-1/2 rotate-90", : "-top-12 left-1/2 -translate-x-1/2 rotate-90",
className className,
)} )}
disabled={!canScrollPrev} disabled={!canScrollPrev}
onClick={scrollPrev} onClick={scrollPrev}
{...props} {...props}
> >
<ArrowLeftIcon className="h-4 w-4" /> <ArrowLeft />
<span className="sr-only">Previous slide</span> <span className="sr-only">Previous slide</span>
</Button> </Button>
) );
}) }
CarouselPrevious.displayName = "CarouselPrevious"
const CarouselNext = React.forwardRef< function CarouselNext({
HTMLButtonElement, className,
React.ComponentProps<typeof Button> variant = "outline",
>(({ className, variant = "outline", size = "icon", ...props }, ref) => { size = "icon",
const { orientation, scrollNext, canScrollNext } = useCarousel() ...props
}: React.ComponentProps<typeof Button>) {
const { orientation, scrollNext, canScrollNext } = useCarousel();
return ( return (
<Button <Button
ref={ref} data-slot="carousel-next"
variant={variant} variant={variant}
size={size} size={size}
className={cn( className={cn(
"absolute h-8 w-8 rounded-full", "absolute size-8 rounded-full",
orientation === "horizontal" orientation === "horizontal"
? "-right-12 top-1/2 -translate-y-1/2" ? "top-1/2 -right-12 -translate-y-1/2"
: "-bottom-12 left-1/2 -translate-x-1/2 rotate-90", : "-bottom-12 left-1/2 -translate-x-1/2 rotate-90",
className className,
)} )}
disabled={!canScrollNext} disabled={!canScrollNext}
onClick={scrollNext} onClick={scrollNext}
{...props} {...props}
> >
<ArrowRightIcon className="h-4 w-4" /> <ArrowRight />
<span className="sr-only">Next slide</span> <span className="sr-only">Next slide</span>
</Button> </Button>
) );
}) }
CarouselNext.displayName = "CarouselNext"
export { export {
type CarouselApi, type CarouselApi,
@@ -257,4 +236,4 @@ export {
CarouselItem, CarouselItem,
CarouselPrevious, CarouselPrevious,
CarouselNext, CarouselNext,
} };
+26 -24
View File
@@ -1,28 +1,30 @@
import * as React from "react" import * as React from "react";
import * as CheckboxPrimitive from "@radix-ui/react-checkbox" import { Checkbox as CheckboxPrimitive } from "radix-ui";
import { CheckIcon } from "@radix-ui/react-icons" import { CheckIcon } from "lucide-react";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
const Checkbox = React.forwardRef< function Checkbox({
React.ElementRef<typeof CheckboxPrimitive.Root>, className,
React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root> ...props
>(({ className, ...props }, ref) => ( }: React.ComponentProps<typeof CheckboxPrimitive.Root>) {
<CheckboxPrimitive.Root return (
ref={ref} <CheckboxPrimitive.Root
className={cn( data-slot="checkbox"
"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={cn(
className "peer size-4 shrink-0 rounded-[4px] border border-input shadow-xs transition-shadow outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 data-[state=checked]:border-primary data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:bg-input/30 dark:aria-invalid:ring-destructive/40 dark:data-[state=checked]:bg-primary",
)} className,
{...props} )}
> {...props}
<CheckboxPrimitive.Indicator
className={cn("flex items-center justify-center text-current")}
> >
<CheckIcon className="h-4 w-4" /> <CheckboxPrimitive.Indicator
</CheckboxPrimitive.Indicator> data-slot="checkbox-indicator"
</CheckboxPrimitive.Root> className="grid place-content-center text-current transition-none"
)) >
Checkbox.displayName = CheckboxPrimitive.Root.displayName <CheckIcon className="size-3.5" />
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
);
}
export { Checkbox } export { Checkbox };
+144
View File
@@ -0,0 +1,144 @@
"use client";
import * as React from "react";
import { format } from "date-fns";
import { DateBefore, DateRange, Matcher, Modifiers } from "react-day-picker";
import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { Calendar } from "@/components/ui/calendar";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { Typography } from "./typography";
import { CalendarIcon } from "lucide-react";
export type UpdateRangeFunction = (newRange: DateRange) => void;
export function DatePickerWithRange({
className,
updateDateRange,
startDate,
endDate,
allowPast = true,
}: {
className?: React.HTMLAttributes<HTMLDivElement> | undefined;
updateDateRange: UpdateRangeFunction | undefined;
startDate?: Date;
endDate?: Date;
allowPast?: boolean;
}) {
// Date Range State.
const [dateRange, setDateRange] = React.useState<DateRange | undefined>({
from: startDate,
to: endDate,
});
//TODOME: Si el día es mods.outside, navegar al mes correspondiente.
// Handle Day change events.
const handleDayClickFrom = (day: Date, mods: Modifiers) => {
const newDateRange: DateRange = {
from: mods.selected ? undefined : day,
to: undefined,
};
fnUpdateRange(newDateRange);
};
const handleDayClickTo = (day: Date, mods: Modifiers) => {
const newDateRange: DateRange = {
from: dateRange?.from,
to: mods.selected ? undefined : day,
};
fnUpdateRange(newDateRange);
};
const fnUpdateRange = (range: DateRange) => {
setDateRange(range);
if (updateDateRange !== undefined) {
updateDateRange(range);
}
};
// Disable days from "To" before "From"
let beforeAndSelected: Matcher[] = [];
if (dateRange?.from) {
const beforeMatcher: DateBefore = { before: dateRange?.from };
const dateMatcher: Matcher = dateRange?.from;
beforeAndSelected = [beforeMatcher, dateMatcher];
}
let pastMatcher: DateBefore | undefined = undefined;
if (!allowPast) {
pastMatcher = { before: new Date() };
}
return (
<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">
Hasta
</Typography>
<Popover>
<PopoverTrigger>
<Button
id="dateFrom"
variant="outline"
data-empty={!dateRange}
className="w-full justify-start text-left font-normal data-[empty=true]:text-muted-foreground"
>
<CalendarIcon />
{dateRange?.from ? (
format(dateRange.from, "PPP")
) : (
<span>Pick a date</span>
)}
</Button>
</PopoverTrigger>
<PopoverContent className="w-auto p-0" align="center">
<Calendar
mode="single"
defaultMonth={dateRange?.from}
selected={dateRange?.from}
onDayClick={handleDayClickFrom}
numberOfMonths={1}
disabled={pastMatcher}
/>
</PopoverContent>
</Popover>
<Popover>
<PopoverTrigger>
<Button
id="dateTo"
variant={"outline"}
data-empty={!dateRange}
className="w-full justify-start text-left font-normal data-[empty=true]:text-muted-foreground"
>
<CalendarIcon className="mr-2 h-4 w-4" />
{dateRange?.to ? (
format(dateRange.to, "PPP")
) : (
<span>Pick a date</span>
)}
</Button>
</PopoverTrigger>
<PopoverContent className="w-auto p-0" align="center">
<Calendar
autoFocus
mode="single"
defaultMonth={dateRange?.to ?? dateRange?.from}
selected={dateRange?.to}
onDayClick={handleDayClickTo}
numberOfMonths={1}
disabled={beforeAndSelected}
/>
</PopoverContent>
</Popover>
</div>
);
}
+255
View File
@@ -0,0 +1,255 @@
import * as React from "react";
import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";
import { cn } from "@/lib/utils";
function DropdownMenu({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
}
function DropdownMenuPortal({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
return (
<DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
);
}
function DropdownMenuTrigger({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
return (
<DropdownMenuPrimitive.Trigger
data-slot="dropdown-menu-trigger"
{...props}
/>
);
}
function DropdownMenuContent({
className,
sideOffset = 4,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
return (
<DropdownMenuPrimitive.Portal>
<DropdownMenuPrimitive.Content
data-slot="dropdown-menu-content"
sideOffset={sideOffset}
className={cn(
"z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md 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 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
className,
)}
{...props}
/>
</DropdownMenuPrimitive.Portal>
);
}
function DropdownMenuGroup({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
return (
<DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
);
}
function DropdownMenuItem({
className,
inset,
variant = "default",
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
inset?: boolean;
variant?: "default" | "destructive";
}) {
return (
<DropdownMenuPrimitive.Item
data-slot="dropdown-menu-item"
data-inset={inset}
data-variant={variant}
className={cn(
"relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:*:[svg]:!text-destructive",
className,
)}
{...props}
/>
);
}
function DropdownMenuCheckboxItem({
className,
children,
checked,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
return (
<DropdownMenuPrimitive.CheckboxItem
data-slot="dropdown-menu-checkbox-item"
className={cn(
"relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className,
)}
checked={checked}
{...props}
>
<span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
<CheckIcon className="size-4" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
</DropdownMenuPrimitive.CheckboxItem>
);
}
function DropdownMenuRadioGroup({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
return (
<DropdownMenuPrimitive.RadioGroup
data-slot="dropdown-menu-radio-group"
{...props}
/>
);
}
function DropdownMenuRadioItem({
className,
children,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
return (
<DropdownMenuPrimitive.RadioItem
data-slot="dropdown-menu-radio-item"
className={cn(
"relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
>
<span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
<CircleIcon className="size-2 fill-current" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
</DropdownMenuPrimitive.RadioItem>
);
}
function DropdownMenuLabel({
className,
inset,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
inset?: boolean;
}) {
return (
<DropdownMenuPrimitive.Label
data-slot="dropdown-menu-label"
data-inset={inset}
className={cn(
"px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
className,
)}
{...props}
/>
);
}
function DropdownMenuSeparator({
className,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
return (
<DropdownMenuPrimitive.Separator
data-slot="dropdown-menu-separator"
className={cn("-mx-1 my-1 h-px bg-border", className)}
{...props}
/>
);
}
function DropdownMenuShortcut({
className,
...props
}: React.ComponentProps<"span">) {
return (
<span
data-slot="dropdown-menu-shortcut"
className={cn(
"ml-auto text-xs tracking-widest text-muted-foreground",
className,
)}
{...props}
/>
);
}
function DropdownMenuSub({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
}
function DropdownMenuSubTrigger({
className,
inset,
children,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
inset?: boolean;
}) {
return (
<DropdownMenuPrimitive.SubTrigger
data-slot="dropdown-menu-sub-trigger"
data-inset={inset}
className={cn(
"flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[inset]:pl-8 data-[state=open]:bg-accent data-[state=open]:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground",
className,
)}
{...props}
>
{children}
<ChevronRightIcon className="ml-auto size-4" />
</DropdownMenuPrimitive.SubTrigger>
);
}
function DropdownMenuSubContent({
className,
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
return (
<DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content"
className={cn(
"z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg 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 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
className,
)}
{...props}
/>
);
}
export {
DropdownMenu,
DropdownMenuPortal,
DropdownMenuTrigger,
DropdownMenuContent,
DropdownMenuGroup,
DropdownMenuLabel,
DropdownMenuItem,
DropdownMenuCheckboxItem,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,
DropdownMenuSeparator,
DropdownMenuShortcut,
DropdownMenuSub,
DropdownMenuSubTrigger,
DropdownMenuSubContent,
};
+246
View File
@@ -0,0 +1,246 @@
import { useMemo } from "react";
import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@/lib/utils";
import { Label } from "@/components/ui/label";
import { Separator } from "@/components/ui/separator";
function FieldSet({ className, ...props }: React.ComponentProps<"fieldset">) {
return (
<fieldset
data-slot="field-set"
className={cn(
"flex flex-col gap-6",
"has-[>[data-slot=checkbox-group]]:gap-3 has-[>[data-slot=radio-group]]:gap-3",
className,
)}
{...props}
/>
);
}
function FieldLegend({
className,
variant = "legend",
...props
}: React.ComponentProps<"legend"> & { variant?: "legend" | "label" }) {
return (
<legend
data-slot="field-legend"
data-variant={variant}
className={cn(
"mb-3 font-medium",
"data-[variant=legend]:text-base",
"data-[variant=label]:text-sm",
className,
)}
{...props}
/>
);
}
function FieldGroup({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
data-slot="field-group"
className={cn(
"group/field-group @container/field-group flex w-full flex-col gap-7 data-[slot=checkbox-group]:gap-3 [&>[data-slot=field-group]]:gap-4",
className,
)}
{...props}
/>
);
}
const fieldVariants = cva(
"group/field flex w-full gap-3 data-[invalid=true]:text-destructive",
{
variants: {
orientation: {
vertical: ["flex-col [&>*]:w-full [&>.sr-only]:w-auto"],
horizontal: [
"flex-row items-center",
"[&>[data-slot=field-label]]:flex-auto",
"has-[>[data-slot=field-content]]:items-start has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px",
],
responsive: [
"flex-col [&>*]:w-full [&>.sr-only]:w-auto @md/field-group:flex-row @md/field-group:items-center @md/field-group:[&>*]:w-auto",
"@md/field-group:[&>[data-slot=field-label]]:flex-auto",
"@md/field-group:has-[>[data-slot=field-content]]:items-start @md/field-group:has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px",
],
},
},
defaultVariants: {
orientation: "vertical",
},
},
);
function Field({
className,
orientation = "vertical",
...props
}: React.ComponentProps<"div"> & VariantProps<typeof fieldVariants>) {
return (
<div
role="group"
data-slot="field"
data-orientation={orientation}
className={cn(fieldVariants({ orientation }), className)}
{...props}
/>
);
}
function FieldContent({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
data-slot="field-content"
className={cn(
"group/field-content flex flex-1 flex-col gap-1.5 leading-snug",
className,
)}
{...props}
/>
);
}
function FieldLabel({
className,
...props
}: React.ComponentProps<typeof Label>) {
return (
<Label
data-slot="field-label"
className={cn(
"group/field-label peer/field-label flex w-fit gap-2 leading-snug group-data-[disabled=true]/field:opacity-50",
"has-[>[data-slot=field]]:w-full has-[>[data-slot=field]]:flex-col has-[>[data-slot=field]]:rounded-md has-[>[data-slot=field]]:border [&>*]:data-[slot=field]:p-4",
"has-data-[state=checked]:border-primary has-data-[state=checked]:bg-primary/5 dark:has-data-[state=checked]:bg-primary/10",
className,
)}
{...props}
/>
);
}
function FieldTitle({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
data-slot="field-label"
className={cn(
"flex w-fit items-center gap-2 text-sm leading-snug font-medium group-data-[disabled=true]/field:opacity-50",
className,
)}
{...props}
/>
);
}
function FieldDescription({ className, ...props }: React.ComponentProps<"p">) {
return (
<p
data-slot="field-description"
className={cn(
"text-sm leading-normal font-normal text-muted-foreground group-has-[[data-orientation=horizontal]]/field:text-balance",
"last:mt-0 nth-last-2:-mt-1 [[data-variant=legend]+&]:-mt-1.5",
"[&>a]:underline [&>a]:underline-offset-4 [&>a:hover]:text-primary",
className,
)}
{...props}
/>
);
}
function FieldSeparator({
children,
className,
...props
}: React.ComponentProps<"div"> & {
children?: React.ReactNode;
}) {
return (
<div
data-slot="field-separator"
data-content={!!children}
className={cn(
"relative -my-2 h-5 text-sm group-data-[variant=outline]/field-group:-mb-2",
className,
)}
{...props}
>
<Separator className="absolute inset-0 top-1/2" />
{children && (
<span
className="relative mx-auto block w-fit bg-background px-2 text-muted-foreground"
data-slot="field-separator-content"
>
{children}
</span>
)}
</div>
);
}
function FieldError({
className,
children,
errors,
...props
}: React.ComponentProps<"div"> & {
errors?: Array<{ message?: string } | undefined>;
}) {
const content = useMemo(() => {
if (children) {
return children;
}
if (!errors?.length) {
return null;
}
const uniqueErrors = [
...new Map(errors.map((error) => [error?.message, error])).values(),
];
if (uniqueErrors?.length == 1) {
return uniqueErrors[0]?.message;
}
return (
<ul className="ml-4 flex list-disc flex-col gap-1">
{uniqueErrors.map(
(error, index) =>
error?.message && <li key={index}>{error.message}</li>,
)}
</ul>
);
}, [children, errors]);
if (!content) {
return null;
}
return (
<div
role="alert"
data-slot="field-error"
className={cn("text-sm font-normal text-destructive", className)}
{...props}
>
{content}
</div>
);
}
export {
Field,
FieldLabel,
FieldDescription,
FieldError,
FieldGroup,
FieldLegend,
FieldSeparator,
FieldSet,
FieldContent,
FieldTitle,
};
+47
View File
@@ -0,0 +1,47 @@
import { Typography } from "./typography";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "./tooltip";
import { PropsWithChildren } from "react";
interface IconWithTooltipNumberProps {
label?: string | null | undefined;
labelPosition?: "left" | "right" | null | undefined;
tooltipText?: string | null | undefined;
}
export function IconWithTooltip({
label = undefined,
labelPosition = "left",
tooltipText = undefined,
children,
}: PropsWithChildren<IconWithTooltipNumberProps>) {
const iconElement = tooltipText ? (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>{children}</TooltipTrigger>
<TooltipContent>
<p className="inline">{tooltipText}</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
) : (
<>{children}</>
);
const labelElement = (
<Typography variant={"p_inline"} className="px-1">
{label}
</Typography>
);
return (
<div className="flex flex-row items-center gap-1">
{label && labelPosition == "left" && labelElement}
{iconElement}
{label && labelPosition == "right" && labelElement}
</div>
);
}
+18 -22
View File
@@ -1,25 +1,21 @@
import * as React from "react" import * as React from "react";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
export interface InputProps function Input({ className, type, ...props }: React.ComponentProps<"input">) {
extends React.InputHTMLAttributes<HTMLInputElement> {} return (
<input
type={type}
data-slot="input"
className={cn(
"h-9 w-full min-w-0 rounded-md border border-input bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none selection:bg-primary selection:text-primary-foreground file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:bg-input/30",
"focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50",
"aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40",
className,
)}
{...props}
/>
);
}
const Input = React.forwardRef<HTMLInputElement, InputProps>( export { Input };
({ className, type, ...props }, ref) => {
return (
<input
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
)}
ref={ref}
{...props}
/>
)
}
)
Input.displayName = "Input"
export { Input }
+19 -21
View File
@@ -1,24 +1,22 @@
import * as React from "react" import * as React from "react";
import * as LabelPrimitive from "@radix-ui/react-label" import { Label as LabelPrimitive } from "radix-ui";
import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
const labelVariants = cva( function Label({
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" className,
) ...props
}: React.ComponentProps<typeof LabelPrimitive.Root>) {
return (
<LabelPrimitive.Root
data-slot="label"
className={cn(
"flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
className,
)}
{...props}
/>
);
}
const Label = React.forwardRef< export { Label };
React.ElementRef<typeof LabelPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
VariantProps<typeof labelVariants>
>(({ className, ...props }, ref) => (
<LabelPrimitive.Root
ref={ref}
className={cn(labelVariants(), className)}
{...props}
/>
))
Label.displayName = LabelPrimitive.Root.displayName
export { Label }
+46
View File
@@ -0,0 +1,46 @@
import { useState } from "react";
import { Button } from "./button";
import { Typography } from "./typography";
export type UpdateSelectedNumberFunction = (newCount: number) => void;
export function NumberSelector({
updateCount,
addEnabled = true,
allowNegative = false,
initialValue = 0,
}: {
updateCount: UpdateSelectedNumberFunction;
addEnabled?: boolean;
allowNegative?: boolean;
initialValue?: number;
}) {
const [count, setCount] = useState<number>(initialValue);
const counterUpdated = (newAmount: number) => {
setCount(newAmount);
if (updateCount != undefined) {
updateCount(newAmount);
}
};
const minusDisabled = !allowNegative && count <= 0;
return (
<div className="flex flex-row items-center gap-2">
<Button
disabled={minusDisabled}
onClick={() => counterUpdated(count - 1)}
>
-
</Button>
<Typography variant={"largeText"} className="mx-2">
{count}
</Typography>
<Button disabled={!addEnabled} onClick={() => counterUpdated(count + 1)}>
+
</Button>
</div>
);
}
+40 -25
View File
@@ -1,31 +1,46 @@
import * as React from "react" import * as React from "react";
import * as PopoverPrimitive from "@radix-ui/react-popover" import { Popover as PopoverPrimitive } from "radix-ui";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
const Popover = PopoverPrimitive.Root function Popover({
...props
}: React.ComponentProps<typeof PopoverPrimitive.Root>) {
return <PopoverPrimitive.Root data-slot="popover" {...props} />;
}
const PopoverTrigger = PopoverPrimitive.Trigger function PopoverTrigger({
...props
}: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {
return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />;
}
const PopoverAnchor = PopoverPrimitive.Anchor function PopoverContent({
className,
align = "center",
sideOffset = 4,
...props
}: React.ComponentProps<typeof PopoverPrimitive.Content>) {
return (
<PopoverPrimitive.Portal>
<PopoverPrimitive.Content
data-slot="popover-content"
align={align}
sideOffset={sideOffset}
className={cn(
"z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-hidden 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 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
className,
)}
{...props}
/>
</PopoverPrimitive.Portal>
);
}
const PopoverContent = React.forwardRef< function PopoverAnchor({
React.ElementRef<typeof PopoverPrimitive.Content>, ...props
React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content> }: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {
>(({ className, align = "center", sideOffset = 4, ...props }, ref) => ( return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;
<PopoverPrimitive.Portal> }
<PopoverPrimitive.Content
ref={ref}
align={align}
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
)}
{...props}
/>
</PopoverPrimitive.Portal>
))
PopoverContent.displayName = PopoverPrimitive.Content.displayName
export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor } export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
+32 -21
View File
@@ -1,29 +1,40 @@
import * as React from "react" import * as React from "react";
import * as SeparatorPrimitive from "@radix-ui/react-separator" import { Separator as SeparatorPrimitive } from "radix-ui";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
import { cva, VariantProps } from "class-variance-authority";
const Separator = React.forwardRef< const separatorVariants = cva(
React.ElementRef<typeof SeparatorPrimitive.Root>, "shrink-0 bg-border data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root> {
>( variants: {
( variant: {
{ className, orientation = "horizontal", decorative = true, ...props }, default: "my-10",
ref },
) => ( },
defaultVariants: {
variant: "default",
},
},
);
function Separator({
className,
variant,
orientation = "horizontal",
decorative = true,
...props
}: React.ComponentProps<typeof SeparatorPrimitive.Root> &
VariantProps<typeof separatorVariants>) {
return (
<SeparatorPrimitive.Root <SeparatorPrimitive.Root
ref={ref} data-slot="separator"
decorative={decorative} decorative={decorative}
orientation={orientation} orientation={orientation}
className={cn( className={cn(separatorVariants({ variant, className }))}
"shrink-0 bg-border",
orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
className
)}
{...props} {...props}
/> />
) );
) }
Separator.displayName = SeparatorPrimitive.Root.displayName
export { Separator } export { Separator };
+6 -8
View File
@@ -1,15 +1,13 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
function Skeleton({ function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) {
return ( return (
<div <div
className={cn("animate-pulse rounded-md bg-primary/10", className)} data-slot="skeleton"
className={cn("animate-pulse rounded-md bg-accent", className)}
{...props} {...props}
/> />
) );
} }
export { Skeleton } export { Skeleton };
+114
View File
@@ -0,0 +1,114 @@
import * as React from "react";
import { cn } from "@/lib/utils";
function Table({ className, ...props }: React.ComponentProps<"table">) {
return (
<div
data-slot="table-container"
className="relative w-full overflow-x-auto"
>
<table
data-slot="table"
className={cn("w-full caption-bottom text-sm", className)}
{...props}
/>
</div>
);
}
function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {
return (
<thead
data-slot="table-header"
className={cn("[&_tr]:border-b", className)}
{...props}
/>
);
}
function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
return (
<tbody
data-slot="table-body"
className={cn("[&_tr:last-child]:border-0", className)}
{...props}
/>
);
}
function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
return (
<tfoot
data-slot="table-footer"
className={cn(
"border-t bg-muted/50 font-medium [&>tr]:last:border-b-0",
className,
)}
{...props}
/>
);
}
function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
return (
<tr
data-slot="table-row"
className={cn(
"border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
className,
)}
{...props}
/>
);
}
function TableHead({ className, ...props }: React.ComponentProps<"th">) {
return (
<th
data-slot="table-head"
className={cn(
"h-10 px-2 text-left align-middle font-medium whitespace-nowrap text-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
className,
)}
{...props}
/>
);
}
function TableCell({ className, ...props }: React.ComponentProps<"td">) {
return (
<td
data-slot="table-cell"
className={cn(
"p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
className,
)}
{...props}
/>
);
}
function TableCaption({
className,
...props
}: React.ComponentProps<"caption">) {
return (
<caption
data-slot="table-caption"
className={cn("mt-4 text-sm text-muted-foreground", className)}
{...props}
/>
);
}
export {
Table,
TableHeader,
TableBody,
TableFooter,
TableHead,
TableRow,
TableCell,
TableCaption,
};
+53 -22
View File
@@ -1,28 +1,59 @@
import * as React from "react" import * as React from "react";
import * as TooltipPrimitive from "@radix-ui/react-tooltip" import { Tooltip as TooltipPrimitive } from "radix-ui";
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils";
const TooltipProvider = TooltipPrimitive.Provider function TooltipProvider({
delayDuration = 0,
...props
}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
return (
<TooltipPrimitive.Provider
data-slot="tooltip-provider"
delayDuration={delayDuration}
{...props}
/>
);
}
const Tooltip = TooltipPrimitive.Root function Tooltip({
...props
}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
return (
<TooltipProvider>
<TooltipPrimitive.Root data-slot="tooltip" {...props} />
</TooltipProvider>
);
}
const TooltipTrigger = TooltipPrimitive.Trigger function TooltipTrigger({
...props
}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
}
const TooltipContent = React.forwardRef< function TooltipContent({
React.ElementRef<typeof TooltipPrimitive.Content>, className,
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content> sideOffset = 0,
>(({ className, sideOffset = 4, ...props }, ref) => ( children,
<TooltipPrimitive.Content ...props
ref={ref} }: React.ComponentProps<typeof TooltipPrimitive.Content>) {
sideOffset={sideOffset} return (
className={cn( <TooltipPrimitive.Portal>
"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", <TooltipPrimitive.Content
className data-slot="tooltip-content"
)} sideOffset={sideOffset}
{...props} className={cn(
/> "z-50 w-fit origin-(--radix-tooltip-content-transform-origin) animate-in rounded-md bg-foreground px-3 py-1.5 text-xs text-balance text-background fade-in-0 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 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
)) className,
TooltipContent.displayName = TooltipPrimitive.Content.displayName )}
{...props}
>
{children}
<TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px] bg-foreground fill-foreground" />
</TooltipPrimitive.Content>
</TooltipPrimitive.Portal>
);
}
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider } export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
+85
View File
@@ -0,0 +1,85 @@
"use client";
import * as React from "react";
import { VariantProps, cva } from "class-variance-authority";
import { cn } from "@/lib/utils";
import { Slot as SlotPrimitive } from "radix-ui";
const typographyVariants = cva("text-foreground", {
variants: {
variant: {
h1: "scroll-m-20 text-center text-4xl font-extrabold tracking-tight text-balance",
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",
h4: "scroll-m-20 text-xl font-semibold tracking-tight",
h5: "scroll-m-20 text-lg font-semibold tracking-tight",
h6: "scroll-m-20 text-base font-semibold tracking-tight",
p: "leading-7 [&:not(:first-child)]:mt-6",
p_inline: "leading-7",
blockquote: "mt-6 border-l-2 pl-6 italic",
ul: "my-6 ml-6 list-disc [&>li]:mt-2",
inlineCode:
"bg-muted relative rounded px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold",
lead: "text-muted-foreground text-xl",
largeText: "text-lg font-semibold",
smallText: "text-sm leading-none font-medium",
mutedText: "text-muted-foreground text-sm",
errorText: "text-destructive text-sm font-normal",
},
},
defaultVariants: {
variant: "p",
},
});
type VariantPropType = VariantProps<typeof typographyVariants>;
const variantElementMap: Record<
NonNullable<VariantPropType["variant"]>,
string
> = {
h1: "h1",
h2: "h2",
h3: "h3",
h4: "h4",
h5: "h5",
h6: "h6",
p: "p",
p_inline: "p",
blockquote: "blockquote",
inlineCode: "code",
largeText: "div",
smallText: "small",
lead: "p",
mutedText: "p",
errorText: "p",
ul: "ul",
};
export interface TypographyProps
extends
React.HTMLAttributes<HTMLElement>,
VariantProps<typeof typographyVariants> {
asChild?: boolean;
as?: string;
}
const Typography = React.forwardRef<HTMLElement, TypographyProps>(
({ className, variant, as, asChild, ...props }, ref) => {
const Comp = asChild
? SlotPrimitive.Slot
: (as ?? (variant ? variantElementMap[variant] : undefined) ?? "div");
return (
<Comp
className={cn(typographyVariants({ variant, className }))}
ref={ref}
{...props}
/>
);
},
);
Typography.displayName = "Typography";
// eslint-disable-next-line react-refresh/only-export-components
export { Typography, typographyVariants };
+196 -49
View File
@@ -1,77 +1,224 @@
@tailwind base; @import "tailwindcss";
@tailwind components; @import "tw-animate-css";
@tailwind utilities;
@layer base { @custom-variant dark (&:is(.dark *));
:root {
--background: 0 0% 100%;
--foreground: 20 14.3% 4.1%;
--card: 0 0% 100%; @theme inline {
--card-foreground: 20 14.3% 4.1%; --radius-sm: calc(var(--radius) - 4px);
--popover: 0 0% 100%; --radius-md: calc(var(--radius) - 2px);
--popover-foreground: 20 14.3% 4.1%;
--primary: 24 9.8% 10%; --radius-lg: var(--radius);
--primary-foreground: 60 9.1% 97.8%;
--secondary: 60 4.8% 95.9%; --radius-xl: calc(var(--radius) + 4px);
--secondary-foreground: 24 9.8% 10%;
--muted: 60 4.8% 95.9%; --color-background: var(--background);
--muted-foreground: 25 5.3% 44.7%;
--accent: 60 4.8% 95.9%; --color-foreground: var(--foreground);
--accent-foreground: 24 9.8% 10%;
--destructive: 0 84.2% 60.2%; --color-card: var(--card);
--destructive-foreground: 60 9.1% 97.8%;
--border: 20 5.9% 90%; --color-card-foreground: var(--card-foreground);
--input: 20 5.9% 90%;
--ring: 20 14.3% 4.1%;
--radius: 0.5rem; --color-popover: var(--popover);
}
.dark { --color-popover-foreground: var(--popover-foreground);
--background: 20 14.3% 4.1%;
--foreground: 60 9.1% 97.8%;
--card: 20 14.3% 4.1%; --color-primary: var(--primary);
--card-foreground: 60 9.1% 97.8%;
--popover: 20 14.3% 4.1%; --color-primary-foreground: var(--primary-foreground);
--popover-foreground: 60 9.1% 97.8%;
--primary: 60 9.1% 97.8%; --color-secondary: var(--secondary);
--primary-foreground: 24 9.8% 10%;
--secondary: 12 6.5% 15.1%; --color-secondary-foreground: var(--secondary-foreground);
--secondary-foreground: 60 9.1% 97.8%;
--muted: 12 6.5% 15.1%; --color-muted: var(--muted);
--muted-foreground: 24 5.4% 63.9%;
--accent: 12 6.5% 15.1%; --color-muted-foreground: var(--muted-foreground);
--accent-foreground: 60 9.1% 97.8%;
--destructive: 0 62.8% 30.6%; --color-accent: var(--accent);
--destructive-foreground: 60 9.1% 97.8%;
--border: 12 6.5% 15.1%; --color-accent-foreground: var(--accent-foreground);
--input: 12 6.5% 15.1%;
--ring: 24 5.7% 82.9%; --color-destructive: var(--destructive);
}
--color-border: var(--border);
--color-input: var(--input);
--color-ring: var(--ring);
--color-chart-1: var(--chart-1);
--color-chart-2: var(--chart-2);
--color-chart-3: var(--chart-3);
--color-chart-4: var(--chart-4);
--color-chart-5: var(--chart-5);
--color-sidebar: var(--sidebar);
--color-sidebar-foreground: var(--sidebar-foreground);
--color-sidebar-primary: var(--sidebar-primary);
--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
--color-sidebar-accent: var(--sidebar-accent);
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
--color-sidebar-border: var(--sidebar-border);
--color-sidebar-ring: var(--sidebar-ring);
}
:root {
--radius: 0.625rem;
--background: oklch(1 0 0);
--foreground: oklch(0.147 0.004 49.25);
--card: oklch(1 0 0);
--card-foreground: oklch(0.147 0.004 49.25);
--popover: oklch(1 0 0);
--popover-foreground: oklch(0.147 0.004 49.25);
--primary: oklch(0.216 0.006 56.043);
--primary-foreground: oklch(0.985 0.001 106.423);
--secondary: oklch(0.97 0.001 106.424);
--secondary-foreground: oklch(0.216 0.006 56.043);
--muted: oklch(0.97 0.001 106.424);
--muted-foreground: oklch(0.553 0.013 58.071);
--accent: oklch(0.97 0.001 106.424);
--accent-foreground: oklch(0.216 0.006 56.043);
--destructive: oklch(0.577 0.245 27.325);
--border: oklch(0.923 0.003 48.717);
--input: oklch(0.923 0.003 48.717);
--ring: oklch(0.709 0.01 56.259);
--chart-1: oklch(0.646 0.222 41.116);
--chart-2: oklch(0.6 0.118 184.704);
--chart-3: oklch(0.398 0.07 227.392);
--chart-4: oklch(0.828 0.189 84.429);
--chart-5: oklch(0.769 0.188 70.08);
--sidebar: oklch(0.985 0.001 106.423);
--sidebar-foreground: oklch(0.147 0.004 49.25);
--sidebar-primary: oklch(0.216 0.006 56.043);
--sidebar-primary-foreground: oklch(0.985 0.001 106.423);
--sidebar-accent: oklch(0.97 0.001 106.424);
--sidebar-accent-foreground: oklch(0.216 0.006 56.043);
--sidebar-border: oklch(0.923 0.003 48.717);
--sidebar-ring: oklch(0.709 0.01 56.259);
}
.dark {
--background: oklch(0.147 0.004 49.25);
--foreground: oklch(0.985 0.001 106.423);
--card: oklch(0.216 0.006 56.043);
--card-foreground: oklch(0.985 0.001 106.423);
--popover: oklch(0.216 0.006 56.043);
--popover-foreground: oklch(0.985 0.001 106.423);
--primary: oklch(0.923 0.003 48.717);
--primary-foreground: oklch(0.216 0.006 56.043);
--secondary: oklch(0.268 0.007 34.298);
--secondary-foreground: oklch(0.985 0.001 106.423);
--muted: oklch(0.268 0.007 34.298);
--muted-foreground: oklch(0.709 0.01 56.259);
--accent: oklch(0.268 0.007 34.298);
--accent-foreground: oklch(0.985 0.001 106.423);
--destructive: oklch(0.704 0.191 22.216);
--border: oklch(1 0 0 / 10%);
--input: oklch(1 0 0 / 15%);
--ring: oklch(0.553 0.013 58.071);
--chart-1: oklch(0.488 0.243 264.376);
--chart-2: oklch(0.696 0.17 162.48);
--chart-3: oklch(0.769 0.188 70.08);
--chart-4: oklch(0.627 0.265 303.9);
--chart-5: oklch(0.645 0.246 16.439);
--sidebar: oklch(0.216 0.006 56.043);
--sidebar-foreground: oklch(0.985 0.001 106.423);
--sidebar-primary: oklch(0.488 0.243 264.376);
--sidebar-primary-foreground: oklch(0.985 0.001 106.423);
--sidebar-accent: oklch(0.268 0.007 34.298);
--sidebar-accent-foreground: oklch(0.985 0.001 106.423);
--sidebar-border: oklch(1 0 0 / 10%);
--sidebar-ring: oklch(0.553 0.013 58.071);
} }
@layer base { @layer base {
* { * {
@apply border-border; @apply border-border outline-ring/50;
} }
body { body {
@apply bg-background text-foreground; @apply bg-background text-foreground;
} }
} }
/* SomniaRooms Extended CSS */
@utility grid-cols-40/60 {
grid-template-columns: 40% 60%;
}
@utility grid-cols-60/40 {
grid-template-columns: 60% 40%;
}
+3 -3
View File
@@ -1,6 +1,6 @@
import { type ClassValue, clsx } from "clsx" import { clsx, type ClassValue } from "clsx";
import { twMerge } from "tailwind-merge" import { twMerge } from "tailwind-merge";
export function cn(...inputs: ClassValue[]) { export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)) return twMerge(clsx(inputs));
} }
+36 -12
View File
@@ -1,10 +1,14 @@
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";
import Root from './routes/Root'; import Root from "./routes/Root";
import ErrorPage from './error-page'; import ErrorPage from "./routes/error-page";
import Homepage from './routes/home-page'; import Homepage from "./routes/home-page";
import SearchPage from "./routes/search-page";
import BookPage from "./routes/book-page";
import SuccessPage from "./routes/success-page";
import ContactPage from "./routes/contact-page";
const router = createBrowserRouter([ const router = createBrowserRouter([
{ {
@@ -12,16 +16,36 @@ const router = createBrowserRouter([
element: <Root />, element: <Root />,
errorElement: <ErrorPage />, errorElement: <ErrorPage />,
children: [ children: [
{
path: "/",
element: <Homepage />,
},
{ {
path: "/home", path: "/home",
element: <Homepage /> element: <Homepage />,
} },
] {
path: "/search",
element: <SearchPage />,
},
{
path: "/book",
element: <BookPage />,
},
{
path: "/success",
element: <SuccessPage />,
},
{
path: "/contact",
element: <ContactPage />,
},
],
}, },
]); ]);
ReactDOM.createRoot(document.getElementById('root')!).render( ReactDOM.createRoot(document.getElementById("root")!).render(
<React.StrictMode> <React.StrictMode>
<RouterProvider router={router} /> <RouterProvider router={router} />
</React.StrictMode>, </React.StrictMode>,
) );
+24
View File
@@ -0,0 +1,24 @@
export type NewBooking = {
arrivalDate: Date;
departureDate: Date;
customerDetails: NewBookingCustomerDetails;
rooms: NewBookingRoom[];
};
export type NewBookingCustomerDetails = {
name: string | null;
surname: string | null;
email: string | null;
phoneNumber: string | null;
};
export type NewBookingRoom = {
roomCategory: number;
guestNumber: number;
amount: number;
price: number;
};
export type NewBookingResponse = {
refNumber: number;
};
+22
View File
@@ -0,0 +1,22 @@
export type ConfigVar = {
key: string;
value: string;
};
export enum eConfigVarKeys {
varCompanyName = "CompanyName",
varCompanyWebsite = "CompanyWebsite",
varCompanyContactFormUrl = "CompanyContactFormUrl",
varCompanyLogo = "CompanyLogo",
varCompanyLogoSize = "CompanyLogoSize",
varCompanyEmail = "CompanyEmail",
varCompanyPhone = "CompanyPhone",
varCompanyAddress = "CompanyAddress",
varNightCountForContactDialog = "NightCountForContactDialog",
varGuestNumberForContactDialog = "GuestNumberForContactDialog",
varShowNonAvailableRooms = "ShowNonAvailableRooms",
varSomniaAttributionNotice = "SomniaAttributionNotice",
varPhotoAspectRatio = "PhotoAspectRatio",
varAPIMaxAllowedNightAmount = "MaxAllowedNightAmount",
varAPIMaxAllowedGuestNumber = "MaxAllowedGuestNumber",
}
+10
View File
@@ -0,0 +1,10 @@
"use client";
import { z } from "zod";
export const BookingFormSchema = z.object({
name: z.string().min(2).max(50),
surname: z.string().min(2).max(50),
email: z.email(),
phone: z.string().min(8),
});
+5
View File
@@ -0,0 +1,5 @@
import { DateRange } from "react-day-picker";
export type SearchFilter = {
dateRange: DateRange;
};
+21
View File
@@ -0,0 +1,21 @@
export type RoomCategory = {
id: number;
name: string;
description: string | undefined;
maxGuestNum: number;
orderHomePage: number | undefined;
roomCategoryPhotos: RoomCategoryPhoto[];
roomCategoryBedTypes: RoomCategoryBedType[];
};
export type RoomCategoryPhoto = {
path: string;
altText: string | undefined;
photoOrder: string | undefined;
};
export type RoomCategoryBedType = {
amount: number;
bedTypeName: string;
bedTypeIcon: string;
};
+19
View File
@@ -0,0 +1,19 @@
export type RoomAvailabity = {
roomCategory: number;
availability: number;
};
export type RoomPrice = {
guestNumber: number;
price: number;
};
export type SearchPeriodRequest = {
startDate: string;
endDate: string;
};
export type RoomPriceSearchResponse = {
roomCategoryId: number;
prices: RoomPrice[];
};
File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 133 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 96 KiB

+5 -2
View File
@@ -8,12 +8,15 @@ html {
box-sizing: inherit; box-sizing: inherit;
} }
.appPage { .appPage {
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
padding: 2rem; padding: 2rem;
text-align: center; text-align: center;
}
background-color: rgb(45, 45, 45); iconify-icon {
display: inline-block;
min-width: 1em;
min-height: 1em;
} }
+14 -12
View File
@@ -1,19 +1,21 @@
import { Outlet } from 'react-router-dom' import { Outlet } from "react-router";
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";
function Root() { function Root() {
return ( return (
<> <>
<AppHeader /> <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
<div className='appPage'> <AppHeader />
<Outlet /> <div className="mx-auto min-h-screen w-full bg-background p-8 text-center text-foreground sm:w-[90%] md:w-[80%]">
</div> <Outlet />
<AppFooter /> </div>
<AppFooter />
</ThemeProvider>
</> </>
) );
} }
export default Root export default Root;
+222
View File
@@ -0,0 +1,222 @@
import { APISendCreateBooking } from "@/api/api-booking";
import { BookingDetails } from "@/components/booking/booking-details";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Separator } from "@/components/ui/separator";
import { Typography } from "@/components/ui/typography";
import { BookingFormSchema } from "@/model/FormSchema";
import { useAppStore } from "@/store";
import { useEffect, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { useNavigate } from "react-router";
import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
import { eBookingState } from "@/utils/AppStateManager";
import { useBookingStateDispacher } from "@/utils/hooks";
import { ConstsNav } from "@/utils/Consts";
import { NewBookingCustomerDetails } from "@/model/Bookings";
import {
Field,
FieldError,
FieldGroup,
FieldLabel,
FieldLegend,
FieldSet,
} from "@/components/ui/field";
import { Card, CardContent, CardHeader } from "@/components/ui/card";
enum PageState {
showForm,
sending,
error,
}
function BookPage() {
const [pageState, setPageState] = useState<PageState>(PageState.showForm);
const bookingData = useAppStore((state) => state.currentBooking);
const appBookingState = useAppStore((state) => state.bookingState);
const setCustomerData = useAppStore(
(state) => state.currentBookingSetCustomer,
);
const navigate = useNavigate();
const { setBookingStateBooked } = useBookingStateDispacher();
const bookingFormId = "booking-form";
const bookingForm = useForm<z.infer<typeof BookingFormSchema>>({
resolver: zodResolver(BookingFormSchema),
defaultValues: {
email: "",
name: "",
surname: "",
phone: "",
},
});
//Redirect to home if no booking is active.
useEffect(() => {
if (
!appBookingState ||
!bookingData ||
(appBookingState.state != eBookingState.Booking &&
appBookingState.state != eBookingState.Booked)
) {
navigate(ConstsNav.page_Home);
}
}, [appBookingState, bookingData, navigate]);
//Send booking request to API
useEffect(() => {
async function sendCreateRequestAsync() {
const rs = await APISendCreateBooking(bookingData);
if (rs.isError) {
setPageState(PageState.error);
} else {
setBookingStateBooked();
navigate(ConstsNav.page_Success, { state: rs.bookingResponse });
}
}
if (pageState != PageState.sending) {
return;
}
sendCreateRequestAsync();
}, [pageState, bookingData, navigate, setBookingStateBooked]);
function onSubmit(values: z.infer<typeof BookingFormSchema>) {
if (bookingData == null) {
return;
}
const newCustomerData: NewBookingCustomerDetails = {
...bookingData.customerDetails,
name: values.name,
surname: values.surname,
email: values.email,
phoneNumber: values.phone,
};
setCustomerData(newCustomerData);
setPageState(PageState.sending);
}
const errorMsg = (
<div>
<Typography variant={"inlineCode"}>
Server error. Try again later!
</Typography>
</div>
);
return (
<>
<Typography variant={"h1"}>Booking Details</Typography>
<Separator className="my-8" />
<div className="lg:grid lg:grid-cols-40/60 lg:gap-x-10">
<Card>
<CardHeader>
<Typography variant={"h2"}>Personal Details</Typography>
</CardHeader>
<CardContent>
<form
id={bookingFormId}
onSubmit={bookingForm.handleSubmit(onSubmit)}
className="space-y-8"
>
<FieldSet>
<FieldLegend>Customer Details</FieldLegend>
<FieldGroup className="flex flex-row">
<Controller
name="name"
control={bookingForm.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor={field.name}>Name</FieldLabel>
<Input
{...field}
id={field.name}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid && (
<FieldError errors={[fieldState.error]} />
)}
</Field>
)}
/>
<Controller
name="surname"
control={bookingForm.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor={field.name}>Surname</FieldLabel>
<Input
{...field}
id={field.name}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid && (
<FieldError errors={[fieldState.error]} />
)}
</Field>
)}
/>
</FieldGroup>
<FieldGroup className="flex flex-col">
<Controller
name="email"
control={bookingForm.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor={field.name}>Email</FieldLabel>
<Input
{...field}
id={field.name}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid && (
<FieldError errors={[fieldState.error]} />
)}
</Field>
)}
/>
<Controller
name="phone"
control={bookingForm.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor={field.name}>
Phone Number
</FieldLabel>
<Input
{...field}
id={field.name}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid && (
<FieldError errors={[fieldState.error]} />
)}
</Field>
)}
/>
</FieldGroup>
</FieldSet>
<Field orientation="vertical">
<Button
type="submit"
form={bookingFormId}
disabled={pageState == PageState.sending}
>
Submit
</Button>
</Field>
</form>
{pageState == PageState.error && errorMsg}
</CardContent>
</Card>
<Separator className="my-10 lg:hidden" />
<BookingDetails mode="View"></BookingDetails>
</div>
</>
);
}
export default BookPage;
+63
View File
@@ -0,0 +1,63 @@
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader } from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton";
import { Typography } from "@/components/ui/typography";
import { eConfigVarKeys } from "@/model/ConfigVar";
import { useConfigVariable } from "@/utils/apiHooks";
import { Mail, Phone } from "lucide-react";
import { useLocation } from "react-router";
function ContactPage() {
const location = useLocation();
const { value: varCompanyPhone, isLoading: isPhoneLoading } =
useConfigVariable(eConfigVarKeys.varCompanyPhone, "");
const { value: varCompanyMail, isLoading: isMailLoading } = useConfigVariable(
eConfigVarKeys.varCompanyEmail,
"",
);
const { value: varCompanyContactPage, isLoading: isContactPageLoading } =
useConfigVariable(eConfigVarKeys.varCompanyContactFormUrl, "");
const isDataLoading = isPhoneLoading || isMailLoading || isContactPageLoading;
const mainText = location.state ?? "Contact us for a personalized quote!";
const LoadingContent = <Skeleton className="h-25 w-full" />;
const MainContent = (
<div className="mx-auto">
<div className="mx-auto">
<Typography variant={"largeText"}>{mainText}</Typography>
<div className="my-4 flex justify-center gap-4">
<Card className="flex flex-col items-center gap-2 px-5 hover:bg-secondary">
<Phone size={"1.2em"} />
<Typography variant={"p_inline"}>{varCompanyPhone}</Typography>
</Card>
<Card className="flex flex-col items-center gap-2 px-5 hover:bg-secondary">
<Mail size={"1.2em"} />
<Typography variant={"p_inline"}>{varCompanyMail}</Typography>
</Card>
</div>
</div>
{varCompanyContactPage !== "" && (
<Button className="my-4" variant={"link"}>
<a href={varCompanyContactPage}>
<Typography variant={"largeText"}>Go to contact form</Typography>
</a>
</Button>
)}
</div>
);
return (
<Card>
<CardHeader>
<Typography variant={"h2"}>Contact us!</Typography>
</CardHeader>
<CardContent>{isDataLoading ? LoadingContent : MainContent}</CardContent>
</Card>
);
}
export default ContactPage;
@@ -1,9 +1,8 @@
import { useRouteError } from "react-router-dom"; import { useRouteError } from "react-router";
export default function ErrorPage() { export default function ErrorPage() {
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
const error : any = useRouteError(); const error: any = useRouteError();
console.error(error); console.error(error);
return ( return (
+2 -2
View File
@@ -1,3 +1,3 @@
.homePage { .homePageRoomGrid {
min-height: 100vh; grid-template-columns: repeat(auto-fit, minmax(300px, 3fr));
} }
+66 -7
View File
@@ -1,13 +1,72 @@
import "./home-page.css" import { useAPIRoomCategoryList } from "@/api/api-roomCategories";
import { Button } from "@/components/ui/button" import { RoomItemCard } from "@/components/Rooms/room-item-card";
import { SearchFilterCard } from "@/components/Search/SearchFilterCard";
import BackendConnectionStatus from "@/components/backend-conection-status";
import { Separator } from "@/components/ui/separator";
import { Skeleton } from "@/components/ui/skeleton";
import { Typography } from "@/components/ui/typography";
import { RoomCategory } from "@/model/RoomCategory";
import { SearchFilter } from "@/model/InternalTypes";
import { useNavigate } from "react-router";
import { LoaderIcon } from "lucide-react";
import "./home-page.css";
import { useAppStore } from "@/store";
import { useBookingStateDispacher } from "@/utils/hooks";
import { eConfigVarKeys } from "@/model/ConfigVar";
import { useConfigVariable } from "@/utils/apiHooks";
import { ConstsNav } from "@/utils/Consts";
function Homepage() { function Homepage() {
const appSearchFilter = useAppStore((state) => state.searchFilter);
const navigate = useNavigate();
const { setBookingStateSearched } = useBookingStateDispacher();
const { value: varCompanyName } = useConfigVariable(
eConfigVarKeys.varCompanyName,
"",
);
const {
roomCategoryList,
isLoading: isLoadingCategories,
isError,
} = useAPIRoomCategoryList();
const onBtSearchClick = (filter: SearchFilter) => {
setBookingStateSearched(filter);
navigate(ConstsNav.page_Search, { state: filter });
};
const roomList = roomCategoryList?.map((element: RoomCategory) => {
return <RoomItemCard key={element.id} room={element} />;
});
return ( return (
<div className="bg-background text-foreground"> <>
<Button>Test</Button> <Typography variant={"h1"}>{varCompanyName}</Typography>
</div> <Separator />
) <SearchFilterCard
onSearchClick={onBtSearchClick}
initialsearchFilter={appSearchFilter}
/>
<Separator />
<div className="homePageRoomGrid grid gap-4">{roomList}</div>
{isLoadingCategories && (
<>
<Skeleton className="mx-auto flex h-50 w-full flex-col items-center justify-center">
<LoaderIcon />
<Typography variant={"h3"} as="h2">
Loading...
</Typography>
</Skeleton>
</>
)}
<Separator />
<BackendConnectionStatus
isLoading={isLoadingCategories}
isError={isError}
/>
</>
);
} }
export default Homepage export default Homepage;
+122
View File
@@ -0,0 +1,122 @@
import { useAPIRoomAvailability } from "@/api/api-roomSearch";
import RoomBooking from "@/components/Rooms/room-booking";
import { SearchFilterCard } from "@/components/Search/SearchFilterCard";
import BackendConnectionStatus from "@/components/backend-conection-status";
import { BookingDetails } from "@/components/booking/booking-details";
import { Separator } from "@/components/ui/separator";
import { Skeleton } from "@/components/ui/skeleton";
import { Typography } from "@/components/ui/typography";
import { SearchFilter } from "@/model/InternalTypes";
import { eBookingState } from "@/utils/AppStateManager";
import { useAppStore } from "@/store";
import { makeSearchPeriodRequestFromSearchFilter } from "@/utils/utils";
import { useNavigate } from "react-router";
import { useBookingStateDispacher } from "@/utils/hooks";
import { ConstsNav } from "@/utils/Consts";
//TODOME: Al pulsar el botón "buscar", si ya existen datos en la reserva (se han añadido habitaciones) mostrar un cuadro de aviso de que si se busca se borrará la selección actual.
//TODOME: Mediante los estados globales de la reserva, si ya está en estado "booking" añadiendo los datos, mostrar un mensaje y permitir redirigir directamente para que continue donde lo dejó.
function SearchPage() {
const appBookingState = useAppStore((state) => state.bookingState);
const appSearchFilter = useAppStore((state) => state.searchFilter);
const navigate = useNavigate();
const { setBookingStateSearched, setBookingStateBooking } =
useBookingStateDispacher();
const {
roomAvailabilityList,
isLoading: isLoadingAvailability,
isError: isErrorAvailability,
} = useAPIRoomAvailability(
makeSearchPeriodRequestFromSearchFilter(appSearchFilter) ?? null,
);
const isLoading = isLoadingAvailability;
const isError = isErrorAvailability;
const hasRooms =
roomAvailabilityList?.length && roomAvailabilityList?.length > 0;
const onBtSearchClick = (newFilter: SearchFilter) => {
setBookingStateSearched(newFilter);
};
const onBookingContinue = () => {
setBookingStateBooking();
navigate(ConstsNav.page_Book);
};
const roomList =
roomAvailabilityList?.map((element) => {
return (
<RoomBooking
key={element.roomCategory + "-" + appBookingState.lastSearchDate}
availableAmount={element.availability}
roomCategoryId={element.roomCategory}
/>
);
}) ?? null;
const noRoomsAvailable = (
<>
<Typography variant={"h3"} as="h3">
Sorry 😔, there aren't rooms available for selected period. You can
contact us for more info.
</Typography>
</>
);
const pageContentSearch = (
<Typography>
Realiza una búsqueda para ver la disponibilidad y los precios.
</Typography>
);
const pageContentLoading = (
<>
<Typography variant={"h3"} as="h2">
Loading...
</Typography>
<Skeleton className="mx-auto h-50 w-full" />
</>
);
const pageContentLoaded = (
<div className="2xl:grid 2xl:grid-cols-60/40 2xl:gap-6">
<div className="flex flex-col gap-5">{roomList}</div>
<Separator className="2xl:hidden" />
<BookingDetails
onBookingConfirm={onBookingContinue}
mode={"Book"}
></BookingDetails>
</div>
);
const getPageContent = () => {
const isSearched =
appBookingState.state == eBookingState.Searched ||
appBookingState.state == eBookingState.Booking;
if (!isSearched) {
return pageContentSearch;
}
if (isLoading) {
return pageContentLoading;
}
if (!hasRooms) {
return noRoomsAvailable;
}
return pageContentLoaded;
};
return (
<div className="bg-background text-foreground">
<SearchFilterCard
onSearchClick={onBtSearchClick}
initialsearchFilter={appSearchFilter}
/>
<Separator />
{getPageContent()}
<Separator />
<BackendConnectionStatus isLoading={isLoading} isError={isError} />
</div>
);
}
export default SearchPage;
+51
View File
@@ -0,0 +1,51 @@
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader } from "@/components/ui/card";
import { Typography } from "@/components/ui/typography";
import { NewBookingResponse } from "@/model/Bookings";
import { useAppStore } from "@/store";
import { ConstsNav } from "@/utils/Consts";
import { useEffect, useState } from "react";
import { useLocation, useNavigate } from "react-router";
function SuccessPage() {
const [pageState, setPageState] = useState<NewBookingResponse | null>(null);
const resetBookingState = useAppStore((state) => state.resetCurrentBooking);
const location = useLocation();
const navigate = useNavigate();
if (pageState == null && location.state != null) {
setPageState(location.state);
}
useEffect(() => {
if (location.state == null) {
navigate(ConstsNav.page_Home);
}
}, [location, navigate]);
const handleBtBackClick = () => {
resetBookingState();
navigate(ConstsNav.page_Home);
};
return (
<Card>
<CardHeader>
<Typography variant={"h2"}>Booking Completed</Typography>
</CardHeader>
<CardContent>
<Typography variant={"largeText"}>
Booking ref: {pageState?.refNumber}
</Typography>
<Button className="my-4" onClick={handleBtBackClick}>
<Typography variant={"largeText"} className="text-primary-foreground">
Go Back
</Typography>
</Button>
</CardContent>
</Card>
);
}
export default SuccessPage;
+131
View File
@@ -0,0 +1,131 @@
import { create } from "zustand";
import { SearchFilter } from "@/model/InternalTypes";
import {
BookingState,
eBookingState,
SetBookingState,
} from "./utils/AppStateManager";
import {
NewBooking,
NewBookingCustomerDetails,
NewBookingRoom,
} from "./model/Bookings";
interface State {
searchFilter: SearchFilter;
currentBooking: NewBooking | null;
bookingState: BookingState;
}
interface Actions {
setSearchFilter: (newFilter: SearchFilter) => void;
resetSearchFilter: () => void;
setCurrentBooking: (newBooking: NewBooking) => void;
resetCurrentBooking: () => void;
initCurrentBooking: (arrival: Date, departure: Date) => void;
currentBookingAddRoom: (newRoom: NewBookingRoom) => void;
currentBookingSetCustomer: (newCustomer: NewBookingCustomerDetails) => void;
setBookingState: (newState: eBookingState) => void;
}
const defaultSearchFilter: SearchFilter = {
dateRange: { from: new Date() },
};
const defaultNewBooking: NewBooking = {
arrivalDate: new Date(),
departureDate: new Date(),
customerDetails: {
name: null,
surname: null,
email: null,
phoneNumber: null,
},
rooms: [],
};
const defaultBookingState: BookingState = {
state: eBookingState.None,
lastSearchDate: new Date(),
};
function getDefaultBooking(arrivalDate: Date, departureDate: Date) {
return {
...defaultNewBooking,
arrivalDate: arrivalDate,
departureDate: departureDate,
};
}
function addNewBookingRoom(
newRoom: NewBookingRoom,
currentBookingState: NewBooking | null,
): NewBooking | null {
if (currentBookingState == null) {
return currentBookingState;
}
//Remove rooms with "same key".
const filteredRooms = currentBookingState.rooms.filter((room) => {
const isDiffRoom = room.roomCategory != newRoom.roomCategory;
const isDiffAmount = room.guestNumber != newRoom.guestNumber;
if (isDiffRoom || (!isDiffRoom && isDiffAmount)) {
return true;
}
return false;
});
if (newRoom.amount > 0) {
filteredRooms.push(newRoom);
}
const newState: NewBooking = {
...currentBookingState,
rooms: filteredRooms ?? [],
};
return newState;
}
function setBookingCustomer(
newCustomer: NewBookingCustomerDetails,
currentBookingState: NewBooking | null,
) {
if (currentBookingState == null) {
return currentBookingState;
}
const newState: NewBooking = {
...currentBookingState,
customerDetails: newCustomer,
};
return newState;
}
export const useAppStore = create<State & Actions>()((set) => ({
searchFilter: defaultSearchFilter,
currentBooking: null,
bookingState: defaultBookingState,
setSearchFilter: (newFilter) => set(() => ({ searchFilter: newFilter })),
resetSearchFilter: () => set(() => ({ searchFilter: defaultSearchFilter })),
setCurrentBooking: (newBooking) =>
set(() => ({ currentBooking: newBooking })),
resetCurrentBooking: () => set(() => ({ currentBooking: null })),
initCurrentBooking: (arrival, departure) =>
set(() => ({ currentBooking: getDefaultBooking(arrival, departure) })),
currentBookingAddRoom: (newRoom) =>
set((state) => ({
currentBooking: addNewBookingRoom(newRoom, state.currentBooking),
})),
currentBookingSetCustomer: (newCustomer) =>
set((state) => ({
currentBooking: setBookingCustomer(newCustomer, state.currentBooking),
})),
setBookingState: (newState) =>
set((state) => ({
bookingState: SetBookingState(newState, state.bookingState),
})),
}));
+27
View File
@@ -0,0 +1,27 @@
export type BookingState = {
state: eBookingState;
lastSearchDate: Date;
};
export enum eBookingState {
None = "NONE",
Searched = "SEARCHED",
Booking = "BOOKING",
Booked = "BOOKED",
}
export function SetBookingState(
newState: eBookingState,
currentAppBookingState: BookingState,
) {
const newAppState: BookingState = {
...currentAppBookingState,
state: newState,
};
if (newState == eBookingState.Searched) {
newAppState.lastSearchDate = new Date();
}
return newAppState;
}
+22
View File
@@ -0,0 +1,22 @@
export const c_somniaRooms_notice_text =
"Powered by SomniaRooms, an Open-Source hospitality booking platform!";
export const c_sominaRooms_webpage = "https://somnia.dev";
export const ConstsNav = {
page_Home: "/home",
page_Contact: "/contact",
page_Search: "/search",
page_Book: "/book",
page_Success: "/success",
};
//TMP - The following texts should be replaced for a proper intl system.
export const ConstsTexts = {
navToContact_maxAllowedNightCount:
"We are sorry, but the selected date range is too large. Search for a smaller range or contact us for a personalized quote.",
navToContact_maxAllowedGuestNumber:
"We are sorry, group bookings are not allowed. Contact us for a personalized quote.",
contactUsAlertDialog_title: "Contact us!",
contactUsAlertDialog_text:
"This booking seems like a big deal... Contact us for a personalized quote!",
};
+97
View File
@@ -0,0 +1,97 @@
import { useAPIConfigVarList } from "@/api/api-configVars";
import { getConfigVarFromList } from "./utils";
import { eConfigVarKeys } from "@/model/ConfigVar";
import { useAPIRoomCategoryList } from "@/api/api-roomCategories";
import { useAPIRoomPrices } from "@/api/api-roomSearch";
import { RoomCategory } from "@/model/RoomCategory";
import { RoomPrice, SearchPeriodRequest } from "@/model/RoomSearch";
export function useConfigVariable(
key: eConfigVarKeys,
defaultValue: string,
): {
value: string;
isLoading: boolean;
} {
const { configVarList, isLoading } = useAPIConfigVarList();
if (isLoading) {
return {
value: defaultValue,
isLoading: true,
};
}
const configVar = getConfigVarFromList(configVarList, key);
return { value: configVar?.value ?? defaultValue, isLoading: isLoading };
}
export function useConfigVariableAsNumber(
key: eConfigVarKeys,
defaultValue: number,
): {
value: number;
isLoading: boolean;
} {
const rs = useConfigVariable(key, defaultValue.toString());
return {
value: rs.isLoading ? defaultValue : parseFloat(rs.value),
isLoading: rs.isLoading,
};
}
export function useRoomCategory(roomCategoryId: number): {
value: RoomCategory | null;
isLoading: boolean;
} {
const { roomCategoryList, isLoading, isError } = useAPIRoomCategoryList();
if (isLoading) {
return {
value: null,
isLoading: true,
};
}
if (isError) {
return {
value: null,
isLoading: false,
};
}
const roomCategoryItem = roomCategoryList?.find(
(i) => i.id == roomCategoryId,
);
return { value: roomCategoryItem ?? null, isLoading: isLoading };
}
export function useRoomPrice(
filter: SearchPeriodRequest | null,
roomCategoryId: number,
): {
value: RoomPrice[];
isLoading: boolean;
} {
const { roomPriceList, isLoading, isError } = useAPIRoomPrices(filter);
if (isLoading) {
return {
value: [],
isLoading: true,
};
}
if (isError) {
return {
value: [],
isLoading: false,
};
}
const roomPrice = roomPriceList?.find(
(i) => i.roomCategoryId == roomCategoryId,
);
return { value: roomPrice?.prices ?? [], isLoading: isLoading };
}
+131
View File
@@ -0,0 +1,131 @@
import { SearchFilter } from "@/model/InternalTypes";
import { useAppStore } from "@/store";
import { getNightCountFromSearchFilter, makeDayUTCDate } from "./utils";
import { useCallback } from "react";
import { eBookingState } from "./AppStateManager";
import { useConfigVariableAsNumber } from "./apiHooks";
import { eConfigVarKeys } from "@/model/ConfigVar";
import { NewBooking } from "@/model/Bookings";
export function useBookingStateDispacher(): {
setBookingStateSearched: (sf: SearchFilter) => void;
setBookingStateBooking: () => void;
setBookingStateBooked: () => void;
} {
const setAppBookingState = useAppStore((state) => state.setBookingState);
const setAppSearchFilter = useAppStore((state) => state.setSearchFilter);
const initAppBooking = useAppStore((state) => state.initCurrentBooking);
const fnSearched = useCallback(
(sf: SearchFilter) => {
setAppSearchFilter(sf);
setAppBookingState(eBookingState.Searched);
initAppBooking(
makeDayUTCDate(sf.dateRange.from),
makeDayUTCDate(sf.dateRange.to),
);
},
[setAppBookingState, setAppSearchFilter, initAppBooking],
);
const fnBooking = useCallback(() => {
setAppBookingState(eBookingState.Booking);
}, [setAppBookingState]);
const fnBooked = useCallback(() => {
setAppBookingState(eBookingState.Booked);
}, [setAppBookingState]);
return {
setBookingStateSearched: fnSearched,
setBookingStateBooking: fnBooking,
setBookingStateBooked: fnBooked,
};
}
//This checks may be moved into "useBookingStateDispacher".
// That way, the logic may be more general and separated from the components and buttons
// and the dialog may use global state.
export function useCheckForNightCount(sf: SearchFilter | null): {
isOverApiMax: boolean;
shouldShowContactDialog: boolean;
isLoading: boolean;
} {
const {
value: varApiMaxAllowedNights,
isLoading: isLoadingVarMaxAllowedNights,
} = useConfigVariableAsNumber(eConfigVarKeys.varAPIMaxAllowedNightAmount, -1);
const {
value: varNightCountForContactDialog,
isLoading: isLoadingVarNightCountForContact,
} = useConfigVariableAsNumber(
eConfigVarKeys.varNightCountForContactDialog,
-1,
);
const areVariablesLoading =
isLoadingVarMaxAllowedNights || isLoadingVarNightCountForContact;
const filterNightCount = getNightCountFromSearchFilter(sf);
if (filterNightCount == null || areVariablesLoading) {
return {
isOverApiMax: false,
shouldShowContactDialog: false,
isLoading: areVariablesLoading,
};
}
const doCheckForMaxAllowedNights = varApiMaxAllowedNights > -1;
const doCheckForContactAlert = varNightCountForContactDialog > -1;
return {
isOverApiMax:
doCheckForMaxAllowedNights && filterNightCount > varApiMaxAllowedNights,
shouldShowContactDialog:
doCheckForContactAlert &&
filterNightCount >= varNightCountForContactDialog,
isLoading: areVariablesLoading,
};
}
export function useCheckForGuestNumber(bookingData: NewBooking | null): {
isOverApiMax: boolean;
shouldShowContactDialog: boolean;
isLoading: boolean;
} {
const {
value: varApiMaxAllowedGuests,
isLoading: isLoadingVarMaxAllowedGuests,
} = useConfigVariableAsNumber(eConfigVarKeys.varAPIMaxAllowedGuestNumber, -1);
const {
value: varGuestNumberForContactDialog,
isLoading: isLoadingVarGuestNumberForContact,
} = useConfigVariableAsNumber(
eConfigVarKeys.varGuestNumberForContactDialog,
-1,
);
const areVariablesLoading =
isLoadingVarMaxAllowedGuests || isLoadingVarGuestNumberForContact;
if (bookingData == null || areVariablesLoading) {
return {
isOverApiMax: false,
shouldShowContactDialog: false,
isLoading: areVariablesLoading,
};
}
//Calculate guest number in current booking data.
const totalGuestNumber = bookingData.rooms.reduce((acc, r) => {
return acc + r.guestNumber * r.amount;
}, 0);
const doCheckForMaxAllowedGuests = varApiMaxAllowedGuests > -1;
const doCheckForContactAlert = varGuestNumberForContactDialog > -1;
return {
isOverApiMax:
doCheckForMaxAllowedGuests && totalGuestNumber > varApiMaxAllowedGuests,
shouldShowContactDialog:
doCheckForContactAlert &&
totalGuestNumber >= varGuestNumberForContactDialog,
isLoading: areVariablesLoading,
};
}
+61
View File
@@ -0,0 +1,61 @@
import { SearchPeriodRequest } from "@/model/RoomSearch";
import { SearchFilter } from "@/model/InternalTypes";
import { ConfigVar } from "@/model/ConfigVar";
import { differenceInDays } from "date-fns";
export function makeDayUTCDate(date: Date | undefined): Date {
if (!date) {
return new Date();
}
return new Date(
date.getFullYear(),
date.getMonth(),
date.getDate(),
23,
59,
59,
999,
);
}
export function isValidSearchFilter(
sf: SearchFilter | null,
): sf is SearchFilter {
if (sf?.dateRange?.from && sf?.dateRange?.to) {
return true;
}
return false;
}
export function getNightCountFromSearchFilter(
sf: SearchFilter | null,
): number | null {
if (!isValidSearchFilter(sf)) {
return null;
}
return differenceInDays(sf.dateRange.to!, sf.dateRange.from!);
}
export function makeSearchPeriodRequestFromSearchFilter(
sf: SearchFilter,
): SearchPeriodRequest | null {
if (!isValidSearchFilter(sf)) {
return null;
}
return {
startDate: sf.dateRange.from!.toISOString(),
endDate: sf.dateRange.to!.toISOString(),
};
}
export function getConfigVarFromList(
varList: ConfigVar[] | undefined,
key: string,
): ConfigVar | undefined {
if (!varList) {
return undefined;
}
return varList.find((v) => v.key === key);
}
-79
View File
@@ -1,79 +0,0 @@
import plugin from 'tailwindcss-animate';
/** @type {import('tailwindcss').Config} */
export default {
darkMode: ["class"],
content: [
'./pages/**/*.{ts,tsx}',
'./components/**/*.{ts,tsx}',
'./app/**/*.{ts,tsx}',
'./src/**/*.{ts,tsx}',
],
prefix: "",
theme: {
container: {
center: true,
padding: "2rem",
screens: {
"2xl": "1400px",
},
},
extend: {
colors: {
border: "hsl(var(--border))",
input: "hsl(var(--input))",
ring: "hsl(var(--ring))",
background: "hsl(var(--background))",
foreground: "hsl(var(--foreground))",
primary: {
DEFAULT: "hsl(var(--primary))",
foreground: "hsl(var(--primary-foreground))",
},
secondary: {
DEFAULT: "hsl(var(--secondary))",
foreground: "hsl(var(--secondary-foreground))",
},
destructive: {
DEFAULT: "hsl(var(--destructive))",
foreground: "hsl(var(--destructive-foreground))",
},
muted: {
DEFAULT: "hsl(var(--muted))",
foreground: "hsl(var(--muted-foreground))",
},
accent: {
DEFAULT: "hsl(var(--accent))",
foreground: "hsl(var(--accent-foreground))",
},
popover: {
DEFAULT: "hsl(var(--popover))",
foreground: "hsl(var(--popover-foreground))",
},
card: {
DEFAULT: "hsl(var(--card))",
foreground: "hsl(var(--card-foreground))",
},
},
borderRadius: {
lg: "var(--radius)",
md: "calc(var(--radius) - 2px)",
sm: "calc(var(--radius) - 4px)",
},
keyframes: {
"accordion-down": {
from: { height: "0" },
to: { height: "var(--radix-accordion-content-height)" },
},
"accordion-up": {
from: { height: "var(--radix-accordion-content-height)" },
to: { height: "0" },
},
},
animation: {
"accordion-down": "accordion-down 0.2s ease-out",
"accordion-up": "accordion-up 0.2s ease-out",
},
},
},
plugins: [plugin],
}
+10
View File
@@ -0,0 +1,10 @@
{
"compilerOptions": {
// ...
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
// ...
}
}
+1 -3
View File
@@ -2,9 +2,7 @@
"compilerOptions": { "compilerOptions": {
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"@/*": [ "@/*": ["./src/*"]
"./src/*"
]
}, },
"target": "ES2020", "target": "ES2020",
"useDefineForClassFields": true, "useDefineForClassFields": true,
+6 -5
View File
@@ -1,10 +1,11 @@
import { defineConfig } from 'vite' import { defineConfig } from "vite";
import react from '@vitejs/plugin-react-swc' import react from "@vitejs/plugin-react-swc";
import path from "path" import path from "path";
import tailwindcss from "@tailwindcss/vite";
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({
plugins: [react()], plugins: [react(), tailwindcss()],
server: { server: {
host: true, host: true,
port: 3000, port: 3000,
@@ -14,4 +15,4 @@ export default defineConfig({
"@": path.resolve(__dirname, "./src"), "@": path.resolve(__dirname, "./src"),
}, },
}, },
}) });