Avishag/tests profiles

client-side/package.json

@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.11.1",
+    "@apollo/react-hooks": "^4.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
@@ -13,27 +14,28 @@
     "@mui/styled-engine-sc": "^6.0.0-alpha.18",
     "@mui/x-charts": "^7.10.0",
     "@mui/x-data-grid": "^7.10.0",
-    "@testing-library/user-event": "^13.5.0",
-    "@testing-library/react": "^13.4.0",
-    "formik": "^2.4.6",
-    "html2canvas": "^1.4.1",
-    "html2pdf.js": "^0.10.2",
-    "jspdf": "^2.5.1",
-    "jspdf-autotable": "^3.8.2",
     "@mui/x-date-pickers": "^7.11.0",
+    "@react-google-maps/api": "^2.19.3",
     "@reduxjs/toolkit": "^2.2.6",
-    "@testing-library/jest-dom": "^5.17.0",
+    "@testing-library/react": "^16.0.0",
+    "@testing-library/user-event": "^13.5.0",
     "@types/redux": "^3.6.31",
     "axios": "^1.7.2",
     "dayjs": "^1.11.12",
     "dotenv": "^16.4.5",
+    "formik": "^2.4.6",
+    "html2canvas": "^1.4.1",
+    "html2pdf.js": "^0.10.2",
+    "jspdf": "^2.5.1",
+    "jspdf-autotable": "^3.8.2",
     "react": "^18.3.1",
+    "react-countdown-circle-timer": "^3.2.1",
     "react-dom": "^18.3.1",
     "react-google-recaptcha": "^3.1.0",
     "react-redux": "^9.1.2",
     "react-router-dom": "^6.24.1",
-    "react-scripts": "5.0.1",
     "redux": "^5.0.1",
+    "redux-thunk": "^3.1.0",
     "styled-components": "^6.1.11",
     "web-vitals": "^2.1.4",
     "yup": "^1.4.0"
@@ -66,9 +68,9 @@
     ]
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@apollo/client": "^3.11.4",
     "@babel/core": "^7.25.2",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/plugin-transform-private-property-in-object": "^7.24.7",
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-react": "^7.24.7",
@@ -88,20 +90,23 @@
     "@testing-library/jest-dom": "^6.4.8",
     "@testing-library/react": "^16.0.0",
     "babel-jest": "^29.7.0",
+    "css-loader": "^7.1.2",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-react": "^7.27.1",
     "eslint-plugin-storybook": "^0.8.0",
     "globals": "^15.8.0",
     "install": "^0.13.0",
     "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "jest-environment-jsdom": "^29.0.0",
     "notistack": "^3.0.1",
     "npm": "^10.8.2",
+    "postcss-loader": "^8.1.1",
     "prop-types": "^15.8.1",
-    "react-apollo": "^3.1.5",
     "react-scripts": "^5.0.1",
     "redux-mock-store": "^1.5.4",
+    "resolve-url-loader": "^5.0.0",
     "sass": "^1.77.6",
+    "sass-loader": "^16.0.1",
     "storybook": "^8.1.11"
   },
   "jest": {

client-side/src/App.jsx

@@ -1,36 +1,26 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Provider } from 'react-redux';
-import { HashRouter, Routes, Route } from 'react-router-dom';
+import { RouterProvider } from 'react-router-dom';
 import Footer from './stories/footer/FooterComponent';
+import { router } from './router/router.jsx';
 import { store } from './redux/store.jsx';
 import { SnackbarProvider } from 'notistack';
-import Layout from './router/layout.jsx';
 import './App.scss';
+import startLocationTracking from './services/googleMapService.js';
 
 function App() {
+  useEffect(() => {
+    startLocationTracking();
+  }, []);
+
   return (
     <SnackbarProvider maxSnack={3}>
-    {/* // TODO insert the real routings */}
-    <Provider store={store}>
-      <HashRouter>
-        <Routes>
-          <Route path="/" element={<Layout />}>
-            <Route index element={<h1>home</h1>} />
-            <Route path="home" element={<h1>home</h1>} />
-            <Route path="profiles" element={<h1>ProfileList</h1>} />
-            <Route path="reports" element={<h1>reports</h1>} />
-            <Route path="statistics" element={<h1>statistics</h1>} />
-            <Route path="*" element={<h1>home</h1>} />
-          </Route>
-        </Routes>
+      <Provider store={store}>
+        <RouterProvider router={router} />
         <Footer />
-      </HashRouter>
-    </Provider>
-   </SnackbarProvider>
-
+      </Provider>
+    </SnackbarProvider>
   );
 }
 
 export default App;
-
-