Skip to content

Commit

Permalink
Merge pull request #10 from davitJabushanuri/develop
Browse files Browse the repository at this point in the history
Sync main and develop
  • Loading branch information
davitJabushanuri committed May 6, 2024
2 parents 56f3abe + d37a328 commit bb26b6f
Show file tree
Hide file tree
Showing 36 changed files with 2,035 additions and 1,768 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ generated/
.env.production.local

# LOGS
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ generated/
.env.production.local

# LOGS
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
86 changes: 43 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,76 +26,76 @@
"@hookform/resolvers": "^3.3.4",
"@next-auth/prisma-adapter": "^1.0.7",
"@paralleldrive/cuid2": "^2.2.2",
"@prisma/client": "^5.9.1",
"@tanstack/react-query": "^5.20.5",
"@tanstack/react-query-devtools": "^5.20.5",
"@types/node": "20.11.19",
"@types/react": "^18.2.55",
"@types/react-dom": "18.2.19",
"@upstash/ratelimit": "^1.0.1",
"@upstash/redis": "^1.28.4",
"axios": "^1.6.7",
"@prisma/client": "^5.12.1",
"@tanstack/react-query": "^5.28.14",
"@tanstack/react-query-devtools": "^5.28.14",
"@types/node": "20.12.4",
"@types/react": "^18.2.74",
"@types/react-dom": "18.2.24",
"@upstash/ratelimit": "^1.0.3",
"@upstash/redis": "^1.29.0",
"axios": "^1.6.8",
"clsx": "^2.1.0",
"emoji-picker-react": "^4.7.17",
"eslint": "^8.56.0",
"eslint-config-next": "^14.1.0",
"framer-motion": "^11.0.5",
"emoji-picker-react": "^4.9.2",
"eslint": "^8.57.0",
"eslint-config-next": "^14.1.4",
"framer-motion": "^11.0.24",
"husky": "^9.0.11",
"next": "^14.1.0",
"next-auth": "^4.24.6",
"next": "^14.1.4",
"next-auth": "^4.24.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.12",
"react-hook-form": "^7.50.1",
"react-intersection-observer": "^9.8.0",
"react-toastify": "^10.0.4",
"sass": "^1.71.0",
"sharp": "^0.32.6",
"socket.io-client": "^4.7.4",
"tailwind-merge": "^2.2.1",
"react-error-boundary": "^4.0.13",
"react-hook-form": "^7.51.2",
"react-intersection-observer": "^9.8.1",
"react-toastify": "^10.0.5",
"sass": "^1.74.1",
"sharp": "^0.33.3",
"socket.io-client": "^4.7.5",
"tailwind-merge": "^2.2.2",
"zod": "^3.22.4",
"zustand": "^4.5.0"
"zustand": "^4.5.2"
},
"devDependencies": {
"@commitlint/cli": "^18.6.1",
"@commitlint/config-conventional": "^18.6.2",
"@flydotio/dockerfile": "^0.5.2",
"@supabase/supabase-js": "^2.39.6",
"@tanstack/eslint-plugin-query": "5.20.1",
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@flydotio/dockerfile": "^0.5.4",
"@supabase/supabase-js": "^2.42.0",
"@tanstack/eslint-plugin-query": "5.28.11",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/react": "^14.2.2",
"@testing-library/user-event": "^14.5.2",
"@total-typescript/ts-reset": "^0.5.1",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"autoprefixer": "^10.4.17",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^7.5.0",
"autoprefixer": "^10.4.19",
"cookies-next": "^4.1.1",
"cssnano": "^6.0.3",
"cssnano": "^6.1.2",
"dayjs": "^1.11.10",
"dotenv": "^16.4.4",
"dotenv": "^16.4.5",
"encoding": "^0.1.13",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jest-dom": "^5.1.0",
"eslint-plugin-jest-dom": "^5.2.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-tailwindcss": "^3.14.2",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-tailwindcss": "^3.15.1",
"eslint-plugin-testing-library": "^6.2.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.2",
"only-allow": "^1.2.1",
"postcss": "^8.4.35",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.11",
"prisma": "^5.9.1",
"tailwindcss": "^3.4.1",
"prettier-plugin-tailwindcss": "^0.5.13",
"prisma": "^5.12.1",
"tailwindcss": "^3.4.3",
"tailwindest": "^2.3.0",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
"typescript": "^5.4.4"
},
"engines": {
"node": ">= 20.0.0"
Expand Down
Loading

0 comments on commit bb26b6f

Please sign in to comment.