Merge branch 'main' into hkirat/fix-admin-dashboard

code100x · Aug 20, 2024 · d64ab2d · d64ab2d
2 parents 6154ca2 + bcbdc1e
commit d64ab2d
Show file tree

Hide file tree

Showing 62 changed files with 11,925 additions and 9,740 deletions.
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
     "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",
@@ -81,7 +82,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",
@@ -121,6 +121,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"
   }