From 864b7e4ee2230ca6dabc71d77c8524035e7f6a0c Mon Sep 17 00:00:00 2001
From: MiryamGabay <miryamgabay9@gmail.com>
Date: Thu, 5 Sep 2024 09:54:49 +0300
Subject: [PATCH 1/4] Save changes before switching branches

---
 client-side/package-lock.json                 | 18 ++++++
 client-side/package.json                      |  2 +
 client-side/src/App.jsx                       | 20 ++++---
 .../components/Report/googleDriveUploader.jsx | 56 +++++++++++++++++++
 .../components/Report/uploadToGoogleDrive.jsx | 52 +++++++++++++++++
 client-side/src/router/router.jsx             | 10 +++-
 6 files changed, 148 insertions(+), 10 deletions(-)
 create mode 100644 client-side/src/components/Report/googleDriveUploader.jsx
 create mode 100644 client-side/src/components/Report/uploadToGoogleDrive.jsx

diff --git a/client-side/package-lock.json b/client-side/package-lock.json
index e9beb0448..57a7885e1 100644
--- a/client-side/package-lock.json
+++ b/client-side/package-lock.json
@@ -17,6 +17,7 @@
         "@mui/x-charts": "^7.10.0",
         "@mui/x-data-grid": "^7.9.0",
         "@mui/x-date-pickers": "^7.12.0",
+        "@react-oauth/google": "^0.12.1",
         "@reduxjs/toolkit": "^2.2.6",
         "@testing-library/jest-dom": "^5.17.0",
         "@testing-library/react": "^13.4.0",
@@ -25,6 +26,7 @@
         "axios": "^1.7.2",
         "dayjs": "^1.11.12",
         "formik": "^2.4.6",
+        "gapi-script": "^1.2.0",
         "html2canvas": "^1.4.1",
         "html2pdf.js": "^0.10.2",
         "jest": "^29.7.0",
@@ -5706,6 +5708,16 @@
         }
       }
     },
+    "node_modules/@react-oauth/google": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/@react-oauth/google/-/google-0.12.1.tgz",
+      "integrity": "sha512-qagsy22t+7UdkYAiT5ZhfM4StXi9PPNvw0zuwNmabrWyMKddczMtBIOARflbaIj+wHiQjnMAsZmzsUYuXeyoSg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
     "node_modules/@react-spring/animated": {
       "version": "9.7.4",
       "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.4.tgz",
@@ -15687,6 +15699,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gapi-script": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gapi-script/-/gapi-script-1.2.0.tgz",
+      "integrity": "sha512-NKTVKiIwFdkO1j1EzcrWu/Pz7gsl1GmBmgh+qhuV2Ytls04W/Eg5aiBL91SCiBM9lU0PMu7p1hTVxhh1rPT5Lw==",
+      "license": "MIT"
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
diff --git a/client-side/package.json b/client-side/package.json
index 491be4732..f0fe8029c 100644
--- a/client-side/package.json
+++ b/client-side/package.json
@@ -12,6 +12,7 @@
     "@mui/x-charts": "^7.10.0",
     "@mui/x-data-grid": "^7.9.0",
     "@mui/x-date-pickers": "^7.12.0",
+    "@react-oauth/google": "^0.12.1",
     "@reduxjs/toolkit": "^2.2.6",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
@@ -20,6 +21,7 @@
     "axios": "^1.7.2",
     "dayjs": "^1.11.12",
     "formik": "^2.4.6",
+    "gapi-script": "^1.2.0",
     "html2canvas": "^1.4.1",
     "html2pdf.js": "^0.10.2",
     "jest": "^29.7.0",
diff --git a/client-side/src/App.jsx b/client-side/src/App.jsx
index dedb45f2f..91398b49a 100644
--- a/client-side/src/App.jsx
+++ b/client-side/src/App.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Provider } from 'react-redux';
 import { RouterProvider } from 'react-router-dom';
 import Footer from './stories/footer/FooterComponent';
