From 3c148129f7b5943443a888da7dde760c421da3c9 Mon Sep 17 00:00:00 2001 From: inmake Date: Mon, 5 Aug 2024 15:20:15 +0500 Subject: [PATCH] upd --- .../complexWingPage/FloorDescription.tsx | 142 ++++++++++-------- .../SequenceWing/WingSignatures.tsx | 50 +++++- .../src/components/header/Navbar/Navbar.tsx | 5 +- client/src/main.tsx | 5 +- 4 files changed, 137 insertions(+), 65 deletions(-) diff --git a/client/src/components/complexWingPage/FloorDescription.tsx b/client/src/components/complexWingPage/FloorDescription.tsx index a3a504b..0b58d2b 100644 --- a/client/src/components/complexWingPage/FloorDescription.tsx +++ b/client/src/components/complexWingPage/FloorDescription.tsx @@ -33,71 +33,93 @@ const FloorDescription = ({ {descriptionFloor?.wing}

-
- {floorApartments.length} units -
+ {floorApartments.length > 0 && ( +
+ {floorApartments.length} units +
+ )}
-
-
-
-

- { - floorApartments.filter( - (apart) => apart.unitType === "Studio Flex" - ).length - } + {floorApartments.filter((apart) => apart.unitType === "Studio Flex") + .length > 0 && ( +

+
+
+

+ { + floorApartments.filter( + (apart) => apart.unitType === "Studio Flex" + ).length + } +

+
+

Studio Flex

+
+

Unavailable

+
+ )} + + {floorApartments.filter( + (apart) => apart.unitType === "Studio Squared" + ).length > 0 && ( +
+
+
+

+ { + floorApartments.filter( + (apart) => apart.unitType === "Studio Squared" + ).length + } +

+
+

Studio²

+
+

Unavailable

+
+ )} + + {floorApartments.filter( + (apart) => apart.unitType === "1 BR Squared" + ).length > 0 && ( +
+
+
+

+ { + floorApartments.filter( + (apart) => apart.unitType === "1 BR Squared" + ).length + } +

+
+

1 Bedroom²

+
+

Unavailable

+
+ )} + + {floorApartments.filter( + (apart) => apart.unitType === "2 BR Squared" + ).length > 0 && ( +
+
+
+

+ { + floorApartments.filter( + (apart) => apart.unitType === "2 BR Squared" + ).length + } +

+
+

+ 2 Bedroom²

-

Studio Flex

+

Unavailable

-

Unavailable

-
-
-
-
-

- { - floorApartments.filter( - (apart) => apart.unitType === "Studio Squared" - ).length - } -

-
-

Studio²

-
-

Unavailable

-
-
-
-
-

- { - floorApartments.filter( - (apart) => apart.unitType === "1 BR Squared" - ).length - } -

-
-

1 Bedroom²

-
-

Unavailable

-
-
-
-
-

- { - floorApartments.filter( - (apart) => apart.unitType === "2 BR Squared" - ).length - } -

-
-

2 Bedroom²

-
-

Unavailable

-
+ )}
{ return ( <> - { d="M17.36 5.32H18.8L16.6 13H15.03L13.46 7.32H13.44L11.87 13H10.28L8.07 5.32H9.56L11.14 11.25H11.16L12.7 5.32H14.25L15.79 11.22H15.81L17.36 5.32ZM20.1695 9.84H22.5995C22.5395 9.08 22.2095 8.55 21.4195 8.55C20.6395 8.55 20.2495 9.07 20.1695 9.84ZM22.8895 11.43L23.7495 12.19C23.2695 12.76 22.5795 13.11 21.5695 13.11C19.7495 13.11 18.7895 11.99 18.7895 10.32C18.7895 8.7 19.7395 7.52 21.4295 7.52C23.0995 7.52 23.9395 8.67 23.9395 10.15C23.9395 10.35 23.9295 10.6 23.8995 10.75H20.1695C20.2695 11.57 20.7095 12.08 21.5995 12.08C22.1195 12.08 22.5595 11.87 22.8895 11.43ZM26.8891 13.11C25.8491 13.11 25.0591 12.83 24.4591 12.39L25.0991 11.47C25.6191 11.88 26.2791 12.1 26.9091 12.1C27.5791 12.1 27.9591 11.9 27.9591 11.52C27.9591 11.09 27.4691 10.99 26.5891 10.83C25.5291 10.63 24.6791 10.24 24.6791 9.2C24.6791 8.28 25.4091 7.52 26.9291 7.52C27.8991 7.52 28.5991 7.78 29.1791 8.19L28.5791 9.09C28.0591 8.72 27.4691 8.53 26.9091 8.53C26.3091 8.53 26.0291 8.77 26.0291 9.06C26.0291 9.46 26.4191 9.55 27.3291 9.72C28.3191 9.91 29.2991 10.23 29.2991 11.34C29.2991 12.39 28.4291 13.11 26.8891 13.11ZM29.6123 8.61V7.63H30.6223V5.93H31.9623V7.63H33.1823V8.61H31.9623V11.25C31.9623 11.79 32.1223 12.06 32.7823 12.06C32.9323 12.06 33.0723 12.05 33.1823 12.03V13.01C32.9523 13.07 32.6323 13.11 32.2923 13.11C31.1423 13.11 30.6223 12.54 30.6223 11.54V8.61H29.6123ZM45.2995 5.32H46.7395L44.5395 13H42.9695L41.3995 7.32H41.3795L39.8095 13H38.2195L36.0095 5.32H37.4995L39.0795 11.25H39.0995L40.6395 5.32H42.1895L43.7295 11.22H43.7495L45.2995 5.32ZM47.4786 6.55V5.32H48.8886V6.55H47.4786ZM48.8586 13H47.5086V7.63H48.8586V13ZM50.2625 13V7.63H51.5325L51.5625 8.39H51.5825C51.9125 7.85 52.4925 7.52 53.2225 7.52C54.3525 7.52 55.0825 8.26 55.0825 9.37V13H53.7325V9.57C53.7325 9.02 53.4025 8.58 52.7725 8.58C52.0525 8.58 51.6125 9.09 51.6125 9.77V13H50.2625ZM61.3437 7.63V12.34C61.3437 14.1 60.1737 14.94 58.4237 14.94C57.5437 14.94 56.8737 14.72 56.3937 14.45L56.8337 13.47C57.2337 13.71 57.7237 13.93 58.3937 13.93C59.3037 13.93 60.0037 13.51 60.0037 12.38V12.01H59.9837C59.6037 12.55 59.0237 12.86 58.3037 12.86C56.9437 12.86 56.0737 11.73 56.0737 10.24C56.0737 8.75 56.9537 7.52 58.3837 7.52C59.1237 7.52 59.6837 7.86 60.0737 8.4H60.0937L60.1337 7.63H61.3437ZM58.7437 11.84C59.5837 11.84 60.0437 11.12 60.0437 10.19C60.0437 9.26 59.5737 8.56 58.7437 8.56C57.8737 8.56 57.4437 9.3 57.4437 10.21C57.4437 11.08 57.8537 11.84 58.7437 11.84Z" fill="white" /> + */} + + + + + + + + + ); diff --git a/client/src/components/header/Navbar/Navbar.tsx b/client/src/components/header/Navbar/Navbar.tsx index 12610fc..43a450f 100644 --- a/client/src/components/header/Navbar/Navbar.tsx +++ b/client/src/components/header/Navbar/Navbar.tsx @@ -22,13 +22,14 @@ const Navbar = () => { useEffect(() => { const pathname = location.pathname; + console.log(pathname); const tab = tabs.find((tab) => tab.path === pathname); - const defaultTab = tabs[0]; if (tab) { setSelectedTab(tab); } else { - setSelectedTab(defaultTab); + setSelectedTab(null); } + console.log("tab", tab); }, [location.pathname]); useEffect(() => { diff --git a/client/src/main.tsx b/client/src/main.tsx index 82b8560..5a0b4f7 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -14,7 +14,8 @@ import UnitTypesItemPage from "./pages/UnitTypesItemPage"; import SearchPage2 from "./pages/SearchPage2"; import FavoritesPage2 from "./pages/FavoritesPage2"; import WithFooterLayout from "./layouts/WithFooterLayout"; -import AboutProjects2Page from "./pages/AboutProjects2Page"; +// import AboutProjects2Page from "./pages/AboutProjects2Page"; +import AboutProjectsPage from "./pages/AboutProjectsPage"; const router = createBrowserRouter([ { @@ -49,7 +50,7 @@ const router = createBrowserRouter([ children: [ { path: "about-projects", - element: , + element: , }, { path: "about",