Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d39c515
first commit
avishag-gvili Jul 25, 2024
30c477d
add profile page
avishag-gvili Jul 28, 2024
b8c7915
add profile page server
avishag-gvili Jul 28, 2024
763e628
change add profile
dvory-git Jul 28, 2024
1618b56
after diffrent
MiryamGabay Jul 29, 2024
1eeda72
after change pages
dvory-git Jul 29, 2024
c32fc61
after change pages
dvory-git Jul 29, 2024
b27dc12
delate console.log
dvory-git Jul 29, 2024
0dacd13
after all
MiryamGabay Jul 29, 2024
ee9b7b3
פתרון קונפליקטים
MiryamGabay Jul 29, 2024
10af603
after diffrent!!
MiryamGabay Jul 29, 2024
eb6ad62
after all diffrent
MiryamGabay Jul 29, 2024
baeb574
change profile-server
avishag-gvili Jul 30, 2024
b3a4fd5
profile
avishag-gvili Jul 30, 2024
27ef8f6
change profile-server
avishag-gvili Jul 30, 2024
cf0687f
after-all-diffrent
MiryamGabay Jul 30, 2024
1dcacff
again
MiryamGabay Jul 30, 2024
df06239
change pages
dvory-git Jul 30, 2024
d3fae21
change pages
dvory-git Jul 30, 2024
050f17e
C# commit 1
avishag-gvili Jul 31, 2024
185bead
profile page
avishag-gvili Aug 1, 2024
749ec75
update profile page
avishag-gvili Aug 1, 2024
4387217
update profile
avishag-gvili Aug 1, 2024
72d8b0f
change
dvory-git Aug 1, 2024
3dfca56
change pages
dvory-git Aug 1, 2024
62cd19b
commit
avishag-gvili Aug 4, 2024
990229e
Resolved merge conflicts
avishag-gvili Aug 5, 2024
29dbbc2
add inputRadio
dvory-git Aug 5, 2024
fe287a8
change
dvory-git Aug 5, 2024
04b30d0
add pages notistack
dvory-git Aug 5, 2024
00bae44
update profile page
avishag-gvili Aug 6, 2024
a211f26
update profile page
avishag-gvili Aug 6, 2024
b13592a
הודעה לתיאור השינויים
avishag-gvili Aug 6, 2024
5f5c65e
הודעה לתיאור השינויים
avishag-gvili Aug 6, 2024
7e07a9c
commit
avishag-gvili Aug 7, 2024
1402c9c
commit
avishag-gvili Aug 7, 2024
666ed75
add tests
avishag-gvili Aug 8, 2024
07ab73c
test for profiles
avishag-gvili Aug 8, 2024
cd7b79f
map and tests
avishag-gvili Aug 15, 2024
91917e5
map and tests
avishag-gvili Aug 15, 2024
898262d
map and tests
avishag-gvili Aug 15, 2024
ebafd5f
map and tests
avishag-gvili Aug 15, 2024
23e5aba
googleMap_and_tests
avishag-gvili Aug 15, 2024
2e188b4
googleMap_and_tests
avishag-gvili Aug 15, 2024
b0caab2
googleMap_and_tests
avishag-gvili Aug 15, 2024
d117ed6
remove API_KEY
SariGlick Aug 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
32,330 changes: 21,567 additions & 10,763 deletions client-side/package-lock.json

Large diffs are not rendered by default.

40 changes: 38 additions & 2 deletions client-side/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
"@mui/material": "^5.16.0",
"@mui/styled-engine-sc": "^6.0.0-alpha.18",
"@mui/x-charts": "^7.10.0",
"@mui/x-data-grid": "^7.9.0",
"@react-google-maps/api": "^2.19.3",
"@mui/x-data-grid": "^7.10.0",
"@reduxjs/toolkit": "^2.2.6",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@types/redux": "^3.6.31",
"axios": "^1.7.2",
Expand All @@ -23,20 +24,22 @@
"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"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test": "jest",
"eject": "react-scripts eject",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
Expand All @@ -61,6 +64,10 @@
]
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
"@babel/preset-env": "^7.25.3",
"@babel/preset-react": "^7.24.7",
"@chromatic-com/storybook": "^1.6.0",
"@eslint/compat": "^1.1.0",
"@eslint/js": "^9.6.0",
Expand All @@ -74,16 +81,45 @@
"@storybook/react": "^8.1.11",
"@storybook/react-webpack5": "^8.1.11",
"@storybook/test": "^8.1.11",
"@testing-library/jest-dom": "^6.4.8",
"babel-jest": "^29.7.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-storybook": "^0.8.0",
"globals": "^15.8.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"notistack": "^3.0.1",
"prop-types": "^15.8.1",

"redux-mock-store": "^1.5.4",
"react-scripts": "^5.0.1",
"regenerator-transform": "^0.15.2",
"sass": "^1.77.6",
"storybook": "^8.1.11"
},
"jest": {
"transform": {
"^.+\\.(js|jsx|ts|tsx)$": "babel-jest"
},
"moduleNameMapper": {
"\\.(css|scss)$": "identity-obj-proxy",
"\\.(jpg|jpeg|png|gif|webp|svg)$": "<rootDir>/__mocks__/fileMock.js",
"^src/(.*)$": "<rootDir>/src/$1"
},
"testEnvironment": "jest-environment-jsdom",
"testEnvironmentOptions": {},
"coverageDirectory": "coverage",
"collectCoverage": true
},
"babel": {
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-transform-private-property-in-object"
]
}
}
15 changes: 9 additions & 6 deletions client-side/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
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';
import { router } from './router/router.jsx';
import { store } from './redux/store.jsx';
import { SnackbarProvider } from 'notistack';
import './App.scss';
import startLocationTracking from './services/googleMapService.js';

function App() {
return (
useEffect(() => {
startLocationTracking();
}, []);

<>
<SnackbarProvider maxSnack={3}>
return (
<SnackbarProvider maxSnack={3}>
<Provider store={store}>
<RouterProvider router={router} />
<Footer />
</Provider>
</SnackbarProvider>
</>
);
}
export default App;

export default App;
55 changes: 28 additions & 27 deletions client-side/src/axios/middleware.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
import axios from 'axios';

const url = process.env.REACT_APP_SERVER_URL;

export async function handleGet(path) {
const response = await axios.create({ baseURL: url }).get(path);
return response;

};

export async function handlePost(path, data) {
const response = await axios.create({ baseURL: url }).post(path, data);
return response;

};

export async function handlePut(path, data) {
const response = await axios.create({ baseURL: url }).put(path, data);
return response;

};

export async function handleDelete(path) {
const response = await axios.create({ baseURL: url }).delete(path);
return response;

};
import axios from 'axios';

const url = process.env.REACT_APP_SERVER_URL;

export async function handleGet(path) {

const response = await axios.create({ baseURL: url }).get(path);
return response;

};

export async function handlePost(path, data) {
console.log(path)
const response = await axios.create({ baseURL: url }).post(path, data);
return response;
};

export async function handlePut(path, data) {
const response = await axios.create({ baseURL: url }).put(path, data);
return response;

};

export async function handleDelete(path) {
const response = await axios.create({ baseURL: url }).delete(path);
return response;

};
Loading