Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b40b2e4430 | |||
| c77dd23dd1 | |||
|
|
0cec8be4cd | ||
|
|
5eb7a1a8fd | ||
| 049b925855 | |||
|
|
7ce09205e4 | ||
|
|
5744fd89ae | ||
| 3216fd00f6 | |||
|
|
a0d87692ea | ||
| 489184b841 | |||
|
|
8453e542a1 | ||
| 2e094b0453 | |||
|
|
598f8d5c55 | ||
| cb7d584589 | |||
| ec75d01b32 | |||
| c00343a6f2 | |||
| f29f87e503 | |||
| 657f12f2b8 |
56
backend/docker-compose.yml
Normal file
56
backend/docker-compose.yml
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
version: '3.8'
|
||||||
|
|
||||||
|
services:
|
||||||
|
postgres:
|
||||||
|
image: postgres:15
|
||||||
|
container_name: postgres_db
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: postgres
|
||||||
|
POSTGRES_PASSWORD: postgres
|
||||||
|
POSTGRES_DB: todo
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
volumes:
|
||||||
|
- pgdata:/var/lib/postgresql/data
|
||||||
|
|
||||||
|
users-auth-service:
|
||||||
|
build:
|
||||||
|
context: ./users-auth-service
|
||||||
|
container_name: users-auth-service
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- postgres
|
||||||
|
environment:
|
||||||
|
PORT: 4000
|
||||||
|
DB_HOST: postgres
|
||||||
|
DB_PORT: 5432
|
||||||
|
DB_USER: postgres
|
||||||
|
DB_PASSWORD: postgres
|
||||||
|
DB_NAME: todo
|
||||||
|
JWT_SECRET: super_secret_key
|
||||||
|
JWT_EXPIRES_IN: 3600s
|
||||||
|
ports:
|
||||||
|
- "4000:4000"
|
||||||
|
|
||||||
|
tasks-projects-service:
|
||||||
|
build:
|
||||||
|
context: ./tasks-projects-service
|
||||||
|
container_name: tasks-projects-service
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- postgres
|
||||||
|
- users-auth-service
|
||||||
|
environment:
|
||||||
|
PORT: 5000
|
||||||
|
DB_HOST: postgres
|
||||||
|
DB_PORT: 5432
|
||||||
|
DB_USER: postgres
|
||||||
|
DB_PASSWORD: postgres
|
||||||
|
DB_NAME: todo
|
||||||
|
JWT_SECRET: super_secret_key
|
||||||
|
ports:
|
||||||
|
- "5000:5000"
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
pgdata:
|
||||||
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "postgres",
|
|
||||||
"host": "109.107.166.17",
|
|
||||||
"port": 5432,
|
|
||||||
"username": "nichtar",
|
|
||||||
"password": "6t30a72",
|
|
||||||
"database": "SDR",
|
|
||||||
"synchronize": true,
|
|
||||||
"logging": false,
|
|
||||||
"entities": ["src/entities/*.ts"],
|
|
||||||
"migrations": ["src/migration/*.ts"],
|
|
||||||
"cli": {
|
|
||||||
"entitiesDir": "src/entities",
|
|
||||||
"migrationsDir": "src/migration"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
3042
backend/package-lock.json
generated
3042
backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,32 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "web",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"main": "index.js",
|
|
||||||
"scripts": {
|
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
|
||||||
},
|
|
||||||
"keywords": [],
|
|
||||||
"author": "",
|
|
||||||
"license": "ISC",
|
|
||||||
"description": "",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bcryptjs": "^3.0.0",
|
"@nestjs/passport": "^11.0.5"
|
||||||
"cors": "^2.8.5",
|
|
||||||
"dotenv": "^16.4.7",
|
|
||||||
"express": "^4.21.2",
|
|
||||||
"jsonwebtoken": "^9.0.2",
|
|
||||||
"pg": "^8.13.3",
|
|
||||||
"pg-pool": "^3.7.1",
|
|
||||||
"reflect-metadata": "^0.2.2",
|
|
||||||
"ts-node-dev": "^2.0.0",
|
|
||||||
"typeorm": "^0.3.20",
|
|
||||||
"typescript": "^5.7.3"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@types/bcryptjs": "^2.4.6",
|
|
||||||
"@types/cors": "^2.8.17",
|
|
||||||
"@types/express": "^5.0.0",
|
|
||||||
"@types/jsonwebtoken": "^9.0.8",
|
|
||||||
"@types/pg": "^8.11.11"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
DB_USER=nichtar
|
|
||||||
DB_HOST=postgres
|
|
||||||
DB_NAME=SDR
|
|
||||||
DB_PASSWORD=postgres
|
|
||||||
DB_PORT=5432
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
import { Request, Response } from 'express';
|
|
||||||
import jwt from 'jsonwebtoken';
|
|
||||||
import { getRepository } from 'typeorm';
|
|
||||||
import { Project } from './entities/Project';
|
|
||||||
import { ProjectMember } from './entities/ProjectMember';
|
|
||||||
import { Task } from './entities/Task';
|
|
||||||
import { User } from './entities/User';
|
|
||||||
|
|
||||||
const SECRET_KEY = process.env.JWT_SECRET || 'your_secret_key';
|
|
||||||
|
|
||||||
// Аутентификация пользователя и выдача токена
|
|
||||||
export const login = async (req: Request, res: Response): Promise<void> => {
|
|
||||||
const { username, password } = req.body;
|
|
||||||
const userRepository = getRepository(User);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const user = await userRepository.findOne({ where: { username } });
|
|
||||||
|
|
||||||
if (!user || user.password !== password) {
|
|
||||||
res.status(401).json({ message: 'Неверные имя пользователя или пароль' });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const token = jwt.sign({ id: user.id, username: user.username }, SECRET_KEY, { expiresIn: '1h' });
|
|
||||||
|
|
||||||
res.json({ token });
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ message: 'Ошибка при аутентификации', error });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// Создание проекта
|
|
||||||
export const createProject = async (req: Request, res: Response) => {
|
|
||||||
const projectRepository = getRepository(Project);
|
|
||||||
const { title, description } = req.body;
|
|
||||||
const ownerId = req.user?.id;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const project = projectRepository.create({ title, description, owner: { id: ownerId } });
|
|
||||||
await projectRepository.save(project);
|
|
||||||
res.status(201).json(project);
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ message: 'Ошибка при создании проекта', error });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Получение списка проектов
|
|
||||||
export const getProjects = async (req: Request, res: Response) => {
|
|
||||||
const projectRepository = getRepository(Project);
|
|
||||||
const userId = req.user?.id;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const projects = await projectRepository.find({
|
|
||||||
where: { owner: { id: userId } }, // Ищем проекты, где owner соответствует ID пользователя
|
|
||||||
relations: ['owner'], // Подгружаем связанные данные о владельце
|
|
||||||
});
|
|
||||||
|
|
||||||
res.json(projects);
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ message: 'Ошибка при получении проектов', error });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Добавление участника в проект
|
|
||||||
export const addMemberToProject = async (req: Request, res: Response) => {
|
|
||||||
const memberRepository = getRepository(ProjectMember);
|
|
||||||
const { projectId } = req.params;
|
|
||||||
const { userId, role } = req.body;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const member = memberRepository.create({ project: { id: Number(projectId) }, user: { id: userId }, role });
|
|
||||||
await memberRepository.save(member);
|
|
||||||
res.status(201).json({ message: 'Участник добавлен в проект' });
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ message: 'Ошибка при добавлении участника', error });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Создание задачи
|
|
||||||
export const createTask = async (req: Request, res: Response) => {
|
|
||||||
const taskRepository = getRepository(Task);
|
|
||||||
const { projectId } = req.params;
|
|
||||||
const { title, status, assignedUserId, deadline } = req.body;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const task = taskRepository.create({
|
|
||||||
project: { id: Number(projectId) },
|
|
||||||
title,
|
|
||||||
status,
|
|
||||||
assigned_user: assignedUserId ? { id: assignedUserId } : null,
|
|
||||||
deadline,
|
|
||||||
});
|
|
||||||
await taskRepository.save(task);
|
|
||||||
res.status(201).json(task);
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ message: 'Ошибка при создании задачи', error });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Получение списка задач по проекту
|
|
||||||
export const getTasksByProject = async (req: Request, res: Response) => {
|
|
||||||
const taskRepository = getRepository(Task);
|
|
||||||
const { projectId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const tasks = await taskRepository.find({ where: { project: { id: Number(projectId) } } });
|
|
||||||
res.json(tasks);
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ message: 'Ошибка при получении задач', error });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
import { createConnection } from 'typeorm';
|
|
||||||
|
|
||||||
export const connectDB = async () => {
|
|
||||||
try {
|
|
||||||
await createConnection();
|
|
||||||
console.log('База данных подключена');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Ошибка подключения к базе данных:', error);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn, UpdateDateColumn } from 'typeorm';
|
|
||||||
import { User } from './User';
|
|
||||||
|
|
||||||
@Entity('projects')
|
|
||||||
export class Project {
|
|
||||||
@PrimaryGeneratedColumn()
|
|
||||||
id!: number;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
title!: string;
|
|
||||||
|
|
||||||
@Column({ nullable: true })
|
|
||||||
description!: string;
|
|
||||||
|
|
||||||
@ManyToOne(() => User, (user) => user.id)
|
|
||||||
owner!: User;
|
|
||||||
|
|
||||||
@CreateDateColumn()
|
|
||||||
created_at!: Date;
|
|
||||||
|
|
||||||
@UpdateDateColumn()
|
|
||||||
updated_at!: Date;
|
|
||||||
}
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
import { Entity, PrimaryGeneratedColumn, ManyToOne, Column } from 'typeorm';
|
|
||||||
import { Project } from './Project';
|
|
||||||
import { User } from './User';
|
|
||||||
|
|
||||||
@Entity('project_members')
|
|
||||||
export class ProjectMember {
|
|
||||||
@PrimaryGeneratedColumn()
|
|
||||||
id!: number;
|
|
||||||
|
|
||||||
@ManyToOne(() => Project, (project) => project.id)
|
|
||||||
project!: Project;
|
|
||||||
|
|
||||||
@ManyToOne(() => User, (user) => user.id)
|
|
||||||
user!: User;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
role!: string; // Возможные значения: owner, member
|
|
||||||
}
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn } from 'typeorm';
|
|
||||||
import { Project } from './Project';
|
|
||||||
import { User } from './User';
|
|
||||||
|
|
||||||
@Entity('tasks')
|
|
||||||
export class Task {
|
|
||||||
@PrimaryGeneratedColumn()
|
|
||||||
id!: number;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
title!: string;
|
|
||||||
|
|
||||||
@Column({ default: 'todo' })
|
|
||||||
status!: string;
|
|
||||||
|
|
||||||
@ManyToOne(() => Project, (project) => project.id)
|
|
||||||
project!: Project;
|
|
||||||
|
|
||||||
@ManyToOne(() => User, (user) => user.id, { nullable: true })
|
|
||||||
assigned_user!: User | null;
|
|
||||||
|
|
||||||
@Column({ type: 'timestamp', nullable: true })
|
|
||||||
deadline!: Date | null;
|
|
||||||
|
|
||||||
@CreateDateColumn()
|
|
||||||
created_at!: Date;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn } from 'typeorm';
|
|
||||||
|
|
||||||
@Entity('users')
|
|
||||||
export class User {
|
|
||||||
@PrimaryGeneratedColumn()
|
|
||||||
id!: number;
|
|
||||||
|
|
||||||
@Column({ unique: true })
|
|
||||||
username!: string;
|
|
||||||
|
|
||||||
@Column({ unique: true })
|
|
||||||
email!: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
password!: string;
|
|
||||||
|
|
||||||
@CreateDateColumn()
|
|
||||||
created_at!: Date;
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
import { Request, Response, NextFunction } from 'express';
|
|
||||||
import jwt from 'jsonwebtoken';
|
|
||||||
|
|
||||||
const SECRET_KEY = process.env.JWT_SECRET || 'your_secret_key';
|
|
||||||
|
|
||||||
export const verifyToken = (req: Request, res: Response, next: NextFunction): void => {
|
|
||||||
const token = req.header('Authorization')?.replace('Bearer ', '');
|
|
||||||
|
|
||||||
if (!token) {
|
|
||||||
res.status(401).json({ message: 'Доступ запрещён. Токен отсутствует.' });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const decoded = jwt.verify(token, SECRET_KEY) as { id: number; username: string };
|
|
||||||
req.user = decoded; // Добавляем `user` в `req`
|
|
||||||
next(); // Передаём управление следующему middleware
|
|
||||||
} catch (error) {
|
|
||||||
res.status(401).json({ message: 'Неверный токен.' });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
import { Router } from 'express';
|
|
||||||
import { login, createProject, getProjects, addMemberToProject, createTask, getTasksByProject } from './controllers';
|
|
||||||
import { verifyToken } from './middlewares';
|
|
||||||
|
|
||||||
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
router.post('/login', login); // Новый маршрут для получения токена
|
|
||||||
|
|
||||||
// Проекты
|
|
||||||
router.post('/projects', verifyToken, createProject);
|
|
||||||
router.get('/projects', verifyToken, getProjects);
|
|
||||||
router.post('/projects/:projectId/members', verifyToken, addMemberToProject);
|
|
||||||
|
|
||||||
// Задачи
|
|
||||||
router.post('/projects/:projectId/tasks', verifyToken, createTask);
|
|
||||||
router.get('/projects/:projectId/tasks', verifyToken, getTasksByProject);
|
|
||||||
|
|
||||||
export default router;
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
import express, { Application } from 'express';
|
|
||||||
import dotenv from 'dotenv';
|
|
||||||
import { connectDB } from './db';
|
|
||||||
import userRoutes from './routes';
|
|
||||||
import cors from 'cors';
|
|
||||||
|
|
||||||
dotenv.config();
|
|
||||||
|
|
||||||
const app: Application = express();
|
|
||||||
const PORT = process.env.PORT || 3000;
|
|
||||||
|
|
||||||
app.use(cors());
|
|
||||||
app.use(express.json());
|
|
||||||
|
|
||||||
connectDB();
|
|
||||||
|
|
||||||
app.use('/api', userRoutes);
|
|
||||||
|
|
||||||
app.listen(PORT, () => {
|
|
||||||
console.log(`Сервер запущен на http://localhost:${PORT}`);
|
|
||||||
});
|
|
||||||
9
backend/tasks-projects-service/.env
Normal file
9
backend/tasks-projects-service/.env
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
PORT=5000
|
||||||
|
|
||||||
|
JWT_SECRET=super_secret_key
|
||||||
|
|
||||||
|
DB_HOST=localhost
|
||||||
|
DB_PORT=5432
|
||||||
|
DB_USER=postgres
|
||||||
|
DB_PASSWORD=postgres
|
||||||
|
DB_NAME=todo
|
||||||
20
backend/tasks-projects-service/Dockerfile
Normal file
20
backend/tasks-projects-service/Dockerfile
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# Используем Node.js 20 в качестве базового образа
|
||||||
|
FROM node:20
|
||||||
|
|
||||||
|
# Устанавливаем рабочую директорию
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Копируем package.json и package-lock.json
|
||||||
|
COPY package*.json ./
|
||||||
|
|
||||||
|
# Устанавливаем зависимости
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
# Копируем исходный код
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Открываем порт (совпадает с PORT в .env)
|
||||||
|
EXPOSE 5000
|
||||||
|
|
||||||
|
# Команда запуска
|
||||||
|
CMD ["npm", "start"]
|
||||||
99
backend/tasks-projects-service/README.md
Normal file
99
backend/tasks-projects-service/README.md
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
<p align="center">
|
||||||
|
<a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
|
||||||
|
[circleci-url]: https://circleci.com/gh/nestjs/nest
|
||||||
|
|
||||||
|
<p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
|
||||||
|
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
|
||||||
|
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
|
||||||
|
<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
|
||||||
|
<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
|
||||||
|
<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
|
||||||
|
<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
|
||||||
|
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
|
||||||
|
<a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
|
||||||
|
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
|
||||||
|
<a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
|
||||||
|
</p>
|
||||||
|
<!--[](https://opencollective.com/nest#backer)
|
||||||
|
[](https://opencollective.com/nest#sponsor)-->
|
||||||
|
|
||||||
|
## Description
|
||||||
|
|
||||||
|
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
|
||||||
|
|
||||||
|
## Project setup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ npm install
|
||||||
|
```
|
||||||
|
|
||||||
|
## Compile and run the project
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# development
|
||||||
|
$ npm run start
|
||||||
|
|
||||||
|
# watch mode
|
||||||
|
$ npm run start:dev
|
||||||
|
|
||||||
|
# production mode
|
||||||
|
$ npm run start:prod
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# unit tests
|
||||||
|
$ npm run test
|
||||||
|
|
||||||
|
# e2e tests
|
||||||
|
$ npm run test:e2e
|
||||||
|
|
||||||
|
# test coverage
|
||||||
|
$ npm run test:cov
|
||||||
|
```
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
|
||||||
|
When you're ready to deploy your NestJS application to production, there are some key steps you can take to ensure it runs as efficiently as possible. Check out the [deployment documentation](https://docs.nestjs.com/deployment) for more information.
|
||||||
|
|
||||||
|
If you are looking for a cloud-based platform to deploy your NestJS application, check out [Mau](https://mau.nestjs.com), our official platform for deploying NestJS applications on AWS. Mau makes deployment straightforward and fast, requiring just a few simple steps:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ npm install -g mau
|
||||||
|
$ mau deploy
|
||||||
|
```
|
||||||
|
|
||||||
|
With Mau, you can deploy your application in just a few clicks, allowing you to focus on building features rather than managing infrastructure.
|
||||||
|
|
||||||
|
## Resources
|
||||||
|
|
||||||
|
Check out a few resources that may come in handy when working with NestJS:
|
||||||
|
|
||||||
|
- Visit the [NestJS Documentation](https://docs.nestjs.com) to learn more about the framework.
|
||||||
|
- For questions and support, please visit our [Discord channel](https://discord.gg/G7Qnnhy).
|
||||||
|
- To dive deeper and get more hands-on experience, check out our official video [courses](https://courses.nestjs.com/).
|
||||||
|
- Deploy your application to AWS with the help of [NestJS Mau](https://mau.nestjs.com) in just a few clicks.
|
||||||
|
- Visualize your application graph and interact with the NestJS application in real-time using [NestJS Devtools](https://devtools.nestjs.com).
|
||||||
|
- Need help with your project (part-time to full-time)? Check out our official [enterprise support](https://enterprise.nestjs.com).
|
||||||
|
- To stay in the loop and get updates, follow us on [X](https://x.com/nestframework) and [LinkedIn](https://linkedin.com/company/nestjs).
|
||||||
|
- Looking for a job, or have a job to offer? Check out our official [Jobs board](https://jobs.nestjs.com).
|
||||||
|
|
||||||
|
## Support
|
||||||
|
|
||||||
|
Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
|
||||||
|
|
||||||
|
## Stay in touch
|
||||||
|
|
||||||
|
- Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
|
||||||
|
- Website - [https://nestjs.com](https://nestjs.com/)
|
||||||
|
- Twitter - [@nestframework](https://twitter.com/nestframework)
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
Nest is [MIT licensed](https://github.com/nestjs/nest/blob/master/LICENSE).
|
||||||
18
backend/tasks-projects-service/data-source.ts
Normal file
18
backend/tasks-projects-service/data-source.ts
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
import 'reflect-metadata';
|
||||||
|
import { DataSource, DataSourceOptions } from 'typeorm';
|
||||||
|
import { config as dotEnvConfig } from 'dotenv';
|
||||||
|
dotEnvConfig(); // загрузит .env
|
||||||
|
|
||||||
|
const options: DataSourceOptions = {
|
||||||
|
type: 'postgres',
|
||||||
|
host: process.env.DB_HOST || 'localhost',
|
||||||
|
port: Number(process.env.DB_PORT) || 5432,
|
||||||
|
username: process.env.DB_USER || 'postgres',
|
||||||
|
password: process.env.DB_PASSWORD || 'postgres',
|
||||||
|
database: process.env.DB_NAME || 'todo',
|
||||||
|
entities: ['src/**/*.entity.ts'],
|
||||||
|
migrations: ['src/migrations/*.ts'],
|
||||||
|
synchronize: false, // теперь мы управляем схемой через миграции
|
||||||
|
};
|
||||||
|
|
||||||
|
export const AppDataSource = new DataSource(options);
|
||||||
35
backend/tasks-projects-service/eslint.config.mjs
Normal file
35
backend/tasks-projects-service/eslint.config.mjs
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
// @ts-check
|
||||||
|
import eslint from '@eslint/js';
|
||||||
|
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
|
||||||
|
import globals from 'globals';
|
||||||
|
import tseslint from 'typescript-eslint';
|
||||||
|
|
||||||
|
export default tseslint.config(
|
||||||
|
{
|
||||||
|
ignores: ['eslint.config.mjs'],
|
||||||
|
},
|
||||||
|
eslint.configs.recommended,
|
||||||
|
...tseslint.configs.recommendedTypeChecked,
|
||||||
|
eslintPluginPrettierRecommended,
|
||||||
|
{
|
||||||
|
languageOptions: {
|
||||||
|
globals: {
|
||||||
|
...globals.node,
|
||||||
|
...globals.jest,
|
||||||
|
},
|
||||||
|
ecmaVersion: 5,
|
||||||
|
sourceType: 'module',
|
||||||
|
parserOptions: {
|
||||||
|
projectService: true,
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
'@typescript-eslint/no-floating-promises': 'warn',
|
||||||
|
'@typescript-eslint/no-unsafe-argument': 'warn'
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
8
backend/tasks-projects-service/nest-cli.json
Normal file
8
backend/tasks-projects-service/nest-cli.json
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://json.schemastore.org/nest-cli",
|
||||||
|
"collection": "@nestjs/schematics",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"compilerOptions": {
|
||||||
|
"deleteOutDir": true
|
||||||
|
}
|
||||||
|
}
|
||||||
11295
backend/tasks-projects-service/package-lock.json
generated
Normal file
11295
backend/tasks-projects-service/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
79
backend/tasks-projects-service/package.json
Normal file
79
backend/tasks-projects-service/package.json
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
{
|
||||||
|
"name": "src",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"description": "",
|
||||||
|
"author": "",
|
||||||
|
"private": true,
|
||||||
|
"license": "UNLICENSED",
|
||||||
|
"scripts": {
|
||||||
|
"build": "nest build",
|
||||||
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
|
"start": "nest start",
|
||||||
|
"start:dev": "nest start --watch",
|
||||||
|
"start:debug": "nest start --debug --watch",
|
||||||
|
"start:prod": "node dist/main",
|
||||||
|
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
||||||
|
"test": "jest",
|
||||||
|
"test:watch": "jest --watch",
|
||||||
|
"test:cov": "jest --coverage",
|
||||||
|
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||||
|
"test:e2e": "jest --config ./test/jest-e2e.json"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nestjs/common": "^11.0.11",
|
||||||
|
"@nestjs/config": "^4.0.0",
|
||||||
|
"@nestjs/core": "^11.0.1",
|
||||||
|
"@nestjs/jwt": "^11.0.0",
|
||||||
|
"@nestjs/platform-express": "^11.0.1",
|
||||||
|
"@nestjs/swagger": "^11.0.6",
|
||||||
|
"@nestjs/typeorm": "^11.0.0",
|
||||||
|
"pg": "^8.13.3",
|
||||||
|
"reflect-metadata": "^0.2.2",
|
||||||
|
"rxjs": "^7.8.1",
|
||||||
|
"typeorm": "^0.3.20"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@eslint/js": "^9.18.0",
|
||||||
|
"@nestjs/cli": "^11.0.0",
|
||||||
|
"@nestjs/schematics": "^11.0.0",
|
||||||
|
"@nestjs/testing": "^11.0.1",
|
||||||
|
"@swc/cli": "^0.6.0",
|
||||||
|
"@swc/core": "^1.10.7",
|
||||||
|
"@types/express": "^5.0.0",
|
||||||
|
"@types/jest": "^29.5.14",
|
||||||
|
"@types/node": "^22.10.7",
|
||||||
|
"@types/supertest": "^6.0.2",
|
||||||
|
"eslint": "^9.18.0",
|
||||||
|
"eslint-config-prettier": "^10.0.1",
|
||||||
|
"eslint-plugin-prettier": "^5.2.2",
|
||||||
|
"globals": "^15.14.0",
|
||||||
|
"jest": "^29.7.0",
|
||||||
|
"prettier": "^3.4.2",
|
||||||
|
"source-map-support": "^0.5.21",
|
||||||
|
"supertest": "^7.0.0",
|
||||||
|
"ts-jest": "^29.2.5",
|
||||||
|
"ts-loader": "^9.5.2",
|
||||||
|
"ts-node": "^10.9.2",
|
||||||
|
"tsconfig-paths": "^4.2.0",
|
||||||
|
"typescript": "^5.7.3",
|
||||||
|
"typescript-eslint": "^8.20.0"
|
||||||
|
},
|
||||||
|
"jest": {
|
||||||
|
"moduleFileExtensions": [
|
||||||
|
"js",
|
||||||
|
"json",
|
||||||
|
"ts"
|
||||||
|
],
|
||||||
|
"rootDir": "src",
|
||||||
|
"testRegex": ".*\\.spec\\.ts$",
|
||||||
|
"transform": {
|
||||||
|
"^.+\\.(t|j)s$": "ts-jest"
|
||||||
|
},
|
||||||
|
"collectCoverageFrom": [
|
||||||
|
"**/*.(t|j)s"
|
||||||
|
],
|
||||||
|
"coverageDirectory": "../coverage",
|
||||||
|
"testEnvironment": "node"
|
||||||
|
}
|
||||||
|
}
|
||||||
4
backend/tasks-projects-service/src/.prettierrc
Normal file
4
backend/tasks-projects-service/src/.prettierrc
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"singleQuote": true,
|
||||||
|
"trailingComma": "all"
|
||||||
|
}
|
||||||
22
backend/tasks-projects-service/src/app.controller.spec.ts
Normal file
22
backend/tasks-projects-service/src/app.controller.spec.ts
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { AppController } from './app.controller';
|
||||||
|
import { AppService } from './app.service';
|
||||||
|
|
||||||
|
describe('AppController', () => {
|
||||||
|
let appController: AppController;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const app: TestingModule = await Test.createTestingModule({
|
||||||
|
controllers: [AppController],
|
||||||
|
providers: [AppService],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
appController = app.get<AppController>(AppController);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('root', () => {
|
||||||
|
it('should return "Hello World!"', () => {
|
||||||
|
expect(appController.getHello()).toBe('Hello World!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
12
backend/tasks-projects-service/src/app.controller.ts
Normal file
12
backend/tasks-projects-service/src/app.controller.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { Controller, Get } from '@nestjs/common';
|
||||||
|
import { AppService } from './app.service';
|
||||||
|
|
||||||
|
@Controller()
|
||||||
|
export class AppController {
|
||||||
|
constructor(private readonly appService: AppService) {}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
getHello(): string {
|
||||||
|
return this.appService.getHello();
|
||||||
|
}
|
||||||
|
}
|
||||||
31
backend/tasks-projects-service/src/app.module.ts
Normal file
31
backend/tasks-projects-service/src/app.module.ts
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { ProjectsModule } from './projects/projects.module';
|
||||||
|
import { TasksModule } from './tasks/tasks.module';
|
||||||
|
import { JwtAuthGuard } from './auth/jwt-auth.guard';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
ConfigModule.forRoot(),
|
||||||
|
TypeOrmModule.forRoot({
|
||||||
|
type: 'postgres',
|
||||||
|
host: process.env.DB_HOST || 'localhost',
|
||||||
|
port: Number(process.env.DB_PORT) || 5432,
|
||||||
|
username: process.env.DB_USER || 'postgres',
|
||||||
|
password: process.env.DB_PASSWORD || 'postgres',
|
||||||
|
database: process.env.DB_NAME || 'todo',
|
||||||
|
autoLoadEntities: true,
|
||||||
|
synchronize: true,
|
||||||
|
}),
|
||||||
|
JwtModule.register({
|
||||||
|
secret: process.env.JWT_SECRET || 'super_secret_key',
|
||||||
|
signOptions: { expiresIn: process.env.JWT_EXPIRES_IN || '3600s' },
|
||||||
|
}),
|
||||||
|
ProjectsModule,
|
||||||
|
TasksModule,
|
||||||
|
],
|
||||||
|
providers: [JwtAuthGuard],
|
||||||
|
})
|
||||||
|
export class AppModule {}
|
||||||
8
backend/tasks-projects-service/src/app.service.ts
Normal file
8
backend/tasks-projects-service/src/app.service.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AppService {
|
||||||
|
getHello(): string {
|
||||||
|
return 'Hello World!';
|
||||||
|
}
|
||||||
|
}
|
||||||
15
backend/tasks-projects-service/src/auth/auth.module.ts
Normal file
15
backend/tasks-projects-service/src/auth/auth.module.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { JwtAuthGuard } from './jwt-auth.guard';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
JwtModule.register({
|
||||||
|
secret: process.env.JWT_SECRET || 'super_secret_key',
|
||||||
|
signOptions: { expiresIn: '1h' },
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
providers: [JwtAuthGuard],
|
||||||
|
exports: [JwtModule, JwtAuthGuard],
|
||||||
|
})
|
||||||
|
export class AuthModule {}
|
||||||
32
backend/tasks-projects-service/src/auth/jwt-auth.guard.ts
Normal file
32
backend/tasks-projects-service/src/auth/jwt-auth.guard.ts
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
|
||||||
|
import { JwtService } from '@nestjs/jwt';
|
||||||
|
import { Request } from 'express';
|
||||||
|
|
||||||
|
interface RequestWithUser extends Request {
|
||||||
|
user?: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class JwtAuthGuard implements CanActivate {
|
||||||
|
constructor(private readonly jwtService: JwtService) {}
|
||||||
|
|
||||||
|
canActivate(context: ExecutionContext): boolean {
|
||||||
|
const request = context.switchToHttp().getRequest<RequestWithUser>();
|
||||||
|
const authHeader = request.headers.authorization;
|
||||||
|
|
||||||
|
if (!authHeader || !authHeader.startsWith('Bearer ')) {
|
||||||
|
throw new UnauthorizedException('Missing or invalid token');
|
||||||
|
}
|
||||||
|
|
||||||
|
const token = authHeader.split(' ')[1];
|
||||||
|
|
||||||
|
try {
|
||||||
|
const decoded = this.jwtService.verify(token);
|
||||||
|
console.log('Decoded JWT:', decoded);
|
||||||
|
request.user = decoded;
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
throw new UnauthorizedException('Invalid token');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
29
backend/tasks-projects-service/src/main.ts
Normal file
29
backend/tasks-projects-service/src/main.ts
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import { NestFactory } from '@nestjs/core';
|
||||||
|
import { AppModule } from './app.module';
|
||||||
|
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
|
||||||
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
|
||||||
|
async function bootstrap() {
|
||||||
|
const app = await NestFactory.create(AppModule);
|
||||||
|
|
||||||
|
app.setGlobalPrefix('api');
|
||||||
|
|
||||||
|
const configService = app.get(ConfigService);
|
||||||
|
const port = configService.get<number>('PORT') || 5000;
|
||||||
|
|
||||||
|
app.enableCors();
|
||||||
|
|
||||||
|
const config = new DocumentBuilder()
|
||||||
|
.setTitle('Cool TODO Manager API')
|
||||||
|
.setDescription('API for managing projects, project-members and tasks')
|
||||||
|
.setVersion('2.0')
|
||||||
|
.addBearerAuth()
|
||||||
|
.build();
|
||||||
|
const document = SwaggerModule.createDocument(app, config);
|
||||||
|
SwaggerModule.setup('api/docs', app, document);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
await app.listen(port);
|
||||||
|
}
|
||||||
|
bootstrap();
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||||
|
|
||||||
|
export class InitialMigration1741411693560 implements MigrationInterface {
|
||||||
|
name = 'InitialMigration1741411693560'
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP CONSTRAINT "FK_e3bd734666db0cb70e8c8d542c8"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" DROP CONSTRAINT "FK_7115f82a61e31ac95b2681d83e4"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" DROP CONSTRAINT "FK_e7520163dafa7c1104fd672caad"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" DROP CONSTRAINT "FK_9884b2ee80eb70b7db4f12e8aed"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "status"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "deadline"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "created_at"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "assignedUserId"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "created_at"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "updated_at"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "ownerId"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD "description" character varying`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ALTER COLUMN "userId" SET NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ALTER COLUMN "role" SET DEFAULT 'member'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ADD CONSTRAINT "FK_7115f82a61e31ac95b2681d83e4" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" DROP CONSTRAINT "FK_7115f82a61e31ac95b2681d83e4"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ALTER COLUMN "role" DROP DEFAULT`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ALTER COLUMN "userId" DROP NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "description"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" ADD "ownerId" integer`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" ADD "updated_at" TIMESTAMP NOT NULL DEFAULT now()`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" ADD "created_at" TIMESTAMP NOT NULL DEFAULT now()`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD "assignedUserId" integer`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD "created_at" TIMESTAMP NOT NULL DEFAULT now()`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD "deadline" TIMESTAMP`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD "status" character varying NOT NULL DEFAULT 'todo'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project" ADD CONSTRAINT "FK_9884b2ee80eb70b7db4f12e8aed" FOREIGN KEY ("ownerId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ADD CONSTRAINT "FK_e7520163dafa7c1104fd672caad" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "project_member" ADD CONSTRAINT "FK_7115f82a61e31ac95b2681d83e4" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD CONSTRAINT "FK_e3bd734666db0cb70e8c8d542c8" FOREIGN KEY ("assignedUserId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "task" ADD CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
import { Entity, PrimaryGeneratedColumn, ManyToOne, Column, JoinColumn } from 'typeorm';
|
||||||
|
import { Project } from './project.entity';
|
||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
@Entity()
|
||||||
|
export class ProjectMember {
|
||||||
|
@ApiProperty({ example: 1, description: 'Project member ID' })
|
||||||
|
@PrimaryGeneratedColumn()
|
||||||
|
id: number;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 1, description: 'Project ID' })
|
||||||
|
@ManyToOne(() => Project, (project) => project.id, { onDelete: 'CASCADE', eager: true })
|
||||||
|
@JoinColumn({ name: 'projectId' })
|
||||||
|
project: Project;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 5, description: 'User ID' })
|
||||||
|
@Column()
|
||||||
|
userId: number;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'admin', description: 'User role in project' })
|
||||||
|
@Column()
|
||||||
|
role: string;
|
||||||
|
}
|
||||||
@ -0,0 +1,74 @@
|
|||||||
|
import { Controller, Post, Delete, Get, Patch, Body, Param, UseGuards, Request, NotFoundException, ForbiddenException } from '@nestjs/common';
|
||||||
|
import { ProjectMembersService } from './project-members.service';
|
||||||
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
|
import { ApiTags, ApiBearerAuth, ApiOperation, ApiResponse, ApiParam, ApiBody } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
class AddMemberDto {
|
||||||
|
userId: number;
|
||||||
|
role: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class RemoveMemberDto {
|
||||||
|
userId: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
class ChangeRoleDto {
|
||||||
|
userId: number;
|
||||||
|
role: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiTags('Project Members')
|
||||||
|
@ApiBearerAuth()
|
||||||
|
@Controller('projects/:id/members')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
export class ProjectMembersController {
|
||||||
|
constructor(private readonly projectMembersService: ProjectMembersService) {}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get all members of a project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
|
||||||
|
@ApiResponse({ status: 200, description: 'List of project members' })
|
||||||
|
@Get()
|
||||||
|
async getMembers(@Param('id') projectId: number) {
|
||||||
|
return this.projectMembersService.getMembers(projectId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Add a member to a project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
|
||||||
|
@ApiBody({ type: AddMemberDto })
|
||||||
|
@ApiResponse({ status: 201, description: 'Member added successfully' })
|
||||||
|
@ApiResponse({ status: 403, description: 'Only project owner can add members' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Project not found' })
|
||||||
|
@Post('add')
|
||||||
|
async addMember(@Request() req, @Param('id') projectId: number, @Body() body: AddMemberDto) {
|
||||||
|
return this.projectMembersService.addMember(req.user.sub, projectId, body.userId, body.role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Remove a member from a project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
|
||||||
|
@ApiBody({ type: RemoveMemberDto })
|
||||||
|
@ApiResponse({ status: 200, description: 'Member removed successfully' })
|
||||||
|
@ApiResponse({ status: 403, description: 'Only project owner can remove members' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Project not found' })
|
||||||
|
@Delete('remove')
|
||||||
|
async removeMember(@Request() req, @Param('id') projectId: number, @Body() body: RemoveMemberDto) {
|
||||||
|
return this.projectMembersService.removeMember(req.user.sub, projectId, body.userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Change member role in a project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
|
||||||
|
@ApiBody({ type: ChangeRoleDto })
|
||||||
|
@ApiResponse({ status: 200, description: 'Role updated successfully' })
|
||||||
|
@ApiResponse({ status: 403, description: 'Only project owner can change roles' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Project not found' })
|
||||||
|
@Patch('role')
|
||||||
|
async changeRole(@Request() req, @Param('id') projectId: number, @Body() body: ChangeRoleDto) {
|
||||||
|
return this.projectMembersService.changeRole(req.user.sub, projectId, body.userId, body.role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'User leaves the project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number', description: 'Project ID' })
|
||||||
|
@Delete('leave')
|
||||||
|
async leaveProject(@Request() req, @Param('id') projectId: number) {
|
||||||
|
return this.projectMembersService.leaveProject(req.user.sub, projectId);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
import { Injectable, NotFoundException, ForbiddenException } from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { ProjectMember } from './project-member.entity';
|
||||||
|
import { Project } from '../projects/project.entity';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ProjectMembersService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(ProjectMember)
|
||||||
|
private readonly projectMembersRepository: Repository<ProjectMember>,
|
||||||
|
@InjectRepository(Project)
|
||||||
|
private readonly projectsRepository: Repository<Project>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async getMembers(projectId: number) {
|
||||||
|
return this.projectMembersRepository.find({ where: { project: { id: projectId } } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async addMember(ownerId: number, projectId: number, userId: number, role: string) {
|
||||||
|
const project = await this.projectsRepository.findOne({ where: { id: projectId } });
|
||||||
|
if (!project) throw new NotFoundException('Project not found');
|
||||||
|
if (project.ownerId !== ownerId) throw new ForbiddenException('Only the project owner can add members');
|
||||||
|
|
||||||
|
const existingMember = await this.projectMembersRepository.findOne({ where: { project: { id: projectId }, userId } });
|
||||||
|
if (existingMember) throw new ForbiddenException('User is already a member');
|
||||||
|
|
||||||
|
const newMember = this.projectMembersRepository.create({ project, userId, role });
|
||||||
|
return this.projectMembersRepository.save(newMember);
|
||||||
|
}
|
||||||
|
|
||||||
|
async removeMember(ownerId: number, projectId: number, userId: number) {
|
||||||
|
const project = await this.projectsRepository.findOne({ where: { id: projectId } });
|
||||||
|
if (!project) throw new NotFoundException('Project not found');
|
||||||
|
if (project.ownerId !== ownerId) throw new ForbiddenException('Only the project owner can remove members');
|
||||||
|
|
||||||
|
await this.projectMembersRepository.delete({ project: { id: projectId }, userId });
|
||||||
|
return { message: 'Member removed' };
|
||||||
|
}
|
||||||
|
|
||||||
|
async changeRole(ownerId: number, projectId: number, userId: number, role: string) {
|
||||||
|
const project = await this.projectsRepository.findOne({ where: { id: projectId } });
|
||||||
|
if (!project) throw new NotFoundException('Project not found');
|
||||||
|
if (project.ownerId !== ownerId) throw new ForbiddenException('Only the project owner can change roles');
|
||||||
|
|
||||||
|
await this.projectMembersRepository.update({ project: { id: projectId }, userId }, { role });
|
||||||
|
return { message: 'Role updated' };
|
||||||
|
}
|
||||||
|
|
||||||
|
async leaveProject(userId: number, projectId: number) {
|
||||||
|
await this.projectMembersRepository.delete({ project: { id: projectId }, userId });
|
||||||
|
return { message: 'You left the project' };
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
|
||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
@Entity()
|
||||||
|
export class Project {
|
||||||
|
@ApiProperty({ example: 1, description: 'Project ID' })
|
||||||
|
@PrimaryGeneratedColumn()
|
||||||
|
id: number;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'My Project', description: 'Title of the project' })
|
||||||
|
@Column()
|
||||||
|
title: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'Optional description', description: 'Project description', required: false })
|
||||||
|
@Column({ nullable: true })
|
||||||
|
description: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 5, description: 'ID of the project owner' })
|
||||||
|
@Column()
|
||||||
|
ownerId: number;
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'Date of creation' })
|
||||||
|
@CreateDateColumn()
|
||||||
|
created_at: Date;
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'Date of last update' })
|
||||||
|
@UpdateDateColumn()
|
||||||
|
updated_at: Date;
|
||||||
|
}
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
import { Controller, Post, Get, Patch, Delete, Body, Param, UseGuards, Request } from '@nestjs/common';
|
||||||
|
import { ProjectsService } from './projects.service';
|
||||||
|
import { Project } from './project.entity';
|
||||||
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
|
import { ApiTags, ApiBearerAuth, ApiOperation, ApiParam, ApiBody, ApiResponse } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
class CreateProjectDto {
|
||||||
|
title: string;
|
||||||
|
description?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class UpdateProjectDto {
|
||||||
|
title?: string;
|
||||||
|
description?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiTags('Projects')
|
||||||
|
@ApiBearerAuth()
|
||||||
|
@Controller('projects')
|
||||||
|
export class ProjectsController {
|
||||||
|
constructor(private readonly projectsService: ProjectsService) {}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Create new project' })
|
||||||
|
@ApiBody({
|
||||||
|
description: 'Project data',
|
||||||
|
type: CreateProjectDto,
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 201, description: 'Project created', type: Project })
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@Post('create')
|
||||||
|
async create(@Request() req, @Body() body: CreateProjectDto): Promise<Project> {
|
||||||
|
return this.projectsService.create({
|
||||||
|
title: body.title,
|
||||||
|
description: body.description,
|
||||||
|
ownerId: req.user?.sub,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get all projects' })
|
||||||
|
@ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true })
|
||||||
|
@Get()
|
||||||
|
async findAll(): Promise<Project[]> {
|
||||||
|
return this.projectsService.findAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get all projects where I participate' })
|
||||||
|
@ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true })
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@Get('my')
|
||||||
|
async findUserProjects(@Request() req): Promise<Project[]> {
|
||||||
|
return this.projectsService.findUserProjects(req.user.sub);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get single project by ID' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number' })
|
||||||
|
@ApiResponse({ status: 200, description: 'Found project', type: Project })
|
||||||
|
@ApiResponse({ status: 404, description: 'Project not found' })
|
||||||
|
@Get(':id')
|
||||||
|
async findOne(@Param('id') id: number): Promise<Project | null> {
|
||||||
|
return this.projectsService.findOneById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Update project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number' })
|
||||||
|
@ApiBody({ description: 'Fields to update', type: UpdateProjectDto })
|
||||||
|
@ApiResponse({ status: 200, description: 'Project updated', type: Project })
|
||||||
|
@ApiResponse({ status: 404, description: 'Project not found' })
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@Patch(':id')
|
||||||
|
async update(
|
||||||
|
@Request() req,
|
||||||
|
@Param('id') id: number,
|
||||||
|
@Body() data: UpdateProjectDto,
|
||||||
|
): Promise<Project> {
|
||||||
|
return this.projectsService.update(id, data, req.user.sub);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Delete project' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number' })
|
||||||
|
@ApiResponse({ status: 200, description: 'Project deleted' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Project not found' })
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
@Delete(':id')
|
||||||
|
async delete(@Request() req, @Param('id') id: number): Promise<void> {
|
||||||
|
return this.projectsService.delete(id, req.user.sub);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { ProjectsService } from './projects.service';
|
||||||
|
import { ProjectsController } from './projects.controller';
|
||||||
|
import { Project } from './project.entity';
|
||||||
|
import { ProjectMembersService } from './project-members.service';
|
||||||
|
import { ProjectMembersController } from './project-members.controller';
|
||||||
|
import { ProjectMember } from './project-member.entity';
|
||||||
|
import { AuthModule } from 'src/auth/auth.module';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [TypeOrmModule.forFeature([Project, ProjectMember]),
|
||||||
|
AuthModule
|
||||||
|
],
|
||||||
|
controllers: [ProjectsController, ProjectMembersController],
|
||||||
|
providers: [ProjectsService, ProjectMembersService],
|
||||||
|
exports: [ProjectsService, ProjectMembersService],
|
||||||
|
})
|
||||||
|
export class ProjectsModule {}
|
||||||
@ -0,0 +1,68 @@
|
|||||||
|
import { Injectable, NotFoundException } from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { Project } from './project.entity';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ProjectsService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(Project)
|
||||||
|
private projectsRepository: Repository<Project>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(data: { title: string; description?: string; ownerId: number }): Promise<Project> {
|
||||||
|
console.log('Received data:', data);
|
||||||
|
const project = this.projectsRepository.create({
|
||||||
|
title: data.title,
|
||||||
|
description: data.description,
|
||||||
|
ownerId: data.ownerId,
|
||||||
|
});
|
||||||
|
return this.projectsRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async findAll(): Promise<Project[]> {
|
||||||
|
return this.projectsRepository.find();
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByOwner(ownerId: number): Promise<Project[]> {
|
||||||
|
return this.projectsRepository.find({ where: { ownerId } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async findUserProjects(userId: number): Promise<Project[]> {
|
||||||
|
return this.projectsRepository
|
||||||
|
.createQueryBuilder('project')
|
||||||
|
.leftJoin('project_members', 'member', 'member.projectId = project.id')
|
||||||
|
.where('project.ownerId = :userId OR member.userId = :userId', { userId })
|
||||||
|
.getMany();
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOneById(id: number): Promise<Project | null> {
|
||||||
|
return this.projectsRepository.findOne({ where: { id } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(id: number, data: { title?: string; description?: string }, ownerId: number): Promise<Project> {
|
||||||
|
const project = await this.findOneById(id);
|
||||||
|
if (!project) throw new NotFoundException('Project not found');
|
||||||
|
|
||||||
|
if (project.ownerId !== ownerId) {
|
||||||
|
throw new NotFoundException('You are not the owner of this project');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.title !== undefined) project.title = data.title;
|
||||||
|
if (data.description !== undefined) project.description = data.description;
|
||||||
|
|
||||||
|
return this.projectsRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(id: number, ownerId: number): Promise<void> {
|
||||||
|
const project = await this.findOneById(id);
|
||||||
|
if (!project) throw new NotFoundException('Project not found');
|
||||||
|
|
||||||
|
if (project.ownerId !== ownerId) {
|
||||||
|
throw new NotFoundException('You are not the owner of this project');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.projectsRepository.delete(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
34
backend/tasks-projects-service/src/tasks/task.entity.ts
Normal file
34
backend/tasks-projects-service/src/tasks/task.entity.ts
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn } from 'typeorm';
|
||||||
|
import { Project } from '../projects/project.entity';
|
||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
@Entity()
|
||||||
|
export class Task {
|
||||||
|
@ApiProperty({ example: 1, description: 'Task ID' })
|
||||||
|
@PrimaryGeneratedColumn()
|
||||||
|
id: number;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 2, description: 'Project ID' })
|
||||||
|
@ManyToOne(() => Project, (project) => project.id, { eager: true, onDelete: 'CASCADE' })
|
||||||
|
project: Project;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'My Task', description: 'Task title' })
|
||||||
|
@Column()
|
||||||
|
title: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'todo', description: 'Task status' })
|
||||||
|
@Column({ default: 'todo' })
|
||||||
|
status: string; // 'todo', 'in_progress', 'done'
|
||||||
|
|
||||||
|
@ApiProperty({ example: 5, description: 'Assigned User ID', required: false })
|
||||||
|
@Column({ nullable: true })
|
||||||
|
assignedUserId?: number;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2025-03-01T12:00:00Z', required: false })
|
||||||
|
@Column({ type: 'timestamp', nullable: true })
|
||||||
|
deadline?: Date;
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'Date of creation' })
|
||||||
|
@CreateDateColumn()
|
||||||
|
created_at: Date;
|
||||||
|
}
|
||||||
94
backend/tasks-projects-service/src/tasks/tasks.controller.ts
Normal file
94
backend/tasks-projects-service/src/tasks/tasks.controller.ts
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
import { Controller, Post, Get, Patch, Delete, Body, Param, UseGuards, Request } from '@nestjs/common';
|
||||||
|
import { TasksService } from './tasks.service';
|
||||||
|
import { Task } from './task.entity';
|
||||||
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
|
import { ApiTags, ApiBearerAuth, ApiOperation, ApiParam, ApiBody, ApiResponse } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
class CreateTaskDto {
|
||||||
|
title: string;
|
||||||
|
projectId: number;
|
||||||
|
assignedUserId?: number;
|
||||||
|
deadline?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class UpdateTaskDto {
|
||||||
|
title?: string;
|
||||||
|
status?: string; // 'todo', 'in_progress', 'done'
|
||||||
|
deadline?: string;
|
||||||
|
assignedUserId?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiTags('Tasks')
|
||||||
|
@ApiBearerAuth()
|
||||||
|
@Controller('tasks')
|
||||||
|
@UseGuards(JwtAuthGuard)
|
||||||
|
export class TasksController {
|
||||||
|
constructor(private readonly tasksService: TasksService) {}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Create new task' })
|
||||||
|
@ApiBody({
|
||||||
|
description: 'Task creation data',
|
||||||
|
type: CreateTaskDto,
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 201, description: 'Task created', type: Task })
|
||||||
|
@Post('create')
|
||||||
|
async create(@Request() req, @Body() body: CreateTaskDto): Promise<Task> {
|
||||||
|
return this.tasksService.create({
|
||||||
|
title: body.title,
|
||||||
|
projectId: body.projectId,
|
||||||
|
assignedUserId: body.assignedUserId ?? req.user.sub,
|
||||||
|
deadline: body.deadline ? new Date(body.deadline) : undefined,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get all tasks' })
|
||||||
|
@ApiResponse({ status: 200, description: 'List of tasks', type: Task, isArray: true })
|
||||||
|
@Get()
|
||||||
|
async findAll(): Promise<Task[]> {
|
||||||
|
return this.tasksService.findAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get task by ID' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number' })
|
||||||
|
@ApiResponse({ status: 200, description: 'Found task', type: Task })
|
||||||
|
@ApiResponse({ status: 404, description: 'Task not found' })
|
||||||
|
@Get(':id')
|
||||||
|
async findOne(@Param('id') id: number): Promise<Task | null> {
|
||||||
|
return this.tasksService.findOneById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get tasks by project ID' })
|
||||||
|
@ApiParam({ name: 'projectId', type: 'number' })
|
||||||
|
@ApiResponse({ status: 200, description: 'List of tasks for the specified project', type: Task, isArray: true })
|
||||||
|
@Get('project/:projectId')
|
||||||
|
async findByProject(@Param('projectId') projectId: number): Promise<Task[]> {
|
||||||
|
return this.tasksService.findByProjectId(projectId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Update task' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number' })
|
||||||
|
@ApiBody({
|
||||||
|
description: 'Fields to update in the task',
|
||||||
|
type: UpdateTaskDto,
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 200, description: 'Task updated', type: Task })
|
||||||
|
@ApiResponse({ status: 404, description: 'Task not found' })
|
||||||
|
@Patch(':id')
|
||||||
|
async update(@Request() req, @Param('id') id: number, @Body() body: UpdateTaskDto): Promise<Task> {
|
||||||
|
return this.tasksService.update(id, {
|
||||||
|
title: body.title,
|
||||||
|
status: body.status,
|
||||||
|
deadline: body.deadline ? new Date(body.deadline) : undefined,
|
||||||
|
assignedUserId: body.assignedUserId ?? req.user.sub,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Delete task' })
|
||||||
|
@ApiParam({ name: 'id', type: 'number' })
|
||||||
|
@ApiResponse({ status: 200, description: 'Task deleted' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Task not found' })
|
||||||
|
@Delete(':id')
|
||||||
|
async delete(@Request() req, @Param('id') id: number) {
|
||||||
|
return this.tasksService.delete(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
19
backend/tasks-projects-service/src/tasks/tasks.module.ts
Normal file
19
backend/tasks-projects-service/src/tasks/tasks.module.ts
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { TasksService } from './tasks.service';
|
||||||
|
import { TasksController } from './tasks.controller';
|
||||||
|
import { Task } from './task.entity';
|
||||||
|
import { ProjectsModule } from '../projects/projects.module';
|
||||||
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
TypeOrmModule.forFeature([Task]),
|
||||||
|
ProjectsModule,
|
||||||
|
AuthModule,
|
||||||
|
],
|
||||||
|
controllers: [TasksController],
|
||||||
|
providers: [TasksService],
|
||||||
|
exports: [TasksService],
|
||||||
|
})
|
||||||
|
export class TasksModule {}
|
||||||
63
backend/tasks-projects-service/src/tasks/tasks.service.ts
Normal file
63
backend/tasks-projects-service/src/tasks/tasks.service.ts
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
import { Injectable, NotFoundException } from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { Task } from './task.entity';
|
||||||
|
import { ProjectsService } from '../projects/projects.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TasksService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(Task)
|
||||||
|
private tasksRepository: Repository<Task>,
|
||||||
|
private projectsService: ProjectsService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(data: { title: string; projectId: number; assignedUserId?: number; deadline?: Date }) {
|
||||||
|
const project = await this.projectsService.findOneById(data.projectId);
|
||||||
|
if (!project) throw new NotFoundException('Project not found');
|
||||||
|
|
||||||
|
const task = this.tasksRepository.create({
|
||||||
|
title: data.title,
|
||||||
|
project,
|
||||||
|
assignedUserId: data.assignedUserId,
|
||||||
|
deadline: data.deadline,
|
||||||
|
});
|
||||||
|
|
||||||
|
return this.tasksRepository.save(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findAll(): Promise<Task[]> {
|
||||||
|
return this.tasksRepository.find();
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOneById(id: number): Promise<Task | null> {
|
||||||
|
return this.tasksRepository.findOne({ where: { id } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByProjectId(projectId: number): Promise<Task[]> {
|
||||||
|
return this.tasksRepository.find({
|
||||||
|
where: { project: { id: projectId } },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(id: number, data: { title?: string; status?: string; deadline?: Date; assignedUserId?: number }) {
|
||||||
|
const task = await this.findOneById(id);
|
||||||
|
if (!task) throw new NotFoundException('Task not found');
|
||||||
|
|
||||||
|
if (data.title !== undefined) task.title = data.title;
|
||||||
|
if (data.status !== undefined) task.status = data.status;
|
||||||
|
if (data.deadline !== undefined) task.deadline = data.deadline;
|
||||||
|
if (data.assignedUserId !== undefined) {
|
||||||
|
task.assignedUserId = data.assignedUserId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.tasksRepository.save(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(id: number) {
|
||||||
|
const result = await this.tasksRepository.delete(id);
|
||||||
|
if (result.affected === 0) {
|
||||||
|
throw new NotFoundException('Task not found');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
4
backend/tasks-projects-service/tsconfig.build.json
Normal file
4
backend/tasks-projects-service/tsconfig.build.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
|
||||||
|
}
|
||||||
21
backend/tasks-projects-service/tsconfig.json
Normal file
21
backend/tasks-projects-service/tsconfig.json
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"module": "commonjs",
|
||||||
|
"declaration": true,
|
||||||
|
"removeComments": true,
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"target": "ES2023",
|
||||||
|
"sourceMap": true,
|
||||||
|
"outDir": "./dist",
|
||||||
|
"baseUrl": "./",
|
||||||
|
"incremental": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strictNullChecks": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"noImplicitAny": false,
|
||||||
|
"strictBindCallApply": false,
|
||||||
|
"noFallthroughCasesInSwitch": false
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,111 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
/* Visit https://aka.ms/tsconfig to read more about this file */
|
|
||||||
|
|
||||||
/* Projects */
|
|
||||||
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
|
|
||||||
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
|
|
||||||
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
|
|
||||||
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
|
|
||||||
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
|
|
||||||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
|
||||||
|
|
||||||
/* Language and Environment */
|
|
||||||
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
|
||||||
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
|
||||||
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
|
||||||
"experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
|
|
||||||
"emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
|
|
||||||
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
|
|
||||||
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
|
|
||||||
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
|
|
||||||
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
|
|
||||||
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
|
|
||||||
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
|
|
||||||
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
|
|
||||||
|
|
||||||
/* Modules */
|
|
||||||
"module": "commonjs", /* Specify what module code is generated. */
|
|
||||||
"rootDir": "./src", /* Specify the root folder within your source files. */
|
|
||||||
// "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */
|
|
||||||
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
|
|
||||||
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
|
|
||||||
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
|
|
||||||
"typeRoots": ["./node_modules/@types", "./src/types"], /* Specify multiple folders that act like './node_modules/@types'. */
|
|
||||||
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
|
|
||||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
|
||||||
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
|
|
||||||
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
|
|
||||||
// "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */
|
|
||||||
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
|
|
||||||
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
|
|
||||||
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
|
|
||||||
// "noUncheckedSideEffectImports": true, /* Check side effect imports. */
|
|
||||||
// "resolveJsonModule": true, /* Enable importing .json files. */
|
|
||||||
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
|
|
||||||
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
|
|
||||||
|
|
||||||
/* JavaScript Support */
|
|
||||||
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
|
|
||||||
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
|
|
||||||
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
|
|
||||||
|
|
||||||
/* Emit */
|
|
||||||
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
|
|
||||||
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
|
|
||||||
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
|
||||||
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
|
||||||
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
|
|
||||||
// "noEmit": true, /* Disable emitting files from a compilation. */
|
|
||||||
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
|
|
||||||
"outDir": "./dist", /* Specify an output folder for all emitted files. */
|
|
||||||
// "removeComments": true, /* Disable emitting comments. */
|
|
||||||
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
|
||||||
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
|
|
||||||
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
|
|
||||||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
|
||||||
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
|
|
||||||
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
|
|
||||||
// "newLine": "crlf", /* Set the newline character for emitting files. */
|
|
||||||
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
|
|
||||||
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
|
|
||||||
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
|
||||||
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
|
|
||||||
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
|
||||||
|
|
||||||
/* Interop Constraints */
|
|
||||||
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
|
||||||
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
|
|
||||||
// "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
|
|
||||||
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
|
|
||||||
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
|
|
||||||
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
|
||||||
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
|
|
||||||
|
|
||||||
/* Type Checking */
|
|
||||||
"strict": true, /* Enable all strict type-checking options. */
|
|
||||||
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
|
|
||||||
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
|
|
||||||
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
|
||||||
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
|
|
||||||
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
|
|
||||||
// "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */
|
|
||||||
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
|
|
||||||
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
|
|
||||||
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
|
|
||||||
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
|
|
||||||
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
|
|
||||||
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
|
|
||||||
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
|
|
||||||
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
|
|
||||||
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
|
|
||||||
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
|
|
||||||
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
|
|
||||||
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
|
|
||||||
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
|
|
||||||
|
|
||||||
/* Completeness */
|
|
||||||
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
|
||||||
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
{"root":["./src/controllers.ts","./src/db.ts","./src/middlewares.ts","./src/routes.ts","./src/server.ts","./src/services.ts","./src/entities/Project.ts","./src/entities/ProjectMember.ts","./src/entities/Task.ts","./src/entities/User.ts","./src/types/express.d.ts"],"version":"5.7.3"}
|
|
||||||
10
backend/users-auth-service/.env
Normal file
10
backend/users-auth-service/.env
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
PORT=4000
|
||||||
|
|
||||||
|
JWT_SECRET=super_secret_key
|
||||||
|
JWT_EXPIRES_IN=3600s
|
||||||
|
|
||||||
|
DB_HOST=localhost
|
||||||
|
DB_PORT=5432
|
||||||
|
DB_USER=postgres
|
||||||
|
DB_PASSWORD=postgres
|
||||||
|
DB_NAME=todo
|
||||||
20
backend/users-auth-service/Dockerfile
Normal file
20
backend/users-auth-service/Dockerfile
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# Используем официальный образ Node.js
|
||||||
|
FROM node:20
|
||||||
|
|
||||||
|
# Устанавливаем рабочую директорию внутри контейнера
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Копируем package.json и package-lock.json
|
||||||
|
COPY package*.json ./
|
||||||
|
|
||||||
|
# Устанавливаем зависимости
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
# Копируем весь код проекта в контейнер
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Открываем порт 4000
|
||||||
|
EXPOSE 4000
|
||||||
|
|
||||||
|
# Команда запуска приложения
|
||||||
|
CMD ["npm", "start"]
|
||||||
99
backend/users-auth-service/README.md
Normal file
99
backend/users-auth-service/README.md
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
<p align="center">
|
||||||
|
<a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
|
||||||
|
[circleci-url]: https://circleci.com/gh/nestjs/nest
|
||||||
|
|
||||||
|
<p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
|
||||||
|
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
|
||||||
|
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
|
||||||
|
<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
|
||||||
|
<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
|
||||||
|
<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
|
||||||
|
<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
|
||||||
|
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
|
||||||
|
<a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
|
||||||
|
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
|
||||||
|
<a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
|
||||||
|
</p>
|
||||||
|
<!--[](https://opencollective.com/nest#backer)
|
||||||
|
[](https://opencollective.com/nest#sponsor)-->
|
||||||
|
|
||||||
|
## Description
|
||||||
|
|
||||||
|
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
|
||||||
|
|
||||||
|
## Project setup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ npm install
|
||||||
|
```
|
||||||
|
|
||||||
|
## Compile and run the project
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# development
|
||||||
|
$ npm run start
|
||||||
|
|
||||||
|
# watch mode
|
||||||
|
$ npm run start:dev
|
||||||
|
|
||||||
|
# production mode
|
||||||
|
$ npm run start:prod
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# unit tests
|
||||||
|
$ npm run test
|
||||||
|
|
||||||
|
# e2e tests
|
||||||
|
$ npm run test:e2e
|
||||||
|
|
||||||
|
# test coverage
|
||||||
|
$ npm run test:cov
|
||||||
|
```
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
|
||||||
|
When you're ready to deploy your NestJS application to production, there are some key steps you can take to ensure it runs as efficiently as possible. Check out the [deployment documentation](https://docs.nestjs.com/deployment) for more information.
|
||||||
|
|
||||||
|
If you are looking for a cloud-based platform to deploy your NestJS application, check out [Mau](https://mau.nestjs.com), our official platform for deploying NestJS applications on AWS. Mau makes deployment straightforward and fast, requiring just a few simple steps:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ npm install -g mau
|
||||||
|
$ mau deploy
|
||||||
|
```
|
||||||
|
|
||||||
|
With Mau, you can deploy your application in just a few clicks, allowing you to focus on building features rather than managing infrastructure.
|
||||||
|
|
||||||
|
## Resources
|
||||||
|
|
||||||
|
Check out a few resources that may come in handy when working with NestJS:
|
||||||
|
|
||||||
|
- Visit the [NestJS Documentation](https://docs.nestjs.com) to learn more about the framework.
|
||||||
|
- For questions and support, please visit our [Discord channel](https://discord.gg/G7Qnnhy).
|
||||||
|
- To dive deeper and get more hands-on experience, check out our official video [courses](https://courses.nestjs.com/).
|
||||||
|
- Deploy your application to AWS with the help of [NestJS Mau](https://mau.nestjs.com) in just a few clicks.
|
||||||
|
- Visualize your application graph and interact with the NestJS application in real-time using [NestJS Devtools](https://devtools.nestjs.com).
|
||||||
|
- Need help with your project (part-time to full-time)? Check out our official [enterprise support](https://enterprise.nestjs.com).
|
||||||
|
- To stay in the loop and get updates, follow us on [X](https://x.com/nestframework) and [LinkedIn](https://linkedin.com/company/nestjs).
|
||||||
|
- Looking for a job, or have a job to offer? Check out our official [Jobs board](https://jobs.nestjs.com).
|
||||||
|
|
||||||
|
## Support
|
||||||
|
|
||||||
|
Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
|
||||||
|
|
||||||
|
## Stay in touch
|
||||||
|
|
||||||
|
- Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
|
||||||
|
- Website - [https://nestjs.com](https://nestjs.com/)
|
||||||
|
- Twitter - [@nestframework](https://twitter.com/nestframework)
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
Nest is [MIT licensed](https://github.com/nestjs/nest/blob/master/LICENSE).
|
||||||
19
backend/users-auth-service/data-source.ts
Normal file
19
backend/users-auth-service/data-source.ts
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import 'reflect-metadata';
|
||||||
|
import { DataSource, DataSourceOptions } from 'typeorm';
|
||||||
|
import { config as dotEnvConfig } from 'dotenv';
|
||||||
|
|
||||||
|
dotEnvConfig();
|
||||||
|
|
||||||
|
const options: DataSourceOptions = {
|
||||||
|
type: 'postgres',
|
||||||
|
host: process.env.DB_HOST || 'localhost',
|
||||||
|
port: Number(process.env.DB_PORT) || 5432,
|
||||||
|
username: process.env.DB_USER || 'postgres',
|
||||||
|
password: process.env.DB_PASSWORD || 'postgres',
|
||||||
|
database: process.env.DB_NAME || 'todo',
|
||||||
|
entities: ['src/**/*.entity.ts'],
|
||||||
|
migrations: ['src/migrations/*.ts'],
|
||||||
|
synchronize: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const AppDataSource = new DataSource(options);
|
||||||
35
backend/users-auth-service/eslint.config.mjs
Normal file
35
backend/users-auth-service/eslint.config.mjs
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
// @ts-check
|
||||||
|
import eslint from '@eslint/js';
|
||||||
|
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
|
||||||
|
import globals from 'globals';
|
||||||
|
import tseslint from 'typescript-eslint';
|
||||||
|
|
||||||
|
export default tseslint.config(
|
||||||
|
{
|
||||||
|
ignores: ['eslint.config.mjs'],
|
||||||
|
},
|
||||||
|
eslint.configs.recommended,
|
||||||
|
...tseslint.configs.recommendedTypeChecked,
|
||||||
|
eslintPluginPrettierRecommended,
|
||||||
|
{
|
||||||
|
languageOptions: {
|
||||||
|
globals: {
|
||||||
|
...globals.node,
|
||||||
|
...globals.jest,
|
||||||
|
},
|
||||||
|
ecmaVersion: 5,
|
||||||
|
sourceType: 'module',
|
||||||
|
parserOptions: {
|
||||||
|
projectService: true,
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
'@typescript-eslint/no-floating-promises': 'warn',
|
||||||
|
'@typescript-eslint/no-unsafe-argument': 'warn'
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
8
backend/users-auth-service/nest-cli.json
Normal file
8
backend/users-auth-service/nest-cli.json
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://json.schemastore.org/nest-cli",
|
||||||
|
"collection": "@nestjs/schematics",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"compilerOptions": {
|
||||||
|
"deleteOutDir": true
|
||||||
|
}
|
||||||
|
}
|
||||||
11792
backend/users-auth-service/package-lock.json
generated
Normal file
11792
backend/users-auth-service/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
83
backend/users-auth-service/package.json
Normal file
83
backend/users-auth-service/package.json
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
{
|
||||||
|
"name": "src",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"description": "",
|
||||||
|
"author": "",
|
||||||
|
"private": true,
|
||||||
|
"license": "UNLICENSED",
|
||||||
|
"scripts": {
|
||||||
|
"build": "nest build",
|
||||||
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
|
"start": "nest start",
|
||||||
|
"start:dev": "nest start --watch",
|
||||||
|
"start:debug": "nest start --debug --watch",
|
||||||
|
"start:prod": "node dist/main",
|
||||||
|
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
||||||
|
"test": "jest",
|
||||||
|
"test:watch": "jest --watch",
|
||||||
|
"test:cov": "jest --coverage",
|
||||||
|
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||||
|
"test:e2e": "jest --config ./test/jest-e2e.json"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nestjs/common": "^11.0.1",
|
||||||
|
"@nestjs/config": "^4.0.0",
|
||||||
|
"@nestjs/core": "^11.0.1",
|
||||||
|
"@nestjs/jwt": "^11.0.0",
|
||||||
|
"@nestjs/passport": "^11.0.5",
|
||||||
|
"@nestjs/platform-express": "^11.0.1",
|
||||||
|
"@nestjs/swagger": "^11.0.6",
|
||||||
|
"@nestjs/typeorm": "^11.0.0",
|
||||||
|
"bcrypt": "^5.1.1",
|
||||||
|
"dotenv": "^16.4.7",
|
||||||
|
"passport-jwt": "^4.0.1",
|
||||||
|
"pg": "^8.13.3",
|
||||||
|
"reflect-metadata": "^0.2.2",
|
||||||
|
"rxjs": "^7.8.1",
|
||||||
|
"typeorm": "^0.3.20"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@eslint/js": "^9.18.0",
|
||||||
|
"@nestjs/cli": "^11.0.0",
|
||||||
|
"@nestjs/schematics": "^11.0.0",
|
||||||
|
"@nestjs/testing": "^11.0.1",
|
||||||
|
"@swc/cli": "^0.6.0",
|
||||||
|
"@swc/core": "^1.10.7",
|
||||||
|
"@types/express": "^5.0.0",
|
||||||
|
"@types/jest": "^29.5.14",
|
||||||
|
"@types/node": "^22.10.7",
|
||||||
|
"@types/supertest": "^6.0.2",
|
||||||
|
"eslint": "^9.18.0",
|
||||||
|
"eslint-config-prettier": "^10.0.1",
|
||||||
|
"eslint-plugin-prettier": "^5.2.2",
|
||||||
|
"globals": "^15.14.0",
|
||||||
|
"jest": "^29.7.0",
|
||||||
|
"prettier": "^3.4.2",
|
||||||
|
"source-map-support": "^0.5.21",
|
||||||
|
"supertest": "^7.0.0",
|
||||||
|
"ts-jest": "^29.2.5",
|
||||||
|
"ts-loader": "^9.5.2",
|
||||||
|
"ts-node": "^10.9.2",
|
||||||
|
"tsconfig-paths": "^4.2.0",
|
||||||
|
"typescript": "^5.7.3",
|
||||||
|
"typescript-eslint": "^8.20.0"
|
||||||
|
},
|
||||||
|
"jest": {
|
||||||
|
"moduleFileExtensions": [
|
||||||
|
"js",
|
||||||
|
"json",
|
||||||
|
"ts"
|
||||||
|
],
|
||||||
|
"rootDir": "src",
|
||||||
|
"testRegex": ".*\\.spec\\.ts$",
|
||||||
|
"transform": {
|
||||||
|
"^.+\\.(t|j)s$": "ts-jest"
|
||||||
|
},
|
||||||
|
"collectCoverageFrom": [
|
||||||
|
"**/*.(t|j)s"
|
||||||
|
],
|
||||||
|
"coverageDirectory": "../coverage",
|
||||||
|
"testEnvironment": "node"
|
||||||
|
}
|
||||||
|
}
|
||||||
4
backend/users-auth-service/src/.prettierrc
Normal file
4
backend/users-auth-service/src/.prettierrc
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"singleQuote": true,
|
||||||
|
"trailingComma": "all"
|
||||||
|
}
|
||||||
22
backend/users-auth-service/src/app.controller.spec.ts
Normal file
22
backend/users-auth-service/src/app.controller.spec.ts
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { AppController } from './app.controller';
|
||||||
|
import { AppService } from './app.service';
|
||||||
|
|
||||||
|
describe('AppController', () => {
|
||||||
|
let appController: AppController;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const app: TestingModule = await Test.createTestingModule({
|
||||||
|
controllers: [AppController],
|
||||||
|
providers: [AppService],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
appController = app.get<AppController>(AppController);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('root', () => {
|
||||||
|
it('should return "Hello World!"', () => {
|
||||||
|
expect(appController.getHello()).toBe('Hello World!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
12
backend/users-auth-service/src/app.controller.ts
Normal file
12
backend/users-auth-service/src/app.controller.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { Controller, Get } from '@nestjs/common';
|
||||||
|
import { AppService } from './app.service';
|
||||||
|
|
||||||
|
@Controller()
|
||||||
|
export class AppController {
|
||||||
|
constructor(private readonly appService: AppService) {}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
getHello(): string {
|
||||||
|
return this.appService.getHello();
|
||||||
|
}
|
||||||
|
}
|
||||||
29
backend/users-auth-service/src/app.module.ts
Normal file
29
backend/users-auth-service/src/app.module.ts
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { ConfigModule } from '@nestjs/config';
|
||||||
|
import { AuthModule } from './auth/auth.module';
|
||||||
|
import { UsersModule } from './users/users.module';
|
||||||
|
import { User } from './users/user.entity';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
ConfigModule.forRoot({ isGlobal: true }),
|
||||||
|
TypeOrmModule.forRootAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: () => ({
|
||||||
|
type: 'postgres',
|
||||||
|
host: process.env.DB_HOST || 'localhost',
|
||||||
|
port: Number(process.env.DB_PORT) || 5432,
|
||||||
|
username: process.env.DB_USER || 'postgres',
|
||||||
|
password: process.env.DB_PASSWORD || 'postgres',
|
||||||
|
database: process.env.DB_NAME || 'todo',
|
||||||
|
entities: [User],
|
||||||
|
synchronize: true,
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
AuthModule,
|
||||||
|
UsersModule
|
||||||
|
],
|
||||||
|
exports: [TypeOrmModule],
|
||||||
|
})
|
||||||
|
export class AppModule {}
|
||||||
8
backend/users-auth-service/src/app.service.ts
Normal file
8
backend/users-auth-service/src/app.service.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AppService {
|
||||||
|
getHello(): string {
|
||||||
|
return 'Hello World!';
|
||||||
|
}
|
||||||
|
}
|
||||||
89
backend/users-auth-service/src/auth/auth.controller.ts
Normal file
89
backend/users-auth-service/src/auth/auth.controller.ts
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
import { Controller, Post, Body, UnauthorizedException } from '@nestjs/common';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { UsersService } from '../users/users.service';
|
||||||
|
import { ApiTags, ApiOperation, ApiBody, ApiResponse, ApiBearerAuth } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
class LoginDto {
|
||||||
|
username: string;
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class LoginResponse {
|
||||||
|
access_token: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class RegisterDto {
|
||||||
|
username: string;
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiTags('Auth')
|
||||||
|
@Controller('auth')
|
||||||
|
export class AuthController {
|
||||||
|
constructor(
|
||||||
|
private authService: AuthService,
|
||||||
|
private usersService: UsersService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Register new user' })
|
||||||
|
@ApiBody({
|
||||||
|
description: 'User registration data',
|
||||||
|
type: RegisterDto,
|
||||||
|
examples: {
|
||||||
|
example1: {
|
||||||
|
summary: 'Typical registration',
|
||||||
|
value: {
|
||||||
|
username: 'john_doe',
|
||||||
|
email: 'john@example.com',
|
||||||
|
password: '123456',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 201,
|
||||||
|
description: 'User created successfully',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 401,
|
||||||
|
description: 'Username already exists',
|
||||||
|
})
|
||||||
|
@Post('register')
|
||||||
|
async register(@Body() body: RegisterDto) {
|
||||||
|
const existing = await this.usersService.findOneByUsername(body.username);
|
||||||
|
if (existing) {
|
||||||
|
throw new UnauthorizedException('Username already exists');
|
||||||
|
}
|
||||||
|
return this.usersService.create(body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Login user' })
|
||||||
|
@ApiBody({
|
||||||
|
description: 'User login data',
|
||||||
|
type: LoginDto,
|
||||||
|
examples: {
|
||||||
|
example1: {
|
||||||
|
summary: 'Typical login',
|
||||||
|
value: {
|
||||||
|
username: 'john_doe',
|
||||||
|
password: '123456',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'User logged in successfully',
|
||||||
|
type: LoginResponse,
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 401,
|
||||||
|
description: 'Invalid username or password',
|
||||||
|
})
|
||||||
|
@Post('login')
|
||||||
|
async login(@Body() body: LoginDto) {
|
||||||
|
const user = await this.authService.validateUser(body.username, body.password);
|
||||||
|
return this.authService.login(user);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
backend/users-auth-service/src/auth/auth.module.ts
Normal file
22
backend/users-auth-service/src/auth/auth.module.ts
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { PassportModule } from '@nestjs/passport';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { AuthController } from './auth.controller';
|
||||||
|
import { UsersModule } from '../users/users.module';
|
||||||
|
import { JwtStrategy } from './jwt.strategy';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
UsersModule,
|
||||||
|
PassportModule,
|
||||||
|
JwtModule.register({
|
||||||
|
secret: process.env.JWT_SECRET || 'super_secret_key',
|
||||||
|
signOptions: { expiresIn: process.env.JWT_EXPIRES_IN || '3600s' },
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
controllers: [AuthController],
|
||||||
|
providers: [AuthService, JwtStrategy],
|
||||||
|
exports: [AuthService],
|
||||||
|
})
|
||||||
|
export class AuthModule {}
|
||||||
33
backend/users-auth-service/src/auth/auth.service.ts
Normal file
33
backend/users-auth-service/src/auth/auth.service.ts
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import { Injectable, UnauthorizedException } from '@nestjs/common';
|
||||||
|
import { JwtService } from '@nestjs/jwt';
|
||||||
|
import { UsersService } from '../users/users.service';
|
||||||
|
import * as bcrypt from 'bcrypt';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuthService {
|
||||||
|
constructor(
|
||||||
|
private usersService: UsersService,
|
||||||
|
private jwtService: JwtService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async validateUser(username: string, password: string) {
|
||||||
|
const user = await this.usersService.findOneByUsername(username);
|
||||||
|
if (!user) {
|
||||||
|
throw new UnauthorizedException('User not found');
|
||||||
|
}
|
||||||
|
const isMatch = await bcrypt.compare(password, user.password);
|
||||||
|
if (!isMatch) {
|
||||||
|
throw new UnauthorizedException('Invalid password');
|
||||||
|
}
|
||||||
|
const { password: _, ...rest } = user;
|
||||||
|
return rest;
|
||||||
|
}
|
||||||
|
|
||||||
|
async login(user: any) {
|
||||||
|
const payload = { username: user.username, sub: user.id };
|
||||||
|
console.log("access_token:", payload);
|
||||||
|
return {
|
||||||
|
access_token: this.jwtService.sign(payload),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
21
backend/users-auth-service/src/auth/jwt.module.ts
Normal file
21
backend/users-auth-service/src/auth/jwt.module.ts
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtStrategy } from './jwt.strategy';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
ConfigModule,
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: async (configService: ConfigService) => ({
|
||||||
|
secret: configService.get<string>('JWT_SECRET'),
|
||||||
|
signOptions: { expiresIn: configService.get<string>('JWT_EXPIRES_IN', '3600s') },
|
||||||
|
}),
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
providers: [JwtStrategy],
|
||||||
|
exports: [JwtModule],
|
||||||
|
})
|
||||||
|
export class JwtAuthModule {}
|
||||||
19
backend/users-auth-service/src/auth/jwt.strategy.ts
Normal file
19
backend/users-auth-service/src/auth/jwt.strategy.ts
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { PassportStrategy } from '@nestjs/passport';
|
||||||
|
import { ExtractJwt, Strategy } from 'passport-jwt';
|
||||||
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class JwtStrategy extends PassportStrategy(Strategy) {
|
||||||
|
constructor(configService: ConfigService) {
|
||||||
|
super({
|
||||||
|
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
||||||
|
ignoreExpiration: false,
|
||||||
|
secretOrKey: configService.get<string>('JWT_SECRET'),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async validate(payload: any) {
|
||||||
|
return { userId: payload.sub, username: payload.username };
|
||||||
|
}
|
||||||
|
}
|
||||||
28
backend/users-auth-service/src/main.ts
Normal file
28
backend/users-auth-service/src/main.ts
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
import { NestFactory } from '@nestjs/core';
|
||||||
|
import { AppModule } from './app.module';
|
||||||
|
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
|
||||||
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
|
||||||
|
async function bootstrap() {
|
||||||
|
const app = await NestFactory.create(AppModule);
|
||||||
|
|
||||||
|
app.setGlobalPrefix('api');
|
||||||
|
const configService = app.get(ConfigService);
|
||||||
|
const port = configService.get<number>('PORT') || 4000;
|
||||||
|
|
||||||
|
app.enableCors();
|
||||||
|
|
||||||
|
const config = new DocumentBuilder()
|
||||||
|
.setTitle('Cool TODO Manager API')
|
||||||
|
.setDescription('API for user authentication and JWT token management')
|
||||||
|
.setVersion('2.0')
|
||||||
|
.addBearerAuth()
|
||||||
|
.build();
|
||||||
|
const document = SwaggerModule.createDocument(app, config);
|
||||||
|
SwaggerModule.setup('api/docs', app, document);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
await app.listen(port);
|
||||||
|
}
|
||||||
|
bootstrap();
|
||||||
25
backend/users-auth-service/src/users/user.entity.ts
Normal file
25
backend/users-auth-service/src/users/user.entity.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn } from 'typeorm';
|
||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
@Entity()
|
||||||
|
export class User {
|
||||||
|
@ApiProperty({ example: 1, description: 'User ID' })
|
||||||
|
@PrimaryGeneratedColumn()
|
||||||
|
id: number;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'john_doe', description: 'Unique username' })
|
||||||
|
@Column({ unique: true })
|
||||||
|
username: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: 'john@example.com', description: 'Unique email' })
|
||||||
|
@Column({ unique: true })
|
||||||
|
email: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '$2b$10$...', description: 'Hashed password' })
|
||||||
|
@Column()
|
||||||
|
password: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2025-03-01T10:00:00.000Z', description: 'Creation date' })
|
||||||
|
@CreateDateColumn()
|
||||||
|
created_at: Date;
|
||||||
|
}
|
||||||
33
backend/users-auth-service/src/users/users.controller.ts
Normal file
33
backend/users-auth-service/src/users/users.controller.ts
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import { Controller, Get, Param } from '@nestjs/common';
|
||||||
|
import { UsersService } from './users.service';
|
||||||
|
import { User } from './user.entity';
|
||||||
|
import { ApiTags, ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
@ApiTags('Users')
|
||||||
|
@Controller('users')
|
||||||
|
export class UsersController {
|
||||||
|
constructor(private readonly usersService: UsersService) {}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get user by username' })
|
||||||
|
@ApiParam({ name: 'username', type: 'string', description: 'The username to look up' })
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'User found',
|
||||||
|
type: User,
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 404,
|
||||||
|
description: 'User not found',
|
||||||
|
})
|
||||||
|
@Get(':username')
|
||||||
|
async getUser(@Param('username') username: string): Promise<User | null> {
|
||||||
|
return this.usersService.findOneByUsername(username);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get all users' })
|
||||||
|
@ApiResponse({ status: 200, description: 'List of users', type: User, isArray: true})
|
||||||
|
@Get()
|
||||||
|
async findAll(): Promise<User[]> {
|
||||||
|
return this.usersService.findAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
13
backend/users-auth-service/src/users/users.module.ts
Normal file
13
backend/users-auth-service/src/users/users.module.ts
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { UsersService } from './users.service';
|
||||||
|
import { UsersController } from './users.controller';
|
||||||
|
import { User } from './user.entity';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [TypeOrmModule.forFeature([User])],
|
||||||
|
providers: [UsersService],
|
||||||
|
controllers: [UsersController],
|
||||||
|
exports: [UsersService],
|
||||||
|
})
|
||||||
|
export class UsersModule {}
|
||||||
39
backend/users-auth-service/src/users/users.service.ts
Normal file
39
backend/users-auth-service/src/users/users.service.ts
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { User } from './user.entity';
|
||||||
|
import * as bcrypt from 'bcrypt';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class UsersService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(User)
|
||||||
|
private usersRepository: Repository<User>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(userData: Partial<User>): Promise<User> {
|
||||||
|
if (!userData.password) {
|
||||||
|
throw new Error('Password is required');
|
||||||
|
}
|
||||||
|
const hashedPassword = await bcrypt.hash(userData.password, 10);
|
||||||
|
|
||||||
|
const user = this.usersRepository.create({
|
||||||
|
username: userData.username,
|
||||||
|
email: userData.email,
|
||||||
|
password: hashedPassword,
|
||||||
|
});
|
||||||
|
return this.usersRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOneByUsername(username: string): Promise<User | null> {
|
||||||
|
return this.usersRepository.findOne({ where: { username } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async findAll(): Promise<User[]> {
|
||||||
|
return this.usersRepository.find();
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOneById(id: number): Promise<User | null> {
|
||||||
|
return this.usersRepository.findOne({ where: { id } });
|
||||||
|
}
|
||||||
|
}
|
||||||
4
backend/users-auth-service/tsconfig.build.json
Normal file
4
backend/users-auth-service/tsconfig.build.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
|
||||||
|
}
|
||||||
21
backend/users-auth-service/tsconfig.json
Normal file
21
backend/users-auth-service/tsconfig.json
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"module": "commonjs",
|
||||||
|
"declaration": true,
|
||||||
|
"removeComments": true,
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"target": "ES2023",
|
||||||
|
"sourceMap": true,
|
||||||
|
"outDir": "./dist",
|
||||||
|
"baseUrl": "./",
|
||||||
|
"incremental": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strictNullChecks": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"noImplicitAny": false,
|
||||||
|
"strictBindCallApply": false,
|
||||||
|
"noFallthroughCasesInSwitch": false
|
||||||
|
}
|
||||||
|
}
|
||||||
18
compose.yml
Normal file
18
compose.yml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
services:
|
||||||
|
back:
|
||||||
|
build: ./nestjs/backend
|
||||||
|
ports:
|
||||||
|
- 3000:3000
|
||||||
|
restart: unless-stopped
|
||||||
|
postgres:
|
||||||
|
image: postgres:latest
|
||||||
|
container_name: postgres_container
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: nichtar
|
||||||
|
POSTGRES_PASSWORD: 1234
|
||||||
|
POSTGRES_DB: todo
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
volumes:
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
325
cool_todo_manager/package-lock.json
generated
325
cool_todo_manager/package-lock.json
generated
@ -16,9 +16,11 @@
|
|||||||
"@tailwindcss/vite": "^4.0.6",
|
"@tailwindcss/vite": "^4.0.6",
|
||||||
"@tanstack/react-query": "^5.66.0",
|
"@tanstack/react-query": "^5.66.0",
|
||||||
"@tanstack/react-query-devtools": "^5.66.0",
|
"@tanstack/react-query-devtools": "^5.66.0",
|
||||||
"axios": "^1.7.9",
|
"axios": "^1.8.4",
|
||||||
"jotai": "^2.12.0",
|
"jotai": "^2.12.0",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
|
"mobx": "^6.13.7",
|
||||||
|
"mobx-react-lite": "^4.1.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.0.0",
|
||||||
"react-redux": "^9.2.0",
|
"react-redux": "^9.2.0",
|
||||||
@ -217,14 +219,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/helpers": {
|
"node_modules/@babel/helpers": {
|
||||||
"version": "7.26.9",
|
"version": "7.26.10",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
|
||||||
"integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
|
"integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/template": "^7.26.9",
|
"@babel/template": "^7.26.9",
|
||||||
"@babel/types": "^7.26.9"
|
"@babel/types": "^7.26.10"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
@ -279,10 +280,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/runtime": {
|
"node_modules/@babel/runtime": {
|
||||||
"version": "7.26.9",
|
"version": "7.26.10",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
|
||||||
"integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
|
"integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"regenerator-runtime": "^0.14.0"
|
"regenerator-runtime": "^0.14.0"
|
||||||
},
|
},
|
||||||
@ -335,11 +335,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/types": {
|
"node_modules/@babel/types": {
|
||||||
"version": "7.26.9",
|
"version": "7.26.10",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
|
||||||
"integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
|
"integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/helper-string-parser": "^7.25.9",
|
"@babel/helper-string-parser": "^7.25.9",
|
||||||
"@babel/helper-validator-identifier": "^7.25.9"
|
"@babel/helper-validator-identifier": "^7.25.9"
|
||||||
@ -349,13 +348,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/aix-ppc64": {
|
"node_modules/@esbuild/aix-ppc64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz",
|
||||||
"integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
|
"integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"aix"
|
"aix"
|
||||||
@ -365,13 +363,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/android-arm": {
|
"node_modules/@esbuild/android-arm": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz",
|
||||||
"integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
|
"integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"android"
|
"android"
|
||||||
@ -381,13 +378,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/android-arm64": {
|
"node_modules/@esbuild/android-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
|
"integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"android"
|
"android"
|
||||||
@ -397,13 +393,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/android-x64": {
|
"node_modules/@esbuild/android-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
|
"integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"android"
|
"android"
|
||||||
@ -413,13 +408,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/darwin-arm64": {
|
"node_modules/@esbuild/darwin-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
|
"integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"darwin"
|
"darwin"
|
||||||
@ -429,13 +423,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/darwin-x64": {
|
"node_modules/@esbuild/darwin-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
|
"integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"darwin"
|
"darwin"
|
||||||
@ -445,13 +438,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/freebsd-arm64": {
|
"node_modules/@esbuild/freebsd-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
|
"integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"freebsd"
|
"freebsd"
|
||||||
@ -461,13 +453,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/freebsd-x64": {
|
"node_modules/@esbuild/freebsd-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
|
"integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"freebsd"
|
"freebsd"
|
||||||
@ -477,13 +468,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-arm": {
|
"node_modules/@esbuild/linux-arm": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz",
|
||||||
"integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
|
"integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -493,13 +483,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-arm64": {
|
"node_modules/@esbuild/linux-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
|
"integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -509,13 +498,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-ia32": {
|
"node_modules/@esbuild/linux-ia32": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz",
|
||||||
"integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
|
"integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ia32"
|
"ia32"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -525,13 +513,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-loong64": {
|
"node_modules/@esbuild/linux-loong64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz",
|
||||||
"integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
|
"integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"loong64"
|
"loong64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -541,13 +528,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-mips64el": {
|
"node_modules/@esbuild/linux-mips64el": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz",
|
||||||
"integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
|
"integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"mips64el"
|
"mips64el"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -557,13 +543,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-ppc64": {
|
"node_modules/@esbuild/linux-ppc64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz",
|
||||||
"integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
|
"integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -573,13 +558,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-riscv64": {
|
"node_modules/@esbuild/linux-riscv64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz",
|
||||||
"integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
|
"integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"riscv64"
|
"riscv64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -589,13 +573,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-s390x": {
|
"node_modules/@esbuild/linux-s390x": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz",
|
||||||
"integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
|
"integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -605,13 +588,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-x64": {
|
"node_modules/@esbuild/linux-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
|
"integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"linux"
|
"linux"
|
||||||
@ -621,13 +603,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/netbsd-arm64": {
|
"node_modules/@esbuild/netbsd-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
|
"integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"netbsd"
|
"netbsd"
|
||||||
@ -637,13 +618,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/netbsd-x64": {
|
"node_modules/@esbuild/netbsd-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
|
"integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"netbsd"
|
"netbsd"
|
||||||
@ -653,13 +633,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/openbsd-arm64": {
|
"node_modules/@esbuild/openbsd-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
|
"integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"openbsd"
|
"openbsd"
|
||||||
@ -669,13 +648,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/openbsd-x64": {
|
"node_modules/@esbuild/openbsd-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
|
"integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"openbsd"
|
"openbsd"
|
||||||
@ -685,13 +663,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/sunos-x64": {
|
"node_modules/@esbuild/sunos-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
|
"integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"sunos"
|
"sunos"
|
||||||
@ -701,13 +678,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/win32-arm64": {
|
"node_modules/@esbuild/win32-arm64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz",
|
||||||
"integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
|
"integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"win32"
|
"win32"
|
||||||
@ -717,13 +693,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/win32-ia32": {
|
"node_modules/@esbuild/win32-ia32": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz",
|
||||||
"integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
|
"integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ia32"
|
"ia32"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"win32"
|
"win32"
|
||||||
@ -733,13 +708,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/win32-x64": {
|
"node_modules/@esbuild/win32-x64": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz",
|
||||||
"integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
|
"integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"win32"
|
"win32"
|
||||||
@ -3520,10 +3494,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/axios": {
|
"node_modules/axios": {
|
||||||
"version": "1.7.9",
|
"version": "1.8.4",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
|
||||||
"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
|
"integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"follow-redirects": "^1.15.6",
|
"follow-redirects": "^1.15.6",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
@ -3870,11 +3843,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/esbuild": {
|
"node_modules/esbuild": {
|
||||||
"version": "0.24.2",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
|
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz",
|
||||||
"integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
|
"integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
"bin": {
|
||||||
"esbuild": "bin/esbuild"
|
"esbuild": "bin/esbuild"
|
||||||
},
|
},
|
||||||
@ -3882,31 +3854,31 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@esbuild/aix-ppc64": "0.24.2",
|
"@esbuild/aix-ppc64": "0.25.1",
|
||||||
"@esbuild/android-arm": "0.24.2",
|
"@esbuild/android-arm": "0.25.1",
|
||||||
"@esbuild/android-arm64": "0.24.2",
|
"@esbuild/android-arm64": "0.25.1",
|
||||||
"@esbuild/android-x64": "0.24.2",
|
"@esbuild/android-x64": "0.25.1",
|
||||||
"@esbuild/darwin-arm64": "0.24.2",
|
"@esbuild/darwin-arm64": "0.25.1",
|
||||||
"@esbuild/darwin-x64": "0.24.2",
|
"@esbuild/darwin-x64": "0.25.1",
|
||||||
"@esbuild/freebsd-arm64": "0.24.2",
|
"@esbuild/freebsd-arm64": "0.25.1",
|
||||||
"@esbuild/freebsd-x64": "0.24.2",
|
"@esbuild/freebsd-x64": "0.25.1",
|
||||||
"@esbuild/linux-arm": "0.24.2",
|
"@esbuild/linux-arm": "0.25.1",
|
||||||
"@esbuild/linux-arm64": "0.24.2",
|
"@esbuild/linux-arm64": "0.25.1",
|
||||||
"@esbuild/linux-ia32": "0.24.2",
|
"@esbuild/linux-ia32": "0.25.1",
|
||||||
"@esbuild/linux-loong64": "0.24.2",
|
"@esbuild/linux-loong64": "0.25.1",
|
||||||
"@esbuild/linux-mips64el": "0.24.2",
|
"@esbuild/linux-mips64el": "0.25.1",
|
||||||
"@esbuild/linux-ppc64": "0.24.2",
|
"@esbuild/linux-ppc64": "0.25.1",
|
||||||
"@esbuild/linux-riscv64": "0.24.2",
|
"@esbuild/linux-riscv64": "0.25.1",
|
||||||
"@esbuild/linux-s390x": "0.24.2",
|
"@esbuild/linux-s390x": "0.25.1",
|
||||||
"@esbuild/linux-x64": "0.24.2",
|
"@esbuild/linux-x64": "0.25.1",
|
||||||
"@esbuild/netbsd-arm64": "0.24.2",
|
"@esbuild/netbsd-arm64": "0.25.1",
|
||||||
"@esbuild/netbsd-x64": "0.24.2",
|
"@esbuild/netbsd-x64": "0.25.1",
|
||||||
"@esbuild/openbsd-arm64": "0.24.2",
|
"@esbuild/openbsd-arm64": "0.25.1",
|
||||||
"@esbuild/openbsd-x64": "0.24.2",
|
"@esbuild/openbsd-x64": "0.25.1",
|
||||||
"@esbuild/sunos-x64": "0.24.2",
|
"@esbuild/sunos-x64": "0.25.1",
|
||||||
"@esbuild/win32-arm64": "0.24.2",
|
"@esbuild/win32-arm64": "0.25.1",
|
||||||
"@esbuild/win32-ia32": "0.24.2",
|
"@esbuild/win32-ia32": "0.25.1",
|
||||||
"@esbuild/win32-x64": "0.24.2"
|
"@esbuild/win32-x64": "0.25.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/escalade": {
|
"node_modules/escalade": {
|
||||||
@ -4993,6 +4965,39 @@
|
|||||||
"node": "*"
|
"node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/mobx": {
|
||||||
|
"version": "6.13.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/mobx/-/mobx-6.13.7.tgz",
|
||||||
|
"integrity": "sha512-aChaVU/DO5aRPmk1GX8L+whocagUUpBQqoPtJk+cm7UOXUk87J4PeWCh6nNmTTIfEhiR9DI/+FnA8dln/hTK7g==",
|
||||||
|
"funding": {
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/mobx"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/mobx-react-lite": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-QEP10dpHHBeQNv1pks3WnHRCem2Zp636lq54M2nKO2Sarr13pL4u6diQXf65yzXUn0mkk18SyIDCm9UOJYTi1w==",
|
||||||
|
"dependencies": {
|
||||||
|
"use-sync-external-store": "^1.4.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/mobx"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"mobx": "^6.9.0",
|
||||||
|
"react": "^16.8.0 || ^17 || ^18 || ^19"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"react-dom": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"react-native": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/ms": {
|
"node_modules/ms": {
|
||||||
"version": "2.1.3",
|
"version": "2.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||||
@ -5001,16 +5006,15 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/nanoid": {
|
"node_modules/nanoid": {
|
||||||
"version": "3.3.8",
|
"version": "3.3.11",
|
||||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
|
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
|
||||||
"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
|
"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "github",
|
"type": "github",
|
||||||
"url": "https://github.com/sponsors/ai"
|
"url": "https://github.com/sponsors/ai"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
"bin": {
|
||||||
"nanoid": "bin/nanoid.cjs"
|
"nanoid": "bin/nanoid.cjs"
|
||||||
},
|
},
|
||||||
@ -5135,9 +5139,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.5.2",
|
"version": "8.5.3",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
|
||||||
"integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
|
"integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "opencollective",
|
"type": "opencollective",
|
||||||
@ -5152,7 +5156,6 @@
|
|||||||
"url": "https://github.com/sponsors/ai"
|
"url": "https://github.com/sponsors/ai"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nanoid": "^3.3.8",
|
"nanoid": "^3.3.8",
|
||||||
"picocolors": "^1.1.1",
|
"picocolors": "^1.1.1",
|
||||||
@ -5595,7 +5598,6 @@
|
|||||||
"version": "1.2.1",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
||||||
"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
|
"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
|
||||||
"license": "BSD-3-Clause",
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
@ -5823,13 +5825,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "6.1.0",
|
"version": "6.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.2.tgz",
|
||||||
"integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
|
"integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==",
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.24.2",
|
"esbuild": "^0.25.0",
|
||||||
"postcss": "^8.5.1",
|
"postcss": "^8.5.3",
|
||||||
"rollup": "^4.30.1"
|
"rollup": "^4.30.1"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@ -18,9 +18,11 @@
|
|||||||
"@tailwindcss/vite": "^4.0.6",
|
"@tailwindcss/vite": "^4.0.6",
|
||||||
"@tanstack/react-query": "^5.66.0",
|
"@tanstack/react-query": "^5.66.0",
|
||||||
"@tanstack/react-query-devtools": "^5.66.0",
|
"@tanstack/react-query-devtools": "^5.66.0",
|
||||||
"axios": "^1.7.9",
|
"axios": "^1.8.4",
|
||||||
"jotai": "^2.12.0",
|
"jotai": "^2.12.0",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
|
"mobx": "^6.13.7",
|
||||||
|
"mobx-react-lite": "^4.1.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.0.0",
|
||||||
"react-redux": "^9.2.0",
|
"react-redux": "^9.2.0",
|
||||||
|
|||||||
@ -1,24 +1,19 @@
|
|||||||
import { Theme } from '@radix-ui/themes';
|
import { Theme } from '@radix-ui/themes';
|
||||||
import '@radix-ui/themes/styles.css';
|
import '@radix-ui/themes/styles.css';
|
||||||
import { QueryClientProvider } from '@tanstack/react-query';
|
|
||||||
import { Provider } from 'react-redux';
|
|
||||||
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
|
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
|
||||||
import queryClient from './api/queryClient';
|
|
||||||
import { store } from './api/RTKQuery';
|
|
||||||
import './App.css';
|
import './App.css';
|
||||||
import MyRoutes from './routes/routes';
|
import MyRoutes from './routes/routes';
|
||||||
|
import { appStore } from './stores/AppStore';
|
||||||
|
import { Ctx } from './context';
|
||||||
|
|
||||||
const router = createBrowserRouter(MyRoutes);
|
const router = createBrowserRouter(MyRoutes);
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
<Theme className="size-full" accentColor="amber" grayColor="gray">
|
<Theme className="size-full" accentColor="amber" grayColor="gray">
|
||||||
<QueryClientProvider client={queryClient}>
|
<Ctx.Provider value={appStore}>
|
||||||
<Provider store={store}>
|
|
||||||
{/* <ThemePanel /> */}
|
|
||||||
<RouterProvider router={router} />
|
<RouterProvider router={router} />
|
||||||
</Provider>
|
</Ctx.Provider>
|
||||||
</QueryClientProvider>
|
|
||||||
</Theme>
|
</Theme>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
import { configureStore, isRejectedWithValue, Middleware } from '@reduxjs/toolkit';
|
|
||||||
import { setupListeners } from '@reduxjs/toolkit/query';
|
|
||||||
import { authApi, mainApi } from '../services/mainApi';
|
|
||||||
|
|
||||||
const loggerMiddleware: Middleware = (_store) => (next) => (action) => {
|
|
||||||
console.log('dispatching', action);
|
|
||||||
if(isRejectedWithValue(action)) {
|
|
||||||
// @ts-ignore
|
|
||||||
const statusCode = action.payload.status;
|
|
||||||
if(statusCode === 401) {
|
|
||||||
console.log('Unauthorized, redirecting to login page');
|
|
||||||
localStorage.removeItem('token');
|
|
||||||
window.location.href = '/login';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let result = next(action);
|
|
||||||
return result;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const store = configureStore({
|
|
||||||
reducer: {
|
|
||||||
[mainApi.reducerPath]: mainApi.reducer,
|
|
||||||
[authApi.reducerPath]: authApi.reducer,
|
|
||||||
},
|
|
||||||
middleware: (getDefaultMiddleware) =>
|
|
||||||
getDefaultMiddleware()
|
|
||||||
.prepend(loggerMiddleware)
|
|
||||||
.concat(mainApi.middleware)
|
|
||||||
.concat(authApi.middleware),
|
|
||||||
});
|
|
||||||
|
|
||||||
setupListeners(store.dispatch);
|
|
||||||
|
|
||||||
@ -9,6 +9,6 @@ export const axiosBase = axios.create({
|
|||||||
export const axiosAuth = axios.create({
|
export const axiosAuth = axios.create({
|
||||||
baseURL: BASE_URL,
|
baseURL: BASE_URL,
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${localStorage.getItem('token')}` // Maybe we will use cookies
|
Authorization: `Bearer ${localStorage.getItem('token')}`
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -1,11 +0,0 @@
|
|||||||
import { QueryClient } from "@tanstack/react-query";
|
|
||||||
|
|
||||||
const queryClient = new QueryClient({
|
|
||||||
defaultOptions: {
|
|
||||||
queries: {
|
|
||||||
retry: 2,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export default queryClient;
|
|
||||||
@ -1,7 +1,8 @@
|
|||||||
|
import { observer } from 'mobx-react-lite';
|
||||||
import { PropsWithChildren } from 'react';
|
import { PropsWithChildren } from 'react';
|
||||||
import { Navigate } from 'react-router-dom';
|
import { Navigate } from 'react-router-dom';
|
||||||
|
|
||||||
export default function AuthWrapper(props: PropsWithChildren) {
|
const AuthWrapper = observer((props: PropsWithChildren) => {
|
||||||
|
|
||||||
if (!localStorage.getItem('token')) {
|
if (!localStorage.getItem('token')) {
|
||||||
console.log('No token found, redirecting to login');
|
console.log('No token found, redirecting to login');
|
||||||
@ -9,4 +10,6 @@ export default function AuthWrapper(props: PropsWithChildren) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return <div>{props.children}</div>;
|
return <div>{props.children}</div>;
|
||||||
}
|
})
|
||||||
|
|
||||||
|
export default AuthWrapper;
|
||||||
@ -1,30 +1,34 @@
|
|||||||
|
import { useEffect } from 'react';
|
||||||
import { Droppable } from '@hello-pangea/dnd';
|
import { Droppable } from '@hello-pangea/dnd';
|
||||||
import { Box, Button, Flex, Text } from '@radix-ui/themes';
|
import { Box, Button, Flex, Text } from '@radix-ui/themes';
|
||||||
import {
|
import { PlusIcon } from '@radix-ui/react-icons';
|
||||||
useCreateTaskMutation,
|
import { observer } from 'mobx-react-lite';
|
||||||
useDeleteProjectMutation,
|
|
||||||
useGetTasksForGroupQuery,
|
|
||||||
} from '../../services/mainApi';
|
|
||||||
import TaskCard from '../TaskCard/TaskCard';
|
import TaskCard from '../TaskCard/TaskCard';
|
||||||
import AddUserToProjectDialog from '../dialogs/AddUserToProjectDialog/AddUserToProjectDialog';
|
import AddUserToProjectDialog from '../dialogs/AddUserToProjectDialog/AddUserToProjectDialog';
|
||||||
import CreateTaskDialog from '../dialogs/CreateTaskDialog/CreateTaskDialog';
|
import CreateTaskDialog from '../dialogs/CreateTaskDialog/CreateTaskDialog';
|
||||||
import DeleteProjectDialog from '../dialogs/DeleteProjectDialog/CreateTaskDialog';
|
import DeleteProjectDialog from '../dialogs/DeleteProjectDialog/CreateTaskDialog';
|
||||||
|
|
||||||
import { PlusIcon } from '@radix-ui/react-icons';
|
import { useStore } from '../../hooks/useStore';
|
||||||
|
|
||||||
type TCardGroup = {
|
type TCardGroup = {
|
||||||
id: string;
|
id: string;
|
||||||
title: string;
|
title: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function CardGroup(props: TCardGroup) {
|
|
||||||
const { data, isLoading } = useGetTasksForGroupQuery(props.id);
|
|
||||||
|
|
||||||
const [createTaskForGroup] = useCreateTaskMutation();
|
function CardGroup(props: TCardGroup) {
|
||||||
const [deleteProject] = useDeleteProjectMutation();
|
const store = useStore();
|
||||||
|
useEffect(() => {
|
||||||
|
store.mainStore.fetchTasksForGroup(props.id).catch(console.error);
|
||||||
|
}, [props.id, store.mainStore]);
|
||||||
|
|
||||||
|
|
||||||
|
const tasks = store.mainStore.tasksByProject.get(props.id) ?? [];
|
||||||
|
const isLoading = store.mainStore.isLoading;
|
||||||
|
|
||||||
const createTask = (taskText: string, date: string) => {
|
const createTask = (taskText: string, date: string) => {
|
||||||
createTaskForGroup({
|
store.mainStore.createTask({
|
||||||
title: taskText,
|
title: taskText,
|
||||||
projectId: props.id,
|
projectId: props.id,
|
||||||
assignedUserId: 1,
|
assignedUserId: 1,
|
||||||
@ -33,7 +37,7 @@ export default function CardGroup(props: TCardGroup) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const deleteGroup = () => {
|
const deleteGroup = () => {
|
||||||
deleteProject(props.id);
|
store.mainStore.deleteProject(props.id);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -41,13 +45,16 @@ export default function CardGroup(props: TCardGroup) {
|
|||||||
{(provided) => (
|
{(provided) => (
|
||||||
<Box className="flex flex-col text-center rounded-lg p-4 bg-gray-200 min-w-fit">
|
<Box className="flex flex-col text-center rounded-lg p-4 bg-gray-200 min-w-fit">
|
||||||
<Text className="mb-2">{props.title}</Text>
|
<Text className="mb-2">{props.title}</Text>
|
||||||
|
|
||||||
<Box
|
<Box
|
||||||
ref={provided.innerRef}
|
ref={provided.innerRef}
|
||||||
className="bg-gray-200 min-w-full rounded-lg !flex flex-col gap-2"
|
className="bg-gray-200 min-w-full rounded-lg !flex flex-col gap-2"
|
||||||
>
|
>
|
||||||
{data &&
|
{isLoading && <Text>Loading...</Text>}
|
||||||
data.map((task, i) => (
|
|
||||||
|
{!isLoading && tasks.map((task: any, i: number) => (
|
||||||
<TaskCard
|
<TaskCard
|
||||||
|
projectId={props.id}
|
||||||
key={task.id}
|
key={task.id}
|
||||||
id={task.id.toString()}
|
id={task.id.toString()}
|
||||||
title={task.title}
|
title={task.title}
|
||||||
@ -56,11 +63,14 @@ export default function CardGroup(props: TCardGroup) {
|
|||||||
status={task.status}
|
status={task.status}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
{provided.placeholder}
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Flex gap={'2'} className="mx-auto w-full mt-2">
|
<Flex gap={'2'} className="mx-auto w-full mt-2">
|
||||||
<CreateTaskDialog onClose={createTask}>
|
<CreateTaskDialog onClose={createTask}>
|
||||||
<Button className='!grow-1'>Add Task</Button>
|
<Button className='!grow-1'>Add Task</Button>
|
||||||
</CreateTaskDialog>
|
</CreateTaskDialog>
|
||||||
|
|
||||||
<DeleteProjectDialog onClose={deleteGroup}>
|
<DeleteProjectDialog onClose={deleteGroup}>
|
||||||
<Button className='!grow-1' color="red">Delete Project</Button>
|
<Button className='!grow-1' color="red">Delete Project</Button>
|
||||||
</DeleteProjectDialog>
|
</DeleteProjectDialog>
|
||||||
@ -77,3 +87,5 @@ export default function CardGroup(props: TCardGroup) {
|
|||||||
</Droppable>
|
</Droppable>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default observer(CardGroup);
|
||||||
|
|||||||
@ -1,28 +1,44 @@
|
|||||||
|
import { useEffect } from 'react';
|
||||||
|
import { observer } from 'mobx-react-lite';
|
||||||
import { DragDropContext } from '@hello-pangea/dnd';
|
import { DragDropContext } from '@hello-pangea/dnd';
|
||||||
import { Button, Flex, ScrollArea } from '@radix-ui/themes';
|
import { Button, Flex, ScrollArea } from '@radix-ui/themes';
|
||||||
import {
|
|
||||||
useCreateProjectMutation,
|
|
||||||
useGetProjectsQuery
|
|
||||||
} from '../../services/mainApi';
|
|
||||||
import CardGroup from '../CardGroup/CardGroup';
|
import CardGroup from '../CardGroup/CardGroup';
|
||||||
import CreateProjectDialog from '../dialogs/CreateProjectDialog/CreateProjectDialog';
|
import CreateProjectDialog from '../dialogs/CreateProjectDialog/CreateProjectDialog';
|
||||||
|
import { useStore } from '../../hooks/useStore';
|
||||||
|
|
||||||
|
function MainBoard() {
|
||||||
|
const store = useStore();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
store.mainStore.fetchProjects().catch(console.error);
|
||||||
|
}, []);
|
||||||
|
|
||||||
export default function MainBoard() {
|
|
||||||
const dragEndHandle = (result: TDragResult) => {
|
const dragEndHandle = (result: TDragResult) => {
|
||||||
result;
|
console.log(result);
|
||||||
};
|
};
|
||||||
|
|
||||||
const [createProject] = useCreateProjectMutation();
|
const createProject = (newProjectData: any) => {
|
||||||
const { data: cringe, isLoading } = useGetProjectsQuery({});
|
store.mainStore.createProject(newProjectData);
|
||||||
|
};
|
||||||
|
|
||||||
|
const cringe = store.mainStore.projects;
|
||||||
|
const isLoading = store.mainStore.isLoading;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<DragDropContext onDragEnd={dragEndHandle}>
|
<DragDropContext onDragEnd={dragEndHandle}>
|
||||||
<ScrollArea scrollbars="horizontal" className="pb-3">
|
<ScrollArea scrollbars="horizontal" className="pb-3">
|
||||||
<Flex gap={'2'} className="min-w-fit">
|
<Flex gap={'2'} className="min-w-fit">
|
||||||
|
{isLoading && <div>Loading Projects...</div>}
|
||||||
|
|
||||||
{!isLoading &&
|
{!isLoading &&
|
||||||
(cringe as any[]).map((item: any) => (
|
cringe.map((item: any) => (
|
||||||
<CardGroup id={item.id} title={item.title} />
|
<CardGroup
|
||||||
|
key={item.id}
|
||||||
|
id={item.id}
|
||||||
|
title={item.title}
|
||||||
|
/>
|
||||||
))}
|
))}
|
||||||
</Flex>
|
</Flex>
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
@ -34,3 +50,5 @@ export default function MainBoard() {
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default observer(MainBoard);
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import { Draggable } from '@hello-pangea/dnd';
|
import { Draggable } from '@hello-pangea/dnd';
|
||||||
import { Badge, Button, Card, Flex, Text } from '@radix-ui/themes';
|
import { Badge, Button, Card, Flex, Text } from '@radix-ui/themes';
|
||||||
import { useUpdateTaskMutation } from '../../services/mainApi';
|
import { observer } from 'mobx-react-lite';
|
||||||
|
import { useStore } from '../../hooks/useStore';
|
||||||
|
|
||||||
type TTaskCard = {
|
type TTaskCard = {
|
||||||
title?: string;
|
title?: string;
|
||||||
@ -8,26 +9,32 @@ type TTaskCard = {
|
|||||||
id?: string;
|
id?: string;
|
||||||
index?: number;
|
index?: number;
|
||||||
status: 'todo' | 'in-progress' | 'completed';
|
status: 'todo' | 'in-progress' | 'completed';
|
||||||
|
projectId: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
const badgeNames = {
|
const badgeNames = {
|
||||||
todo: 'To do',
|
todo: 'To do',
|
||||||
'in-progress': 'In progress',
|
'in-progress': 'In progress',
|
||||||
completed: 'Completed',
|
completed: 'Completed',
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
const badgeColors = {
|
const badgeColors = {
|
||||||
todo: 'blue',
|
todo: 'blue',
|
||||||
'in-progress': 'orange',
|
'in-progress': 'orange',
|
||||||
completed: 'green',
|
completed: 'green',
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
export default function TaskCard(props: TTaskCard) {
|
const TaskCard = observer((props: TTaskCard) => {
|
||||||
const [updateTask] = useUpdateTaskMutation();
|
|
||||||
|
const store = useStore()
|
||||||
|
|
||||||
const updateStatus = (newStatus: 'todo' | 'in-progress' | 'completed') => {
|
const updateStatus = (newStatus: 'todo' | 'in-progress' | 'completed') => {
|
||||||
updateTask({ id: props.id, status: newStatus });
|
if (!props.id) return;
|
||||||
|
store.mainStore.updateTask({ id: props.id, status: newStatus });
|
||||||
};
|
};
|
||||||
|
// @ts-ignore
|
||||||
|
console.log(`rerendered with`, store.mainStore.tasksByProject.get(2) );
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Draggable draggableId={props.id || '123'} index={props.index || 0}>
|
<Draggable draggableId={props.id || '123'} index={props.index || 0}>
|
||||||
@ -36,6 +43,7 @@ export default function TaskCard(props: TTaskCard) {
|
|||||||
className="!w-62 !flex flex-col gap-2"
|
className="!w-62 !flex flex-col gap-2"
|
||||||
ref={provided.innerRef}
|
ref={provided.innerRef}
|
||||||
{...provided.draggableProps}
|
{...provided.draggableProps}
|
||||||
|
{...provided.dragHandleProps}
|
||||||
>
|
>
|
||||||
<Flex direction="column" gap="2">
|
<Flex direction="column" gap="2">
|
||||||
<Flex justify={'between'}>
|
<Flex justify={'between'}>
|
||||||
@ -46,17 +54,26 @@ export default function TaskCard(props: TTaskCard) {
|
|||||||
|
|
||||||
<Flex justify={'between'}>
|
<Flex justify={'between'}>
|
||||||
{props.status !== 'todo' && (
|
{props.status !== 'todo' && (
|
||||||
<Button color={badgeColors['todo']} onClick={() => updateStatus('todo')}>
|
<Button
|
||||||
|
color={badgeColors['todo']}
|
||||||
|
onClick={() => updateStatus('todo')}
|
||||||
|
>
|
||||||
Todo
|
Todo
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{props.status !== 'in-progress' && (
|
{props.status !== 'in-progress' && (
|
||||||
<Button color={badgeColors['in-progress']} onClick={() => updateStatus('in-progress')}>
|
<Button
|
||||||
|
color={badgeColors['in-progress']}
|
||||||
|
onClick={() => updateStatus('in-progress')}
|
||||||
|
>
|
||||||
In Progress
|
In Progress
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{props.status !== 'completed' && (
|
{props.status !== 'completed' && (
|
||||||
<Button color={badgeColors['completed']} onClick={() => updateStatus('completed')}>
|
<Button
|
||||||
|
color={badgeColors['completed']}
|
||||||
|
onClick={() => updateStatus('completed')}
|
||||||
|
>
|
||||||
Completed
|
Completed
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
@ -65,4 +82,6 @@ export default function TaskCard(props: TTaskCard) {
|
|||||||
)}
|
)}
|
||||||
</Draggable>
|
</Draggable>
|
||||||
);
|
);
|
||||||
}
|
})
|
||||||
|
|
||||||
|
export default TaskCard;
|
||||||
|
|||||||
@ -1,28 +1,28 @@
|
|||||||
|
import { PropsWithChildren, useEffect, useState } from 'react';
|
||||||
|
import { observer } from 'mobx-react-lite';
|
||||||
import { Button, Dialog, Flex, Select } from '@radix-ui/themes';
|
import { Button, Dialog, Flex, Select } from '@radix-ui/themes';
|
||||||
import { PropsWithChildren, useState } from 'react';
|
|
||||||
import {
|
import { useStore } from '../../../hooks/useStore';
|
||||||
useAddProjectMemberMutation,
|
|
||||||
useGetAllUsersQuery,
|
|
||||||
} from '../../../services/mainApi';
|
|
||||||
|
|
||||||
type TAddUserToProjectDialog = {
|
type TAddUserToProjectDialog = {
|
||||||
projectId: number;
|
projectId: number;
|
||||||
} & PropsWithChildren;
|
} & PropsWithChildren;
|
||||||
|
|
||||||
export default function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
|
function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
|
||||||
const { projectId, children } = props;
|
const { projectId, children } = props;
|
||||||
const { data: users, isLoading, error, refetch } = useGetAllUsersQuery({});
|
|
||||||
const [addProjectMember, { isLoading: isAdding }] =
|
|
||||||
useAddProjectMemberMutation();
|
|
||||||
const [selectedUserId, setSelectedUserId] = useState<number | null>(null);
|
const [selectedUserId, setSelectedUserId] = useState<number | null>(null);
|
||||||
|
|
||||||
|
const store = useStore();
|
||||||
|
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
store.authStore.fetchAllUsers();
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleAddUser = async () => {
|
const handleAddUser = async () => {
|
||||||
if (selectedUserId) {
|
if (selectedUserId) {
|
||||||
try {
|
try {
|
||||||
await addProjectMember({
|
await store.mainStore.addProjectMember(projectId.toString(), selectedUserId.toString());
|
||||||
projectId,
|
|
||||||
memberId: selectedUserId,
|
|
||||||
}).unwrap();
|
|
||||||
setSelectedUserId(null);
|
setSelectedUserId(null);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to add user:', err);
|
console.error('Failed to add user:', err);
|
||||||
@ -30,9 +30,12 @@ export default function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const isLoading = store.authStore.isLoading;
|
||||||
|
const error = store.authStore.error;
|
||||||
|
const users = store.authStore.allUsers;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog.Root onOpenChange={() => refetch()}>
|
<Dialog.Root>
|
||||||
<Dialog.Trigger>{children}</Dialog.Trigger>
|
<Dialog.Trigger>{children}</Dialog.Trigger>
|
||||||
|
|
||||||
<Dialog.Content maxWidth="450px">
|
<Dialog.Content maxWidth="450px">
|
||||||
@ -42,26 +45,21 @@ export default function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
|
|||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<span>Loading users...</span>
|
<span>Loading users...</span>
|
||||||
) : error ? (
|
) : error ? (
|
||||||
<span>Error loading users.</span>
|
<span>Error loading users: {error}</span>
|
||||||
) : (
|
) : (
|
||||||
<Select.Root
|
<Select.Root
|
||||||
value={selectedUserId?.toString() || ''}
|
value={selectedUserId?.toString() || ''}
|
||||||
onValueChange={(value) =>
|
onValueChange={(value) => setSelectedUserId(Number(value))}
|
||||||
setSelectedUserId(Number(value))
|
|
||||||
}
|
|
||||||
required
|
required
|
||||||
>
|
>
|
||||||
<Select.Trigger aria-label="User">
|
<Select.Trigger aria-label="User">
|
||||||
{selectedUserId
|
{selectedUserId
|
||||||
? users?.find(
|
? users?.find((user: any) => user.id === selectedUserId)?.username
|
||||||
(user: any) =>
|
|
||||||
user.id === selectedUserId,
|
|
||||||
)?.username
|
|
||||||
: 'Select a user'}
|
: 'Select a user'}
|
||||||
</Select.Trigger>
|
</Select.Trigger>
|
||||||
<Select.Content>
|
<Select.Content>
|
||||||
{users?.map((user: any) => (
|
{users?.map((user: any) => (
|
||||||
<Select.Item key={user.id} value={user.id}>
|
<Select.Item key={user.id} value={user.id.toString()}>
|
||||||
{user.username}
|
{user.username}
|
||||||
</Select.Item>
|
</Select.Item>
|
||||||
))}
|
))}
|
||||||
@ -76,13 +74,10 @@ export default function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
|
|||||||
Cancel
|
Cancel
|
||||||
</Button>
|
</Button>
|
||||||
</Dialog.Close>
|
</Dialog.Close>
|
||||||
|
|
||||||
<Dialog.Close>
|
<Dialog.Close>
|
||||||
<Button
|
<Button color="green" onClick={handleAddUser} disabled={!selectedUserId || isLoading}>
|
||||||
color="green"
|
{isLoading ? 'Adding...' : 'Add'}
|
||||||
onClick={handleAddUser}
|
|
||||||
disabled={!selectedUserId || isAdding}
|
|
||||||
>
|
|
||||||
{isAdding ? 'Adding...' : 'Add'}
|
|
||||||
</Button>
|
</Button>
|
||||||
</Dialog.Close>
|
</Dialog.Close>
|
||||||
</Flex>
|
</Flex>
|
||||||
@ -90,3 +85,5 @@ export default function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
|
|||||||
</Dialog.Root>
|
</Dialog.Root>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default observer(AddUserToProjectDialog);
|
||||||
|
|||||||
4
cool_todo_manager/src/context.ts
Normal file
4
cool_todo_manager/src/context.ts
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { appStore } from "./stores/AppStore";
|
||||||
|
|
||||||
|
export const Ctx = React.createContext(appStore);
|
||||||
8
cool_todo_manager/src/hooks/useStore.tsx
Normal file
8
cool_todo_manager/src/hooks/useStore.tsx
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
import { useContext } from "react";
|
||||||
|
import { Ctx } from "../context";
|
||||||
|
|
||||||
|
export function useStore() {
|
||||||
|
const store = useContext(Ctx)
|
||||||
|
|
||||||
|
return store;
|
||||||
|
}
|
||||||
@ -1,3 +1,5 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { observer } from 'mobx-react-lite';
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
Button,
|
Button,
|
||||||
@ -8,18 +10,24 @@ import {
|
|||||||
TextField,
|
TextField,
|
||||||
} from '@radix-ui/themes';
|
} from '@radix-ui/themes';
|
||||||
import { Form } from 'radix-ui';
|
import { Form } from 'radix-ui';
|
||||||
import { useState } from 'react';
|
|
||||||
import { useLoginMutation } from '../../../services/mainApi';
|
|
||||||
|
|
||||||
export default function LoginPage() {
|
// Импортируем store.authStore
|
||||||
const [login, { isError }] = useLoginMutation();
|
import { useStore } from '../../../hooks/useStore';
|
||||||
|
|
||||||
|
|
||||||
|
function LoginPage() {
|
||||||
const [username, setUsername] = useState('');
|
const [username, setUsername] = useState('');
|
||||||
const [password, setPassword] = useState('');
|
const [password, setPassword] = useState('');
|
||||||
|
|
||||||
const submitHandler = (e: React.FormEvent<HTMLFormElement>) => {
|
const store = useStore();
|
||||||
|
// В RTK Query было: [login, { isError } ] = useLoginMutation();
|
||||||
|
// Теперь берем store.authStore.error, store.authStore.isLoading
|
||||||
|
const isError = !!store.authStore.error;
|
||||||
|
const isLoading = store.authStore.isLoading;
|
||||||
|
|
||||||
|
const submitHandler = async (e: React.FormEvent<HTMLFormElement>) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
login({ username, password });
|
await store.authStore.login({ username, password }).catch(() => {});
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -29,15 +37,11 @@ export default function LoginPage() {
|
|||||||
Login
|
Login
|
||||||
</Heading>
|
</Heading>
|
||||||
|
|
||||||
<Form.Root
|
<Form.Root className="flex flex-col gap-4" onSubmit={submitHandler}>
|
||||||
className="flex flex-col gap-4"
|
|
||||||
onSubmit={submitHandler}
|
|
||||||
>
|
|
||||||
<Form.Field name="email">
|
<Form.Field name="email">
|
||||||
<Form.Message match={'valueMissing'}>
|
<Form.Message match={'valueMissing'}>
|
||||||
<Text>Username is required</Text>
|
<Text>Username is required</Text>
|
||||||
</Form.Message>
|
</Form.Message>
|
||||||
|
|
||||||
<Form.Control asChild>
|
<Form.Control asChild>
|
||||||
<TextField.Root
|
<TextField.Root
|
||||||
type="text"
|
type="text"
|
||||||
@ -54,7 +58,6 @@ export default function LoginPage() {
|
|||||||
<Form.Message match="valueMissing">
|
<Form.Message match="valueMissing">
|
||||||
<Text>Password is required</Text>
|
<Text>Password is required</Text>
|
||||||
</Form.Message>
|
</Form.Message>
|
||||||
|
|
||||||
<Form.Control asChild>
|
<Form.Control asChild>
|
||||||
<TextField.Root
|
<TextField.Root
|
||||||
type="password"
|
type="password"
|
||||||
@ -68,14 +71,11 @@ export default function LoginPage() {
|
|||||||
</Form.Field>
|
</Form.Field>
|
||||||
|
|
||||||
{isError && (
|
{isError && (
|
||||||
<Text>{'Unable to login. Please try again.'}</Text>
|
<Text>{store.authStore.error || 'Unable to login. Please try again.'}</Text>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Button
|
<Button type="submit" className="mt-4" disabled={isLoading}>
|
||||||
// onClick={(e) => e.preventDefault()}
|
{isLoading ? 'Loading...' : 'Sign In'}
|
||||||
className="mt-4"
|
|
||||||
>
|
|
||||||
Sign In
|
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Box className='w-full !flex justify-center'>
|
<Box className='w-full !flex justify-center'>
|
||||||
@ -88,3 +88,5 @@ export default function LoginPage() {
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default observer(LoginPage);
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { observer } from 'mobx-react-lite';
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
Button,
|
Button,
|
||||||
@ -8,17 +10,23 @@ import {
|
|||||||
TextField,
|
TextField,
|
||||||
} from '@radix-ui/themes';
|
} from '@radix-ui/themes';
|
||||||
import { Form } from 'radix-ui';
|
import { Form } from 'radix-ui';
|
||||||
import { useState } from 'react';
|
|
||||||
import { useRegisterMutation } from '../../../services/mainApi';
|
|
||||||
|
|
||||||
export default function RegisterPage() {
|
// Импортируем store.authStore
|
||||||
const [register, { isLoading, error }] = useRegisterMutation();
|
import { useStore } from '../../../hooks/useStore';
|
||||||
|
|
||||||
|
|
||||||
|
function RegisterPage() {
|
||||||
const [formData, setFormData] = useState({
|
const [formData, setFormData] = useState({
|
||||||
username: '',
|
username: '',
|
||||||
email: '',
|
email: '',
|
||||||
password: '',
|
password: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const store = useStore();
|
||||||
|
|
||||||
|
const isLoading = store.authStore.isLoading;
|
||||||
|
const error = store.authStore.error;
|
||||||
|
|
||||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
@ -29,7 +37,7 @@ export default function RegisterPage() {
|
|||||||
const handleSubmit = async (e: React.FormEvent) => {
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
try {
|
try {
|
||||||
await register(formData).unwrap();
|
await store.authStore.register(formData);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to register:', err);
|
console.error('Failed to register:', err);
|
||||||
}
|
}
|
||||||
@ -40,15 +48,11 @@ export default function RegisterPage() {
|
|||||||
<Heading size="4" className="text-center !mb-2">
|
<Heading size="4" className="text-center !mb-2">
|
||||||
Register
|
Register
|
||||||
</Heading>
|
</Heading>
|
||||||
<Form.Root
|
<Form.Root className="flex flex-col gap-4" onSubmit={handleSubmit}>
|
||||||
className="flex flex-col gap-4"
|
|
||||||
onSubmit={handleSubmit}
|
|
||||||
>
|
|
||||||
<Form.Field name="username">
|
<Form.Field name="username">
|
||||||
<Form.Message match="valueMissing">
|
<Form.Message match="valueMissing">
|
||||||
<Text>Username is required</Text>
|
<Text>Username is required</Text>
|
||||||
</Form.Message>
|
</Form.Message>
|
||||||
|
|
||||||
<Form.Control asChild>
|
<Form.Control asChild>
|
||||||
<TextField.Root
|
<TextField.Root
|
||||||
type="text"
|
type="text"
|
||||||
@ -67,11 +71,9 @@ export default function RegisterPage() {
|
|||||||
<Form.Message match="valueMissing">
|
<Form.Message match="valueMissing">
|
||||||
<Text>Email is required</Text>
|
<Text>Email is required</Text>
|
||||||
</Form.Message>
|
</Form.Message>
|
||||||
|
|
||||||
<Form.Message match="typeMismatch">
|
<Form.Message match="typeMismatch">
|
||||||
<Text>Email is not valid</Text>
|
<Text>Email is not valid</Text>
|
||||||
</Form.Message>
|
</Form.Message>
|
||||||
|
|
||||||
<Form.Control asChild>
|
<Form.Control asChild>
|
||||||
<TextField.Root
|
<TextField.Root
|
||||||
type="email"
|
type="email"
|
||||||
@ -90,10 +92,10 @@ export default function RegisterPage() {
|
|||||||
<Form.Message match="valueMissing">
|
<Form.Message match="valueMissing">
|
||||||
<Text>Password is required</Text>
|
<Text>Password is required</Text>
|
||||||
</Form.Message>
|
</Form.Message>
|
||||||
|
|
||||||
<Form.Control asChild>
|
<Form.Control asChild>
|
||||||
<TextField.Root
|
<TextField.Root
|
||||||
type="password"
|
type="password"
|
||||||
|
name="password"
|
||||||
placeholder="Password"
|
placeholder="Password"
|
||||||
required
|
required
|
||||||
value={formData.password}
|
value={formData.password}
|
||||||
@ -105,12 +107,12 @@ export default function RegisterPage() {
|
|||||||
</Form.Field>
|
</Form.Field>
|
||||||
|
|
||||||
<Button type="submit" disabled={isLoading} className="mt-4">
|
<Button type="submit" disabled={isLoading} className="mt-4">
|
||||||
Register
|
{isLoading ? 'Loading...' : 'Register'}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<Box className="text-red-500">
|
<Box className="text-red-500">
|
||||||
<Text>Error registering user.</Text>
|
<Text>Error registering user: {error}</Text>
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@ -123,3 +125,5 @@ export default function RegisterPage() {
|
|||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default observer(RegisterPage);
|
||||||
|
|||||||
@ -1,10 +1,14 @@
|
|||||||
import { Box } from '@radix-ui/themes'
|
import { Box } from '@radix-ui/themes'
|
||||||
|
import { observer } from 'mobx-react-lite'
|
||||||
import { Outlet } from 'react-router-dom'
|
import { Outlet } from 'react-router-dom'
|
||||||
|
|
||||||
export default function MainPage() {
|
const MainPage = observer(() => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box className='size-full'>
|
<Box className='size-full'>
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
}
|
})
|
||||||
|
|
||||||
|
export default MainPage
|
||||||
@ -1,231 +0,0 @@
|
|||||||
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
|
|
||||||
|
|
||||||
export const mainApi = createApi({
|
|
||||||
reducerPath: 'api',
|
|
||||||
baseQuery: fetchBaseQuery({
|
|
||||||
baseUrl: 'http://109.107.166.17:5000/api/',
|
|
||||||
prepareHeaders: (headers) => {
|
|
||||||
headers.set(
|
|
||||||
'Authorization',
|
|
||||||
`Bearer ${localStorage.getItem('token')}`,
|
|
||||||
);
|
|
||||||
return headers;
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
tagTypes: ['Task', 'Project', 'ProjectMembers'],
|
|
||||||
endpoints: (builder) => ({
|
|
||||||
getTasks: builder.query<string[], void>({
|
|
||||||
query: () => ({
|
|
||||||
url: 'tasks',
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
providesTags: (result) =>
|
|
||||||
result
|
|
||||||
? [
|
|
||||||
...result.map((task) => ({
|
|
||||||
type: 'Task' as const,
|
|
||||||
id: task,
|
|
||||||
})),
|
|
||||||
{ type: 'Task', id: 'LIST' },
|
|
||||||
]
|
|
||||||
: [{ type: 'Task', id: 'LIST' }],
|
|
||||||
}),
|
|
||||||
getTasksForGroup: builder.query<any[], string>({
|
|
||||||
query: (id: string) => ({
|
|
||||||
url: `tasks/project/${id}`,
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
providesTags: (result) =>
|
|
||||||
result
|
|
||||||
? [
|
|
||||||
...result.map((task) => ({
|
|
||||||
type: 'Task' as const,
|
|
||||||
id: task,
|
|
||||||
})),
|
|
||||||
{ type: 'Task', id: 'LIST' },
|
|
||||||
]
|
|
||||||
: [{ type: 'Task', id: 'LIST' }],
|
|
||||||
}),
|
|
||||||
getTask: builder.query<string, string>({
|
|
||||||
query: (id) => ({
|
|
||||||
url: `tasks/${id}`,
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
providesTags: (result, error, id) => [{ type: 'Task', id }],
|
|
||||||
}),
|
|
||||||
updateTask: builder.mutation({
|
|
||||||
query: (task) => ({
|
|
||||||
url: `tasks/${task.id}`,
|
|
||||||
method: 'PATCH',
|
|
||||||
body: { status: task.status },
|
|
||||||
}),
|
|
||||||
invalidatesTags: (result, error, id) => [{ type: 'Task', id }],
|
|
||||||
}),
|
|
||||||
deleteTask: builder.mutation({
|
|
||||||
query: (id) => ({
|
|
||||||
url: `tasks/${id}`,
|
|
||||||
method: 'DELETE',
|
|
||||||
}),
|
|
||||||
invalidatesTags: (result, error, id) => [{ type: 'Task', id }],
|
|
||||||
}),
|
|
||||||
createTask: builder.mutation({
|
|
||||||
query: (newTask) => ({
|
|
||||||
url: 'tasks/create',
|
|
||||||
method: 'POST',
|
|
||||||
body: newTask,
|
|
||||||
}),
|
|
||||||
invalidatesTags: [{ type: 'Task', id: 'LIST' }],
|
|
||||||
}),
|
|
||||||
|
|
||||||
// PROJECTS
|
|
||||||
createProject: builder.mutation({
|
|
||||||
query: (newProject) => ({
|
|
||||||
url: 'projects/create',
|
|
||||||
method: 'POST',
|
|
||||||
body: newProject,
|
|
||||||
}),
|
|
||||||
invalidatesTags: [{ type: 'Project', id: 'LIST' }],
|
|
||||||
}),
|
|
||||||
getProjects: builder.query({
|
|
||||||
query: () => ({
|
|
||||||
url: 'projects/my',
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
providesTags: (result, error, id) => [
|
|
||||||
{ type: 'Project', id: 'LIST' },
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
getProject: builder.query({
|
|
||||||
query: (id) => ({
|
|
||||||
url: `projects/${id}`,
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
providesTags: (result, error, id) => [{ type: 'Project', id }],
|
|
||||||
}),
|
|
||||||
updateProject: builder.mutation({
|
|
||||||
query: ({ id, project }) => ({
|
|
||||||
url: `projects/${id}`,
|
|
||||||
method: 'PATCH',
|
|
||||||
body: project,
|
|
||||||
}),
|
|
||||||
invalidatesTags: (result, error, id) => [{ type: 'Project', id }],
|
|
||||||
}),
|
|
||||||
deleteProject: builder.mutation({
|
|
||||||
query: (id) => ({
|
|
||||||
url: `projects/${id}`,
|
|
||||||
method: 'DELETE',
|
|
||||||
}),
|
|
||||||
invalidatesTags: (result, error, id) => [
|
|
||||||
{ type: 'Project', id: 'LIST' },
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
|
|
||||||
// PROJECT MEMBERS
|
|
||||||
addProjectMember: builder.mutation({
|
|
||||||
query: ({ projectId, memberId }) => ({
|
|
||||||
url: `projects/${projectId}/members/add`,
|
|
||||||
method: 'POST',
|
|
||||||
body: { userId: memberId, role: '' },
|
|
||||||
}),
|
|
||||||
invalidatesTags: (result, error, args) => [
|
|
||||||
{ type: 'ProjectMembers', id: 'LIST' },
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
getProjectMembers: builder.query({
|
|
||||||
query: (id) => ({
|
|
||||||
url: `projects/${id}/members`,
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
providesTags: (result, error, args) => [
|
|
||||||
{ type: 'ProjectMembers', id: 'LIST' },
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
removeProjectMember: builder.mutation({
|
|
||||||
query: ({ projectId, memberId }) => ({
|
|
||||||
url: `projects/${projectId}/members/remove`,
|
|
||||||
method: 'DELETE',
|
|
||||||
body: { userId: memberId },
|
|
||||||
}),
|
|
||||||
invalidatesTags: (result, error, id) => [
|
|
||||||
{ type: 'ProjectMembers', id: 'LIST' },
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const authApi = createApi({
|
|
||||||
reducerPath: 'authApi',
|
|
||||||
baseQuery: fetchBaseQuery({
|
|
||||||
baseUrl: 'http://109.107.166.17:4000/api/',
|
|
||||||
}),
|
|
||||||
endpoints: (builder) => ({
|
|
||||||
login: builder.mutation({
|
|
||||||
query: (credentials) => ({
|
|
||||||
url: '/auth/login',
|
|
||||||
method: 'POST',
|
|
||||||
body: credentials,
|
|
||||||
}),
|
|
||||||
async onQueryStarted(arg, { queryFulfilled }) {
|
|
||||||
try {
|
|
||||||
const response = await queryFulfilled;
|
|
||||||
if (response.data.access_token) {
|
|
||||||
localStorage.setItem(
|
|
||||||
'token',
|
|
||||||
response.data.access_token,
|
|
||||||
);
|
|
||||||
if (response.meta?.response?.status === 201)
|
|
||||||
window.location.href = '/';
|
|
||||||
}
|
|
||||||
} catch (error) {}
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
register: builder.mutation({
|
|
||||||
query: (credentials) => ({
|
|
||||||
url: '/auth/register',
|
|
||||||
method: 'POST',
|
|
||||||
body: credentials,
|
|
||||||
}),
|
|
||||||
onQueryStarted: async (arg, { queryFulfilled }) => {
|
|
||||||
try {
|
|
||||||
const response = await queryFulfilled;
|
|
||||||
if (response.meta?.response?.status === 201)
|
|
||||||
window.location.href = '/login';
|
|
||||||
} catch (error) {}
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
|
|
||||||
// USERS
|
|
||||||
getAllUsers: builder.query({
|
|
||||||
query: () => ({
|
|
||||||
url: '/users',
|
|
||||||
method: 'GET',
|
|
||||||
}),
|
|
||||||
keepUnusedDataFor: 0,
|
|
||||||
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const { useLoginMutation, useRegisterMutation, useGetAllUsersQuery } =
|
|
||||||
authApi;
|
|
||||||
|
|
||||||
export const {
|
|
||||||
useGetTasksQuery,
|
|
||||||
useCreateTaskMutation,
|
|
||||||
useUpdateTaskMutation,
|
|
||||||
useDeleteTaskMutation,
|
|
||||||
useGetTasksForGroupQuery,
|
|
||||||
} = mainApi;
|
|
||||||
|
|
||||||
export const {
|
|
||||||
useGetProjectsQuery,
|
|
||||||
useCreateProjectMutation,
|
|
||||||
useUpdateProjectMutation,
|
|
||||||
useDeleteProjectMutation,
|
|
||||||
} = mainApi;
|
|
||||||
|
|
||||||
export const {
|
|
||||||
useRemoveProjectMemberMutation,
|
|
||||||
useAddProjectMemberMutation,
|
|
||||||
useGetProjectMembersQuery,
|
|
||||||
} = mainApi;
|
|
||||||
15
cool_todo_manager/src/stores/AppStore.ts
Normal file
15
cool_todo_manager/src/stores/AppStore.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { makeAutoObservable } from 'mobx';
|
||||||
|
import { MainStore } from './MainStore';
|
||||||
|
import { AuthStore } from './AuthStore';
|
||||||
|
|
||||||
|
export class AppStore {
|
||||||
|
mainStore: MainStore
|
||||||
|
authStore: AuthStore
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.mainStore = new MainStore(this)
|
||||||
|
this.authStore = new AuthStore(this)
|
||||||
|
makeAutoObservable(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export const appStore = new AppStore()
|
||||||
95
cool_todo_manager/src/stores/AuthStore.ts
Normal file
95
cool_todo_manager/src/stores/AuthStore.ts
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
import { makeAutoObservable, runInAction } from 'mobx';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { AppStore } from './AppStore';
|
||||||
|
|
||||||
|
|
||||||
|
export class AuthStore {
|
||||||
|
appStore: AppStore
|
||||||
|
|
||||||
|
isLoading = false;
|
||||||
|
error: string | null = null;
|
||||||
|
|
||||||
|
allUsers: any[] = [];
|
||||||
|
|
||||||
|
constructor(appStore:any) {
|
||||||
|
this.appStore = appStore
|
||||||
|
makeAutoObservable(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
get token() {
|
||||||
|
return localStorage.getItem('token') || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
async login(credentials: { username: string; password: string }) {
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
try {
|
||||||
|
const response = await axios.post(
|
||||||
|
'http://109.107.166.17:4000/api/auth/login',
|
||||||
|
credentials,
|
||||||
|
);
|
||||||
|
|
||||||
|
runInAction(() => {
|
||||||
|
if (response.data.access_token) {
|
||||||
|
localStorage.setItem('token', response.data.access_token);
|
||||||
|
window.location.href = '/';
|
||||||
|
}
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при логине';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async register(credentials: { username: string; password: string }) {
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
try {
|
||||||
|
const response = await axios.post(
|
||||||
|
'http://109.107.166.17:4000/api/auth/register',
|
||||||
|
credentials,
|
||||||
|
);
|
||||||
|
|
||||||
|
runInAction(() => {
|
||||||
|
if (response.status === 201) {
|
||||||
|
window.location.href = '/login';
|
||||||
|
}
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при регистрации';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchAllUsers(force = false) {
|
||||||
|
if (this.allUsers.length && !force) {
|
||||||
|
return this.allUsers;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await axios.get('http://109.107.166.17:4000/api/users');
|
||||||
|
runInAction(() => {
|
||||||
|
this.allUsers = response.data;
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
return this.allUsers;
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при получении пользователей';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
323
cool_todo_manager/src/stores/MainStore.ts
Normal file
323
cool_todo_manager/src/stores/MainStore.ts
Normal file
@ -0,0 +1,323 @@
|
|||||||
|
import { makeAutoObservable, runInAction } from 'mobx';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { AppStore } from './AppStore';
|
||||||
|
|
||||||
|
export class MainStore {
|
||||||
|
appStore: AppStore
|
||||||
|
|
||||||
|
isLoading = false;
|
||||||
|
error: string | null = null;
|
||||||
|
|
||||||
|
|
||||||
|
tasks: any[] = [];
|
||||||
|
tasksByProject = new Map<string, any[]>();
|
||||||
|
|
||||||
|
projects: any[] = [];
|
||||||
|
projectById = new Map<string, any>();
|
||||||
|
projectMembersById = new Map<string, any[]>();
|
||||||
|
|
||||||
|
constructor(appStore:any) {
|
||||||
|
this.appStore = appStore
|
||||||
|
makeAutoObservable(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
get token() {
|
||||||
|
return localStorage.getItem('token') || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
get headers() {
|
||||||
|
return {
|
||||||
|
Authorization: `Bearer ${this.token}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchTasksForGroup(projectId: string, force = false) {
|
||||||
|
if (this.tasksByProject.has(projectId) && !force) {
|
||||||
|
return this.tasksByProject.get(projectId);
|
||||||
|
}
|
||||||
|
console.log(`This is tasks for ${projectId}`);
|
||||||
|
|
||||||
|
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
try {
|
||||||
|
const response = await axios.get(
|
||||||
|
`http://109.107.166.17:5000/api/tasks/project/${projectId}`,
|
||||||
|
{
|
||||||
|
headers: this.headers,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
runInAction(() => {
|
||||||
|
this.tasksByProject.set(projectId, response.data);
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
return response.data;
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при загрузке задач группы';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchTask(taskId: string) {
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
try {
|
||||||
|
const response = await axios.get(
|
||||||
|
`http://109.107.166.17:5000/api/tasks/${taskId}`,
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
return response.data;
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при загрузке задачи';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
runInAction(() => {
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async createTask(newTask: any) {
|
||||||
|
try {
|
||||||
|
const response = await axios.post(
|
||||||
|
'http://109.107.166.17:5000/api/tasks/create',
|
||||||
|
newTask,
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
const createdTask = response.data;
|
||||||
|
this.tasks.push(createdTask);
|
||||||
|
const oldTasks = this.tasksByProject.get(newTask.projectId) ?? [];
|
||||||
|
this.tasksByProject.set(newTask.projectId, [...oldTasks, createdTask]);
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при создании задачи';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateTask(task: { id: string; status: string }) {
|
||||||
|
try {
|
||||||
|
const response = await axios.patch(
|
||||||
|
`http://109.107.166.17:5000/api/tasks/${task.id}`,
|
||||||
|
{ status: task.status },
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
runInAction(() => {
|
||||||
|
const index = this.tasks.findIndex((t) => t.id === task.id);
|
||||||
|
if (index !== -1) {
|
||||||
|
this.tasks[index].status = task.status;
|
||||||
|
}
|
||||||
|
const projectId = response.data.project.id;
|
||||||
|
const oldArray = this.tasksByProject.get(projectId) || [];
|
||||||
|
const indexInMap = oldArray.findIndex((t) => t.id === +task.id);
|
||||||
|
if (indexInMap !== -1) {
|
||||||
|
oldArray[indexInMap].status = task.status;
|
||||||
|
this.tasksByProject.set(projectId, [...oldArray]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при обновлении задачи';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async deleteTask(taskId: string) {
|
||||||
|
try {
|
||||||
|
await axios.delete(`http://109.107.166.17:5000/api/tasks/${taskId}`, {
|
||||||
|
headers: this.headers,
|
||||||
|
});
|
||||||
|
// Удаляем локально
|
||||||
|
runInAction(() => {
|
||||||
|
this.tasks = this.tasks.filter((t) => t.id !== taskId);
|
||||||
|
});
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при удалении задачи';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async fetchProjects(force = false) {
|
||||||
|
if (this.projects.length && !force) {
|
||||||
|
return this.projects;
|
||||||
|
}
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await axios.get(
|
||||||
|
'http://109.107.166.17:5000/api/projects/my',
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
runInAction(() => {
|
||||||
|
this.projects = response.data;
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
return this.projects;
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при получении проектов';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchProject(projectId: string) {
|
||||||
|
if (this.projectById.has(projectId)) {
|
||||||
|
return this.projectById.get(projectId);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
try {
|
||||||
|
const response = await axios.get(
|
||||||
|
`http://109.107.166.17:5000/api/projects/${projectId}`,
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
runInAction(() => {
|
||||||
|
this.projectById.set(projectId, response.data);
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
return response.data;
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при получении проекта';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async createProject(newProject: any) {
|
||||||
|
try {
|
||||||
|
const response = await axios.post(
|
||||||
|
'http://109.107.166.17:5000/api/projects/create',
|
||||||
|
newProject,
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
const created = response.data;
|
||||||
|
runInAction(() => {
|
||||||
|
this.projects.push(created);
|
||||||
|
});
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при создании проекта';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateProject(id: string, projectData: any) {
|
||||||
|
try {
|
||||||
|
await axios.patch(
|
||||||
|
`http://109.107.166.17:5000/api/projects/${id}`,
|
||||||
|
projectData,
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
this.fetchProjects(true);
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при обновлении проекта';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteProject(id: string) {
|
||||||
|
try {
|
||||||
|
await axios.delete(`http://109.107.166.17:5000/api/projects/${id}`, {
|
||||||
|
headers: this.headers,
|
||||||
|
});
|
||||||
|
// Удаляем локально
|
||||||
|
runInAction(() => {
|
||||||
|
this.projects = this.projects.filter((p) => p.id !== id);
|
||||||
|
});
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при удалении проекта';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async addProjectMember(projectId: string, memberId: string) {
|
||||||
|
try {
|
||||||
|
await axios.post(
|
||||||
|
`http://109.107.166.17:5000/api/projects/${projectId}/members/add`,
|
||||||
|
{
|
||||||
|
userId: memberId,
|
||||||
|
role: '',
|
||||||
|
},
|
||||||
|
{ headers: this.headers },
|
||||||
|
);
|
||||||
|
this.projectMembersById.delete(projectId);
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при добавлении участника';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
async fetchProjectMembers(projectId: string, force = false) {
|
||||||
|
if (this.projectMembersById.has(projectId) && !force) {
|
||||||
|
return this.projectMembersById.get(projectId);
|
||||||
|
}
|
||||||
|
this.isLoading = true;
|
||||||
|
this.error = null;
|
||||||
|
try {
|
||||||
|
const response = await axios.get(
|
||||||
|
`http://109.107.166.17:5000/api/projects/${projectId}/members`,
|
||||||
|
{
|
||||||
|
headers: this.headers,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
runInAction(() => {
|
||||||
|
this.projectMembersById.set(projectId, response.data);
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
return response.data;
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при получении участников проекта';
|
||||||
|
this.isLoading = false;
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async removeProjectMember(projectId: string, memberId: string) {
|
||||||
|
try {
|
||||||
|
await axios.delete(
|
||||||
|
`http://109.107.166.17:5000/api/projects/${projectId}/members/remove`,
|
||||||
|
{
|
||||||
|
data: { userId: memberId },
|
||||||
|
headers: this.headers,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
this.projectMembersById.delete(projectId);
|
||||||
|
} catch (error: any) {
|
||||||
|
runInAction(() => {
|
||||||
|
this.error = error?.response?.data?.message || 'Ошибка при удалении участника';
|
||||||
|
});
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user