pakcage.json

data-for-change · Aug 16, 2023 · 452499d · 452499d
1 parent d2d5477
commit 452499d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "@babel/eslint-parser": "^7.14.7",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -33,6 +34,7 @@
     "react-leaflet": "3.1.0",
     "react-leaflet-google-layer": "^2.0.4",
     "react-router-dom": "^6.15.0",
+    "react-scripts": "^5.0.1",
     "react-share": "^4.4.0",
     "recharts": "^2.0.9",
     "tinycolor2": "^1.4.2",

diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Box, Button, makeStyles, Theme, Typography } from '@material-ui/core';
 import { observer } from 'mobx-react-lite';
 import MapDialog from 'components/molecules/MapDialog';
@@ -12,6 +12,17 @@ import StreetCard, { StreetCardProps } from 'components/StreetCard';
 import ResponsiveDrawer from 'components/molecules/infoDrawer/Drawer';
 import SectionInfo from 'components/molecules/sectionInfo';
 
+enum LocationType {
+  cityAndStreet,
+  sagment
+}
+
+type Location = {
+  type: LocationType,
+  location: string,
+  id?: string
+}
+
 const HomePage = () => {
   const classes = useStyles();
   const navigate = useNavigate();
@@ -22,7 +33,7 @@ const HomePage = () => {
 
   const [open, setOpen] = useState(false);
 
-  const [currentLocation, setCurrentLocation] = useState<string>('תל אביב, אלנבי')
+  const [currentLocation, setCurrentLocation] = useState<Location>({ type: LocationType.cityAndStreet, location: 'תל אביב, אלנבי' })
 
   const [isDrawerOpen, setIsDrawerOpen] = useState(false);
   const [selectedSection, setSelectedSection] = useState({});
@@ -31,7 +42,6 @@ const HomePage = () => {
     setIsDrawerOpen(!isDrawerOpen);
   };
 
-
   const [cards, setCards] = useState<StreetCardProps[]>([
     { streetName: 'בוגרשוב', city: 'תל אביב', handleClick: handleDrawerToggle },
     { streetName: 'בוגרשוב', city: 'תל אביב', handleClick: handleDrawerToggle },
@@ -56,7 +66,7 @@ const HomePage = () => {
   const onLocationSearch = () => {
     if (roadSegmentLocation) {
       //navigate(`${settingsStore.currentLanguageRouteString}/location/${roadSegmentLocation?.road_segment_id}`);
-      setCurrentLocation(roadSegmentLocation?.road_segment_id.toString())
+      setCurrentLocation({ type: LocationType.sagment, location: roadSegmentLocation.road_segment_name, id: roadSegmentLocation.road_segment_id.toString() })
       setOpen(false);
       store.setGpsLocationData(null);
     }
@@ -67,35 +77,35 @@ const HomePage = () => {
     console.log('city is', city);
     console.log('street is', street);
     //navigate(`${settingsStore.currentLanguageRouteString}/cityAndStreet/${street}/${city}`);
-    setCurrentLocation(`${street},${city}`)
+    setCurrentLocation({ type: LocationType.cityAndStreet, location: `${street}, ${city}` })
     setOpen(false);
   };
 
-
   return (
     <Box className={classes.container}>
       <Box className={classes.columnContainer}>
-        {cards.map((streetData, index) => (
-      </Typography>
-      {cards.map((streetData: StreetCardProps, index: number) => (
+        <Typography>
+          {currentLocation.location} - <Button onClick={() => setOpen(true)}>שינוי כתובת</Button>
+        </Typography>
+        {cards.map((streetData: StreetCardProps, index: number) => (
           <StreetCard key={index} {...streetData} />
         ))}
 
-      <MapDialog
-        open={open}
-        section={roadSegmentLocation?.road_segment_name}
-        roadNumber={roadSegmentLocation?.road1}
-        onLocationChange={onLocationChange}
-        onClose={() => {
-          setOpen(false);
-          store.setGpsLocationData(null);
-        }}
-        onSearch={onLocationSearch}
-        onStreetAndCitySearch={onStreetAndCitySearch}
-      />
+        <MapDialog
+          open={open}
+          section={roadSegmentLocation?.road_segment_name}
+          roadNumber={roadSegmentLocation?.road1}
+          onLocationChange={onLocationChange}
+          onClose={() => {
+            setOpen(false);
+            store.setGpsLocationData(null);
+          }}
+          onSearch={onLocationSearch}
+          onStreetAndCitySearch={onStreetAndCitySearch}
+        />
       </Box>
       <Box className={classes.columnContainer}>
-          <SectionInfo section={selectedSection}/>
+        <SectionInfo section={selectedSection} />
       </Box>
       {/* <ResponsiveDrawer isDrawerOpen={isDrawerOpen}>