Merge pull request #1570 from gtech-mulearn/dev

devserver
gtech-mulearn · Jun 21, 2024 · 2aededc · 2aededc
2 parents 14fd7b3 + 5cd93a6
commit 2aededc
Show file tree

Hide file tree

Showing 51 changed files with 2,066 additions and 465 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,16 +18,17 @@
         "axios": "^1.3.4",
         "file-saver": "^2.0.5",
         "formik": "^2.2.9",
-        "framer-motion": "^10.15.0",
+        "framer-motion": "^10.18.0",
         "lottie-react": "^2.4.0",
         "moment": "^2.29.4",
         "razorpay": "^2.9.3",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
+        "react-fast-marquee": "^1.6.4",
         "react-google-charts": "^4.0.0",
         "react-helmet": "^6.1.0",
         "react-hot-toast": "^2.4.1",
-        "react-icons": "^4.10.1",
+        "react-icons": "^4.12.0",
         "react-qr-code": "^2.0.11",
         "react-router-dom": "^6.9.0",
         "react-select": "^5.7.7",

diff --git a/src/App.tsx b/src/App.tsx
@@ -241,6 +241,8 @@ const ConnectedDevices = lazy(
 );
 const Wadhwani = lazy(() => import("./modules/Dashboard/modules/Wadhwani"));
 
+const Trivial = lazy(() => import("./modules/Public/TrivialIdeas/modules/trivial"));
+
 function App() {
     const AuthChecker = SecureAuthRoutes();
     const router = createBrowserRouter([
@@ -277,6 +279,10 @@ function App() {
             path: "donation/refund",
             element: <Refund />
         },
+        {
+            path:"trivial-ideas",
+            element:<Trivial />
+        },
         {
             path: "/",
             element: <AuthRoutes />,