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
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

NEXT_PUBLIC_API_BASE_URL=http://localhost:3000/api/
OPENAPI_URL=http://localhost:3000/api/json
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ npm-debug.log*
Thumbs.db
*storybook.log
storybook-static
/.cursor/mcp.json
6 changes: 4 additions & 2 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import 'app/styles/global.css';
import { QueryProvider } from 'shared/providers';
import { Toaster } from 'shared/ui';
import { Toaster, TooltipProvider } from 'shared/ui';

export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<html lang="en">
<body>
<QueryProvider>{children}</QueryProvider>
<QueryProvider>
<TooltipProvider>{children}</TooltipProvider>
</QueryProvider>
<Toaster richColors />
</body>
</html>
Expand Down
21 changes: 21 additions & 0 deletions app/team/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import 'app/styles/global.css';
import { Separator, SidebarInset, SidebarProvider, SidebarTrigger } from 'shared/ui';
import { AppSidebar } from 'app/layouts/BaseLayout';

export default async function RootLayout({ children }: { children: React.ReactNode }) {
return (
<SidebarProvider>
<AppSidebar />
<SidebarInset>
<header className="flex h-14 shrink-0 items-center gap-2 border-b px-4">
<SidebarTrigger className="-ml-1" />
<Separator
orientation="vertical"
className="mr-2 self-center! data-[orientation=vertical]:h-6"
/>
</header>
<div className="p-4">{children}</div>
</SidebarInset>
</SidebarProvider>
);
}
1 change: 1 addition & 0 deletions app/team/tasks/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { TasksPage as default } from 'pages/tasks';
3 changes: 1 addition & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ const eslintConfig = defineConfig([
'NEXT_JS_PAGE_ROUTER_FILENAME_CASE',
'**/!({page,layout,loading,error,not-found,template,default,route}).{jsx,tsx}':
'PASCAL_CASE',
'**/use*.{ts,tsx}': 'CAMEL_CASE',
'**/*{Error,Type,Types,Interface,Props,Dto,Response,Request,Contract,Contracts}.ts':
'PASCAL_CASE',
'**/!(*{Error,Type,Types,Interface,Props,Dto,Response,Request,Contract,Contracts}|use*).ts':
'**/!(*{Error,Type,Types,Interface,Props,Dto,Response,Request,Contract,Contracts}*).ts':
'KEBAB_CASE',
'**/*.{js,mjs,cjs,mts,cts}': 'KEBAB_CASE',
},
Expand Down
51 changes: 43 additions & 8 deletions infra/dev/compose.dev.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.9'

name: task-tracker

services:
Expand All @@ -9,8 +7,6 @@ services:
build:
context: ../..
dockerfile: Dockerfile.dev
environment:
WATCHPACK_POLLING: 'true'
ports:
- '4000:4000'
command: pnpm run dev -p 4000
Expand All @@ -35,7 +31,7 @@ services:
hostname: api
container_name: api
platform: linux/amd64
image: ghcr.io/task-tracker-lab/task-tracker-backend:dev
image: ghcr.io/task-tracker-lab/backend:sha-9b66ff7
env_file:
- .env
ports:
Expand Down Expand Up @@ -74,7 +70,11 @@ services:
networks:
- backend
healthcheck:
test: ['CMD-SHELL', 'pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB" -q || exit 1']
test: [
'CMD-SHELL',
'pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB" -q
|| exit 1',
]
interval: 5s
timeout: 5s
retries: 5
Expand All @@ -86,7 +86,7 @@ services:
image: redis:7-alpine
restart: always
ports:
- '7001:6379'
- '${REDIS_PORT:-6999}:6379'
command: redis-server --save 60 1 --loglevel notice
volumes:
- redis_data:/data
Expand All @@ -99,10 +99,45 @@ services:
retries: 5
profiles: ['infra']

minio:
hostname: minio
container_name: minio
image: minio/minio:latest
restart: always
environment:
MINIO_ROOT_USER: ${S3_ACCESS_KEY}
MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY}
ports:
- '9000:9000' # API
- '9001:9001' # Console (UI)
command: server /data --console-address ":9001"
volumes:
- minio_data:/data
networks:
- backend
profiles: ['infra']

minio-init:
image: minio/mc:latest
depends_on:
- minio
environment:
MINIO_ROOT_USER: ${S3_ACCESS_KEY}
MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY}
networks:
- backend
profiles: ['infra']
entrypoint: >
/bin/sh -c " sleep 5; mc alias set myminio http://minio:9000
${S3_ACCESS_KEY} ${S3_SECRET_KEY}; mc mb myminio/${S3_BUCKET_NAME}
--ignore-existing; mc anonymous set download
myminio/${S3_BUCKET_NAME}; exit 0; "

volumes:
frontend_node_modules:
postgres_data:
redis_data:
frontend_node_modules:
minio_data:

networks:
backend:
Expand Down
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"@tanstack/react-query": "^5.90.21",
"@tanstack/react-query-devtools": "^5.91.3",
"axios": "^1.15.0",
"axios-auth-refresh": "^5.0.2",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"input-otp": "^1.4.2",
Expand Down Expand Up @@ -71,10 +70,10 @@
"jsdom": "^29.0.1",
"lint-staged": "^16.3.1",
"orval": "^8.7.0",
"postcss": "^8.5.6",
"postcss": "8.5.10",
"prettier": "^3.0.0",
"prettier-plugin-tailwindcss": "^0.7.2",
"shadcn": "^3.8.5",
"shadcn": "^4.5.0",
"steiger": "^0.5.11",
"storybook": "^10.3.3",
"tailwindcss": "^4.2.0",
Expand All @@ -84,5 +83,10 @@
"vite": "^8.0.2",
"vitest": "^4.1.2"
},
"packageManager": "pnpm@10.30.1"
"packageManager": "pnpm@10.30.1",
"pnpm": {
"overrides": {
"postcss": "8.5.10"
}
}
}
Loading
Loading