Merge pull request #82 from iranpsc/fix/logicBugs3

fix some logic bugs

Author: theAwmin

babel.json

@@ -0,0 +1,6 @@
+{
+  "stories": [],
+  "versions": [],
+  "backups": [],
+  "activity": []
+}

package-lock.json

@@ -44,6 +44,7 @@
     "i18next-http-backend": "^2.6.1",
     "i18next-localstorage-backend": "^4.2.0",
     "jalali-moment": "^3.3.11",
+    "jsonpath": "^1.2.1",
     "keen-slider": "^6.8.6",
     "laravel-echo": "^1.15.0",
     "leaflet": "^1.9.4",
@@ -80,6 +81,7 @@
     "react-tooltip": "^5.28.1",
     "react-unity-webgl": "^9.4.0",
     "resumablejs": "^1.1.0",
+    "schema-utils": "4.3.x",
     "shortid": "^2.2.16",
     "slate": "^0.118.1",
     "slate-history": "^0.100.0",

package.json

@@ -1,3 +1,4 @@
+
 {
   "tiles": [
     "https://map.irpsc.com/tiles/{z}/{x}/{y}.mvt",

public/tile.json

@@ -3,7 +3,6 @@ import { BrowserRouter } from "react-router-dom"; // Import useNavigate
 import { Toaster } from "react-hot-toast";
 import "./App.css";
 import "react-quill/dist/quill.snow.css";
-import styled from "styled-components";
 import "./i18n/i18n.js";
 import Echo from "laravel-echo";
 import Pusher from "pusher-js";
@@ -12,10 +11,6 @@ import WalletProvider from "./services/reducers/WalletContext";
 import FollowProvider from "./services/reducers/FollowContext";
 import { MapContextProvider } from "./services/reducers/mapContext";
 import { ThemeProviderContext } from "./services/reducers/ThemeContext";
-import MapTreeD from "./layouts/map";
-import Menu from "./layouts/menu";
-import StatusBar from "./layouts/statusBar";
-import { MenuContextProvider } from "./services/reducers/MenuContext";
 import { MapProvider } from "react-map-gl";
 import { SelectedEnvironmentProvider } from "./services/reducers/SelectedEnvironmentContext.jsx";
 import { AlertProvider } from "./services/reducers/AlertContext.jsx";
@@ -26,9 +21,6 @@ import RotateDevice from "./components/RotateDevice";
 import Error410Modal from "./components/Error410Modal";
 import { useAppHeight } from "./hooks/useAppHeight.js";
 import { ScrollDirectionProvider } from "./services/reducers/ScrollDirectionContext.jsx";
-import { Outlet, Route, Routes, Navigate } from "react-router-dom";
-import MainLayout from "./layouts/MainLayout.jsx";
-
 function App() {
   useAppHeight();
 
@@ -47,42 +39,42 @@ function App() {
     });
   }, []);
 
-  return (
-    <ScrollDirectionProvider>
-      <LoaderProvider>
-        <MapProvider>
-          <ThemeProviderContext>
-            <LanguageProvider>
+  return (<LanguageProvider>
+
+    <BrowserRouter>
+      <ScrollDirectionProvider>
+        <LoaderProvider>
+          <MapProvider>
+            <ThemeProviderContext>
               <UserProvider>
                 <WalletProvider>
                   <FollowProvider>
                     <SelectedEnvironmentProvider>
                       <MapContextProvider>
                         <AlertProvider>
-                          <BrowserRouter>
-                            <RotateDevice />
-                            <Routers />
+                          <RotateDevice />
+                          <Routers />
 
-                            <Error410Modal />
-                            <Toaster
-                              containerStyle={{
-                                zIndex: 100000,
-                                marginBottom: 48,
-                              }}
-                              position="bottom-right"
-                            />
-                          </BrowserRouter>
+                          <Error410Modal />
+                          <Toaster
+                            containerStyle={{
+                              zIndex: 100000,
+                              marginBottom: 48,
+                            }}
+                            position="bottom-right"
+                          />
                         </AlertProvider>
                       </MapContextProvider>
                     </SelectedEnvironmentProvider>
                   </FollowProvider>
                 </WalletProvider>
               </UserProvider>
-            </LanguageProvider>
-          </ThemeProviderContext>
-        </MapProvider>
-      </LoaderProvider>
-    </ScrollDirectionProvider>
+            </ThemeProviderContext>
+          </MapProvider>
+        </LoaderProvider>
+      </ScrollDirectionProvider>
+    </BrowserRouter>              </LanguageProvider>
+
   );
 }
 

src/App.jsx

@@ -21,14 +21,14 @@ const Container = styled.div`
         ? "#18C08F"
         : props.type === "error"
         ? "#C30000"
-        : "#FFA500"}; // رنگ برای وضعیت در دست بررسی
+        : "#FFA500"}; 
   svg {
     color: ${(props) =>
       props.type === "success"
         ? "#18C08F"
         : props.type === "error"
         ? "#C30000"
-        : "#FFA500"}; // رنگ آیکن برای وضعیت در دست بررسی
+        : "#FFA500"}; 
     font-size: ${(props) => (props.type === "success" ? "25px" : "40px")};
   }
 `;
@@ -41,15 +41,15 @@ const Right = styled.div`
 const Texts = styled.div``;
 const Left = styled.div`
   padding: 10px 22px 10px 22px;
