diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml deleted file mode 100644 index 8596a2f..0000000 --- a/.github/workflows/playwright.yml +++ /dev/null @@ -1,39 +0,0 @@ -# name: Playwright Tests -# on: -# push: -# branches: [ main, master ] -# pull_request: -# branches: [ main, master ] -# jobs: -# test: -# timeout-minutes: 60 -# runs-on: ubuntu-latest -# steps: -# - name: Checkout -# uses: actions/checkout@v4 - -# - name: Install pnpm -# uses: pnpm/action-setup@v4 -# with: -# version: 9 - -# - name: Use Node.js 20 -# uses: actions/setup-node@v4 -# with: -# node-version: 20 -# cache: 'pnpm' - -# - name: Install Playwright Browsers -# run: pnpm exec playwright install --with-deps -# - name: Run Playwright tests -# run: pnpm exec playwright test - -# - name: - - -# - uses: actions/upload-artifact@v4 -# if: always() -# with: -# name: playwright-report -# path: playwright-report/ -# retention-days: 30 diff --git a/package.json b/package.json index 7ea4732..d5d45b8 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "pnpm run -r dev", "build": "pnpm run -r build", + "lint": "pnpm run -r lint", "prepare": "husky install", "commitlint": "commitlint --edit" }, diff --git a/server/eslint.config.js b/server/eslint.config.js new file mode 100644 index 0000000..5d267db --- /dev/null +++ b/server/eslint.config.js @@ -0,0 +1,10 @@ +const pluginJs = require('@eslint/js') +const globals = require('globals') +const tseslint = require('typescript-eslint') + +module.exports = [ + { files: ['src/**/*.ts'], ignores: ['dist/**', 'drizzle', 'node_modules'] }, + { languageOptions: { globals: globals.node } }, + pluginJs.configs.recommended, + ...tseslint.configs.recommended, +] diff --git a/server/eslint.config.mjs b/server/eslint.config.mjs deleted file mode 100644 index 64eeacc..0000000 --- a/server/eslint.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import pluginJs from '@eslint/js' -import globals from 'globals' -import tseslint from 'typescript-eslint' - -export default [ - { files: ['**/*.{js,mjs,cjs,ts}'] }, - { languageOptions: { globals: globals.node } }, - pluginJs.configs.recommended, - ...tseslint.configs.recommended, -] diff --git a/server/package.json b/server/package.json index c00d444..ae0f6fb 100644 --- a/server/package.json +++ b/server/package.json @@ -7,6 +7,7 @@ "start": "node dist/index.js", "dev": "tsx watch src/index.ts", "build": "tsc", + "lint": "tsc && eslint -c eslint.config.js", "migrate:gen": "drizzle-kit generate", "migrate:run": "tsx src/scripts/migrate.ts", "seed": "tsx src/scripts/seed.ts" diff --git a/web/src/features/group/components/GroupHeader.tsx b/web/src/features/group/components/GroupHeader.tsx index 72ddf77..ed2f673 100644 --- a/web/src/features/group/components/GroupHeader.tsx +++ b/web/src/features/group/components/GroupHeader.tsx @@ -17,7 +17,7 @@ export const RoomHeader = ({ groupId, showMembers }: RoomHeaderProps) => { error, } = useQuery({ queryKey: ['currentRoom', groupId], - queryFn: ({ queryKey }) => fetchRoom(queryKey[1]), + queryFn: ({ queryKey }) => fetchRoom(queryKey[1] as number), }) let content diff --git a/web/src/features/group/components/JoinGroupItem.tsx b/web/src/features/group/components/JoinGroupItem.tsx index 388080f..217e41a 100644 --- a/web/src/features/group/components/JoinGroupItem.tsx +++ b/web/src/features/group/components/JoinGroupItem.tsx @@ -1,26 +1,26 @@ import { IGroup } from '../group.interface' export const JoinRoomItem = ({ - room, + group, isChecked, toggleRoomCheck, }: { - room: IGroup + group: IGroup isChecked: boolean toggleRoomCheck: (id: number, isChecked: boolean) => void }) => ( -