neki/Cool_TODO_manager
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: neki:mobx
Branches Tags
neki:develop
neki:feature/webpack-shit
neki:mobx
neki:nginxSetup
neki:master
..
compare: neki:develop
Branches Tags
neki:feature/webpack-shit
neki:mobx
neki:nginxSetup
neki:develop
neki:master

2 Commits
mobx ... develop

Author SHA1 Message Date
tarasovne
4f1dd5eb7a Merge pull request 'feature/SPA' (#10) from feature/SPA into develop 
Reviewed-on: #10
 2025-03-22 18:31:22 +00:00
tarasov-ne
1fa3dde153 delfakesrc 2025-03-22 21:30:42 +03:00
26 changed files with 567 additions and 884 deletions
Show Stats Expand all files Collapse all files

18
backend/tasks-projects-service/data-source.ts
View File

@ -1,18 +0,0 @@
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);

44
backend/tasks-projects-service/src/migrations/1741411693560-InitialMigration.ts
View File

@ -1,44 +0,0 @@
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`);
}
}

7
backend/tasks-projects-service/src/projects/projects.controller.ts
View File

@ -44,15 +44,14 @@ export class ProjectsController {
return this.projectsService.findAll(); return this.projectsService.findAll();
} }
@ApiOperation({ summary: 'Get all projects where I participate' }) @ApiOperation({ summary: 'Get my projects' })
@ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true }) @ApiResponse({ status: 200, description: 'List of projects', type: Project, isArray: true })
@UseGuards(JwtAuthGuard) @UseGuards(JwtAuthGuard)
@Get('my') @Get('my')
async findUserProjects(@Request() req): Promise<Project[]> { async findMyProjects(@Request() req): Promise<Project[]> {
return this.projectsService.findUserProjects(req.user.sub); return this.projectsService.findByOwner(req.user.sub);
} }
@ApiOperation({ summary: 'Get single project by ID' }) @ApiOperation({ summary: 'Get single project by ID' })
@ApiParam({ name: 'id', type: 'number' }) @ApiParam({ name: 'id', type: 'number' })
@ApiResponse({ status: 200, description: 'Found project', type: Project }) @ApiResponse({ status: 200, description: 'Found project', type: Project })

8
backend/tasks-projects-service/src/projects/projects.service.ts
View File

@ -29,14 +29,6 @@ export class ProjectsService {
return this.projectsRepository.find({ where: { ownerId } }); 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> { async findOneById(id: number): Promise<Project | null> {
return this.projectsRepository.findOne({ where: { id } }); return this.projectsRepository.findOne({ where: { id } });
} }

19
backend/users-auth-service/data-source.ts
View File

@ -1,19 +0,0 @@
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);

2
backend/users-auth-service/src/auth/auth.controller.ts
View File

@ -46,7 +46,7 @@ export class AuthController {
description: 'User created successfully', description: 'User created successfully',
}) })
@ApiResponse({ @ApiResponse({
status: 401, status: 409,
description: 'Username already exists', description: 'Username already exists',
}) })
@Post('register') @Post('register')

325
cool_todo_manager/package-lock.json generated
View File

@ -16,11 +16,9 @@
"@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.8.4", "axios": "^1.7.9",
"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",
@ -219,13 +217,14 @@
} }
}, },
"node_modules/@babel/helpers": { "node_modules/@babel/helpers": {
"version": "7.26.10", "version": "7.26.9",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
"integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@babel/template": "^7.26.9", "@babel/template": "^7.26.9",
"@babel/types": "^7.26.10" "@babel/types": "^7.26.9"
}, },
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
@ -280,9 +279,10 @@
} }
}, },
"node_modules/@babel/runtime": { "node_modules/@babel/runtime": {
"version": "7.26.10", "version": "7.26.9",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
"integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
"license": "MIT",
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.14.0" "regenerator-runtime": "^0.14.0"
}, },
@ -335,10 +335,11 @@
} }
}, },
"node_modules/@babel/types": { "node_modules/@babel/types": {
"version": "7.26.10", "version": "7.26.9",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
"integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
"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"
@ -348,12 +349,13 @@
} }
}, },
"node_modules/@esbuild/aix-ppc64": { "node_modules/@esbuild/aix-ppc64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
"integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==", "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
"cpu": [ "cpu": [
"ppc64" "ppc64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"aix" "aix"
@ -363,12 +365,13 @@
} }
}, },
"node_modules/@esbuild/android-arm": { "node_modules/@esbuild/android-arm": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
"integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==", "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"android" "android"
@ -378,12 +381,13 @@
} }
}, },
"node_modules/@esbuild/android-arm64": { "node_modules/@esbuild/android-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
"integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==", "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"android" "android"
@ -393,12 +397,13 @@
} }
}, },
"node_modules/@esbuild/android-x64": { "node_modules/@esbuild/android-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
"integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==", "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"android" "android"
@ -408,12 +413,13 @@
} }
}, },
"node_modules/@esbuild/darwin-arm64": { "node_modules/@esbuild/darwin-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
"integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==", "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"darwin" "darwin"
@ -423,12 +429,13 @@
} }
}, },
"node_modules/@esbuild/darwin-x64": { "node_modules/@esbuild/darwin-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
"integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==", "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"darwin" "darwin"
@ -438,12 +445,13 @@
} }
}, },
"node_modules/@esbuild/freebsd-arm64": { "node_modules/@esbuild/freebsd-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
"integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==", "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"freebsd" "freebsd"
@ -453,12 +461,13 @@
} }
}, },
"node_modules/@esbuild/freebsd-x64": { "node_modules/@esbuild/freebsd-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
"integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==", "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"freebsd" "freebsd"
@ -468,12 +477,13 @@
} }
}, },
"node_modules/@esbuild/linux-arm": { "node_modules/@esbuild/linux-arm": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
"integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==", "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -483,12 +493,13 @@
} }
}, },
"node_modules/@esbuild/linux-arm64": { "node_modules/@esbuild/linux-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
"integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==", "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -498,12 +509,13 @@
} }
}, },
"node_modules/@esbuild/linux-ia32": { "node_modules/@esbuild/linux-ia32": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
"integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==", "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
"cpu": [ "cpu": [
"ia32" "ia32"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -513,12 +525,13 @@
} }
}, },
"node_modules/@esbuild/linux-loong64": { "node_modules/@esbuild/linux-loong64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
"integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==", "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
"cpu": [ "cpu": [
"loong64" "loong64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -528,12 +541,13 @@
} }
}, },
"node_modules/@esbuild/linux-mips64el": { "node_modules/@esbuild/linux-mips64el": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
"integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==", "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
"cpu": [ "cpu": [
"mips64el" "mips64el"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -543,12 +557,13 @@
} }
}, },
"node_modules/@esbuild/linux-ppc64": { "node_modules/@esbuild/linux-ppc64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
"integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==", "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
"cpu": [ "cpu": [
"ppc64" "ppc64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -558,12 +573,13 @@
} }
}, },
"node_modules/@esbuild/linux-riscv64": { "node_modules/@esbuild/linux-riscv64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
"integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==", "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
"cpu": [ "cpu": [
"riscv64" "riscv64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -573,12 +589,13 @@
} }
}, },
"node_modules/@esbuild/linux-s390x": { "node_modules/@esbuild/linux-s390x": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
"integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==", "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
"cpu": [ "cpu": [
"s390x" "s390x"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -588,12 +605,13 @@
} }
}, },
"node_modules/@esbuild/linux-x64": { "node_modules/@esbuild/linux-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
"integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==", "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"linux" "linux"
@ -603,12 +621,13 @@
} }
}, },
"node_modules/@esbuild/netbsd-arm64": { "node_modules/@esbuild/netbsd-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
"integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==", "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"netbsd" "netbsd"
@ -618,12 +637,13 @@
} }
}, },
"node_modules/@esbuild/netbsd-x64": { "node_modules/@esbuild/netbsd-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
"integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==", "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"netbsd" "netbsd"
@ -633,12 +653,13 @@
} }
}, },
"node_modules/@esbuild/openbsd-arm64": { "node_modules/@esbuild/openbsd-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
"integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==", "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"openbsd" "openbsd"
@ -648,12 +669,13 @@
} }
}, },
"node_modules/@esbuild/openbsd-x64": { "node_modules/@esbuild/openbsd-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
"integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==", "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"openbsd" "openbsd"
@ -663,12 +685,13 @@
} }
}, },
"node_modules/@esbuild/sunos-x64": { "node_modules/@esbuild/sunos-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
"integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==", "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"sunos" "sunos"
@ -678,12 +701,13 @@
} }
}, },
"node_modules/@esbuild/win32-arm64": { "node_modules/@esbuild/win32-arm64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
"integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==", "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"win32" "win32"
@ -693,12 +717,13 @@
} }
}, },
"node_modules/@esbuild/win32-ia32": { "node_modules/@esbuild/win32-ia32": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
"integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==", "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
"cpu": [ "cpu": [
"ia32" "ia32"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"win32" "win32"
@ -708,12 +733,13 @@
} }
}, },
"node_modules/@esbuild/win32-x64": { "node_modules/@esbuild/win32-x64": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz", "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
"integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==", "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
"win32" "win32"
@ -3494,9 +3520,10 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.8.4", "version": "1.7.9",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
"integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==", "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
"license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.6", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",
@ -3843,10 +3870,11 @@
} }
}, },
"node_modules/esbuild": { "node_modules/esbuild": {
"version": "0.25.1", "version": "0.24.2",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
"integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==", "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT",
"bin": { "bin": {
"esbuild": "bin/esbuild" "esbuild": "bin/esbuild"
}, },
@ -3854,31 +3882,31 @@
"node": ">=18" "node": ">=18"
}, },
"optionalDependencies": { "optionalDependencies": {
"@esbuild/aix-ppc64": "0.25.1", "@esbuild/aix-ppc64": "0.24.2",
"@esbuild/android-arm": "0.25.1", "@esbuild/android-arm": "0.24.2",
"@esbuild/android-arm64": "0.25.1", "@esbuild/android-arm64": "0.24.2",
"@esbuild/android-x64": "0.25.1", "@esbuild/android-x64": "0.24.2",
"@esbuild/darwin-arm64": "0.25.1", "@esbuild/darwin-arm64": "0.24.2",
"@esbuild/darwin-x64": "0.25.1", "@esbuild/darwin-x64": "0.24.2",
"@esbuild/freebsd-arm64": "0.25.1", "@esbuild/freebsd-arm64": "0.24.2",
"@esbuild/freebsd-x64": "0.25.1", "@esbuild/freebsd-x64": "0.24.2",
"@esbuild/linux-arm": "0.25.1", "@esbuild/linux-arm": "0.24.2",
"@esbuild/linux-arm64": "0.25.1", "@esbuild/linux-arm64": "0.24.2",
"@esbuild/linux-ia32": "0.25.1", "@esbuild/linux-ia32": "0.24.2",
"@esbuild/linux-loong64": "0.25.1", "@esbuild/linux-loong64": "0.24.2",
"@esbuild/linux-mips64el": "0.25.1", "@esbuild/linux-mips64el": "0.24.2",
"@esbuild/linux-ppc64": "0.25.1", "@esbuild/linux-ppc64": "0.24.2",
"@esbuild/linux-riscv64": "0.25.1", "@esbuild/linux-riscv64": "0.24.2",
"@esbuild/linux-s390x": "0.25.1", "@esbuild/linux-s390x": "0.24.2",
"@esbuild/linux-x64": "0.25.1", "@esbuild/linux-x64": "0.24.2",
"@esbuild/netbsd-arm64": "0.25.1", "@esbuild/netbsd-arm64": "0.24.2",
"@esbuild/netbsd-x64": "0.25.1", "@esbuild/netbsd-x64": "0.24.2",
"@esbuild/openbsd-arm64": "0.25.1", "@esbuild/openbsd-arm64": "0.24.2",
"@esbuild/openbsd-x64": "0.25.1", "@esbuild/openbsd-x64": "0.24.2",
"@esbuild/sunos-x64": "0.25.1", "@esbuild/sunos-x64": "0.24.2",
"@esbuild/win32-arm64": "0.25.1", "@esbuild/win32-arm64": "0.24.2",
"@esbuild/win32-ia32": "0.25.1", "@esbuild/win32-ia32": "0.24.2",
"@esbuild/win32-x64": "0.25.1" "@esbuild/win32-x64": "0.24.2"
} }
}, },
"node_modules/escalade": { "node_modules/escalade": {
@ -4965,39 +4993,6 @@
"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",
@ -5006,15 +5001,16 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/nanoid": { "node_modules/nanoid": {
"version": "3.3.11", "version": "3.3.8",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
"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"
}, },
@ -5139,9 +5135,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.3", "version": "8.5.2",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
"integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@ -5156,6 +5152,7 @@
"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",
@ -5598,6 +5595,7 @@
"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"
} }
@ -5825,12 +5823,13 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.2.2", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.2.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz",
"integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==", "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
"license": "MIT",
"dependencies": { "dependencies": {
"esbuild": "^0.25.0", "esbuild": "^0.24.2",
"postcss": "^8.5.3", "postcss": "^8.5.1",
"rollup": "^4.30.1" "rollup": "^4.30.1"
}, },
"bin": { "bin": {

4
cool_todo_manager/package.json
View File

@ -18,11 +18,9 @@
"@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.8.4", "axios": "^1.7.9",
"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",

15
cool_todo_manager/src/App.tsx
View File

@ -1,19 +1,24 @@
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">
<Ctx.Provider value={appStore}> <QueryClientProvider client={queryClient}>
<RouterProvider router={router} /> <Provider store={store}>
</Ctx.Provider> {/* <ThemePanel /> */}
<RouterProvider router={router} />
</Provider>
</QueryClientProvider>
</Theme> </Theme>
); );
} }

33
cool_todo_manager/src/api/RTKQuery.ts Normal file
View File

@ -0,0 +1,33 @@
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);

2
cool_todo_manager/src/api/axios.ts
View File

@ -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')}` Authorization: `Bearer ${localStorage.getItem('token')}` // Maybe we will use cookies
} }
}); });

