diff --git a/src/App.tsx b/src/App.tsx
index 04a7df6..e35b587 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,6 +1,5 @@
-import { AppShell, Container } from '@mantine/core';
+import { AppShell, Container, ScrollArea } from '@mantine/core';
import { HeaderSimple } from './Header';
-// import { Karta } from './Karta';
import { KartaPage } from './KartaPage';
import { FooterLinks } from './Footer';
// import { ArticleCardPanel } from './ArticleCardPanel';
@@ -12,18 +11,16 @@ import headerLinks from './assets/header.json';
function App() {
return (
- }
- footer={}
- >
-
-
- //
- //
- //
- //
- //
+
+
+
+
+
+
);
}
diff --git a/src/Footer.tsx b/src/Footer.tsx
index 6d0ad41..acc7606 100644
--- a/src/Footer.tsx
+++ b/src/Footer.tsx
@@ -4,7 +4,6 @@ import { createStyles, Text, Container, rem, Title } from '@mantine/core';
const useStyles = createStyles((theme) => ({
footer: {
- marginTop: rem(40),
paddingTop: rem(40),
paddingBottom: rem(40),
backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : theme.colors.gray[0],
@@ -138,6 +137,7 @@ export function FooterLinks({ data }: FooterLinksProps) {
{groups}
+
);
diff --git a/src/Header.tsx b/src/Header.tsx
index edb506e..6993531 100644
--- a/src/Header.tsx
+++ b/src/Header.tsx
@@ -70,7 +70,7 @@ export function HeaderSimple({ links }: HeaderSimpleProps) {
));
return (
-
+
Литкарта
{/* */}
diff --git a/src/Karta.tsx b/src/Karta.tsx
deleted file mode 100644
index 5693d71..0000000
--- a/src/Karta.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-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 (
-
-
-
- );
-}
\ No newline at end of file
diff --git a/src/KartaPage.tsx b/src/KartaPage.tsx
index 36c3971..f08e937 100644
--- a/src/KartaPage.tsx
+++ b/src/KartaPage.tsx
@@ -1,42 +1,21 @@
-import { Grid, Skeleton, Flex, ScrollArea, Autocomplete } from '@mantine/core';
-import { Karta } from './Karta';
+import { Grid, Skeleton, Flex, ScrollArea, Autocomplete, Container } from '@mantine/core';
import { ArticleCardVertical } from './ArticleCard';
import articleCard from './assets/card.json';
+import Map from 'react-map-gl/maplibre';
+import mapstyle from './assets/basemap.json'
export function KartaPage() {
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
);
}
\ No newline at end of file