Calendar page

apps/backend/.env.example

@@ -1,2 +1 @@
 DATABASE_URL="postgresql://postgres:postgres@localhost:5432/mydb?schema=public"
-FRONTEND_HOST="http://localhost:3000"

apps/backend/package.json

@@ -18,7 +18,7 @@
     "@nestjs/core": "^10.3.8",
     "@nestjs/platform-express": "^10.3.8",
     "@nestjs/swagger": "^7.3.1",
-    "@prisma/client": "^5.18.0",
+    "@prisma/client": "^5.13.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "nestjs-prisma": "^0.23.0",
@@ -35,7 +35,6 @@
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^7.7.1",
     "@typescript-eslint/parser": "^7.7.1",
-    "prisma": "^5.18.0",
     "source-map-support": "^0.5.21",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",

apps/backend/src/event/entity/event.entity.ts

@@ -35,7 +35,6 @@ export class Event {
   color: Color;
 
   @IsNotEmpty()
-  @IsEnum(Status)
   status: Status;
 
   @IsString()

apps/backend/src/event/event.service.ts

@@ -4,33 +4,19 @@ import { PrismaService } from 'nestjs-prisma';
 
 import { CreateEventDto } from './dto/create-event.dto';
 import { UpdateEventDto } from './dto/update-event.dto';
-import { EventDetailsDto } from './entity/event.details';
 import { Event } from './entity/event.entity';
 
 @Injectable()
 export class EventService {
   constructor(private readonly prisma: PrismaService) {}
 
   async create(data: CreateEventDto): Promise<Event> {
-    const { ownerId, ...restOfData } = data;
     try {
-      return await this.prisma.event.create({
-        data: {
-          ...restOfData,
-          owner: {
-            connect: {
-              authSchId: ownerId,
-            },
-          },
-        },
-      });
+      return await this.prisma.event.create({ data });
     } catch (error) {
       if (error instanceof PrismaClientValidationError) {
         throw new BadRequestException(`Invalid data`);
       }
-      if (error instanceof PrismaClientKnownRequestError) {
-        if (error.code === 'P2002') throw new BadRequestException(`Invalid data: user not found`);
-      }
       throw error;
     }
   }
@@ -39,15 +25,9 @@ export class EventService {
     return this.prisma.event.findMany();
   }
 
-  async findOne(id: string): Promise<EventDetailsDto> {
+  async findOne(id: string): Promise<Event> {
     try {
-      return await this.prisma.event.findUnique({
-        where: { id },
-        include: {
-          owner: true,
-          organizers: true,
-        },
-      });
+      return await this.prisma.event.findUnique({ where: { id } });
     } catch {
       throw new NotFoundException(`Event not found`);
     }
@@ -58,8 +38,7 @@ export class EventService {
       return await this.prisma.event.update({ where: { id }, data });
     } catch (error) {
       if (error instanceof PrismaClientKnownRequestError) {
-        if (error.code === 'P2002') throw new BadRequestException(`Invalid data: user not found`);
-        if (error.code === 'P2025') throw new NotFoundException(`Event not found`);
+        throw new NotFoundException(`Event not found`);
       }
       if (error instanceof PrismaClientValidationError) {
         throw new BadRequestException(`Invalid data`);

apps/backend/src/main.ts

@@ -1,18 +1,11 @@
 import { ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import cors from 'cors';
 
 import { AppModule } from './app.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   app.useGlobalPipes(new ValidationPipe({ whitelist: true }));
-  app.use(
-    cors({
-      origin: process.env.FRONTEND_HOST,
-      credentials: true,
-    })
-  );
   await app.listen(3001);
 }
 bootstrap();

apps/backend/src/users/dto/create-user.dto.ts

@@ -1,5 +1,5 @@
 import { OmitType } from '@nestjs/swagger';
 
-import { UserEntity } from '../entities/user.entity';
+import { User } from '../entities/user.entity';
 
-export class CreateUserDto extends OmitType(UserEntity, ['isAdmin']) {}
+export class CreateUserDto extends OmitType(User, ['isAdmin']) {}

apps/backend/src/users/entities/user.entity.ts

@@ -1,6 +1,6 @@
 import { IsBoolean, IsEmail, IsNotEmpty, IsString } from 'class-validator';
 
-export class UserEntity {
+export class User {
   @IsString()
   @IsNotEmpty()
   authSchId: string;

apps/backend/src/users/users.controller.ts

@@ -2,15 +2,15 @@ import { Body, Controller, Delete, Get, Param, Patch, Post } from '@nestjs/commo
 
 import { CreateUserDto } from './dto/create-user.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
-import { UserEntity } from './entities/user.entity';
+import { User } from './entities/user.entity';
 import { UsersService } from './users.service';
 
 @Controller('users')
 export class UsersController {
   constructor(private readonly usersService: UsersService) {}
 
   @Post()
-  create(@Body() data: CreateUserDto): Promise<UserEntity> {
+  create(@Body() data: CreateUserDto): Promise<User> {
     return this.usersService.create(data);
   }
 

apps/backend/src/users/users.service.ts

@@ -4,45 +4,41 @@ import { PrismaService } from 'nestjs-prisma';
 
 import { CreateUserDto } from './dto/create-user.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
-import { UserEntity } from './entities/user.entity';
+import { User } from './entities/user.entity';
 
 @Injectable()
 export class UsersService {
   constructor(private readonly prisma: PrismaService) {}
 
-  async create(data: CreateUserDto): Promise<UserEntity> {
+  async create(data: CreateUserDto): Promise<User> {
     try {
       return await this.prisma.user.create({ data });
     } catch (error) {
       if (error instanceof PrismaClientValidationError) {
         throw new BadRequestException('Invalid User data');
       }
-      if (error instanceof PrismaClientKnownRequestError) {
-        if (error.code === 'P2002') throw new BadRequestException(`Invalid User data: email already in use`);
-      }
       throw error;
     }
   }
 
-  async findAll(): Promise<UserEntity[]> {
+  async findAll(): Promise<User[]> {
     return this.prisma.user.findMany();
   }
 
-  async findOne(id: string): Promise<UserEntity> {
+  async findOne(id: string): Promise<User> {
     const user = await this.prisma.user.findUnique({ where: { authSchId: id } });
     if (user === null) {
       throw new NotFoundException('User not found');
     }
     return user;
   }
 
-  async update(id: string, data: UpdateUserDto): Promise<UserEntity> {
+  async update(id: string, data: UpdateUserDto): Promise<User> {
     try {
       return await this.prisma.user.update({ where: { authSchId: id }, data });
     } catch (error) {
       if (error instanceof PrismaClientKnownRequestError) {
-        if (error.code === 'P2002') throw new BadRequestException(`Invalid data: email already in use`);
-        if (error.code === 'P2025') throw new NotFoundException(`User not found`);
+        throw new NotFoundException(`User not found`);
       }
       if (error instanceof PrismaClientValidationError) {
         throw new BadRequestException(`Invalid data`);
@@ -51,7 +47,7 @@ export class UsersService {
     }
   }
 
-  async delete(id: string): Promise<UserEntity> {
+  async delete(id: string): Promise<User> {
     try {
       return await this.prisma.user.delete({ where: { authSchId: id } });
     } catch {

apps/frontend/package.json

@@ -12,28 +12,22 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.51.15",
-    "@tanstack/react-query-devtools": "^5.51.23",
-    "axios": "^1.7.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "lucide-react": "^0.372.0",
     "next": "14.2.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.52.2",
-    "react-icons": "^5.2.1",
-    "react-router-dom": "^6.25.1",
     "tailwind-merge": "^2.3.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
     "@types/node": "^20.12.7",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
-    "eslint-plugin-react": "^7.34.1",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "eslint-plugin-react": "^7.34.1"
   }
 }