Merge pull request #1656 from acm-ucr/SafeDuck/ReactQuery

React Query Migration
acm-ucr · Sep 11, 2024 · 4bd4c84 · 4bd4c84
2 parents 1163d2c + eab699a
commit 4bd4c84
Show file tree

Hide file tree

Showing 24 changed files with 619 additions and 233 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -3,7 +3,12 @@
     "browser": true,
     "es2021": true
   },
-  "extends": ["next/core-web-vitals", "google", "prettier"],
+  "extends": [
+    "next/core-web-vitals",
+    "google",
+    "prettier",
+    "plugin:@tanstack/eslint-plugin-query/recommended"
+  ],
   "overrides": [],
   "parserOptions": {
     "ecmaVersion": "latest",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "prepare": "husky install"
   },
   "devDependencies": {
+    "@tanstack/eslint-plugin-query": "^5.51.13",
     "@types/node": "^20.16.1",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
@@ -49,6 +50,8 @@
     "@radix-ui/react-tabs": "^1.1.0",
     "@react-email/components": "^0.0.25",
     "@tailwindcss/typography": "^0.5.15",
+    "@tanstack/react-query": "^5.51.11",
+    "@tanstack/react-query-devtools": "^5.55.0",
     "@tanstack/react-table": "^8.20.5",
     "@tanstack/react-virtual": "^3.10.6",
     "class-variance-authority": "^0.7.0",

diff --git a/src/app/admin/[type]/page.js b/src/app/admin/[type]/page.js
@@ -1,8 +1,8 @@
 "use client";
 import ProtectedPage from "@/components/ProtectedPage";
 import Admins from "@/components/admin/dashboards/Admins";
-import Events from "@/components/admin/services/calendar/Events";
-import CheckIn from "@/components/admin/services/checkin/CheckIn";
+import Events from "@/components/admin/services/calendar";
+import CheckIn from "@/components/admin/services/checkin";
 import Committees from "@/components/admin/dashboards/Committees";
 import Feedback from "@/components/admin/dashboards/Feedback";
 import Interests from "@/components/admin/dashboards/Interests";

diff --git a/src/app/api/statistics/route.js b/src/app/api/statistics/route.js
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable new-cap */
 import "./globals.css";
 import { Poppins } from "next/font/google";
-import Session from "@/components/Session";
+import Providers from "@/components/Providers";
 import { Toaster } from "react-hot-toast";
 import { getServerSession } from "next-auth";
 import { options } from "@/utils/auth";
@@ -24,10 +24,10 @@ const RootLayout = async ({ children }: Props) => {
     <html lang="en" className="h-full">
       <body className={`${poppins.variable} flex h-full flex-col lg:flex-row`}>
         <div className="flex h-full w-full">
-          <Session session={session}>
+          <Providers session={session}>
             <Toaster />
             {children}
-          </Session>
+          </Providers>
         </div>
       </body>
     </html>