Merge branch 'feature/regional-map' into 'main'

Feature/regional map

See merge request vkuchenik/website-framework!42

client/src/App.jsx

@@ -1,4 +1,6 @@
 import Dashboard from './components/layout/Dashboard.jsx'
+import 'leaflet/dist/leaflet.css';
+
 
 function App() {
   return (

client/src/components/layout/Canvas/views/GlobalMapCanvas.jsx

@@ -1,11 +1,10 @@
 import React from "react";
 import { MapContainer, TileLayer, Marker, Popup } from "react-leaflet";
-import 'leaflet/dist/leaflet.css';
 
 export default function GlobalMapCanvas() {
   const position = [45.61142478054226, -122.49630033167544]; // [latitude, longitude]
   return (
-      <MapContainer center={position} zoom={13} style={{ height: "100%", width: "100%" }}>
+      <MapContainer center={position} zoom={3} style={{ height: "100%", width: "100%" }}>
         <TileLayer
           url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
           attribution='&copy; OpenStreetMap contributors'

client/src/components/layout/Canvas/views/RegionalMapCanvas.jsx

@@ -1,24 +1,19 @@
-import { Box, Text } from '@chakra-ui/react';
+import React from "react";
+import { MapContainer, TileLayer, Marker, Popup } from "react-leaflet";
 
-export default function RegionalMapCanvas() {
+export default function GlobalMapCanvas() {
+  const position = [45.61142478054226, -122.49630033167544]; // [latitude, longitude]
   return (
-        <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
+      <MapContainer center={position} zoom={13} style={{ height: "100%", width: "100%" }}>
-            <Box 
+        <TileLayer
-                bg="bg" 
+          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-                shadow="md" 
+          attribution='&copy; OpenStreetMap contributors'
-                borderRadius="md"
+        />
-                p={8}
+        <Marker position={position}>
-                width="600px"
+          <Popup>
-                height="100px"
+            CVO — Home of the volcanoligists
-                textAlign="center"
+          </Popup>
-                display="flex"
+        </Marker>
-                alignItems="center"
+      </MapContainer>
-                justifyContent="center"
-            >
-                <Text fontsize="2xl" fontWeight="bold" color="gray.700">
-                    Regional Map Canvas coming soon!
-                </Text>
-            </Box>
-        </Box>
   );
 }

client/src/components/layout/Dashboard.jsx

@@ -49,7 +49,8 @@ export default function Dashboard() {
     <>
       <Grid css={styles}
         templateRows="1fr 11fr"
-        templateColumns="1fr 20fr"
+        // templateColumns="1fr 20fr"
+        templateColumns="auto 1fr"
         height="100vh"
         width="100vw"
       >