infolayout header

agiledev-students-fall2023 · Oct 31, 2023 · e88f539 · e88f539
1 parent 5cf90f8
commit e88f539
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/front-end/GoodOldMap/src/pages/Error/Error.jsx b/front-end/GoodOldMap/src/pages/Error/Error.jsx
@@ -1,9 +1,12 @@
 import PageLink from "../../components/common/pageLink"
+import { useLocation } from "react-router-dom"
 const Error = () => {
+  const location = useLocation();
   return(
     <>
       <h1 className="w-full text-center ">404 Not Found</h1>
       <PageLink to="/" value="Go back to main page"/>
+      <PageLink to="/info" value="test info" from={location.pathname}/>
     </>
   )
 }

diff --git a/front-end/GoodOldMap/src/pages/InfoDetail/InfoLayout.jsx b/front-end/GoodOldMap/src/pages/InfoDetail/InfoLayout.jsx
@@ -1,6 +1,13 @@
 import { Outlet } from "react-router-dom"
+import NavBar from "../../components/common/navBar"
+import LeftBtn from "../../components/common/leftBtn"
+import RightBtn from "../../components/common/rightBtn"
 
 const InfoLayout = () => {
+  const handleRightClick = (evt) => {
+    evt.stopPropagation();
+  }
+
   return (
     <>
     <div className="min-h-screen flex flex-col">

diff --git a/front-end/GoodOldMap/src/pages/MainMap/MainMap.jsx b/front-end/GoodOldMap/src/pages/MainMap/MainMap.jsx
@@ -4,6 +4,8 @@ import { Icon } from 'leaflet';
 
 const MainMap = () => {
   const [position, setPosition] = useState([51.505, -0.09])
+  const [city, setCity] = useState("")
+
   return(
     <>
       <MapContainer className='mapContainer' center={position} zoom={4} scrollWheelZoom={false}>