11
cool_todo_manager/src/api/queryClient.ts Normal file
View File

@ -0,0 +1,11 @@
import { QueryClient } from "@tanstack/react-query";
const queryClient = new QueryClient({
defaultOptions: {
queries: {
retry: 2,
},
},
})
export default queryClient;

7
cool_todo_manager/src/components/AuthWrapper/AuthWrapper.tsx
View File

@ -1,8 +1,7 @@
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';
const AuthWrapper = observer((props: PropsWithChildren) => { export default function AuthWrapper(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');
@ -10,6 +9,4 @@ const AuthWrapper = observer((props: PropsWithChildren) => {
} }
return <div>{props.children}</div>; return <div>{props.children}</div>;
}) }
export default AuthWrapper;

64
cool_todo_manager/src/components/CardGroup/CardGroup.tsx
View File

@ -1,34 +1,30 @@
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 { PlusIcon } from '@radix-ui/react-icons'; import {
import { observer } from 'mobx-react-lite'; useCreateTaskMutation,
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 { useStore } from '../../hooks/useStore'; import { PlusIcon } from '@radix-ui/react-icons';
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();
const [deleteProject] = useDeleteProjectMutation();
function CardGroup(props: TCardGroup) {
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) => {
store.mainStore.createTask({ createTaskForGroup({
title: taskText, title: taskText,
projectId: props.id, projectId: props.id,
assignedUserId: 1, assignedUserId: 1,
@ -37,7 +33,7 @@ function CardGroup(props: TCardGroup) {
}; };
const deleteGroup = () => { const deleteGroup = () => {
store.mainStore.deleteProject(props.id); deleteProject(props.id);
}; };
return ( return (
@ -45,32 +41,26 @@ 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"
> >
{isLoading && <Text>Loading...</Text>} {data &&
data.map((task, i) => (
{!isLoading && tasks.map((task: any, i: number) => ( <TaskCard
<TaskCard key={task.id}
projectId={props.id} id={task.id.toString()}
key={task.id} title={task.title}
id={task.id.toString()} description={task.status}
title={task.title} index={i}
description={task.status} status={task.status}
index={i} />
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>
@ -79,7 +69,7 @@ function CardGroup(props: TCardGroup) {
<AddUserToProjectDialog projectId={+props.id}> <AddUserToProjectDialog projectId={+props.id}>
<Button className='!mt-2'> <Button className='!mt-2'>
<PlusIcon /> <PlusIcon />
Add user Add user
</Button> </Button>
</AddUserToProjectDialog> </AddUserToProjectDialog>
</Box> </Box>
@ -87,5 +77,3 @@ function CardGroup(props: TCardGroup) {
</Droppable> </Droppable>
); );
} }
export default observer(CardGroup);

38
cool_todo_manager/src/components/MainBoard/MainBoard.tsx
View File

@ -1,44 +1,28 @@
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) => {
console.log(result); result;
}; };
const createProject = (newProjectData: any) => { const [createProject] = useCreateProjectMutation();
store.mainStore.createProject(newProjectData); const { data: cringe, isLoading } = useGetProjectsQuery({});
};
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.map((item: any) => ( (cringe as any[]).map((item: any) => (
<CardGroup <CardGroup id={item.id} title={item.title} />
key={item.id}
id={item.id}
title={item.title}
/>
))} ))}
</Flex> </Flex>
</ScrollArea> </ScrollArea>
@ -50,5 +34,3 @@ function MainBoard() {
</> </>
); );
} }
export default observer(MainBoard);

39
cool_todo_manager/src/components/TaskCard/TaskCard.tsx
View File

@ -1,7 +1,6 @@
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 { observer } from 'mobx-react-lite'; import { useUpdateTaskMutation } from '../../services/mainApi';
import { useStore } from '../../hooks/useStore';
type TTaskCard = { type TTaskCard = {
title?: string; title?: string;
@ -9,32 +8,26 @@ 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
const TaskCard = observer((props: TTaskCard) => { export default function TaskCard(props: TTaskCard) {
const [updateTask] = useUpdateTaskMutation();
const store = useStore()
const updateStatus = (newStatus: 'todo' | 'in-progress' | 'completed') => { const updateStatus = (newStatus: 'todo' | 'in-progress' | 'completed') => {
if (!props.id) return; updateTask({ id: props.id, status: newStatus });
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}>
@ -43,7 +36,6 @@ const TaskCard = observer((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'}>
@ -54,26 +46,17 @@ const TaskCard = observer((props: TTaskCard) => {
<Flex justify={'between'}> <Flex justify={'between'}>
{props.status !== 'todo' && ( {props.status !== 'todo' && (
<Button <Button color={badgeColors['todo']} onClick={() => updateStatus('todo')}>
color={badgeColors['todo']}
onClick={() => updateStatus('todo')}
>
Todo Todo
</Button> </Button>
)} )}
{props.status !== 'in-progress' && ( {props.status !== 'in-progress' && (
<Button <Button color={badgeColors['in-progress']} onClick={() => updateStatus('in-progress')}>
color={badgeColors['in-progress']}
onClick={() => updateStatus('in-progress')}
>
In Progress In Progress
</Button> </Button>
)} )}
{props.status !== 'completed' && ( {props.status !== 'completed' && (
<Button <Button color={badgeColors['completed']} onClick={() => updateStatus('completed')}>
color={badgeColors['completed']}
onClick={() => updateStatus('completed')}
>
Completed Completed
</Button> </Button>
)} )}
@ -82,6 +65,4 @@ const TaskCard = observer((props: TTaskCard) => {
)} )}
</Draggable> </Draggable>
); );
}) }
export default TaskCard;

55
cool_todo_manager/src/components/dialogs/AddUserToProjectDialog/AddUserToProjectDialog.tsx
View File

@ -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 { useStore } from '../../../hooks/useStore'; import {
useAddProjectMemberMutation,
useGetAllUsersQuery,
} from '../../../services/mainApi';
type TAddUserToProjectDialog = { type TAddUserToProjectDialog = {
projectId: number; projectId: number;
} & PropsWithChildren; } & PropsWithChildren;
function AddUserToProjectDialog(props: TAddUserToProjectDialog) { export default 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 store.mainStore.addProjectMember(projectId.toString(), selectedUserId.toString()); await addProjectMember({
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,12 +30,9 @@ function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
} }
}; };
const isLoading = store.authStore.isLoading;
const error = store.authStore.error;
const users = store.authStore.allUsers;
return ( return (
<Dialog.Root> <Dialog.Root onOpenChange={() => refetch()}>
<Dialog.Trigger>{children}</Dialog.Trigger> <Dialog.Trigger>{children}</Dialog.Trigger>
<Dialog.Content maxWidth="450px"> <Dialog.Content maxWidth="450px">
@ -45,21 +42,26 @@ function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
{isLoading ? ( {isLoading ? (
<span>Loading users...</span> <span>Loading users...</span>
) : error ? ( ) : error ? (
<span>Error loading users: {error}</span> <span>Error loading users.</span>
) : ( ) : (
<Select.Root <Select.Root
value={selectedUserId?.toString() || ''} value={selectedUserId?.toString() || ''}
onValueChange={(value) => setSelectedUserId(Number(value))} onValueChange={(value) =>
setSelectedUserId(Number(value))
}
required required
> >
<Select.Trigger aria-label="User"> <Select.Trigger aria-label="User">
{selectedUserId {selectedUserId
? users?.find((user: any) => user.id === selectedUserId)?.username ? users?.find(
(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.toString()}> <Select.Item key={user.id} value={user.id}>
{user.username} {user.username}
</Select.Item> </Select.Item>
))} ))}
@ -74,10 +76,13 @@ function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
Cancel Cancel
</Button> </Button>
</Dialog.Close> </Dialog.Close>
<Dialog.Close> <Dialog.Close>
<Button color="green" onClick={handleAddUser} disabled={!selectedUserId || isLoading}> <Button
{isLoading ? 'Adding...' : 'Add'} color="green"
onClick={handleAddUser}
disabled={!selectedUserId || isAdding}
>
{isAdding ? 'Adding...' : 'Add'}
</Button> </Button>
</Dialog.Close> </Dialog.Close>
</Flex> </Flex>
@ -85,5 +90,3 @@ function AddUserToProjectDialog(props: TAddUserToProjectDialog) {
</Dialog.Root> </Dialog.Root>
); );
} }
export default observer(AddUserToProjectDialog);

4
cool_todo_manager/src/context.ts
View File

@ -1,4 +0,0 @@
import React from "react";
import { appStore } from "./stores/AppStore";
export const Ctx = React.createContext(appStore);

8
cool_todo_manager/src/hooks/useStore.tsx
View File

@ -1,8 +0,0 @@
import { useContext } from "react";
import { Ctx } from "../context";
export function useStore() {
const store = useContext(Ctx)
return store;
}

40
cool_todo_manager/src/pages/auth/LoginPage/LoginPage.tsx
View File

@ -1,5 +1,3 @@
import { useState } from 'react';
import { observer } from 'mobx-react-lite';
import { import {
Box, Box,
Button, Button,
@ -10,24 +8,18 @@ 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';
// Импортируем store.authStore export default function LoginPage() {
import { useStore } from '../../../hooks/useStore'; const [login, { isError }] = useLoginMutation();
function LoginPage() {
const [username, setUsername] = useState(''); const [username, setUsername] = useState('');
const [password, setPassword] = useState(''); const [password, setPassword] = useState('');
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>) => { const submitHandler = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault(); e.preventDefault();
await store.authStore.login({ username, password }).catch(() => {}); login({ username, password });
}; };
return ( return (
@ -37,11 +29,15 @@ function LoginPage() {
Login Login
</Heading> </Heading>
<Form.Root className="flex flex-col gap-4" onSubmit={submitHandler}> <Form.Root
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"
@ -58,6 +54,7 @@ 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"
@ -71,13 +68,16 @@ function LoginPage() {
</Form.Field> </Form.Field>
{isError && ( {isError && (
<Text>{store.authStore.error || 'Unable to login. Please try again.'}</Text> <Text>{'Unable to login. Please try again.'}</Text>
)} )}
<Button type="submit" className="mt-4" disabled={isLoading}> <Button
{isLoading ? 'Loading...' : 'Sign In'} // onClick={(e) => e.preventDefault()}
className="mt-4"
>
Sign In
</Button> </Button>
<Box className='w-full !flex justify-center'> <Box className='w-full !flex justify-center'>
<Link href="/register"> <Link href="/register">
<Text>Register</Text> <Text>Register</Text>
@ -88,5 +88,3 @@ function LoginPage() {
</> </>
); );
} }
export default observer(LoginPage);

36
cool_todo_manager/src/pages/auth/RegisterPage/RegisterPage.tsx
View File

@ -1,5 +1,3 @@
import { useState } from 'react';
import { observer } from 'mobx-react-lite';
import { import {
Box, Box,
Button, Button,
@ -10,23 +8,17 @@ 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';
// Импортируем store.authStore export default function RegisterPage() {
import { useStore } from '../../../hooks/useStore'; const [register, { isLoading, error }] = useRegisterMutation();
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,
@ -37,7 +29,7 @@ function RegisterPage() {
const handleSubmit = async (e: React.FormEvent) => { const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault(); e.preventDefault();
try { try {
await store.authStore.register(formData); await register(formData).unwrap();
} catch (err) { } catch (err) {
console.error('Failed to register:', err); console.error('Failed to register:', err);
} }
@ -48,11 +40,15 @@ function RegisterPage() {
<Heading size="4" className="text-center !mb-2"> <Heading size="4" className="text-center !mb-2">
Register Register
</Heading> </Heading>
<Form.Root className="flex flex-col gap-4" onSubmit={handleSubmit}> <Form.Root
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"
@ -71,9 +67,11 @@ 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"
@ -92,10 +90,10 @@ 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}
@ -107,12 +105,12 @@ function RegisterPage() {
</Form.Field> </Form.Field>
<Button type="submit" disabled={isLoading} className="mt-4"> <Button type="submit" disabled={isLoading} className="mt-4">
{isLoading ? 'Loading...' : 'Register'} Register
</Button> </Button>
{error && ( {error && (
<Box className="text-red-500"> <Box className="text-red-500">
<Text>Error registering user: {error}</Text> <Text>Error registering user.</Text>
</Box> </Box>
)} )}
@ -124,6 +122,4 @@ function RegisterPage() {
</Form.Root> </Form.Root>
</Card> </Card>
); );
} }
export default observer(RegisterPage);

8
cool_todo_manager/src/pages/main/MainPage.tsx
View File

@ -1,14 +1,10 @@
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'
const MainPage = observer(() => { export default function MainPage() {
return ( return (
<Box className='size-full'> <Box className='size-full'>
<Outlet /> <Outlet />
</Box> </Box>
) )
}) }
export default MainPage

231
cool_todo_manager/src/services/mainApi.ts Normal file
View File

@ -0,0 +1,231 @@
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
View File

@ -1,15 +0,0 @@
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
View File

@ -1,95 +0,0 @@
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
View File

@ -1,323 +0,0 @@
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;
}
}
}