diff --git a/public/images/top_shadow.png b/public/images/top_shadow.png new file mode 100644 index 0000000..c0b6179 Binary files /dev/null and b/public/images/top_shadow.png differ diff --git a/src/components/ButtomPanel.tsx b/src/components/ButtomPanel.tsx index 6d238ce..ba6f20c 100644 --- a/src/components/ButtomPanel.tsx +++ b/src/components/ButtomPanel.tsx @@ -11,16 +11,6 @@ const ButtomPanel = () => { return (
- {/*
-
- -

Work in progress

-
-
- Mockups are in the early stages of development and may differ - significantly from the final version. -
-
*/}
- compass + compass
diff --git a/src/components/complexPage/ComplexButtomPanel.tsx b/src/components/complexPage/ComplexButtomPanel.tsx new file mode 100644 index 0000000..851e9d6 --- /dev/null +++ b/src/components/complexPage/ComplexButtomPanel.tsx @@ -0,0 +1,38 @@ +import useModal from "../../store/useModal"; +import Button from "../Button"; +import DisclaimerIcon from "../icons/DisclaimerIcon"; +import DisclaimerModal from "../modals/DisclaimerModal"; + +const ButtomPanel = () => { + const { setModal } = useModal(); + const handleOnDisclaimerClick = () => { + setModal(); + }; + return ( +
+
+
+
+
+
+
+ compass +
+
+
+ ); +}; + +export default ButtomPanel; diff --git a/src/components/complexPage/ComplexTopPanel.tsx b/src/components/complexPage/ComplexTopPanel.tsx index 8653b0c..97d6ee4 100644 --- a/src/components/complexPage/ComplexTopPanel.tsx +++ b/src/components/complexPage/ComplexTopPanel.tsx @@ -42,54 +42,61 @@ const ComplexTopPanel = () => { }; return ( -
-
-
+
+

+ ROVE Home Marasi Drive +

+

+ Select a wing +

+
+
+ {isFullMode ? ( +
-
+ ); }; diff --git a/src/components/complexPage/FloorLayout.tsx b/src/components/complexPage/FloorLayout.tsx new file mode 100644 index 0000000..27da03d --- /dev/null +++ b/src/components/complexPage/FloorLayout.tsx @@ -0,0 +1,5 @@ +const FloorLayout = () => { + return <>; +}; + +export default FloorLayout; diff --git a/src/components/complexPage/SequenceSlider.tsx b/src/components/complexPage/SequenceSlider.tsx index 1fa4e1b..950aa4c 100644 --- a/src/components/complexPage/SequenceSlider.tsx +++ b/src/components/complexPage/SequenceSlider.tsx @@ -4,6 +4,10 @@ import { useState, useEffect } from "react"; import { isMobile } from "react-device-detect"; import { useSwipeable } from "react-swipeable"; import { Transition } from "react-transition-group"; +import Button from "../Button"; +import ActiveResizeIcon from "../icons/ActiveResizeIcon"; +import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon"; +import RightArrowSliderIcon from "../icons/RightArrowSliderIcon"; // const marks = [ // { @@ -49,13 +53,13 @@ interface SequenceSliderProps { function SequenceSlider({ path }: SequenceSliderProps) { const [selectedImageRightIndex, setSelectedRightImageIndex] = - useState(keyframes[0]); + useState(keyframes[3]); const [selectedImageLeftIndex, setSelectedImageLeftIndex] = useState( - arrayLength - keyframes[0] + arrayLength - keyframes[3] ); const [isAnimate, setIsAnimate] = useState(false); - const [keyframeIndex, setKeyframeIndex] = useState(0); + const [keyframeIndex, setKeyframeIndex] = useState(3); const handlers = useSwipeable({ trackMouse: true, onSwipedLeft: () => !isAnimate && next(), @@ -158,16 +162,10 @@ function SequenceSlider({ path }: SequenceSliderProps) { return () => window.removeEventListener("resize", handleResize); }, []); - useEffect(() => { - console.log("selectedRightIn", selectedImageRightIndex); - - return () => {}; - }, []); - return (
))}
- - - - + />
- {/* */} -
+ >
( -
+
diff --git a/src/components/header/Header/Layout.tsx b/src/components/header/Header/Layout.tsx index 8c83296..92850b0 100644 --- a/src/components/header/Header/Layout.tsx +++ b/src/components/header/Header/Layout.tsx @@ -17,8 +17,8 @@ const Layout = () => { }, []); return ( <> - {isMobile ? : } + {isMobile ? : } {modal} diff --git a/src/components/icons/RightArrowSliderIcon.tsx b/src/components/icons/RightArrowSliderIcon.tsx index 69eeb6b..2ef2f60 100644 --- a/src/components/icons/RightArrowSliderIcon.tsx +++ b/src/components/icons/RightArrowSliderIcon.tsx @@ -1,18 +1,18 @@ const RightArrowSliderIcon = () => { return ( ); diff --git a/src/components/masterplanPage/TopPanel.tsx b/src/components/masterplanPage/TopPanel.tsx index 0a6ee9a..c5f2714 100644 --- a/src/components/masterplanPage/TopPanel.tsx +++ b/src/components/masterplanPage/TopPanel.tsx @@ -28,30 +28,33 @@ const TopPanel = () => { }; return ( -
- {isFullMode ? ( + <> +
+ +
+
+ {isFullMode ? ( +
+
+ ); }; diff --git a/src/components/modals/HelpModal.tsx b/src/components/modals/HelpModal.tsx index 4b76916..5136e78 100644 --- a/src/components/modals/HelpModal.tsx +++ b/src/components/modals/HelpModal.tsx @@ -24,7 +24,7 @@ const HelpModal = () => { />
1 diff --git a/src/consts/buttonStyles.ts b/src/consts/buttonStyles.ts index 05fb8c6..d88ab50 100644 --- a/src/consts/buttonStyles.ts +++ b/src/consts/buttonStyles.ts @@ -13,7 +13,7 @@ const textColors: ButtonStyle = { primary: "text-[#0D1922]", secondary: "text-[#0D1922]", tertiary: "text-[#ffffff]", - fab: "text-[#ffffff]", + fab: "text-[#0D1922]", }; const borders: ButtonStyle = {