Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
vijaysingh2219 authored Aug 26, 2024
2 parents 3ed2f5f + 0211b1f commit 509aa2c
Show file tree
Hide file tree
Showing 86 changed files with 14,285 additions and 9,826 deletions.
9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-navigation-menu": "^1.1.4",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tooltip": "^1.0.7",
"@types/bcrypt": "^5.0.2",
Expand All @@ -55,10 +57,12 @@
"bcrypt": "^5.1.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"date-fns": "^3.6.0",
"dayjs": "^1.11.10",
"discord-oauth2": "^2.11.0",
"discord.js": "^14.14.1",
"embla-carousel-react": "^8.0.0",
"framer-motion": "^11.3.28",
"fuse.js": "^7.0.0",
"ioredis": "^5.4.1",
"jose": "^5.2.2",
Expand All @@ -72,6 +76,8 @@
"notion-client": "^6.16.0",
"pdf-lib": "^1.17.1",
"react": "^18",
"react-big-calendar": "^1.13.2",
"react-day-picker": "8.10.1",
"react-dom": "^18",
"react-hook-form": "^7.50.1",
"react-icons": "^5.1.0",
Expand All @@ -82,7 +88,6 @@
"storybook": "^8.0.8",
"tailwind-merge": "^2.2.1",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.4.5",
"vaul": "^0.8.9",
"video.js": "^8.6.1",
"videojs-contrib-eme": "^3.11.1",
Expand All @@ -106,6 +111,7 @@
"@testing-library/react": "^15.0.7",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-big-calendar": "^1.8.9",
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
Expand All @@ -122,6 +128,7 @@
"prisma": "^5.17.0",
"tailwindcss": "^3.3.0",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"vitest": "^1.6.0",
"vitest-mock-extended": "^1.3.1"
}
Expand Down
Loading

0 comments on commit 509aa2c

Please sign in to comment.