Compare commits
33 commits
15f4fbd40b
...
7ede267762
| Author | SHA1 | Date | |
|---|---|---|---|
| 7ede267762 | |||
| 53cc8cb2b7 | |||
| ce27923118 | |||
| 94f89fea89 | |||
| a8c52e3f54 | |||
| ed6174ad34 | |||
| fdc556afc0 | |||
| a8eb6a7a92 | |||
| 4c07c0466e | |||
| 1c082b9eb1 | |||
| 9af74e4df4 | |||
| 331bf5edda | |||
0815440f72
|
|||
|
1d17f7329e
|
|||
|
f6b094bbb2
|
|||
| a1568e455f | |||
|
9f0a5813be
|
|||
|
1cb2019298
|
|||
|
6231d6cd45
|
|||
| 2e31d935a6 | |||
| e1a50b87e5 | |||
| 12fe9be5a5 | |||
| 5dd0179ac2 | |||
| d2ba0bfc16 | |||
| 232ce7bafe | |||
| f769b400c6 | |||
| 7f822e0e77 | |||
| 7775e5f0a8 | |||
| a563031f91 | |||
| 70fad4de73 | |||
| 92be324186 | |||
| 6c734f2d19 | |||
| 72c3f6c17f |
23 changed files with 818 additions and 367 deletions
19
.env.example
19
.env.example
|
|
@ -6,4 +6,23 @@ AUTH_AUTHENTIK_ID=
|
|||
AUTH_AUTHENTIK_SECRET=
|
||||
AUTH_AUTHENTIK_ISSUER=
|
||||
|
||||
AUTH_DISCORD_ID=
|
||||
AUTH_DISCORD_SECRET=
|
||||
|
||||
AUTH_FACEBOOK_ID=
|
||||
AUTH_FACEBOOK_SECRET=
|
||||
|
||||
AUTH_GITHUB_ID=
|
||||
AUTH_GITHUB_SECRET=
|
||||
|
||||
AUTH_GITLAB_ID=
|
||||
AUTH_GITLAB_SECRET=
|
||||
|
||||
AUTH_GOOGLE_ID=
|
||||
AUTH_GOOGLE_SECRET=
|
||||
|
||||
AUTH_KEYCLOAK_ID=
|
||||
AUTH_KEYCLOAK_SECRET=
|
||||
AUTH_KEYCLOAK_ISSUER=
|
||||
|
||||
NEXT_PUBLIC_APP_URL=
|
||||
|
|
|
|||
219
README.md
219
README.md
|
|
@ -1,5 +1,19 @@
|
|||
# MeetUP
|
||||
|
||||
## Table of contents
|
||||
|
||||
- [Description](#description)
|
||||
- [Project Status](#project-status)
|
||||
- [Features](#features)
|
||||
- [Implemented Features](#implemented-features)
|
||||
- [Planned Features](#planned-features-roadmap)
|
||||
- [Technologies Used](#technologies-used)
|
||||
- [Development environment setup](#development-environment-setup)
|
||||
- [Without Docker](#without-docker)
|
||||
- [With Docker](#with-docker)
|
||||
- [Production Deployment using Docker](#production-deployment-using-docker)
|
||||
- [Contributing](#contributing)
|
||||
|
||||
## Description
|
||||
|
||||
MeetUP is a social calendar application designed to make coordinating schedules with friends seamless and intuitive. It was created because it can be a hassle coordinating meetings between multiple friends and across different friend groups. MeetUP aims to simplify the process of finding mutual availability without endless back-and-forth messaging.
|
||||
|
|
@ -12,52 +26,54 @@ MeetUP is a social calendar application designed to make coordinating schedules
|
|||
|
||||
### Implemented Features
|
||||
|
||||
- Core infrastructure setup in progress. No user-facing features are implemented yet.
|
||||
- Event creation, deletion, and editing
|
||||
- SSO and credentials login and signup
|
||||
- Participant invitation and status
|
||||
- Calendar of your own events
|
||||
- Calendar of other users' availability (only in event creation form)
|
||||
|
||||
### Planned Features (Roadmap)
|
||||
|
||||
- **Friendships:** Connect with friends to share calendars.
|
||||
- **Group Calendars:** Create and manage shared calendars for groups.
|
||||
- **iCal Import:** Import existing calendars from iCalendar (.ics) files.
|
||||
- **iCal Export:** Export personal or shared calendars in iCalendar (.ics) format.
|
||||
- **Email Notifications:** Receive email alerts for event bookings, reminders, and updates.
|
||||
- **View Blocked Slots:** See when friends are busy without revealing event details.
|
||||
- **Book Timeslots:** Request and confirm meeting times in friends' available slots.
|
||||
- **SSO Compatibility:** Planning for Single Sign-On integration.
|
||||
- Friendships
|
||||
- Group calendars
|
||||
- iCal import and export
|
||||
- Notifications (in-app and external/mail)
|
||||
|
||||
## Technologies Used
|
||||
|
||||
This project is built with a modern tech stack:
|
||||
|
||||
- **Package Manager:** [Yarn](https://yarnpkg.com/)
|
||||
- **Framework:** [Next.js](https://nextjs.org/) - React framework for server-side rendering and static site generation.
|
||||
- **Language:** [TypeScript](https://www.typescriptlang.org/) - Superset of JavaScript that adds static typing.
|
||||
- **ORM:** [Prisma](https://www.prisma.io/) - Next-generation ORM for Node.js and TypeScript.
|
||||
- **Authentication:** [Auth.js](https://authjs.dev/) (formerly NextAuth.js) - Authentication for Next.js.
|
||||
- **Styling:** [Tailwind CSS](https://tailwindcss.com/) - A utility-first CSS framework.
|
||||
- **UI Components:** [shadcn/ui](https://ui.shadcn.com/) - Re-usable components built using Radix UI and Tailwind CSS.
|
||||
- **Containerization:** [Docker](https://www.docker.com/) (for planned self-hosting option)
|
||||
- _(You can also list related tools here, e.g., ESLint, Prettier, testing libraries if you plan to use them)_
|
||||
- **Framework:** [Next.js](https://nextjs.org/)
|
||||
- **Language:** [TypeScript](https://www.typescriptlang.org/)
|
||||
- **ORM:** [Prisma](https://www.prisma.io/)
|
||||
- **Authentication:** [Auth.js](https://authjs.dev/)
|
||||
- **Styling:** [Tailwind CSS](https://tailwindcss.com/)
|
||||
- **UI Components:** [shadcn/ui](https://ui.shadcn.com/)
|
||||
- **Containerization:** [Docker](https://www.docker.com/)
|
||||
- **API Docs:** [Swagger](https://swagger.io/)
|
||||
- **React hook API client:** [orval](https://orval.dev/)
|
||||
|
||||
## Getting Started
|
||||
## Development environment setup
|
||||
|
||||
### Without Docker
|
||||
|
||||
**Prerequisites:**
|
||||
|
||||
- Node.js: Version is continually upgraded. It's recommended to use the latest LTS or a recent stable version. (Check `.nvmrc` if available).
|
||||
- Yarn: Version is continually upgraded. (Check `package.json` engines field if specified).
|
||||
- A database supported by Prisma (e.g., PostgreSQL, MySQL, SQLite). Ensure your database server is running.
|
||||
- **Node.js**: version 22+
|
||||
- **corepack**: enable using `corepack enable`
|
||||
|
||||
**Installation & Running Locally:**
|
||||
**Installation & Running:**
|
||||
|
||||
1. **Clone the repository:**
|
||||
- Using SSH:
|
||||
- Using HTTPS:
|
||||
```bash
|
||||
git clone https://git.dominikstahl.dev/DHBW-WE/MeetUp.git
|
||||
```
|
||||
- Or using SSH:
|
||||
```bash
|
||||
git clone ssh://git@git.dominikstahl.dev/DHBW-WE/MeetUp.git
|
||||
```
|
||||
- Or using HTTPS (recommended for most users):
|
||||
```bash
|
||||
git clone [https://git.dominikstahl.dev/DHBW-WE/MeetUp.git](https://git.dominikstahl.dev/DHBW-WE/MeetUp.git)
|
||||
```
|
||||
```bash
|
||||
cd MeetUp
|
||||
```
|
||||
|
|
@ -66,53 +82,44 @@ This project is built with a modern tech stack:
|
|||
yarn install
|
||||
```
|
||||
3. **Set up environment variables:**
|
||||
- You will need to create an `AUTH_SECRET`. You can generate one using the following command:
|
||||
```bash
|
||||
npx auth secret
|
||||
```
|
||||
- Copy the `.env.example` file (if it exists) to `.env.local`. If not, create `.env.local`.
|
||||
```bash
|
||||
# If .env.example exists:
|
||||
cp .env.example .env.local
|
||||
# Otherwise, create .env.local and add the following:
|
||||
```
|
||||
- Ensure the following environment variables are set in your `.env.local` file. Adjust `DATABASE_URL` for your specific database provider and credentials.
|
||||
You will need to create an `AUTH_SECRET`. You can generate one using the following command:
|
||||
|
||||
```env
|
||||
# Database Connection String (Prisma)
|
||||
# Example for PostgreSQL: DATABASE_URL="postgresql://USER:PASSWORD@HOST:PORT/DATABASE?schema=public"
|
||||
DATABASE_URL="your_database_connection_string"
|
||||
```bash
|
||||
npx auth secret
|
||||
```
|
||||
|
||||
# Generated with npx auth secret
|
||||
AUTH_SECRET="your_generated_auth_secret"
|
||||
Add any additional needed environment variables into the generated `.env.local` file.
|
||||
Example variables can be found in the `.env.example` file. The following variables are required:
|
||||
|
||||
# Authentik SSO Variables (if you are using this provider)
|
||||
AUTH_AUTHENTIK_ID=
|
||||
AUTH_AUTHENTIK_SECRET=
|
||||
AUTH_AUTHENTIK_ISSUER=
|
||||
```env
|
||||
# Generated with npx auth secret
|
||||
AUTH_SECRET="your_generated_auth_secret"
|
||||
|
||||
# Base URL of your application
|
||||
NEXT_PUBLIC_APP_URL="http://localhost:3000"
|
||||
```
|
||||
DATABASE_URL="file:./dev.db"
|
||||
```
|
||||
|
||||
4. **Apply database migrations (Prisma):**
|
||||
- Ensure your Prisma schema (`prisma/schema.prisma`) is defined.
|
||||
- Setup/update the database with these commands:
|
||||
```bash
|
||||
yarn prisma:generate
|
||||
```
|
||||
```bash
|
||||
yarn prisma:db:push
|
||||
```
|
||||
- Run the following command to apply migrations and generate Prisma Client:
|
||||
```bash
|
||||
npx prisma migrate dev
|
||||
# You might be prompted to name your first migration.
|
||||
```
|
||||
Set up/update the database with these commands:
|
||||
|
||||
Tipp: You can open the prisma database UI with `yarn prisma:studio`
|
||||
```bash
|
||||
yarn prisma:generate
|
||||
```
|
||||
|
||||
5. **Run the development server:**
|
||||
```bash
|
||||
yarn prisma:db:push
|
||||
```
|
||||
|
||||
Tip: You can open the Prisma database UI with `yarn prisma:studio`
|
||||
|
||||
5. **Generate needed TypeScript files:**
|
||||
Generate the `swagger.json` file and the API client using:
|
||||
|
||||
```bash
|
||||
yarn swagger:generate
|
||||
yarn orval:generate
|
||||
```
|
||||
|
||||
6. **Run the development server:**
|
||||
|
||||
```bash
|
||||
yarn dev
|
||||
|
|
@ -120,56 +127,64 @@ This project is built with a modern tech stack:
|
|||
|
||||
Open [http://localhost:3000](http://localhost:3000) in your browser to see the application.
|
||||
|
||||
The test user for the application is:
|
||||
### With Docker
|
||||
|
||||
```bash
|
||||
email: test@example.com
|
||||
password: password
|
||||
```
|
||||
**Prerequisites:**
|
||||
|
||||
**Docker Development Environment:**
|
||||
- **Docker**
|
||||
- **Docker Compose**
|
||||
|
||||
- The docker development environment can be started with the following command:
|
||||
**Running:**
|
||||
|
||||
```bash
|
||||
yarn dev_container
|
||||
```
|
||||
|
||||
**Self-Hosting with Docker (Planned):**
|
||||
## Production Deployment using Docker
|
||||
|
||||
- A Docker image and `docker-compose.yml` file will be provided in the future to allow for easy self-hosting of the MeetUP application. This setup will also include database services. Instructions will be updated here once available.
|
||||
The application can be hosted using the [Docker container](https://git.dominikstahl.dev/DHBW-WE/-/packages/container/meetup/main).
|
||||
|
||||
There is an example Docker Compose file provided [here](https://git.dominikstahl.dev/DHBW-WE/MeetUp/src/branch/main/docker-compose.yml).
|
||||
|
||||
## Contributing
|
||||
|
||||
Contributions are welcome! If you'd like to contribute, please:
|
||||
Contributions are welcome! If you'd like to contribute, please follow these steps:
|
||||
|
||||
1. Fork the repository.
|
||||
2. Create a new branch (`git checkout -b <action>/<issue#>-action_name`).
|
||||
2. Create a new branch:
|
||||
|
||||
```bash
|
||||
git checkout -b <type>/<issueNum>-<short_description>
|
||||
```
|
||||
|
||||
- Example: `feat/42-add_login_form`
|
||||
|
||||
3. Make your changes.
|
||||
4. Commit your changes (`git commit -m '<action>: add some feature'`).
|
||||
5. Push to the branch (`git push origin <action>/<issue#>-action_name`).
|
||||
4. Commit your changes using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/):
|
||||
- The commit message should be structured as follows:
|
||||
|
||||
```
|
||||
<type>(optional scope): <short description>
|
||||
```
|
||||
|
||||
- Example: `feat(auth): add login form`
|
||||
- Example: `fix(events): correct event time calculation`
|
||||
- Example: `docs: update README with setup instructions`
|
||||
|
||||
- Used types:
|
||||
- `feat`: Feature added
|
||||
- `fix`: Bug fix
|
||||
- `test`: Add or modify tests
|
||||
- `docs`: Documentation changes
|
||||
- `chore`: Changes to non-code files (workflows, lock files, etc.)
|
||||
- `refactor`: Code refactoring without changing functionality
|
||||
- `style`: Code style changes (formatting, etc.)
|
||||
- `revert`: Revert a previous commit
|
||||
|
||||
5. Push to your branch:
|
||||
```bash
|
||||
git push origin <type>/<issue#>-<short_description>
|
||||
```
|
||||
6. Open a Pull Request against the `main` branch.
|
||||
|
||||
Possible actions are:
|
||||
|
||||
*feat* -> Feature added
|
||||
*fix* -> Fixed a bug
|
||||
*test* -> Modified or added tests
|
||||
*docs* -> Modified documentation
|
||||
*chore* -> changes to non code files (workflows, lock files, ...)
|
||||
*refactor* -> rewritten code without changing functionality
|
||||
*style* -> code style (yarn format)
|
||||
*revert* -> reverts a previous commit
|
||||
|
||||
Please ensure your code adheres to the project's coding standards (e.g., run linters/formatters if configured) and that any database schema changes are accompanied by a Prisma migration.
|
||||
|
||||
---
|
||||
|
||||
**(Optional Sections You Might Want to Add Later):**
|
||||
|
||||
- **Screenshots/Demo:** (Once you have UI to show)
|
||||
- **API Reference:** (If you plan to expose an API)
|
||||
- **Detailed Deployment Guides:** (For various platforms beyond Docker)
|
||||
- **License:** (e.g., MIT, GPL - Important for open source projects)
|
||||
- **Contact:** (How to get in touch with the maintainers)
|
||||
- **Acknowledgements:** (Credit to any libraries, inspirations, or contributors)
|
||||
Please ensure your code adheres to the project's coding standards (run `yarn format`) and that any database schema changes are accompanied by a Prisma migration.
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
"@fortawesome/free-solid-svg-icons": "^6.7.2",
|
||||
"@fortawesome/react-fontawesome": "^0.2.2",
|
||||
"@hookform/resolvers": "^5.0.1",
|
||||
"@marko19907/string-to-color": "^1.0.0",
|
||||
"@prisma/client": "^6.9.0",
|
||||
"@radix-ui/react-avatar": "^1.1.10",
|
||||
"@radix-ui/react-collapsible": "^1.1.11",
|
||||
|
|
@ -51,7 +52,7 @@
|
|||
"clsx": "^2.1.1",
|
||||
"cmdk": "^1.1.1",
|
||||
"date-fns": "^4.1.0",
|
||||
"lucide-react": "^0.523.0",
|
||||
"lucide-react": "^0.525.0",
|
||||
"next": "15.3.4",
|
||||
"next-auth": "^5.0.0-beta.25",
|
||||
"next-swagger-doc": "^0.4.1",
|
||||
|
|
@ -72,7 +73,7 @@
|
|||
"devDependencies": {
|
||||
"@eslint/eslintrc": "3.3.1",
|
||||
"@tailwindcss/postcss": "4.1.11",
|
||||
"@types/node": "22.15.33",
|
||||
"@types/node": "22.15.34",
|
||||
"@types/react": "19.1.8",
|
||||
"@types/react-big-calendar": "1.16.2",
|
||||
"@types/react-dom": "19.1.6",
|
||||
|
|
@ -80,7 +81,7 @@
|
|||
"@types/webpack-env": "1.18.8",
|
||||
"cypress": "14.5.0",
|
||||
"dotenv-cli": "8.0.0",
|
||||
"eslint": "9.29.0",
|
||||
"eslint": "9.30.0",
|
||||
"eslint-config-next": "15.3.4",
|
||||
"eslint-config-prettier": "10.1.5",
|
||||
"orval": "7.10.0",
|
||||
|
|
|
|||
|
|
@ -40,14 +40,12 @@ export default function ShowEvent() {
|
|||
|
||||
if (isLoading || userLoading) {
|
||||
return (
|
||||
<div className='flex justify-center items-center h-screen'>
|
||||
Loading...
|
||||
</div>
|
||||
<div className='flex justify-center items-center h-full'>Loading...</div>
|
||||
);
|
||||
}
|
||||
if (error || !eventData?.data?.event) {
|
||||
return (
|
||||
<div className='flex justify-center items-center h-screen'>
|
||||
<div className='flex justify-center items-center h-full'>
|
||||
Error loading event.
|
||||
</div>
|
||||
);
|
||||
|
|
@ -70,8 +68,8 @@ export default function ShowEvent() {
|
|||
};
|
||||
|
||||
return (
|
||||
<div className='flex flex-col items-center justify-center h-screen'>
|
||||
<Card className='w-[80%] max-w-screen p-0 gap-0 max-xl:w-[95%] max-h-[90vh] overflow-auto'>
|
||||
<div className='flex items-center justify-center h-full'>
|
||||
<Card className='w-[80%] max-w-screen p-0 gap-0 max-xl:w-[95%] mx-auto'>
|
||||
<CardHeader className='p-0 m-0 gap-0' />
|
||||
|
||||
<CardContent>
|
||||
|
|
|
|||
|
|
@ -9,16 +9,14 @@ export default async function Page({
|
|||
}) {
|
||||
const eventID = (await params).eventID;
|
||||
return (
|
||||
<div className='flex flex-col items-center justify-center h-screen'>
|
||||
<Card className='w-[80%] max-w-screen p-0 gap-0 max-xl:w-[95%] max-h-[90vh] overflow-auto'>
|
||||
<CardHeader className='p-0 m-0 gap-0' />
|
||||
<Card className='w-[80%] max-w-screen p-0 gap-0 max-xl:w-[95%] mx-auto'>
|
||||
<CardHeader className='p-0 m-0 gap-0' />
|
||||
|
||||
<CardContent>
|
||||
<Suspense>
|
||||
<EventForm type='edit' eventId={eventID} />
|
||||
</Suspense>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
<CardContent>
|
||||
<Suspense>
|
||||
<EventForm type='edit' eventId={eventID} />
|
||||
</Suspense>
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
import { ThemePicker } from '@/components/misc/theme-picker';
|
||||
import { Card, CardContent, CardHeader } from '@/components/ui/card';
|
||||
import EventForm from '@/components/forms/event-form';
|
||||
import { Suspense } from 'react';
|
||||
|
||||
export default function NewEvent() {
|
||||
return (
|
||||
<div className='flex flex-col items-center justify-center h-screen'>
|
||||
<div className='absolute top-4 right-4'>{<ThemePicker />}</div>
|
||||
<div className='flex flex-col items-center justify-center h-full'>
|
||||
<Card className='w-[80%] max-w-screen p-0 gap-0 max-xl:w-[95%] max-h-[90vh] overflow-auto'>
|
||||
<CardHeader className='p-0 m-0 gap-0' />
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export default function Events() {
|
|||
const events = eventsData?.data?.events || [];
|
||||
|
||||
return (
|
||||
<div className='relative h-screen flex flex-col items-center'>
|
||||
<div className='relative h-full flex flex-col items-center'>
|
||||
{/* Heading */}
|
||||
<h1 className='text-3xl font-bold mt-8 mb-4 text-center z-10'>
|
||||
My Events
|
||||
|
|
|
|||
|
|
@ -4,14 +4,29 @@ import Calendar from '@/components/calendar';
|
|||
import { useGetApiUserMe } from '@/generated/api/user/user';
|
||||
|
||||
export default function Home() {
|
||||
const { data } = useGetApiUserMe();
|
||||
const { data, isLoading } = useGetApiUserMe();
|
||||
|
||||
return (
|
||||
<div className='max-h-full'>
|
||||
<Calendar
|
||||
userId={data?.data.user?.id}
|
||||
height='calc(100svh - 50px - (var(--spacing) * 2 * 5))'
|
||||
/>
|
||||
<div className='grid grid-cols-1 w-full place-items-center'>
|
||||
<div className='w-full sm:w-[90%] mb-4'>
|
||||
<h1 className='text-2xl font-bold text-center'>
|
||||
Welcome, <wbr />
|
||||
<span style={{ whiteSpace: 'nowrap' }}>
|
||||
{isLoading
|
||||
? 'Loading...'
|
||||
: data?.data.user?.first_name ||
|
||||
data?.data.user?.name ||
|
||||
'Unknown User'}{' '}
|
||||
👋
|
||||
</span>
|
||||
</h1>
|
||||
</div>
|
||||
<div className='w-full sm:w-[90%]'>
|
||||
<Calendar
|
||||
userId={data?.data.user?.id}
|
||||
height='calc(100svh - 115px - (var(--spacing) * 2 * 5))'
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import {
|
|||
} from '@/app/api/validation';
|
||||
import { z } from 'zod/v4';
|
||||
|
||||
export const GET = auth(async function GET(req, { params }) {
|
||||
export const GET = auth(async function GET(req) {
|
||||
const authCheck = userAuthenticated(req);
|
||||
if (!authCheck.continue)
|
||||
return returnZodTypeCheckedResponse(
|
||||
|
|
@ -24,7 +24,22 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
authCheck.metadata,
|
||||
);
|
||||
|
||||
const dataRaw = Object.fromEntries(new URL(req.url).searchParams);
|
||||
const dataRaw: Record<string, string | string[]> = {};
|
||||
for (const [key, value] of req.nextUrl.searchParams.entries()) {
|
||||
if (key.endsWith('[]')) {
|
||||
const cleanKey = key.slice(0, -2);
|
||||
if (!dataRaw[cleanKey]) {
|
||||
dataRaw[cleanKey] = [];
|
||||
}
|
||||
if (Array.isArray(dataRaw[cleanKey])) {
|
||||
(dataRaw[cleanKey] as string[]).push(value);
|
||||
} else {
|
||||
dataRaw[cleanKey] = [dataRaw[cleanKey] as string, value];
|
||||
}
|
||||
} else {
|
||||
dataRaw[key] = value;
|
||||
}
|
||||
}
|
||||
const data = await userCalendarQuerySchema.safeParseAsync(dataRaw);
|
||||
if (!data.success)
|
||||
return returnZodTypeCheckedResponse(
|
||||
|
|
@ -36,15 +51,15 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
},
|
||||
{ status: 400 },
|
||||
);
|
||||
const { end, start } = data.data;
|
||||
const { end, start, userIds } = data.data;
|
||||
|
||||
const requestUserId = authCheck.user.id;
|
||||
|
||||
const requestedUserId = (await params).user;
|
||||
|
||||
const requestedUser = await prisma.user.findFirst({
|
||||
const requestedUser = await prisma.user.findMany({
|
||||
where: {
|
||||
id: requestedUserId,
|
||||
id: {
|
||||
in: userIds,
|
||||
},
|
||||
},
|
||||
select: {
|
||||
meetingParts: {
|
||||
|
|
@ -57,6 +72,9 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
gte: start,
|
||||
},
|
||||
},
|
||||
status: {
|
||||
not: 'DECLINED',
|
||||
},
|
||||
},
|
||||
orderBy: {
|
||||
meeting: {
|
||||
|
|
@ -64,6 +82,7 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
},
|
||||
},
|
||||
select: {
|
||||
user_id: true,
|
||||
meeting: {
|
||||
select: {
|
||||
id: true,
|
||||
|
|
@ -136,6 +155,7 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
start_time: 'asc',
|
||||
},
|
||||
select: {
|
||||
user_id: true,
|
||||
id: true,
|
||||
reason: true,
|
||||
start_time: true,
|
||||
|
|
@ -153,46 +173,64 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
if (!requestedUser)
|
||||
return returnZodTypeCheckedResponse(
|
||||
ErrorResponseSchema,
|
||||
{ success: false, message: 'User not found' },
|
||||
{ success: false, message: 'User/s not found' },
|
||||
{ status: 404 },
|
||||
);
|
||||
|
||||
const calendar: z.input<typeof UserCalendarSchema> = [];
|
||||
|
||||
for (const event of requestedUser.meetingParts) {
|
||||
for (const event of requestedUser.map((r) => r.meetingParts).flat()) {
|
||||
if (
|
||||
event.meeting.participants.some((p) => p.user.id === requestUserId) ||
|
||||
event.meeting.organizer_id === requestUserId
|
||||
) {
|
||||
calendar.push({ ...event.meeting, type: 'event' });
|
||||
calendar.push({
|
||||
...event.meeting,
|
||||
type: 'event',
|
||||
users: event.meeting.participants
|
||||
.map((p) => p.user.id)
|
||||
.filter((id) => userIds.includes(id)),
|
||||
});
|
||||
} else {
|
||||
calendar.push({
|
||||
id: event.meeting.id,
|
||||
start_time: event.meeting.start_time,
|
||||
end_time: event.meeting.end_time,
|
||||
type: 'blocked_private',
|
||||
users: event.meeting.participants
|
||||
.map((p) => p.user.id)
|
||||
.filter((id) => userIds.includes(id)),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for (const event of requestedUser.meetingsOrg) {
|
||||
for (const event of requestedUser.map((r) => r.meetingsOrg).flat()) {
|
||||
if (
|
||||
event.participants.some((p) => p.user.id === requestUserId) ||
|
||||
event.organizer_id === requestUserId
|
||||
) {
|
||||
calendar.push({ ...event, type: 'event' });
|
||||
calendar.push({
|
||||
...event,
|
||||
type: 'event',
|
||||
users: event.participants
|
||||
.map((p) => p.user.id)
|
||||
.filter((id) => userIds.includes(id)),
|
||||
});
|
||||
} else {
|
||||
calendar.push({
|
||||
id: event.id,
|
||||
start_time: event.start_time,
|
||||
end_time: event.end_time,
|
||||
type: 'blocked_private',
|
||||
users: event.participants
|
||||
.map((p) => p.user.id)
|
||||
.filter((id) => userIds.includes(id)),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for (const slot of requestedUser.blockedSlots) {
|
||||
if (requestUserId === requestedUserId) {
|
||||
for (const slot of requestedUser.map((r) => r.blockedSlots).flat()) {
|
||||
if (requestUserId === userIds[0] && userIds.length === 1) {
|
||||
calendar.push({
|
||||
start_time: slot.start_time,
|
||||
end_time: slot.end_time,
|
||||
|
|
@ -204,6 +242,7 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
created_at: slot.created_at,
|
||||
updated_at: slot.updated_at,
|
||||
type: 'blocked_owned',
|
||||
users: [requestUserId],
|
||||
});
|
||||
} else {
|
||||
calendar.push({
|
||||
|
|
@ -211,6 +250,7 @@ export const GET = auth(async function GET(req, { params }) {
|
|||
end_time: slot.end_time,
|
||||
id: slot.id,
|
||||
type: 'blocked_private',
|
||||
users: [slot.user_id],
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -7,17 +7,12 @@ import {
|
|||
userNotFoundResponse,
|
||||
} from '@/lib/defaultApiResponses';
|
||||
import { OpenAPIRegistry } from '@asteasolutions/zod-to-openapi';
|
||||
import zod from 'zod/v4';
|
||||
import { UserIdParamSchema } from '@/app/api/validation';
|
||||
|
||||
export default function registerSwaggerPaths(registry: OpenAPIRegistry) {
|
||||
registry.registerPath({
|
||||
method: 'get',
|
||||
path: '/api/user/{user}/calendar',
|
||||
path: '/api/calendar',
|
||||
request: {
|
||||
params: zod.object({
|
||||
user: UserIdParamSchema,
|
||||
}),
|
||||
query: userCalendarQuerySchema,
|
||||
},
|
||||
responses: {
|
||||
|
|
@ -32,6 +27,6 @@ export default function registerSwaggerPaths(registry: OpenAPIRegistry) {
|
|||
...notAuthenticatedResponse,
|
||||
...userNotFoundResponse,
|
||||
},
|
||||
tags: ['User'],
|
||||
tags: ['Calendar'],
|
||||
});
|
||||
}
|
||||
|
|
@ -14,6 +14,8 @@ export const BlockedSlotSchema = zod
|
|||
end_time: eventEndTimeSchema,
|
||||
type: zod.literal('blocked_private'),
|
||||
id: zod.string(),
|
||||
users: zod.string().array(),
|
||||
user_id: zod.string().optional(),
|
||||
})
|
||||
.openapi('BlockedSlotSchema', {
|
||||
description: 'Blocked time slot in the user calendar',
|
||||
|
|
@ -31,17 +33,21 @@ export const OwnedBlockedSlotSchema = zod
|
|||
created_at: zod.date().nullish(),
|
||||
updated_at: zod.date().nullish(),
|
||||
type: zod.literal('blocked_owned'),
|
||||
users: zod.string().array(),
|
||||
user_id: zod.string().optional(),
|
||||
})
|
||||
.openapi('OwnedBlockedSlotSchema', {
|
||||
description: 'Blocked slot owned by the user',
|
||||
});
|
||||
|
||||
export const VisibleSlotSchema = EventSchema.omit({
|
||||
organizer: true,
|
||||
participants: true,
|
||||
organizer: true,
|
||||
})
|
||||
.extend({
|
||||
type: zod.literal('event'),
|
||||
users: zod.string().array(),
|
||||
user_id: zod.string().optional(),
|
||||
})
|
||||
.openapi('VisibleSlotSchema', {
|
||||
description: 'Visible time slot in the user calendar',
|
||||
|
|
@ -86,6 +92,7 @@ export const userCalendarQuerySchema = zod
|
|||
);
|
||||
return endOfWeek;
|
||||
}),
|
||||
userIds: zod.string().array(),
|
||||
})
|
||||
.openapi('UserCalendarQuerySchema', {
|
||||
description: 'Query parameters for filtering the user calendar',
|
||||
|
|
@ -19,7 +19,7 @@ export const GET = auth(async function GET(req) {
|
|||
authCheck.metadata,
|
||||
);
|
||||
|
||||
const dataRaw = Object.fromEntries(new URL(req.url).searchParams);
|
||||
const dataRaw = Object.fromEntries(req.nextUrl.searchParams);
|
||||
const data = await searchUserSchema.safeParseAsync(dataRaw);
|
||||
if (!data.success)
|
||||
return returnZodTypeCheckedResponse(
|
||||
|
|
|
|||
28
src/app/not-found.tsx
Normal file
28
src/app/not-found.tsx
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
import Link from 'next/link';
|
||||
import { Button } from '@/components/ui/button';
|
||||
|
||||
export default function NotFound() {
|
||||
return (
|
||||
<div className='min-h-screen flex items-center justify-center bg-background'>
|
||||
<div className='text-center space-y-6 px-4'>
|
||||
<div className='space-y-2'>
|
||||
<h1 className='text-9xl font-bold text-primary'>404</h1>
|
||||
<h2 className='text-3xl font-semibold text-text'>Page Not Found</h2>
|
||||
<p className='text-lg text-text-muted max-w-md mx-auto'>
|
||||
Sorry, we couldn't find the page you're looking for. It
|
||||
might have been moved, deleted, or doesn't exist.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className='flex flex-col sm:flex-row gap-4 justify-center items-center'>
|
||||
<Button asChild className='px-8'>
|
||||
<Link href='/'>Go Home</Link>
|
||||
</Button>
|
||||
<Button variant='outline_primary' asChild className='px-8'>
|
||||
<Link href='/events'>Browse Events</Link>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
19
src/auth.ts
19
src/auth.ts
|
|
@ -2,8 +2,15 @@ import NextAuth, { CredentialsSignin } from 'next-auth';
|
|||
|
||||
import { Prisma } from '@/generated/prisma';
|
||||
import type { Provider } from 'next-auth/providers';
|
||||
|
||||
import Credentials from 'next-auth/providers/credentials';
|
||||
import Authentik from 'next-auth/providers/authentik';
|
||||
import AuthentikProvider from 'next-auth/providers/authentik';
|
||||
import DiscordProvider from 'next-auth/providers/discord';
|
||||
import FacebookProvider from 'next-auth/providers/facebook';
|
||||
import GithubProvider from 'next-auth/providers/github';
|
||||
import GitlabProvider from 'next-auth/providers/gitlab';
|
||||
import GoogleProvider from 'next-auth/providers/google';
|
||||
import KeycloakProvider from 'next-auth/providers/keycloak';
|
||||
|
||||
import { PrismaAdapter } from '@auth/prisma-adapter';
|
||||
import { prisma } from '@/prisma';
|
||||
|
|
@ -88,8 +95,16 @@ const providers: Provider[] = [
|
|||
}
|
||||
},
|
||||
}),
|
||||
|
||||
process.env.AUTH_DISCORD_ID && DiscordProvider,
|
||||
process.env.AUTH_FACEBOOK_ID && FacebookProvider,
|
||||
process.env.AUTH_GITHUB_ID && GithubProvider,
|
||||
process.env.AUTH_GITLAB_ID && GitlabProvider,
|
||||
process.env.AUTH_GOOGLE_ID && GoogleProvider,
|
||||
process.env.AUTH_KEYCLOAK_ID && KeycloakProvider,
|
||||
|
||||
process.env.AUTH_AUTHENTIK_ID &&
|
||||
Authentik({
|
||||
AuthentikProvider({
|
||||
profile(profile) {
|
||||
return {
|
||||
id: profile.sub,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import '@/components/react-big-calendar.css';
|
|||
import 'react-big-calendar/lib/addons/dragAndDrop/styles.css';
|
||||
import CustomToolbar from '@/components/custom-toolbar';
|
||||
import React from 'react';
|
||||
import { useGetApiUserUserCalendar } from '@/generated/api/user/user';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { usePatchApiEventEventID } from '@/generated/api/event/event';
|
||||
import { useSession } from 'next-auth/react';
|
||||
|
|
@ -17,6 +16,7 @@ import { ErrorBoundary } from 'react-error-boundary';
|
|||
import { Button } from '@/components/ui/button';
|
||||
import { fromZodIssue } from 'zod-validation-error/v4';
|
||||
import type { $ZodIssue } from 'zod/v4/core';
|
||||
import { useGetApiCalendar } from '@/generated/api/calendar/calendar';
|
||||
|
||||
moment.updateLocale('en', {
|
||||
week: {
|
||||
|
|
@ -25,12 +25,28 @@ moment.updateLocale('en', {
|
|||
},
|
||||
});
|
||||
|
||||
function eventPropGetter(event: {
|
||||
id: string;
|
||||
start: Date;
|
||||
end: Date;
|
||||
type: UserCalendarSchemaItem['type'];
|
||||
userId?: string;
|
||||
colorOverride?: string;
|
||||
}) {
|
||||
return {
|
||||
style: event.colorOverride
|
||||
? { backgroundColor: event.colorOverride }
|
||||
: undefined,
|
||||
};
|
||||
}
|
||||
|
||||
const DaDRBCalendar = withDragAndDrop<
|
||||
{
|
||||
id: string;
|
||||
start: Date;
|
||||
end: Date;
|
||||
type: UserCalendarSchemaItem['type'];
|
||||
userId?: string;
|
||||
},
|
||||
{
|
||||
id: string;
|
||||
|
|
@ -44,9 +60,21 @@ const localizer = momentLocalizer(moment);
|
|||
export default function Calendar({
|
||||
userId,
|
||||
height,
|
||||
additionalEvents = [],
|
||||
className,
|
||||
}: {
|
||||
userId?: string;
|
||||
userId?: string | string[];
|
||||
height: string;
|
||||
additionalEvents?: {
|
||||
id: string;
|
||||
title: string;
|
||||
start: Date;
|
||||
end: Date;
|
||||
type: UserCalendarSchemaItem['type'];
|
||||
userId?: string;
|
||||
colorOverride?: string;
|
||||
}[];
|
||||
className?: string;
|
||||
}) {
|
||||
return (
|
||||
<QueryErrorResetBoundary>
|
||||
|
|
@ -67,10 +95,26 @@ export default function Calendar({
|
|||
</div>
|
||||
)}
|
||||
>
|
||||
{userId ? (
|
||||
<CalendarWithUserEvents userId={userId} height={height} />
|
||||
{typeof userId === 'string' ? (
|
||||
<CalendarWithUserEvents
|
||||
userId={userId}
|
||||
height={height}
|
||||
additionalEvents={additionalEvents}
|
||||
className={className}
|
||||
/>
|
||||
) : Array.isArray(userId) && userId.length > 0 ? (
|
||||
<CalendarWithMultiUserEvents
|
||||
userIds={userId}
|
||||
height={height}
|
||||
additionalEvents={additionalEvents}
|
||||
className={className}
|
||||
/>
|
||||
) : (
|
||||
<CalendarWithoutUserEvents height={height} />
|
||||
<CalendarWithoutUserEvents
|
||||
height={height}
|
||||
additionalEvents={additionalEvents}
|
||||
className={className}
|
||||
/>
|
||||
)}
|
||||
</ErrorBoundary>
|
||||
)}
|
||||
|
|
@ -81,9 +125,21 @@ export default function Calendar({
|
|||
function CalendarWithUserEvents({
|
||||
userId,
|
||||
height,
|
||||
additionalEvents,
|
||||
className,
|
||||
}: {
|
||||
userId: string;
|
||||
height: string;
|
||||
additionalEvents?: {
|
||||
id: string;
|
||||
title: string;
|
||||
start: Date;
|
||||
end: Date;
|
||||
type: UserCalendarSchemaItem['type'];
|
||||
userId?: string;
|
||||
colorOverride?: string;
|
||||
}[];
|
||||
className?: string;
|
||||
}) {
|
||||
const sesstion = useSession();
|
||||
const [currentView, setCurrentView] = React.useState<
|
||||
|
|
@ -92,9 +148,9 @@ function CalendarWithUserEvents({
|
|||
const [currentDate, setCurrentDate] = React.useState<Date>(new Date());
|
||||
const router = useRouter();
|
||||
|
||||
const { data, refetch, error, isError } = useGetApiUserUserCalendar(
|
||||
userId,
|
||||
const { data, refetch, error, isError } = useGetApiCalendar(
|
||||
{
|
||||
userIds: [userId],
|
||||
start: moment(currentDate)
|
||||
.startOf(
|
||||
currentView === 'agenda'
|
||||
|
|
@ -137,6 +193,8 @@ function CalendarWithUserEvents({
|
|||
|
||||
return (
|
||||
<DaDRBCalendar
|
||||
className={className}
|
||||
eventPropGetter={eventPropGetter}
|
||||
localizer={localizer}
|
||||
culture='de-DE'
|
||||
defaultView='week'
|
||||
|
|
@ -152,15 +210,17 @@ function CalendarWithUserEvents({
|
|||
onNavigate={(date) => {
|
||||
setCurrentDate(date);
|
||||
}}
|
||||
events={
|
||||
data?.data.calendar.map((event) => ({
|
||||
events={[
|
||||
...(data?.data.calendar.map((event) => ({
|
||||
id: event.id,
|
||||
title: event.type === 'event' ? event.title : 'Blocker',
|
||||
start: new Date(event.start_time),
|
||||
end: new Date(event.end_time),
|
||||
type: event.type,
|
||||
})) ?? []
|
||||
}
|
||||
userId: event.users[0],
|
||||
})) ?? []),
|
||||
...(additionalEvents ?? []),
|
||||
]}
|
||||
onSelectEvent={(event) => {
|
||||
router.push(`/events/${event.id}`);
|
||||
}}
|
||||
|
|
@ -228,7 +288,116 @@ function CalendarWithUserEvents({
|
|||
);
|
||||
}
|
||||
|
||||
function CalendarWithoutUserEvents({ height }: { height: string }) {
|
||||
function CalendarWithMultiUserEvents({
|
||||
userIds,
|
||||
height,
|
||||
additionalEvents,
|
||||
className,
|
||||
}: {
|
||||
userIds: string[];
|
||||
height: string;
|
||||
additionalEvents?: {
|
||||
id: string;
|
||||
title: string;
|
||||
start: Date;
|
||||
end: Date;
|
||||
type: UserCalendarSchemaItem['type'];
|
||||
userId?: string;
|
||||
colorOverride?: string;
|
||||
}[];
|
||||
className?: string;
|
||||
}) {
|
||||
const [currentView, setCurrentView] = React.useState<
|
||||
'month' | 'week' | 'day' | 'agenda' | 'work_week'
|
||||
>('week');
|
||||
const [currentDate, setCurrentDate] = React.useState<Date>(new Date());
|
||||
|
||||
const { data, error, isError } = useGetApiCalendar(
|
||||
{
|
||||
userIds: userIds,
|
||||
start: moment(currentDate)
|
||||
.startOf(
|
||||
currentView === 'agenda'
|
||||
? 'month'
|
||||
: currentView === 'work_week'
|
||||
? 'week'
|
||||
: currentView,
|
||||
)
|
||||
.toISOString(),
|
||||
end: moment(currentDate)
|
||||
.endOf(
|
||||
currentView === 'agenda'
|
||||
? 'month'
|
||||
: currentView === 'work_week'
|
||||
? 'week'
|
||||
: currentView,
|
||||
)
|
||||
.toISOString(),
|
||||
},
|
||||
{
|
||||
query: {
|
||||
refetchOnWindowFocus: true,
|
||||
refetchOnReconnect: true,
|
||||
refetchOnMount: true,
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
if (isError) {
|
||||
throw error.response?.data || 'Failed to fetch calendar data';
|
||||
}
|
||||
|
||||
return (
|
||||
<DaDRBCalendar
|
||||
className={className}
|
||||
eventPropGetter={eventPropGetter}
|
||||
localizer={localizer}
|
||||
culture='de-DE'
|
||||
defaultView='week'
|
||||
components={{
|
||||
toolbar: CustomToolbar,
|
||||
}}
|
||||
style={{
|
||||
height: height,
|
||||
}}
|
||||
onView={setCurrentView}
|
||||
view={currentView}
|
||||
date={currentDate}
|
||||
onNavigate={(date) => {
|
||||
setCurrentDate(date);
|
||||
}}
|
||||
events={[
|
||||
...(data?.data.calendar.map((event) => ({
|
||||
id: event.id,
|
||||
title: event.type === 'event' ? event.title : 'Blocker',
|
||||
start: new Date(event.start_time),
|
||||
end: new Date(event.end_time),
|
||||
type: event.type,
|
||||
userId: event.users[0],
|
||||
})) ?? []),
|
||||
...(additionalEvents ?? []),
|
||||
]}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function CalendarWithoutUserEvents({
|
||||
height,
|
||||
additionalEvents,
|
||||
className,
|
||||
}: {
|
||||
height: string;
|
||||
additionalEvents?: {
|
||||
id: string;
|
||||
title: string;
|
||||
start: Date;
|
||||
end: Date;
|
||||
type: UserCalendarSchemaItem['type'];
|
||||
userId?: string;
|
||||
colorOverride?: string;
|
||||
}[];
|
||||
className?: string;
|
||||
}) {
|
||||
const [currentView, setCurrentView] = React.useState<
|
||||
'month' | 'week' | 'day' | 'agenda' | 'work_week'
|
||||
>('week');
|
||||
|
|
@ -236,6 +405,8 @@ function CalendarWithoutUserEvents({ height }: { height: string }) {
|
|||
|
||||
return (
|
||||
<DaDRBCalendar
|
||||
className={className}
|
||||
eventPropGetter={eventPropGetter}
|
||||
localizer={localizer}
|
||||
culture='de-DE'
|
||||
defaultView='week'
|
||||
|
|
@ -251,6 +422,7 @@ function CalendarWithoutUserEvents({ height }: { height: string }) {
|
|||
onNavigate={(date) => {
|
||||
setCurrentDate(date);
|
||||
}}
|
||||
events={additionalEvents}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
/* Container der Toolbar */
|
||||
.custom-toolbar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
gap: 8px;
|
||||
padding: calc(var(--spacing) * 2);
|
||||
padding-left: calc(50px + var(--spacing));
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (max-width: 870px) {
|
||||
padding-left: 0;
|
||||
flex-direction: column;
|
||||
}
|
||||
box-shadow: none;
|
||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
|
|
@ -25,6 +29,12 @@
|
|||
display: flex;
|
||||
gap: 8px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.custom-toolbar .navigation-controls .handleWeek {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
}
|
||||
|
||||
.custom-toolbar .navigation-controls button {
|
||||
|
|
@ -77,6 +87,8 @@
|
|||
border-radius: 11px;
|
||||
justify-items: center;
|
||||
align-items: center;
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.custom-toolbar .navigation-controls .handleWeek button {
|
||||
|
|
@ -93,6 +105,9 @@
|
|||
padding: 0 8px;
|
||||
border-radius: 11px;
|
||||
justify-items: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.right-section .datepicker-box {
|
||||
|
|
@ -100,8 +115,12 @@
|
|||
background-color: #c6c6c6;
|
||||
height: 36px;
|
||||
border-radius: 11px;
|
||||
font-size: 12px;
|
||||
font-size: 14px;
|
||||
align-self: center;
|
||||
font-family: 'Varela Round', sans-serif;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.datepicker {
|
||||
|
|
|
|||
|
|
@ -171,12 +171,9 @@ const CustomToolbar: React.FC<CustomToolbarProps> = ({
|
|||
};
|
||||
|
||||
return (
|
||||
<div
|
||||
className='custom-toolbar'
|
||||
style={{ display: 'flex', flexDirection: 'initial', gap: '8px' }}
|
||||
>
|
||||
<div className='custom-toolbar'>
|
||||
<div className='view-change'>
|
||||
<div className='view-switcher' style={{ display: 'flex', gap: '8px' }}>
|
||||
<div className='view-switcher'>
|
||||
<Button
|
||||
//className='hover:bg-orange-600 hover:text-white'
|
||||
type='submit'
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ import {
|
|||
const items = [
|
||||
{
|
||||
title: 'Calendar',
|
||||
url: '#',
|
||||
url: '/home',
|
||||
icon: CalendarDays,
|
||||
},
|
||||
{
|
||||
|
|
@ -77,7 +77,7 @@ export function AppSidebar() {
|
|||
></Logo>
|
||||
</Link>
|
||||
</SidebarHeader>
|
||||
<SidebarContent className='grid grid-rows-[auto_1fr_auto]'>
|
||||
<SidebarContent className='grid grid-rows-[auto_1fr_auto] overflow-hidden'>
|
||||
<Collapsible defaultOpen className='group/collapsible'>
|
||||
<SidebarGroup>
|
||||
<SidebarGroupLabel asChild>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,20 @@
|
|||
'use client';
|
||||
|
||||
import { Card } from '@/components/ui/card';
|
||||
import Logo from '@/components/misc/logo';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import Link from 'next/link';
|
||||
import zod from 'zod/v4';
|
||||
import { EventSchema } from '@/app/api/event/validation';
|
||||
import { useSession } from 'next-auth/react';
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from '../ui/select';
|
||||
import { usePatchApiEventEventIDParticipantUser } from '@/generated/api/event-participant/event-participant';
|
||||
|
||||
type EventListEntryProps = zod.output<typeof EventSchema>;
|
||||
|
||||
|
|
@ -13,7 +24,11 @@ export default function EventListEntry({
|
|||
start_time,
|
||||
end_time,
|
||||
location,
|
||||
participants,
|
||||
}: EventListEntryProps) {
|
||||
const session = useSession();
|
||||
const updateAttendance = usePatchApiEventEventIDParticipantUser();
|
||||
|
||||
const formatDate = (isoString?: string) => {
|
||||
if (!isoString) return '-';
|
||||
return new Date(isoString).toLocaleDateString();
|
||||
|
|
@ -60,6 +75,45 @@ export default function EventListEntry({
|
|||
<Label>{location}</Label>
|
||||
</div>
|
||||
)}
|
||||
{participants &&
|
||||
participants.some(
|
||||
(p) => p.user.id === session.data?.user?.id,
|
||||
) && (
|
||||
<div className='flex items-center justify-end'>
|
||||
<Select
|
||||
defaultValue={
|
||||
participants
|
||||
.find((p) => p.user.id === session.data?.user?.id)
|
||||
?.status.toUpperCase() || 'PENDING'
|
||||
}
|
||||
onValueChange={(value) => {
|
||||
updateAttendance.mutate({
|
||||
eventID: id,
|
||||
user: session.data?.user?.id || '',
|
||||
data: {
|
||||
status: value as
|
||||
| 'ACCEPTED'
|
||||
| 'TENTATIVE'
|
||||
| 'DECLINED'
|
||||
| 'PENDING',
|
||||
},
|
||||
});
|
||||
}}
|
||||
>
|
||||
<SelectTrigger id='language'>
|
||||
<SelectValue placeholder='Select status' />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value='ACCEPTED'>Attending</SelectItem>
|
||||
<SelectItem value='TENTATIVE'>Maybe Attending</SelectItem>
|
||||
<SelectItem value='DECLINED'>Not Attending</SelectItem>
|
||||
<SelectItem value='PENDING' disabled>
|
||||
Pending Response
|
||||
</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</Card>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ type ParticipantListEntryProps = zod.output<typeof ParticipantSchema>;
|
|||
|
||||
export default function ParticipantListEntry({
|
||||
user,
|
||||
status,
|
||||
}: ParticipantListEntryProps) {
|
||||
const { resolvedTheme } = useTheme();
|
||||
const defaultImage =
|
||||
|
|
@ -21,6 +22,7 @@ export default function ParticipantListEntry({
|
|||
<div className='flex items-center gap-2 py-1 ml-5'>
|
||||
<Image src={finalImageSrc} alt='Avatar' width={30} height={30} />
|
||||
<span>{user.name}</span>
|
||||
<span className='text-sm text-gray-500'>{status}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,16 @@ import { useSearchParams } from 'next/navigation';
|
|||
|
||||
import zod from 'zod/v4';
|
||||
import { PublicUserSchema } from '@/app/api/user/validation';
|
||||
import Calendar from '@/components/calendar';
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
DialogTrigger,
|
||||
} from '../ui/dialog';
|
||||
|
||||
type User = zod.output<typeof PublicUserSchema>;
|
||||
|
||||
|
|
@ -41,7 +51,12 @@ const EventForm: React.FC<EventFormProps> = (props) => {
|
|||
const startFromUrl = searchParams.get('start');
|
||||
const endFromUrl = searchParams.get('end');
|
||||
|
||||
const { mutate: createEvent, status, isSuccess, error } = usePostApiEvent();
|
||||
const {
|
||||
mutateAsync: createEvent,
|
||||
status,
|
||||
isSuccess,
|
||||
error,
|
||||
} = usePostApiEvent();
|
||||
const { data, isLoading, error: fetchError } = useGetApiUserMe();
|
||||
const { data: eventData } = useGetApiEventEventID(props.eventId!, {
|
||||
query: { enabled: props.type === 'edit' },
|
||||
|
|
@ -68,6 +83,8 @@ const EventForm: React.FC<EventFormProps> = (props) => {
|
|||
const [location, setLocation] = React.useState('');
|
||||
const [description, setDescription] = React.useState('');
|
||||
|
||||
const [calendarOpen, setCalendarOpen] = React.useState(false);
|
||||
|
||||
// Update state when event data loads
|
||||
React.useEffect(() => {
|
||||
if (props.type === 'edit' && event) {
|
||||
|
|
@ -138,8 +155,10 @@ const EventForm: React.FC<EventFormProps> = (props) => {
|
|||
participants: selectedParticipants.map((u) => u.id),
|
||||
};
|
||||
|
||||
let eventID: string | undefined;
|
||||
|
||||
if (props.type === 'edit' && props.eventId) {
|
||||
await patchEvent.mutateAsync({
|
||||
const mutationResult = await patchEvent.mutateAsync({
|
||||
eventID: props.eventId,
|
||||
data: {
|
||||
title: data.title,
|
||||
|
|
@ -150,9 +169,12 @@ const EventForm: React.FC<EventFormProps> = (props) => {
|
|||
participants: data.participants,
|
||||
},
|
||||
});
|
||||
eventID = mutationResult.data.event.id;
|
||||
console.log('Updating event');
|
||||
} else {
|
||||
console.log('Creating event');
|
||||
const mutationResult = await createEvent({ data });
|
||||
eventID = mutationResult.data.event.id;
|
||||
createEvent({ data });
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +183,7 @@ const EventForm: React.FC<EventFormProps> = (props) => {
|
|||
toastId={t}
|
||||
title='Event saved'
|
||||
description={event?.title}
|
||||
onAction={() => router.push(`/events/${event?.id}`)}
|
||||
onAction={() => router.push(`/events/${eventID}`)}
|
||||
variant='success'
|
||||
buttonText='show'
|
||||
/>
|
||||
|
|
@ -194,149 +216,183 @@ const EventForm: React.FC<EventFormProps> = (props) => {
|
|||
return <div>Error loading event.</div>;
|
||||
|
||||
return (
|
||||
<form className='flex flex-col gap-5 w-full' onSubmit={handleSubmit}>
|
||||
<div className='grid grid-row-start:auto gap-4 sm:gap-8 w-full'>
|
||||
<div className='h-full w-full mt-0 ml-2 mb-16 flex items-center max-sm:grid max-sm:grid-row-start:auto max-sm:mb-6 max-sm:mt-10 max-sm:ml-0'>
|
||||
<div className='w-[100px] max-sm:w-full max-sm:flex max-sm:justify-center'>
|
||||
<Logo colorType='monochrome' logoType='submark' width={50} />
|
||||
</div>
|
||||
<div className='items-center ml-auto mr-auto max-sm:mb-6 max-sm:w-full'>
|
||||
<LabeledInput
|
||||
type='text'
|
||||
label='Event Name'
|
||||
placeholder={props.type === 'create' ? 'New Event' : 'Event Name'}
|
||||
name='eventName'
|
||||
variantSize='big'
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className='w-0 sm:w-[50px]'></div>
|
||||
</div>
|
||||
<div className='grid grid-cols-4 gap-4 h-full w-full max-lg:grid-cols-2 max-sm:grid-cols-1'>
|
||||
<div>
|
||||
<TimePicker
|
||||
dateLabel='start Time'
|
||||
timeLabel=' '
|
||||
date={startDate}
|
||||
setDate={setStartDate}
|
||||
time={startTime}
|
||||
setTime={setStartTime}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<TimePicker
|
||||
dateLabel='end Time'
|
||||
timeLabel=' '
|
||||
date={endDate}
|
||||
setDate={setEndDate}
|
||||
time={endTime}
|
||||
setTime={setEndTime}
|
||||
/>
|
||||
</div>
|
||||
<div className='w-54'>
|
||||
<LabeledInput
|
||||
type='text'
|
||||
label='Location'
|
||||
placeholder='where is the event?'
|
||||
name='eventLocation'
|
||||
value={location}
|
||||
onChange={(e) => setLocation(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className='flex flex-col gap-4'>
|
||||
<div className='flex flex-row gap-2'>
|
||||
<Label className='w-[70px]'>created:</Label>
|
||||
<Label className='text-[var(--color-neutral-300)]'>
|
||||
{createdAtDisplay}
|
||||
</Label>
|
||||
<>
|
||||
<Dialog open={calendarOpen} onOpenChange={setCalendarOpen}>
|
||||
<form className='flex flex-col gap-5 w-full' onSubmit={handleSubmit}>
|
||||
<div className='grid grid-row-start:auto gap-4 sm:gap-8 w-full'>
|
||||
<div className='h-full w-full mt-0 ml-2 mb-16 flex items-center max-sm:grid max-sm:grid-row-start:auto max-sm:mb-6 max-sm:mt-10 max-sm:ml-0'>
|
||||
<div className='w-[100px] max-sm:w-full max-sm:flex max-sm:justify-center'>
|
||||
<Logo colorType='monochrome' logoType='submark' width={50} />
|
||||
</div>
|
||||
<div className='items-center ml-auto mr-auto max-sm:mb-6 max-sm:w-full'>
|
||||
<LabeledInput
|
||||
type='text'
|
||||
label='Event Name'
|
||||
placeholder={
|
||||
props.type === 'create' ? 'New Event' : 'Event Name'
|
||||
}
|
||||
name='eventName'
|
||||
variantSize='big'
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className='w-0 sm:w-[50px]'></div>
|
||||
</div>
|
||||
<div className='flex flex-row gap-2'>
|
||||
<Label className='w-[70px]'>updated:</Label>
|
||||
<p className='text-[var(--color-neutral-300)]'>
|
||||
{updatedAtDisplay}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className='h-full w-full grid grid-cols-2 gap-4 max-sm:grid-cols-1'>
|
||||
<div className='h-full w-full grid grid-flow-row gap-4'>
|
||||
<div className='h-full w-full'>
|
||||
<div className='flex flex-row gap-2'>
|
||||
<Label>Organiser:</Label>
|
||||
<Label className='text-[var(--color-neutral-300)]'>
|
||||
{organiserValue}
|
||||
</Label>
|
||||
<div className='grid grid-cols-4 gap-4 h-full w-full max-lg:grid-cols-2 max-sm:grid-cols-1'>
|
||||
<div>
|
||||
<TimePicker
|
||||
dateLabel='start Time'
|
||||
timeLabel=' '
|
||||
date={startDate}
|
||||
setDate={setStartDate}
|
||||
time={startTime}
|
||||
setTime={setStartTime}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<TimePicker
|
||||
dateLabel='end Time'
|
||||
timeLabel=' '
|
||||
date={endDate}
|
||||
setDate={setEndDate}
|
||||
time={endTime}
|
||||
setTime={setEndTime}
|
||||
/>
|
||||
</div>
|
||||
<div className='w-54'>
|
||||
<LabeledInput
|
||||
type='text'
|
||||
label='Location'
|
||||
placeholder='where is the event?'
|
||||
name='eventLocation'
|
||||
value={location}
|
||||
onChange={(e) => setLocation(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className='flex flex-col gap-4'>
|
||||
<div className='flex flex-row gap-2'>
|
||||
<Label className='w-[70px]'>created:</Label>
|
||||
<Label className='text-[var(--color-neutral-300)]'>
|
||||
{createdAtDisplay}
|
||||
</Label>
|
||||
</div>
|
||||
<div className='flex flex-row gap-2'>
|
||||
<Label className='w-[70px]'>updated:</Label>
|
||||
<p className='text-[var(--color-neutral-300)]'>
|
||||
{updatedAtDisplay}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className='h-full w-full'>
|
||||
<LabeledInput
|
||||
type='text'
|
||||
label='Event Description'
|
||||
placeholder='What is the event about?'
|
||||
name='eventDescription'
|
||||
variantSize='textarea'
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
></LabeledInput>
|
||||
</div>
|
||||
</div>
|
||||
<div className='h-full w-full'>
|
||||
<Label>Participants</Label>
|
||||
<UserSearchInput
|
||||
selectedUsers={selectedParticipants}
|
||||
addUserAction={(user) => {
|
||||
setSelectedParticipants((current) =>
|
||||
current.find((u) => u.id === user.id)
|
||||
? current
|
||||
: [...current, user],
|
||||
);
|
||||
}}
|
||||
removeUserAction={(user) => {
|
||||
setSelectedParticipants((current) =>
|
||||
current.filter((u) => u.id !== user.id),
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<div className='grid grid-cols-1 mt-3 sm:max-h-60 sm:grid-cols-2 sm:overflow-y-auto sm:mb-0'>
|
||||
{selectedParticipants.map((user) => (
|
||||
<ParticipantListEntry
|
||||
key={user.id}
|
||||
user={user}
|
||||
status='PENDING'
|
||||
<div className='h-full w-full grid grid-cols-2 gap-4 max-sm:grid-cols-1'>
|
||||
<div className='h-full w-full grid grid-flow-row gap-4'>
|
||||
<div className='h-full w-full'>
|
||||
<div className='flex flex-row gap-2'>
|
||||
<Label>Organiser:</Label>
|
||||
<Label className='text-[var(--color-neutral-300)]'>
|
||||
{organiserValue}
|
||||
</Label>
|
||||
</div>
|
||||
</div>
|
||||
<div className='h-full w-full'>
|
||||
<LabeledInput
|
||||
type='text'
|
||||
label='Event Description'
|
||||
placeholder='What is the event about?'
|
||||
name='eventDescription'
|
||||
variantSize='textarea'
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
></LabeledInput>
|
||||
</div>
|
||||
</div>
|
||||
<div className='h-full w-full'>
|
||||
<Label>Participants</Label>
|
||||
<UserSearchInput
|
||||
selectedUsers={selectedParticipants}
|
||||
addUserAction={(user) => {
|
||||
setSelectedParticipants((current) =>
|
||||
current.find((u) => u.id === user.id)
|
||||
? current
|
||||
: [...current, user],
|
||||
);
|
||||
}}
|
||||
removeUserAction={(user) => {
|
||||
setSelectedParticipants((current) =>
|
||||
current.filter((u) => u.id !== user.id),
|
||||
);
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
<DialogTrigger asChild>
|
||||
<Button variant='primary'>Calendar</Button>
|
||||
</DialogTrigger>
|
||||
<div className='grid grid-cols-1 mt-3 sm:max-h-60 sm:grid-cols-2 sm:overflow-y-auto sm:mb-0'>
|
||||
{selectedParticipants.map((user) => (
|
||||
<ParticipantListEntry
|
||||
key={user.id}
|
||||
user={user}
|
||||
status='PENDING'
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className='flex flex-row gap-2 justify-end mt-4 mb-6'>
|
||||
<div className='w-[20%] grid max-sm:w-[40%]'>
|
||||
<Button
|
||||
type='button'
|
||||
variant='secondary'
|
||||
onClick={() => {
|
||||
router.back();
|
||||
console.log('user aborted - no change in database');
|
||||
}}
|
||||
>
|
||||
cancel
|
||||
</Button>
|
||||
<div className='flex flex-row gap-2 justify-end mt-4 mb-6'>
|
||||
<div className='w-[20%] grid max-sm:w-[40%]'>
|
||||
<Button
|
||||
type='button'
|
||||
variant='secondary'
|
||||
onClick={() => {
|
||||
router.back();
|
||||
console.log('user aborted - no change in database');
|
||||
}}
|
||||
>
|
||||
cancel
|
||||
</Button>
|
||||
</div>
|
||||
<div className='w-[20%] grid max-sm:w-[40%]'>
|
||||
<Button
|
||||
type='submit'
|
||||
variant='primary'
|
||||
disabled={status === 'pending'}
|
||||
>
|
||||
{status === 'pending' ? 'Saving...' : 'save event'}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
{isSuccess && <p>Event created!</p>}
|
||||
{error && <p className='text-red-500'>Error: {error.message}</p>}
|
||||
</div>
|
||||
<div className='w-[20%] grid max-sm:w-[40%]'>
|
||||
<Button
|
||||
type='submit'
|
||||
variant='primary'
|
||||
disabled={status === 'pending'}
|
||||
>
|
||||
{status === 'pending' ? 'Saving...' : 'save event'}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
{isSuccess && <p>Event created!</p>}
|
||||
{error && <p className='text-red-500'>Error: {error.message}</p>}
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
<DialogContent className='sm:max-w-[750px]'>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Calendar</DialogTitle>
|
||||
<DialogDescription>
|
||||
Calendar for selected participants
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<DialogFooter className='max-w-[calc(100svw-70px)]'>
|
||||
<Calendar
|
||||
userId={selectedParticipants.map((u) => u.id)}
|
||||
additionalEvents={[
|
||||
{
|
||||
id: 'temp-event',
|
||||
title: title || 'New Event',
|
||||
start: startDate ? new Date(startDate) : new Date(),
|
||||
end: endDate ? new Date(endDate) : new Date(),
|
||||
type: 'event',
|
||||
userId: 'create-event',
|
||||
colorOverride: '#ff9800',
|
||||
},
|
||||
]}
|
||||
height='600px'
|
||||
/>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
}
|
||||
|
||||
.rbc-off-range-bg {
|
||||
background: #e6e6e6;
|
||||
background: var(--color-neutral-700);
|
||||
}
|
||||
|
||||
.rbc-header {
|
||||
|
|
@ -596,7 +596,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
min-height: 100%;
|
||||
|
||||
/*Own changes 06*/
|
||||
background-color: #383838;
|
||||
background-color: var(--color-neutral-700);
|
||||
/*Own changes 06*/
|
||||
}
|
||||
.rbc-time-column .rbc-timeslot-group {
|
||||
|
|
@ -606,7 +606,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
}
|
||||
|
||||
.rbc-timeslot-group {
|
||||
border-bottom: 1px solid #8d8d8d; /*#ddd*/
|
||||
border-bottom: 1px solid var(--color-neutral-300); /*#ddd*/
|
||||
min-height: 40px;
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
|
|
@ -624,12 +624,13 @@ button.rbc-input::-moz-focus-inner {
|
|||
flex: none;
|
||||
|
||||
/*Own changes 07*/
|
||||
background-color: #8d8d8d;
|
||||
background-color: var(--color-neutral-500);
|
||||
/*Own changes 07*/
|
||||
}
|
||||
|
||||
.rbc-label {
|
||||
padding: 0 5px;
|
||||
width: 54.3542px;
|
||||
}
|
||||
|
||||
.rbc-day-slot {
|
||||
|
|
@ -686,7 +687,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
min-height: 1em;
|
||||
}
|
||||
.rbc-day-slot .rbc-time-slot {
|
||||
border-top: 1px solid #383838; /*#f7f7f7*/
|
||||
border-top: 1px solid transparent; /*#f7f7f7*/
|
||||
}
|
||||
|
||||
.rbc-time-view-resources .rbc-time-gutter,
|
||||
|
|
@ -782,7 +783,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
position: relative;
|
||||
|
||||
/*Own changes 05*/
|
||||
background-color: #555555;
|
||||
background-color: var(--color-neutral-500);
|
||||
/*Own changes 05*/
|
||||
}
|
||||
.rbc-time-view .rbc-allday-cell + .rbc-allday-cell {
|
||||
|
|
@ -809,6 +810,10 @@ button.rbc-input::-moz-focus-inner {
|
|||
-webkit-box-direction: normal;
|
||||
-ms-flex-direction: row;
|
||||
flex-direction: row;
|
||||
margin-right: 14px;
|
||||
@media ((hover: none) and (pointer: coarse)) {
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
.rbc-rtl .rbc-time-header.rbc-overflowing {
|
||||
border-right-width: 0;
|
||||
|
|
@ -872,7 +877,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
}
|
||||
|
||||
.rbc-time-header-content {
|
||||
border-bottom: 2px solid #717171; /*#ddd*/
|
||||
border-bottom: 2px solid var(--color-neutral-400); /*#ddd*/
|
||||
}
|
||||
|
||||
.rbc-time-column :last-child {
|
||||
|
|
@ -890,7 +895,7 @@ button.rbc-input::-moz-focus-inner {
|
|||
/*Own changes 09*/
|
||||
}
|
||||
.rbc-time-content > * + * > * {
|
||||
border-left: 1px solid #c6c6c6; /*#ddd*/
|
||||
border-left: 1px solid var(--color-neutral-300); /*#ddd*/
|
||||
}
|
||||
.rbc-rtl .rbc-time-content > * + * > * {
|
||||
border-left-width: 0;
|
||||
|
|
|
|||
99
yarn.lock
99
yarn.lock
|
|
@ -436,21 +436,21 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@eslint/config-array@npm:^0.20.1":
|
||||
version: 0.20.1
|
||||
resolution: "@eslint/config-array@npm:0.20.1"
|
||||
"@eslint/config-array@npm:^0.21.0":
|
||||
version: 0.21.0
|
||||
resolution: "@eslint/config-array@npm:0.21.0"
|
||||
dependencies:
|
||||
"@eslint/object-schema": "npm:^2.1.6"
|
||||
debug: "npm:^4.3.1"
|
||||
minimatch: "npm:^3.1.2"
|
||||
checksum: 10c0/709108c3925d83c2166024646829ab61ba5fa85c6568daefd32508899f46ed8dc36d7153042df6dcc7e58ad543bc93298b646575daecb5eb4e39a43d838dab42
|
||||
checksum: 10c0/0ea801139166c4aa56465b309af512ef9b2d3c68f9198751bbc3e21894fe70f25fbf26e1b0e9fffff41857bc21bfddeee58649ae6d79aadcd747db0c5dca771f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@eslint/config-helpers@npm:^0.2.1":
|
||||
version: 0.2.3
|
||||
resolution: "@eslint/config-helpers@npm:0.2.3"
|
||||
checksum: 10c0/8fd36d7f33013628787947c81894807c7498b31eacf6648efa6d7c7a99aac6bf0d59a8a4d14f968ec2aeebefb76a1a7e4fd4cd556a296323d4711b3d7a7cda22
|
||||
"@eslint/config-helpers@npm:^0.3.0":
|
||||
version: 0.3.0
|
||||
resolution: "@eslint/config-helpers@npm:0.3.0"
|
||||
checksum: 10c0/013ae7b189eeae8b30cc2ee87bc5c9c091a9cd615579003290eb28bebad5d78806a478e74ba10b3fe08ed66975b52af7d2cd4b4b43990376412b14e5664878c8
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
@ -489,10 +489,10 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@eslint/js@npm:9.29.0":
|
||||
version: 9.29.0
|
||||
resolution: "@eslint/js@npm:9.29.0"
|
||||
checksum: 10c0/d0ccf37063fa27a3fae9347cb044f84ca10b5a2fa19ffb2b3fedf3b96843ac1ff359ea9f0ab0e80f2f16fda4cb0dc61ea0fed0375090f050fe0a029e7d6de3a3
|
||||
"@eslint/js@npm:9.30.0":
|
||||
version: 9.30.0
|
||||
resolution: "@eslint/js@npm:9.30.0"
|
||||
checksum: 10c0/aec2df7f4e4e884d693dc27dbf4713c1a48afa327bfadac25ebd0e61a2797ce906f2f2a9be0d7d922acb68ccd68cc88779737811f9769eb4933d1f5e574c469e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
@ -1013,6 +1013,15 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@marko19907/string-to-color@npm:^1.0.0":
|
||||
version: 1.0.0
|
||||
resolution: "@marko19907/string-to-color@npm:1.0.0"
|
||||
dependencies:
|
||||
esm-seedrandom: "npm:^3.0.5"
|
||||
checksum: 10c0/fd297937fb5a8a0c3372bc614f9a4e21842e3392ef54e0d323f0fe730ec5b5a441f921e63b3b151bd39ca64a120ddfe905d1a67ca62ed637ade69c96c55fe641
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@napi-rs/wasm-runtime@npm:^0.2.11":
|
||||
version: 0.2.11
|
||||
resolution: "@napi-rs/wasm-runtime@npm:0.2.11"
|
||||
|
|
@ -3243,21 +3252,21 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@tanstack/query-core@npm:5.81.2":
|
||||
version: 5.81.2
|
||||
resolution: "@tanstack/query-core@npm:5.81.2"
|
||||
checksum: 10c0/36a6bddec2e7512015bcfbb0d7b0876fab418de9e0ef21ad403598276960e0b7d53efd62832ce462738ad22d9883e31cb5403eafc65dfd9b2f6744c22a9d8e42
|
||||
"@tanstack/query-core@npm:5.81.5":
|
||||
version: 5.81.5
|
||||
resolution: "@tanstack/query-core@npm:5.81.5"
|
||||
checksum: 10c0/8d3af841f0e2f3fba1dfd100a8bbc2d07e7b1d5b8570d3d0d8bba5127601c2788e5f7c84839f93f3b0cbe54f14866c1fef8e3f9e745f02d27afaaeea33b7b755
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@tanstack/react-query@npm:^5.80.7":
|
||||
version: 5.81.2
|
||||
resolution: "@tanstack/react-query@npm:5.81.2"
|
||||
version: 5.81.5
|
||||
resolution: "@tanstack/react-query@npm:5.81.5"
|
||||
dependencies:
|
||||
"@tanstack/query-core": "npm:5.81.2"
|
||||
"@tanstack/query-core": "npm:5.81.5"
|
||||
peerDependencies:
|
||||
react: ^18 || ^19
|
||||
checksum: 10c0/a80a2e7401a02bfc8d7a926c9e48b0a108cae21a2c47691632e754de44ca08838c105fb0c30804f4ccbf173bee04ad9a3e45a8bebdfc1d1a32468bbb9d960e19
|
||||
checksum: 10c0/04803dd7d7d6ac73ba8c55bb25d76aa2f74d173d1574a113c35559bf6a8ac7d04a75db5e470e9a2e4132fee5e0ce1ab23bd8c27d17f70a461aca0e7ae740e76b
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
@ -3378,12 +3387,12 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/node@npm:22.15.33":
|
||||
version: 22.15.33
|
||||
resolution: "@types/node@npm:22.15.33"
|
||||
"@types/node@npm:22.15.34":
|
||||
version: 22.15.34
|
||||
resolution: "@types/node@npm:22.15.34"
|
||||
dependencies:
|
||||
undici-types: "npm:~6.21.0"
|
||||
checksum: 10c0/ee040c29c891aa37fffc27d04a8529318c391356346933646b7692eaf62236831ad532f6ebaf43ebd6a2ef1f0f091860d8a0a83a4e3c5a4f66d37aa1b2c99f31
|
||||
checksum: 10c0/fb6a6b36daaa1b484aaba3d33b4d1e7b37ea993e29f20b7a676affa76ed6ff6acd2ded4d5003469bc8dbc815b3d224533b4560896037ef6d5b5d552721ab7d57
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
@ -5667,17 +5676,17 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"eslint@npm:9.29.0":
|
||||
version: 9.29.0
|
||||
resolution: "eslint@npm:9.29.0"
|
||||
"eslint@npm:9.30.0":
|
||||
version: 9.30.0
|
||||
resolution: "eslint@npm:9.30.0"
|
||||
dependencies:
|
||||
"@eslint-community/eslint-utils": "npm:^4.2.0"
|
||||
"@eslint-community/regexpp": "npm:^4.12.1"
|
||||
"@eslint/config-array": "npm:^0.20.1"
|
||||
"@eslint/config-helpers": "npm:^0.2.1"
|
||||
"@eslint/config-array": "npm:^0.21.0"
|
||||
"@eslint/config-helpers": "npm:^0.3.0"
|
||||
"@eslint/core": "npm:^0.14.0"
|
||||
"@eslint/eslintrc": "npm:^3.3.1"
|
||||
"@eslint/js": "npm:9.29.0"
|
||||
"@eslint/js": "npm:9.30.0"
|
||||
"@eslint/plugin-kit": "npm:^0.3.1"
|
||||
"@humanfs/node": "npm:^0.16.6"
|
||||
"@humanwhocodes/module-importer": "npm:^1.0.1"
|
||||
|
|
@ -5713,7 +5722,14 @@ __metadata:
|
|||
optional: true
|
||||
bin:
|
||||
eslint: bin/eslint.js
|
||||
checksum: 10c0/75e3f841e0f8b0fa93dbb2ba6ae538bd8b611c3654117bc3dadf90bb009923dfd2c15ec2948dc6e6b8b571317cc125c5cceb9255da8cd644ee740020df645dd8
|
||||
checksum: 10c0/ebc4b17cfd96f308ebaeb12dfab133a551eb03200c80109ecf663fbeb9af83c4eb3c143407c1b04522d23b5f5844fe9a629b00d409adfc460c1aadf5108da86a
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"esm-seedrandom@npm:^3.0.5":
|
||||
version: 3.0.5
|
||||
resolution: "esm-seedrandom@npm:3.0.5"
|
||||
checksum: 10c0/6fe5a33f31bce0e733814df884cdfc27812e4b04ce973f7cf008b7b8500ecab6706f54591841bd12dd3bdd9bbb153abf04fb8efd4934a5b0ab273bff114cdb3b
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
@ -7582,12 +7598,12 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"lucide-react@npm:^0.523.0":
|
||||
version: 0.523.0
|
||||
resolution: "lucide-react@npm:0.523.0"
|
||||
"lucide-react@npm:^0.525.0":
|
||||
version: 0.525.0
|
||||
resolution: "lucide-react@npm:0.525.0"
|
||||
peerDependencies:
|
||||
react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||
checksum: 10c0/dafd180d05326edc81d928f37d6574930f0592da08b91c536ae5675d0b764295368e8daf9bcc81a5283c18e2f19412060d1da475b4f26112168245e708bd562f
|
||||
checksum: 10c0/81c4438e2cf1c86ea2ebe0a97b378201512450894283cccce766a89bc6a4e47c8df1d9115d845d98f582bb0a10be31c454aa232520fea35018dac1cd8466ea9b
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
@ -7683,6 +7699,7 @@ __metadata:
|
|||
"@fortawesome/free-solid-svg-icons": "npm:^6.7.2"
|
||||
"@fortawesome/react-fontawesome": "npm:^0.2.2"
|
||||
"@hookform/resolvers": "npm:^5.0.1"
|
||||
"@marko19907/string-to-color": "npm:^1.0.0"
|
||||
"@prisma/client": "npm:^6.9.0"
|
||||
"@radix-ui/react-avatar": "npm:^1.1.10"
|
||||
"@radix-ui/react-collapsible": "npm:^1.1.11"
|
||||
|
|
@ -7700,7 +7717,7 @@ __metadata:
|
|||
"@radix-ui/react-tooltip": "npm:^1.2.7"
|
||||
"@tailwindcss/postcss": "npm:4.1.11"
|
||||
"@tanstack/react-query": "npm:^5.80.7"
|
||||
"@types/node": "npm:22.15.33"
|
||||
"@types/node": "npm:22.15.34"
|
||||
"@types/react": "npm:19.1.8"
|
||||
"@types/react-big-calendar": "npm:1.16.2"
|
||||
"@types/react-dom": "npm:19.1.6"
|
||||
|
|
@ -7713,10 +7730,10 @@ __metadata:
|
|||
cypress: "npm:14.5.0"
|
||||
date-fns: "npm:^4.1.0"
|
||||
dotenv-cli: "npm:8.0.0"
|
||||
eslint: "npm:9.29.0"
|
||||
eslint: "npm:9.30.0"
|
||||
eslint-config-next: "npm:15.3.4"
|
||||
eslint-config-prettier: "npm:10.1.5"
|
||||
lucide-react: "npm:^0.523.0"
|
||||
lucide-react: "npm:^0.525.0"
|
||||
next: "npm:15.3.4"
|
||||
next-auth: "npm:^5.0.0-beta.25"
|
||||
next-swagger-doc: "npm:^0.4.1"
|
||||
|
|
@ -9018,11 +9035,11 @@ __metadata:
|
|||
linkType: hard
|
||||
|
||||
"react-hook-form@npm:^7.56.4":
|
||||
version: 7.58.1
|
||||
resolution: "react-hook-form@npm:7.58.1"
|
||||
version: 7.59.0
|
||||
resolution: "react-hook-form@npm:7.59.0"
|
||||
peerDependencies:
|
||||
react: ^16.8.0 || ^17 || ^18 || ^19
|
||||
checksum: 10c0/981b9982b7eb497c3afff86c219175fdd4d92a24e3533518035239545dda23f5ebc6ba647fb29a250f768bdf811ba413094ce0103fbf36b436737fc18aa1bb49
|
||||
checksum: 10c0/6be30ce65121f4be0f491c2929142e2d9a390a8802f58fb7a41ab978ab8daa6fcd2c442258dbd1b053e6864a83c8f4b1d83de9c95f0efdf5c2120d3c21bd838e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue