{selectedRegion && selectedDistrict && selectedYear &&
diff --git a/client/src/components/map/MapLegend/MapLegend.tsx b/client/src/components/map/MapLegend/MapLegend.tsx
index 3c3671a..c1ab94b 100644
--- a/client/src/components/map/MapLegend/MapLegend.tsx
+++ b/client/src/components/map/MapLegend/MapLegend.tsx
@@ -1,8 +1,8 @@
-import { useMantineColorScheme } from '@mantine/core'
import useSWR from 'swr'
import { fetcher } from '../../../http/axiosInstance'
import { BASE_URL } from '../../../constants'
import { Accordion, AccordionHeader, AccordionItem, AccordionPanel, ColorSwatch, Text } from '@fluentui/react-components'
+import { useAppStore } from '../../../store/app'
const MapLegend = ({
selectedDistrict,
@@ -11,7 +11,7 @@ const MapLegend = ({
selectedDistrict: number | null,
selectedYear: number | null,
}) => {
- const { colorScheme } = useMantineColorScheme()
+ const { colorScheme } = useAppStore()
const { data: existingObjectsList } = useSWR(
selectedYear && selectedDistrict ? `/general/objects/list?year=${selectedYear}&city_id=${selectedDistrict}&planning=0` : null,
diff --git a/client/src/components/map/MapToolbar/MapToolbar.tsx b/client/src/components/map/MapToolbar/MapToolbar.tsx
index f988e46..40b7343 100644
--- a/client/src/components/map/MapToolbar/MapToolbar.tsx
+++ b/client/src/components/map/MapToolbar/MapToolbar.tsx
@@ -1,49 +1,66 @@
-import { useMantineColorScheme } from '@mantine/core'
import { IconArrowBackUp, IconArrowsMove, IconCircle, IconExclamationCircle, IconLine, IconPoint, IconPolygon, IconRuler, IconTransformPoint } from '@tabler/icons-react'
import { getDraw, setCurrentTool, useMapStore } from '../../../store/map';
import { saveFeatures } from '../mapUtils';
-import { Button } from '@fluentui/react-components';
+import { Button, Tooltip } from '@fluentui/react-components';
+import { useAppStore } from '../../../store/app';
const MapToolbar = ({
map_id
}: { map_id: string }) => {
const { currentTool } = useMapStore().id[map_id]
- const { colorScheme } = useMantineColorScheme();
+ const { colorScheme } = useAppStore();
return (
} appearance='transparent' onClick={() => saveFeatures(map_id)} />
- } appearance='transparent' onClick={() => getDraw(map_id)?.removeLastPoint()} />
+
+ } appearance='transparent' onClick={() => getDraw(map_id)?.removeLastPoint()} />
+
- } appearance={currentTool === 'Edit' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'Edit')
- }} />
+
+ } appearance={currentTool === 'Edit' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'Edit')
+ }} />
+
- } appearance={currentTool === 'Point' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'Point')
- }} />
+
+ } appearance={currentTool === 'Point' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'Point')
+ }} />
+
- } appearance={currentTool === 'LineString' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'LineString')
- }} />
- } appearance={currentTool === 'Polygon' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'Polygon')
- }} />
+
+ } appearance={currentTool === 'LineString' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'LineString')
+ }} />
+
- } appearance={currentTool === 'Circle' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'Circle')
- }} />
+
+ } appearance={currentTool === 'Polygon' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'Polygon')
+ }} />
+
- } appearance={currentTool === 'Mover' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'Mover')
- }} />
+
+ } appearance={currentTool === 'Circle' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'Circle')
+ }} />
+
- } appearance={currentTool === 'Measure' ? 'primary' : 'transparent'} onClick={() => {
- setCurrentTool(map_id, 'Measure')
- }} />
+
+ } appearance={currentTool === 'Mover' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'Mover')
+ }} />
+
+
+
+ } appearance={currentTool === 'Measure' ? 'primary' : 'transparent'} onClick={() => {
+ setCurrentTool(map_id, 'Measure')
+ }} />
+
)
diff --git a/client/src/constants/app.tsx b/client/src/constants/app.tsx
index d6a4609..b040bdb 100644
--- a/client/src/constants/app.tsx
+++ b/client/src/constants/app.tsx
@@ -47,7 +47,7 @@ const pages = [
component:
,
drawer: false,
dashboard: false,
- enabled: true,
+ enabled: false,
},
{
label: "Настройки",
@@ -137,7 +137,7 @@ const pages = [
component:
,
drawer: true,
dashboard: true,
- enabled: true,
+ enabled: false,
},
{
label: "Монитор",
@@ -173,7 +173,7 @@ const pages = [
component:
,
drawer: true,
dashboard: true,
- enabled: true,
+ enabled: false,
},
{
label: 'Fuel',
diff --git a/client/src/layouts/DashboardLayout.tsx b/client/src/layouts/DashboardLayout.tsx
index 45e63a0..db7986e 100644
--- a/client/src/layouts/DashboardLayout.tsx
+++ b/client/src/layouts/DashboardLayout.tsx
@@ -1,11 +1,11 @@
-import { useMantineColorScheme } from '@mantine/core';
-import { Outlet, useNavigate } from 'react-router-dom';
-import { IconLogout, IconSettings, IconMoon, IconSun, IconMenu2, IconUser } from '@tabler/icons-react';
+import { Outlet, useLocation, useNavigate } from 'react-router-dom';
+import { IconLogout, IconSettings, IconMoon, IconSun, IconMenu2, IconUser, IconLogin } from '@tabler/icons-react';
import { getUserData, logout, useAuthStore } from '../store/auth';
import { useEffect, useState } from 'react';
import { UserData } from '../interfaces/auth';
import { pages } from '../constants/app';
import { Button, Image, makeStyles, Menu, MenuButton, MenuItem, MenuList, MenuPopover, MenuTrigger, Text } from '@fluentui/react-components';
+import { setColorScheme, useAppStore } from '../store/app';
const useStyles = makeStyles({
root: {
@@ -49,6 +49,8 @@ const useStyles = makeStyles({
function DashboardLayout() {
const navigate = useNavigate()
+ const location = useLocation()
+ const { colorScheme } = useAppStore()
const getPageTitle = () => {
const currentPath = location.pathname
@@ -69,8 +71,6 @@ function DashboardLayout() {
}
}, [authStore])
- const { colorScheme, setColorScheme } = useMantineColorScheme();
-
const classes = useStyles()
const [navbarOpen, setNavbarOpen] = useState(true)
@@ -80,7 +80,6 @@ function DashboardLayout() {
-
-
+ }
+ }}>Выход}
+
}>
+ 0.1.0
+
+
+
+
@@ -127,7 +127,7 @@ function DashboardLayout() {
maxWidth: navbarOpen ? '200px' : '2.70rem',
}}>
{pages.filter((page) => page.drawer).filter((page) => page.enabled).map((item) => (
-