Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pnpm exec lint-staged
pnpm lint:fsd:frontend
pnpm typecheck:backend
pnpm typecheck:frontend
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
node_modules
dist
build
.next
coverage
pnpm-lock.yaml
*.tsbuildinfo
12 changes: 6 additions & 6 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"semi": true,
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 100,
"tabWidth": 2,
"endOfLine": "auto"
"semi": true,
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 100,
"tabWidth": 2,
"endOfLine": "auto"
}
1 change: 1 addition & 0 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"test": "jest",
"test:ci": "jest --runInBand",
"lint": "eslint .",
"lint:fix": "eslint --fix",
"format": "prettier --write .",
"format:check": "prettier --check ."
},
Expand Down
32 changes: 16 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
services:
postgres:
container_name: postgres
image: postgres:latest
restart: always
environment:
POSTGRES_USER: ${DB_USERNAME}
POSTGRES_PASSWORD: ${DB_PASSWORD}
DB_DATABASE: ${DB_DATABASE}
postgres:
container_name: postgres
image: postgres:latest
restart: always
environment:
POSTGRES_USER: ${DB_USERNAME}
POSTGRES_PASSWORD: ${DB_PASSWORD}
DB_DATABASE: ${DB_DATABASE}

ports:
- '5433:5432'
volumes:
- postgres_data:/var/lib/postgresql/postgres_data
networks:
- nestjs
ports:
- '5433:5432'
volumes:
- postgres_data:/var/lib/postgresql/postgres_data
networks:
- nestjs

volumes:
postgres_data:
postgres_data:

networks:
nestjs:
nestjs:
41 changes: 38 additions & 3 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
import eslint from '@eslint/js';
import { defineConfig } from 'eslint/config';
import js from '@eslint/js';
import tseslint from 'typescript-eslint';
import importPlugin from 'eslint-plugin-import';
import unusedImports from 'eslint-plugin-unused-imports';
import prettier from 'eslint-plugin-prettier';
import globals from 'globals'; // Добавили для работы окружений

export default defineConfig(eslint.configs.recommended, tseslint.configs.recommended);
export default [
js.configs.recommended,
...tseslint.configs.recommended,

{
files: ['**/*.{ts,tsx}'],
languageOptions: {
parser: tseslint.parser,
parserOptions: {
project: ['./tsconfig.json'],
},
globals: {
...globals.es2021,
},
},
},
{
plugins: {
import: importPlugin,
'unused-imports': unusedImports,
prettier,
},
rules: {
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'unused-imports/no-unused-imports': 'error',
},
},

{
ignores: ['node_modules', 'dist', '.next', 'build', '**/jest.config.ts', '**/*.config.ts'],
},
];
54 changes: 37 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "task-tracker",
"version": "1.0.0",
"private": "true",
"description": "",
"main": "index.js",
"scripts": {
"name": "task-tracker",
"version": "1.0.0",
"private": "true",
"description": "",
"main": "index.js",
"scripts": {
"dev": "pnpm run --parallel dev",
"build": "pnpm run --parallel build",
"start": "pnpm run --parallel start",
Expand All @@ -28,16 +28,36 @@
"test:backend:ci": "pnpm --filter @task-tracker/backend test:ci",
"typecheck:backend": "pnpm --filter @task-tracker/backend typecheck",
"prisma:generate:backend": "pnpm --filter @task-tracker/backend prisma:generate",
"prisma:migrate:deploy:backend": "pnpm --filter @task-tracker/backend prisma:migrate:deploy"
"prisma:migrate:deploy:backend": "pnpm --filter @task-tracker/backend prisma:migrate:deploy",
"prepare": "husky"
},
"devDependencies": {
"@eslint/js": "9.39.2",
"@types/node": "^25.0.0",
"eslint": "^9.39.2",
"prettier": "^3.0.0",
"typescript": "^5.0.0",
"typescript-eslint": "^8.56.0"
},
"license": "ISC",
"packageManager": "pnpm@10.29.3"
"lint-staged": {
Comment thread
kapitulin24 marked this conversation as resolved.
".{ts,tsx,js,,mjs}": [
"eslint --fix --no-warn-ignored",
"prettier --write"
],
".{json,css,md}": [
"prettier --write"
]
},
"devDependencies": {
"@eslint/js": "9.39.2",
"@types/node": "^25.0.0",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-n": "^17.24.0",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
"eslint-plugin-unused-imports": "^4.4.1",
"globals": "^17.3.0",
"husky": "^9.1.7",
"lint-staged": "^16.3.1",
"prettier": "^3.0.0",
"typescript": "^5.0.0",
"typescript-eslint": "^8.56.0"
},
"license": "ISC",
"packageManager": "pnpm@10.29.3"
}
24 changes: 12 additions & 12 deletions packages/shared-types/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@task-tracker/shared-types",
"version": "1.0.0",
"private": "true",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"packageManager": "pnpm@10.29.3"
"name": "@task-tracker/shared-types",
"version": "1.0.0",
"private": "true",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"packageManager": "pnpm@10.29.3"
}
14 changes: 7 additions & 7 deletions packages/shared-types/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src",
"declaration": true
},
"include": ["src/**/*"]
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src",
"declaration": true
},
"include": ["src/**/*"]
}
Loading