@@ -6,18 +6,22 @@ import { router } from './router/router.jsx';
 import { store } from './redux/store.jsx';
 import { SnackbarProvider } from 'notistack';
 import './App.scss';
+import { GoogleOAuthProvider } from '@react-oauth/google';
+
+const clientId = "1074410346984-b9bsnokpb84s4afiim9t9d797k6orsvk.apps.googleusercontent.com";
 
 function App() {
-  return (
 
-    <>
+  return (
+    <GoogleOAuthProvider clientId={clientId}>
       <SnackbarProvider maxSnack={3}>
-      <Provider store={store}>
-        <RouterProvider router={router} />
-        <Footer />
+        <Provider store={store}>
+          <RouterProvider router={router} />
+          <Footer />
         </Provider>
-    </SnackbarProvider>
-    </>
+      </SnackbarProvider>
+    </GoogleOAuthProvider>
   );
 }
+
 export default App;
diff --git a/client-side/src/components/Report/googleDriveUploader.jsx b/client-side/src/components/Report/googleDriveUploader.jsx
new file mode 100644
index 000000000..4f20ed1db
--- /dev/null
+++ b/client-side/src/components/Report/googleDriveUploader.jsx
@@ -0,0 +1,56 @@
+import React, { useEffect, useState } from 'react';
+import { gapi } from 'gapi-script';
+import GenericButton from '../../stories/Button/GenericButton'; 
+
+const CLIENT_ID = '1074410346984-b9bsnokpb84s4afiim9t9d797k6orsvk.apps.googleusercontent.com';
+
+const GoogleDriveUploader = () => {
+  useEffect(() => {
+    function start() {
+      gapi.client.init({
+        clientId: CLIENT_ID,
+        scope: 'https://www.googleapis.com/auth/drive.file',
+      }).then(() => {
+        console.log('GAPI client initialized');
+      }).catch(error => {
+        console.error('Error initializing GAPI client:', error);
+      });
+    }
+
+    gapi.load('client:auth2', start);
+  }, []);
+
+  const handleAuthClick = async () => {
+    try {
+      await gapi.auth2.getAuthInstance().signIn({
+        prompt: 'select_account'
+      });
+      console.log('Successfully signed in');
+    } catch (error) {
+      console.error('Error signing in:', error);
+    }
+  };
+
+  const handleSignoutClick = () => {
+    gapi.auth2.getAuthInstance().signOut();
+  };
+
+  return (
+    <div>
+      <GenericButton
+        label="Sign in with Google"
+        onClick={handleAuthClick}
+        className="signInButton"
+        size="large"
+      />
+      <GenericButton
+        label="Sign out"
+        onClick={handleSignoutClick}
+        className="signOutButton"
+        size="large"  
+      />
+    </div>
+  );
+};
+
+export default GoogleDriveUploader;
diff --git a/client-side/src/components/Report/uploadToGoogleDrive.jsx b/client-side/src/components/Report/uploadToGoogleDrive.jsx
new file mode 100644
index 000000000..062b13112
--- /dev/null
+++ b/client-side/src/components/Report/uploadToGoogleDrive.jsx
@@ -0,0 +1,52 @@
+import { useGoogleLogin } from '@react-oauth/google';
+import axios from 'axios';
+import GenericButton from '../../stories/Button/GenericButton';  
+
+const UploadToGoogleDrive = () => {
+    const login = useGoogleLogin({
+        onSuccess: async (tokenResponse) => {
+            const accessToken = tokenResponse.access_token;
+
+            const fileData = new Blob(["Hello, world!"], { type: "text/plain" });
+
+            const metadata = {
+                name: 'yourfile.txt', 
+                mimeType: 'text/plain', 
+            };
+
+            const form = new FormData();
+            form.append('metadata', new Blob([JSON.stringify(metadata)], { type: 'application/json' }));
+            form.append('file', fileData);
+
+            try {
+                const response = await axios.post(
+                    'https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart',
+                    form,
+                    {
+                        headers: {
+                            Authorization: `Bearer ${accessToken}`,
+                            'Content-Type': 'multipart/related',
+                        },
+                    }
+                );
+                console.log('File uploaded:', response.data);
+            } catch (error) {
+                console.error('Error uploading file:', error);
+            }
+        },
+        onError: error => console.error('Login failed:', error)
+    });
+
+    return (
+        <div>
+            <GenericButton
+                label="Upload to Google Drive"
+                onClick={() => login()}
+                className="uploadButton"
+                size="large"  
+            />
+        </div>
+    );
+};
+
+export default UploadToGoogleDrive;
diff --git a/client-side/src/router/router.jsx b/client-side/src/router/router.jsx
index 7bfa68907..905f4b675 100644
--- a/client-side/src/router/router.jsx
+++ b/client-side/src/router/router.jsx
@@ -1,8 +1,10 @@
 import React from "react";
 import {createBrowserRouter } from "react-router-dom";
-import ProfileList from "../components/profileComponent.jsx";
+// import ProfileList from "../components/profileComponent.jsx";
 import Layout from "./layout.jsx";
 import Login from "../login/Login.jsx";
+import UploadToGoogleDrive from "../components/Report/uploadToGoogleDrive.jsx";
+import GoogleDriveUploader from "../components/Report/googleDriveUploader.jsx";
 export  const router = createBrowserRouter([
     {
         path: '',
@@ -18,11 +20,15 @@ export  const router = createBrowserRouter([
             },
             {
                 path: '/profiles',
-                element:<ProfileList/>
+                // element:<ProfileList/>
             },
             {
                 path: '/login',
                 element: <Login/>
+            },
+            {
+                path: '/reports',
+                element: <><UploadToGoogleDrive/><GoogleDriveUploader/></>
             }
         ]
     },

From 0f09cc2625f536aa3d4196fffd2c5c638fbbed23 Mon Sep 17 00:00:00 2001
From: MiryamGabay <miryamgabay9@gmail.com>
Date: Thu, 5 Sep 2024 10:17:37 +0300
Subject: [PATCH 2/4] google drive

---
 client-side/src/components/Report/googleDriveUploader.jsx | 2 +-
 client-side/src/components/Report/uploadToGoogleDrive.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-side/src/components/Report/googleDriveUploader.jsx b/client-side/src/components/Report/googleDriveUploader.jsx
index 4f20ed1db..7d7639013 100644
--- a/client-side/src/components/Report/googleDriveUploader.jsx
+++ b/client-side/src/components/Report/googleDriveUploader.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { gapi } from 'gapi-script';
 import GenericButton from '../../stories/Button/GenericButton'; 
 
diff --git a/client-side/src/components/Report/uploadToGoogleDrive.jsx b/client-side/src/components/Report/uploadToGoogleDrive.jsx
index 062b13112..2474dd5c0 100644
--- a/client-side/src/components/Report/uploadToGoogleDrive.jsx
+++ b/client-side/src/components/Report/uploadToGoogleDrive.jsx
@@ -7,8 +7,8 @@ const UploadToGoogleDrive = () => {
         onSuccess: async (tokenResponse) => {
             const accessToken = tokenResponse.access_token;
 
+            //כרגע מעלה לדריב קובץ חסר משמהות
             const fileData = new Blob(["Hello, world!"], { type: "text/plain" });
-
             const metadata = {
                 name: 'yourfile.txt', 
                 mimeType: 'text/plain', 

From c446d024d7d6322ceff879ec3685ecdbafba7b20 Mon Sep 17 00:00:00 2001
From: MiryamGabay <miryamgabay9@gmail.com>
Date: Sun, 8 Sep 2024 13:45:46 +0300
Subject: [PATCH 3/4] fixed

---
 client-side/.env                              |  1 +
 client-side/src/App.jsx                       |  4 +--
 client-side/src/axios/axiosInstance.js        | 32 +++++++++++++++++
 client-side/src/axios/middleware.js           | 24 +++++--------
 .../components/Report/googleDriveUploader.jsx | 25 +++++++-------
 .../components/Report/managerGoogleDrive.jsx  | 22 ++++++++++++
 .../components/Report/uploadToGoogleDrive.jsx | 34 +++++++++----------
 .../src/constants/googleDriveConstants.js     | 31 +++++++++++++++++
 client-side/src/router/router.jsx             | 10 ++----
 9 files changed, 129 insertions(+), 54 deletions(-)
 create mode 100644 client-side/src/axios/axiosInstance.js
 create mode 100644 client-side/src/components/Report/managerGoogleDrive.jsx
 create mode 100644 client-side/src/constants/googleDriveConstants.js

diff --git a/client-side/.env b/client-side/.env
index 4655bc2cf..e15d05f74 100644
--- a/client-side/.env
+++ b/client-side/.env
@@ -1,3 +1,4 @@
 REACT_APP_BASE_URL='http://localhost:3000'
 REACT_APP_SECRET_CODE_CAPVAL='6Ld5uBoqAAAAAKwPXqo5eanm9ZFSuOoBBSdl00pE'
 REACT_APP_SERVER_URL='http://localhost:5000'
+REACT_APP_GOOGLE_CLIENT_ID='1074410346984-b9bsnokpb84s4afiim9t9d797k6orsvk.apps.googleusercontent.com'
diff --git a/client-side/src/App.jsx b/client-side/src/App.jsx
index 91398b49a..0aaef8c3b 100644
--- a/client-side/src/App.jsx
+++ b/client-side/src/App.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Provider } from 'react-redux';
 import { RouterProvider } from 'react-router-dom';
 import Footer from './stories/footer/FooterComponent';
@@ -8,7 +8,7 @@ import { SnackbarProvider } from 'notistack';
 import './App.scss';
 import { GoogleOAuthProvider } from '@react-oauth/google';
 
-const clientId = "1074410346984-b9bsnokpb84s4afiim9t9d797k6orsvk.apps.googleusercontent.com";
+const clientId = process.env.REACT_APP_GOOGLE_CLIENT_ID;
 
 function App() {
 
diff --git a/client-side/src/axios/axiosInstance.js b/client-side/src/axios/axiosInstance.js
new file mode 100644
index 000000000..bc4ff5b6d
--- /dev/null
+++ b/client-side/src/axios/axiosInstance.js
@@ -0,0 +1,32 @@
+import axios from 'axios';
+
+const axiosInstance = axios.create({
+    baseURL: process.env.REACT_APP_SERVER_URL,
+});
+
+axiosInstance.interceptors.request.use(
+    (config) => {
+        const token = localStorage.getItem('authToken'); 
+        if (token) {
+            config.headers['Authorization'] = `Bearer ${token}`;
+        }
+        return config;
+    },
+    (error) => {
+        return Promise.reject(error);
+    }
+);
+
+axiosInstance.interceptors.response.use(
+    (response) => {
+        return response;
+    },
+    (error) => {
+        if (error.response.status === 401) {
+            window.location.href = '/login';
+        }
+        return Promise.reject(error);
+    }
+);
+
+export default axiosInstance;
diff --git a/client-side/src/axios/middleware.js b/client-side/src/axios/middleware.js
index 62503f44b..4479526a1 100644
--- a/client-side/src/axios/middleware.js
+++ b/client-side/src/axios/middleware.js
@@ -1,27 +1,21 @@
-import axios from 'axios';
+import axiosInstance from './axiosInstance';
 
-const url = process.env.REACT_APP_SERVER_URL;
-
-export async function handleGet(path) {
-    const response = await axios.create({ baseURL: url }).get(path);
+export async function handleGet(path, config = {}) {
+    const response = await axiosInstance.get(path, config);
     return response;
-
 };
 
-export async function handlePost(path, data) {
-    const response = await axios.create({ baseURL: url }).post(path, data);
+export async function handlePost(path, data, config = {}) {
+    const response = await axiosInstance.post(path, data, config);
     return response;
-
 };
 
-export async function handlePut(path, data) {
-    const response = await axios.create({ baseURL: url }).put(path, data);
+export async function handlePut(path, data, config = {}) {
+    const response = await axiosInstance.put(path, data, config);
     return response;
-
 };
 
-export async function handleDelete(path) {
-    const response = await axios.create({ baseURL: url }).delete(path);
+export async function handleDelete(path, config = {}) {
+    const response = await axiosInstance.delete(path, config);
     return response;
-
 };
diff --git a/client-side/src/components/Report/googleDriveUploader.jsx b/client-side/src/components/Report/googleDriveUploader.jsx
index 7d7639013..4306e76d4 100644
--- a/client-side/src/components/Report/googleDriveUploader.jsx
+++ b/client-side/src/components/Report/googleDriveUploader.jsx
@@ -1,33 +1,34 @@
 import React, { useEffect } from 'react';
 import { gapi } from 'gapi-script';
-import GenericButton from '../../stories/Button/GenericButton'; 
-
-const CLIENT_ID = '1074410346984-b9bsnokpb84s4afiim9t9d797k6orsvk.apps.googleusercontent.com';
+import GenericButton from '../../stories/Button/GenericButton';
+import { GOOGLE_API, MESSAGES, BUTTON_LABELS } from '../../constants/googleDriveConstants';
 
 const GoogleDriveUploader = () => {
+  const CLIENT_ID = process.env.REACT_APP_GOOGLE_CLIENT_ID;
+
   useEffect(() => {
     function start() {
       gapi.client.init({
         clientId: CLIENT_ID,
-        scope: 'https://www.googleapis.com/auth/drive.file',
+        scope: GOOGLE_API.scopes,
       }).then(() => {
-        console.log('GAPI client initialized');
+        console.log(MESSAGES.gapiClientInitialized);
       }).catch(error => {
-        console.error('Error initializing GAPI client:', error);
+        console.error(MESSAGES.gapiInitError, error);
       });
     }
 
     gapi.load('client:auth2', start);
-  }, []);
+  }, [CLIENT_ID]);
 
   const handleAuthClick = async () => {
     try {
       await gapi.auth2.getAuthInstance().signIn({
-        prompt: 'select_account'
+        prompt: GOOGLE_API.prompt,
       });
-      console.log('Successfully signed in');
+      console.log(MESSAGES.gapiSignInSuccess);
     } catch (error) {
-      console.error('Error signing in:', error);
+      console.error(MESSAGES.signInError, error);
     }
   };
 
@@ -38,13 +39,13 @@ const GoogleDriveUploader = () => {
   return (
     <div>
       <GenericButton
-        label="Sign in with Google"
+        label={BUTTON_LABELS.signIn}
         onClick={handleAuthClick}
         className="signInButton"
         size="large"
       />
       <GenericButton
-        label="Sign out"
+        label={BUTTON_LABELS.signOut}
         onClick={handleSignoutClick}
         className="signOutButton"
         size="large"  
diff --git a/client-side/src/components/Report/managerGoogleDrive.jsx b/client-side/src/components/Report/managerGoogleDrive.jsx
new file mode 100644
index 000000000..ed42be550
--- /dev/null
+++ b/client-side/src/components/Report/managerGoogleDrive.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import GoogleDriveUploader from './googleDriveUploader';
+import UploadToGoogleDrive from './uploadToGoogleDrive';
+
+const ManagerGoogleDrive = () => {
+    const fileContent = "Hello, world!";
+    const fileName = 'yourfile.txt';
+    const fileMimeType = 'text/plain';
+
+    return (
+        <div>
+            <UploadToGoogleDrive
+                fileContent={fileContent}
+                fileName={fileName}
+                fileMimeType={fileMimeType}
+            />
+            <GoogleDriveUploader />
+        </div>
+    );
+};
+
+export default ManagerGoogleDrive;
diff --git a/client-side/src/components/Report/uploadToGoogleDrive.jsx b/client-side/src/components/Report/uploadToGoogleDrive.jsx
index 2474dd5c0..7124ee1ca 100644
--- a/client-side/src/components/Report/uploadToGoogleDrive.jsx
+++ b/client-side/src/components/Report/uploadToGoogleDrive.jsx
@@ -1,26 +1,25 @@
 import { useGoogleLogin } from '@react-oauth/google';
-import axios from 'axios';
-import GenericButton from '../../stories/Button/GenericButton';  
+import GenericButton from '../../stories/Button/GenericButton';
+import { FILE_DETAILS, URLS, MESSAGES, BUTTON_LABELS } from '../../constants/googleDriveConstants';
+import { handlePost } from '../../axios/middleware';
 
 const UploadToGoogleDrive = () => {
+    const CLIENT_ID = process.env.REACT_APP_GOOGLE_CLIENT_ID;
+
     const login = useGoogleLogin({
+        clientId: CLIENT_ID,
         onSuccess: async (tokenResponse) => {
             const accessToken = tokenResponse.access_token;
 
-            //כרגע מעלה לדריב קובץ חסר משמהות
-            const fileData = new Blob(["Hello, world!"], { type: "text/plain" });
-            const metadata = {
-                name: 'yourfile.txt', 
-                mimeType: 'text/plain', 
-            };
+            const fileData = new Blob([FILE_DETAILS.content], { type: FILE_DETAILS.mimeType });
 
             const form = new FormData();
-            form.append('metadata', new Blob([JSON.stringify(metadata)], { type: 'application/json' }));
+            form.append('metadata', new Blob([JSON.stringify({ name: FILE_DETAILS.name, mimeType: FILE_DETAILS.mimeType })], { type: 'application/json' }));
             form.append('file', fileData);
 
             try {
-                const response = await axios.post(
-                    'https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart',
+                const response = await handlePost(
+                    URLS.uploadUrl,
                     form,
                     {
                         headers: {
@@ -29,24 +28,25 @@ const UploadToGoogleDrive = () => {
                         },
                     }
                 );
-                console.log('File uploaded:', response.data);
+                console.log('File uploaded successfully:', response);
             } catch (error) {
-                console.error('Error uploading file:', error);
+                console.error(MESSAGES.uploadError, error);
             }
         },
-        onError: error => console.error('Login failed:', error)
+        onError: error => console.error(MESSAGES.loginFailed, error)
     });
 
     return (
         <div>
             <GenericButton
-                label="Upload to Google Drive"
-                onClick={() => login()}
+                label={BUTTON_LABELS.upload}
+                onClick={login}
                 className="uploadButton"
-                size="large"  
+                size="large"
             />
         </div>
     );
 };
 
 export default UploadToGoogleDrive;
+
diff --git a/client-side/src/constants/googleDriveConstants.js b/client-side/src/constants/googleDriveConstants.js
new file mode 100644
index 000000000..ae34666fd
--- /dev/null
+++ b/client-side/src/constants/googleDriveConstants.js
@@ -0,0 +1,31 @@
+export const BUTTON_LABELS = {
+    upload: 'Upload to Google Drive',
+    signIn: 'Sign in with Google',
+    signOut: 'Sign out',
+};
+
+export const FILE_DETAILS = {
+    name: 'yourfile.txt',
+    mimeType: 'text/plain',
+    content: 'Hello, world!',
+};
+
+export const URLS = {
+    uploadUrl: 'https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart',
+};
+
+export const MESSAGES = {
+    loginFailed: 'Login failed:',
+    uploadError: 'Error uploading file:',
+    signInError: 'Error signing in:',
+    signOutError: 'Error signing out:',
+    gapiInitError: 'Error initializing GAPI client:',
+    gapiSignInSuccess: 'Successfully signed in',
+    gapiClientInitialized: 'GAPI client initialized',
+};
+
+export const GOOGLE_API = {
+    clientId: '1074410346984-b9bsnokpb84s4afiim9t9d797k6orsvk.apps.googleusercontent.com',
+    scopes: 'https://www.googleapis.com/auth/drive.file',
+    prompt: 'select_account',
+};
diff --git a/client-side/src/router/router.jsx b/client-side/src/router/router.jsx
index 905f4b675..dc8b57cd5 100644
--- a/client-side/src/router/router.jsx
+++ b/client-side/src/router/router.jsx
@@ -1,10 +1,8 @@
 import React from "react";
 import {createBrowserRouter } from "react-router-dom";
-// import ProfileList from "../components/profileComponent.jsx";
 import Layout from "./layout.jsx";
 import Login from "../login/Login.jsx";
-import UploadToGoogleDrive from "../components/Report/uploadToGoogleDrive.jsx";
-import GoogleDriveUploader from "../components/Report/googleDriveUploader.jsx";
+import ManagerGoogleDrive from "../components/Report/managerGoogleDrive.jsx";
 export  const router = createBrowserRouter([
     {
         path: '',
@@ -18,17 +16,13 @@ export  const router = createBrowserRouter([
                 path: '/home',
                 element: <h1>home</h1>
             },
-            {
-                path: '/profiles',
-                // element:<ProfileList/>
-            },
             {
                 path: '/login',
                 element: <Login/>
             },
             {
                 path: '/reports',
-                element: <><UploadToGoogleDrive/><GoogleDriveUploader/></>
+                element: <ManagerGoogleDrive/>
             }
         ]
     },

From cd016f96f38d7f6d6adecafbe858e2369e5029b9 Mon Sep 17 00:00:00 2001
From: MiryamGabay <miryamgabay9@gmail.com>
Date: Wed, 11 Sep 2024 09:32:09 +0300
Subject: [PATCH 4/4] after conflictes

---
 server-side/controllers/preference.controller.js |  4 ----
 server-side/router/preference.router.js          | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/server-side/controllers/preference.controller.js b/server-side/controllers/preference.controller.js
index 46f71ac85..1744df6f6 100644
--- a/server-side/controllers/preference.controller.js
+++ b/server-side/controllers/preference.controller.js
@@ -64,10 +64,6 @@ export const deletePreference = async (req, res, next) => {
 
         res.json({ message: 'deleted succesfully!!' }).status(204)
     } catch (error) {
-<<<<<<< HEAD
-        return next({ message: error.message });
-=======
         return next({ message: error.message, status: 500 });
->>>>>>> 9b418204928598b6d7eda4b6b9ba01463f7803d9
     }
 };
diff --git a/server-side/router/preference.router.js b/server-side/router/preference.router.js
index e0f8baff4..114a4a803 100644
--- a/server-side/router/preference.router.js
+++ b/server-side/router/preference.router.js
@@ -2,15 +2,6 @@ import  express from 'express';
 import  upload from '../middleware/uploadFiles.js';
 import  {getAllPreference,getPreferenceById,updatePreference,deletePreference,addPreference} from '../controllers/preference.controller.js'
 
-<<<<<<< HEAD
-const router=express.Router();
-router.get('/preferences',getAllPreference);
-router.get('/preferences/:id',getPreferenceById);
-router.post('/preferences',upload.single('soundVoice'),addPreference);
-router.put('/preferences/:id',upload.single('soundVoice'),updatePreference);
-router.delete('/preferences/:id',deletePreference);
-export default router;
-=======
 const preferencesRouter=express.Router();
 
 preferencesRouter.get('/',getAllPreference);
@@ -20,4 +11,3 @@ preferencesRouter.put('/:id',upload.single('soundVoice'),updatePreference);
 preferencesRouter.delete('/:id',deletePreference);
 
 export default preferencesRouter;
->>>>>>> 9b418204928598b6d7eda4b6b9ba01463f7803d9