diff --git a/nest-cli.json b/backend/nest-cli.json similarity index 100% rename from nest-cli.json rename to backend/nest-cli.json diff --git a/prisma/migrations/20260614114952_add_join_request_flow/migration.sql b/backend/prisma/migrations/20260614114952_add_join_request_flow/migration.sql similarity index 100% rename from prisma/migrations/20260614114952_add_join_request_flow/migration.sql rename to backend/prisma/migrations/20260614114952_add_join_request_flow/migration.sql diff --git a/prisma/migrations/migration_lock.toml b/backend/prisma/migrations/migration_lock.toml similarity index 100% rename from prisma/migrations/migration_lock.toml rename to backend/prisma/migrations/migration_lock.toml diff --git a/prisma.service.ts b/backend/prisma/prisma.service.ts similarity index 100% rename from prisma.service.ts rename to backend/prisma/prisma.service.ts diff --git a/prisma/schema.prisma b/backend/prisma/schema.prisma similarity index 100% rename from prisma/schema.prisma rename to backend/prisma/schema.prisma diff --git a/schema.sql b/backend/prisma/schema.sql similarity index 100% rename from schema.sql rename to backend/prisma/schema.sql diff --git a/seed.ts b/backend/seed.ts similarity index 100% rename from seed.ts rename to backend/seed.ts diff --git a/admin.guard.ts b/backend/src/auth/admin.guard.ts similarity index 100% rename from admin.guard.ts rename to backend/src/auth/admin.guard.ts diff --git a/jwt-auth.guard.ts b/backend/src/auth/jwt-auth.guard.ts similarity index 100% rename from jwt-auth.guard.ts rename to backend/src/auth/jwt-auth.guard.ts diff --git a/jwt.strategy.ts b/backend/src/auth/jwt.strategy.ts similarity index 100% rename from jwt.strategy.ts rename to backend/src/auth/jwt.strategy.ts diff --git a/rbac.middleware.ts b/backend/src/common/rbac.middleware.ts similarity index 100% rename from rbac.middleware.ts rename to backend/src/common/rbac.middleware.ts diff --git a/main.ts b/backend/src/main.ts similarity index 99% rename from main.ts rename to backend/src/main.ts index 2a7272e..5999e4a 100644 --- a/main.ts +++ b/backend/src/main.ts @@ -1,14 +1,14 @@ import 'reflect-metadata'; import { NestFactory } from '@nestjs/core'; import { Module, Controller, Get, Post, Body, Param, Patch, Delete, ParseUUIDPipe, NotFoundException, BadRequestException, UnauthorizedException, UseGuards, Req, Query, ForbiddenException } from '@nestjs/common'; -import { PrismaService } from './prisma.service.js'; +import { PrismaService } from '../prisma/prisma.service.js'; import 'dotenv/config'; import * as bcrypt from 'bcrypt'; -import { AdminGuard } from './admin.guard.js'; +import { AdminGuard } from './auth/admin.guard.js'; import { JwtModule, JwtService } from '@nestjs/jwt'; -import { JwtAuthGuard } from './jwt-auth.guard.js'; -import { JwtStrategy } from './jwt.strategy.js'; -import { TourRoleGuard } from './rbac.middleware.js'; +import { JwtAuthGuard } from './auth/jwt-auth.guard.js'; +import { JwtStrategy } from './auth/jwt.strategy.js'; +import { TourRoleGuard } from './common/rbac.middleware.js'; @Controller() class AppController { diff --git a/tsconfig.build.json b/backend/tsconfig.build.json similarity index 100% rename from tsconfig.build.json rename to backend/tsconfig.build.json diff --git a/tsconfig.json b/backend/tsconfig.json similarity index 59% rename from tsconfig.json rename to backend/tsconfig.json index c885c0d..4e11ae6 100644 --- a/tsconfig.json +++ b/backend/tsconfig.json @@ -1,12 +1,7 @@ { "compilerOptions": { - "ignoreDeprecations": "5.0", - "module": "NodeNext", - "moduleResolution": "NodeNext", - "allowImportingTsExtensions": true, - "rewriteRelativeImportExtensions": true, - "noEmit": false, - "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "node", "declaration": true, "removeComments": true, "emitDecoratorMetadata": true, @@ -15,12 +10,18 @@ "target": "ES2021", "sourceMap": true, "outDir": "./dist", - "incremental": true, "skipLibCheck": true, "strictNullChecks": false, "noImplicitAny": false, "strictBindCallApply": false, "forceConsistentCasingInFileNames": false, - "noFallthroughCasesInSwitch": false - } -} \ No newline at end of file + "noFallthroughCasesInSwitch": false, + "resolveJsonModule": true, + "esModuleInterop": true, + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + } + }, + "include": ["src/**/*"] +} diff --git a/ARCHITECTURE.md b/docs/ARCHITECTURE.md similarity index 100% rename from ARCHITECTURE.md rename to docs/ARCHITECTURE.md diff --git a/UITourDesign.md b/docs/UITourDesign.md similarity index 100% rename from UITourDesign.md rename to docs/UITourDesign.md diff --git a/index.html b/frontend/index.html similarity index 81% rename from index.html rename to frontend/index.html index 2d5e765..6e27e30 100644 --- a/index.html +++ b/frontend/index.html @@ -7,6 +7,6 @@
- +