From 23a339c3adcfbe03eee51688e555f66cc03b0934 Mon Sep 17 00:00:00 2001
From: gtitov <gherman.s.titov@gmail.com>
Date: Sat, 26 Aug 2023 21:33:32 +0300
Subject: [PATCH] second commit

---
 src/Karta.tsx     | 37 ++++++++++++++++++--------
 src/KartaPage.tsx | 67 +++++++++++++++++++++++------------------------
 2 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/src/Karta.tsx b/src/Karta.tsx
index b70aafe..5693d71 100644
--- a/src/Karta.tsx
+++ b/src/Karta.tsx
@@ -2,18 +2,33 @@ import { createStyles } from '@mantine/core';
 import Map from 'react-map-gl/maplibre';
 import mapstyle from './assets/basemap.json'
 
+const useStyles = createStyles(() => ({
+    root: {
+        // paddingTop: rem(80),
+        // paddingBottom: rem(120),
+        height: '80vh',
+        position: 'relative',
+    },
+}));
+
 export function Karta() {
+    const { classes } = useStyles();
+
     return (
-        <Map
-            initialViewState={{
-                longitude: 55,
-                latitude: 60,
-                zoom: 3
-            }}
-            style={{
-                
-            }}
-            mapStyle={mapstyle}
-        />
+        <div className={classes.root}>
+                <Map
+                    initialViewState={{
+                        longitude: 55,
+                        latitude: 60,
+                        zoom: 3
+                    }}
+                    style={{
+                        position: 'absolute',
+                        top: 0,
+                        bottom: 0
+                    }}
+                    mapStyle={mapstyle}
+                />
+        </div>
     );
 }
\ No newline at end of file
diff --git a/src/KartaPage.tsx b/src/KartaPage.tsx
index d15cbd9..36c3971 100644
--- a/src/KartaPage.tsx
+++ b/src/KartaPage.tsx
@@ -5,39 +5,38 @@ import articleCard from './assets/card.json';
 
 export function KartaPage() {
   return (
-    <Karta />
-    // <Grid >
-    //   <Grid.Col span={8}>
-    //     <Karta />
-    //   </Grid.Col>
-    //   <Grid.Col span={4} >
-    //     <ScrollArea h={'80vh'} type="auto">
-    //       <Flex
-    //         mih={50}
-    //         gap="md"
-    //         justify="flex-start"
-    //         align="start"
-    //         direction="column"
-    //         wrap="wrap"
-    //         mr={20}
-    //       >
-    //         <Autocomplete
-    //           w={'100%'}
-    //           placeholder="Поиск"
-    //           limit={2}
-    //           data={['Паустовский', 'Бианки', 'Пришвин', 'Брюсов', 'Островский']}
-    //         />
-    //         <ArticleCardVertical {...articleCard} />
-    //         <Skeleton mb={10} animate={false} height={100} />
-    //         <Skeleton mb={10} animate={false} height={100} />
-    //         <Skeleton mb={10} animate={false} height={100} />
-    //         <ArticleCardVertical {...articleCard} />
-    //         <Skeleton mb={10} animate={false} height={100} />
-    //         <Skeleton mb={10} animate={false} height={100} />
-    //         <Skeleton mb={10} animate={false} height={100} />
-    //       </Flex>
-    //     </ScrollArea>
-    //   </Grid.Col>
-    // </Grid>
+    <Grid >
+      <Grid.Col span={8}>
+        <Karta />
+      </Grid.Col>
+      <Grid.Col span={4} >
+        <ScrollArea h={'80vh'} type="auto">
+          <Flex
+            mih={50}
+            gap="md"
+            justify="flex-start"
+            align="start"
+            direction="column"
+            wrap="wrap"
+            mr={20}
+          >
+            <Autocomplete
+              w={'100%'}
+              placeholder="Поиск"
+              limit={2}
+              data={['Паустовский', 'Бианки', 'Пришвин', 'Брюсов', 'Островский']}
+            />
+            <ArticleCardVertical {...articleCard} />
+            <Skeleton mb={10} animate={false} height={100} />
+            <Skeleton mb={10} animate={false} height={100} />
+            <Skeleton mb={10} animate={false} height={100} />
+            <ArticleCardVertical {...articleCard} />
+            <Skeleton mb={10} animate={false} height={100} />
+            <Skeleton mb={10} animate={false} height={100} />
+            <Skeleton mb={10} animate={false} height={100} />
+          </Flex>
+        </ScrollArea>
+      </Grid.Col>
+    </Grid>
   );
 }
\ No newline at end of file