-  background-color: #e9e9e9;
+  background-color: #E9E9E9;
   border-radius: 10px;
   font-weight: 600;
   color: ${(props) => props.theme.colors.newColors.shades.title};
   cursor: pointer;
 `;
 const Text = styled.p`
   color: ${(props) =>
-    props.color ? "#C30000" : props.theme.colors.newColors.shades.title};
+    props.color ? "#C30000" : props.theme.colors.newColors.otherColors.iconText};
   font-weight: ${(props) => (props.color ? "700" : "")};
 `;
 

src/assets/images/defulte-profile.png

@@ -10,22 +10,22 @@ const ButtonElement = styled.button`
         ? `${props.color}80` // Add 50% transparency when disabled
         : props.color
       : props.grayTheme
-      ? props.theme.colors.newColors.otherColors.garyBtn
-      : props.disabled === "pending"
-      ? "#3B3B3B"
-      : props.theme.colors.primary};
+        ? props.theme.colors.newColors.otherColors.garyBtn
+        : props.disabled === "pending"
+          ? "#3B3B3B"
+          : props.theme.colors.primary};
   border: none;
   padding: ${(props) => (props.large ? "0 20px" : "10px 22px")};
   width: ${(props) =>
     props.fit
       ? "fit-content"
       : props.edit
-      ? "125px"
-      : props.large
-      ? "fit-content"
-      : props.full
-      ? "100%"
-      : "fit-content"};
+        ? "125px"
+        : props.large
+          ? "fit-content"
+          : props.full
+            ? "100%"
+            : "fit-content"};
   height: 45px;
   font-weight: 500;
   font-size: 16px;
@@ -34,8 +34,8 @@ const ButtonElement = styled.button`
     props.disabled === "pending"
       ? "#949494"
       : props.grayTheme
-      ? props.theme.colors.newColors.otherColors.grayBtnText
-      : props.theme.colors.newColors.primaryText};
+        ? props.theme.colors.newColors.otherColors.grayBtnText
+        : props.theme.colors.newColors.primaryText};
   color: ${(props) => (props.textColor ? props.textColor : "")};
   font-family: inherit;
   display: flex;
@@ -52,7 +52,7 @@ const ButtonElement = styled.button`
   @media (min-width: 998px) {
     height: ${(props) => (props.large ? "40px" : "50px")};
   }
-  img {
+  & img {
     width: 25px;
     height: 25px;
     margin: 0 3px;
@@ -74,7 +74,6 @@ const Button = ({
   grayTheme,
   style,
 }) => {
-  // ترکیب onclick و onClick
   const handleClick = onClick || onclick;
 
   return (

src/components/Alert/Alert.jsx

@@ -32,6 +32,7 @@ const CustomEditor = ({
   label,
   showIcon = true,
   placeholder = "",
+  border = false,
 }) => {
   const [content, setContent] = useState(value);
 
@@ -87,7 +88,7 @@ const CustomEditor = ({
   return (
     <div>
       {label && <Label>{label}</Label>}
-      <StyledEditorContainer>
+      <StyledEditorContainer border={border}>
         <ReactQuill
           value={content}
           onChange={handleChange}

src/components/Button.jsx

@@ -1,20 +1,44 @@
-import React from 'react';
-import { FullscreenControlContainer, CustomButton } from '../layouts/map/styles';
+import React from "react";
+import {
+  FullscreenControlContainer,
+  CustomButton,
+} from "../layouts/map/styles";
 import { ReactComponent as FullPageIcon } from "../assets/images/fullPage.svg";
 
-const FullscreenControls = ({ isPersian, onToggleFullScreen, onToggleMapFullScreen }) => (
-  <>
-    <FullscreenControlContainer isPersian={isPersian}>
-      <CustomButton as={FullPageIcon} onClick={onToggleFullScreen} />
-    </FullscreenControlContainer>
-    <FullscreenControlContainer style={{ top: "125px" }} isPersian={isPersian}>
-      <CustomButton
-        as={FullPageIcon}
-        style={{ transform: "rotate(45deg)" }}
-        onClick={onToggleMapFullScreen}
-      />
-    </FullscreenControlContainer>
-  </>
-);
+const FullscreenControls = ({
+  isPersian,
+  onToggleFullScreen,
+  onToggleMapFullScreen,
+  isFullScreenMap,
+}) => {
+  const isMobile = window.innerWidth <= 1024;
 
-export default React.memo(FullscreenControls);
+  return (
+    <>
+      {!isMobile && !isFullScreenMap && (
+        <FullscreenControlContainer isPersian={isPersian}>
+          <CustomButton as={FullPageIcon} onClick={onToggleFullScreen} />
+        </FullscreenControlContainer>
+      )}
+
+      <FullscreenControlContainer
+        style={{
+          top: isMobile
+            ? isFullScreenMap && "85px"
+            : isFullScreenMap
+              ? "85px"
+              : "125px",
+        }}
+        isPersian={isPersian}
+      >
+        <CustomButton
+          as={FullPageIcon}
+          style={{ transform: "rotate(45deg)" }}
+          onClick={onToggleMapFullScreen}
+        />
+      </FullscreenControlContainer>
+    </>
+  );
+};
+
+export default React.memo(FullscreenControls);