Removed mantine libraries; Removed mandatory authentication

2025-09-22 09:38:21 +09:00
parent c8caec7351
commit 037c0b7cf1
18 changed files with 686 additions and 1069 deletions
--- a/client/src/components/map/MapComponent.tsx
+++ b/client/src/components/map/MapComponent.tsx
@ -14,7 +14,6 @@ import { addInteractions, handleImageDrop, loadFeatures, processFigure, processL
 import useSWR, { SWRConfiguration } from 'swr'
 import { fetcher } from '../../http/axiosInstance'
 import { BASE_URL } from '../../constants'
-import { useMantineColorScheme } from '@mantine/core'
 import { IconBoxMultiple, IconBoxPadding, IconChevronLeft, IconPlus, IconUpload, } from '@tabler/icons-react'
 import { ICitySettings, IFigure, ILine } from '../../interfaces/gis'
 import axios from 'axios'
@ -34,8 +33,9 @@ import GisService from '../../services/GisService'
 import MapMode from './MapMode'
 import { satMapsProviders, schemas } from '../../constants/map'
 import MapPrint from './MapPrint/MapPrint'
-import { Field, Menu, MenuButton, MenuList, MenuPopover, MenuTrigger, Combobox, Option, Button, Divider, Spinner, Portal } from '@fluentui/react-components'
+import { Field, Menu, MenuButton, MenuList, MenuPopover, MenuTrigger, Combobox, Option, Button, Divider, Spinner, Portal, Dropdown } from '@fluentui/react-components'
 import { IRegion } from '../../interfaces/fuel'
+import { useAppStore } from '../../store/app'

 const swrOptions: SWRConfiguration = {
    revalidateOnFocus: false
@ -60,8 +60,9 @@ const MapComponent = ({
    id: string,
    active: boolean,
 }) => {
+    const { colorScheme } = useAppStore()
+
    // Store
-    const { colorScheme } = useMantineColorScheme()
    const { selectedYear, currentObjectId, selectedRegion, selectedDistrict } = useObjectsStore().id[id]
    const {
        mode, map, currentTool, alignMode, satMapsProvider,
@ -559,7 +560,7 @@ const MapComponent = ({
                        <Combobox
                            placeholder="Схема"
                            clearable
-                            style={{ width: "92px", minWidth: 'auto' }}
+                            style={{ minWidth: 'auto' }}
                            value={selectedYear ? selectedYear.toString() : ""}
                            onOptionSelect={(_ev, data) => {
                                if (data.optionValue) {
@ -585,25 +586,29 @@ const MapComponent = ({
                            </MenuTrigger>

                            <MenuPopover>
-                                <MenuList>
+                                <MenuList style={{ padding: '1rem' }}>
                                    <Field>Настройка видимости слоёв</Field>

                                    <div style={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
-                                        <Combobox
-                                            defaultValue={satMapsProviders.find(provider => provider.value === satMapsProvider)?.label ?? ""}
-                                            onOptionSelect={(_ev, data) => {
-                                                if (data.optionValue) {
-                                                    setSatMapsProvider(id, data.optionValue as SatelliteMapsProvider);
-                                                }
-                                            }}
-                                        >
-                                            {satMapsProviders.map((provider) => (
-                                                <Option text={provider.label} key={provider.value} value={provider.value}>
-                                                    {provider.label}
-                                                </Option>
-                                            ))}
-                                        </Combobox>
-
+                                        <Field label="Спутниковые снимки">
+                                            <Dropdown
+                                                defaultValue={satMapsProviders.find(provider => provider.value === satMapsProvider)?.label}
+                                                value={satMapsProviders.find(provider => provider.value === satMapsProvider)?.label}
+                                                defaultSelectedOptions={[satMapsProvider]}
+                                                selectedOptions={[satMapsProvider]}
+                                                onOptionSelect={(_ev, data) => {
+                                                    if (data.optionValue) {
+                                                        setSatMapsProvider(id, data.optionValue as SatelliteMapsProvider);
+                                                    }
+                                                }}
+                                            >
+                                                {satMapsProviders.map((provider) => (
+                                                    <Option key={provider.value} text={provider.label} value={provider.value}>
+                                                        {provider.label}
+                                                    </Option>
+                                                ))}
+                                            </Dropdown>
+                                        </Field>
                                    </div>
                                    <div style={{
                                        display: 'flex',
@ -652,7 +657,7 @@ const MapComponent = ({

            <div style={{ position: 'absolute', width: '100%', height: '100%' }}>
                <div style={{ display: 'flex', flexDirection: 'column', width: '100%', height: '100%' }}>
-                    <div style={{ display: 'flex', width: '100%', height: '94%', padding: '0.5rem', flexGrow: 1 }}>
+                    <div style={{ display: 'flex', height: '94%', padding: '0.5rem', flexGrow: 1 }}>
                        <div style={{ display: 'flex', flexDirection: 'column', width: '100%', maxWidth: '380px' }}>
                            <div style={{ display: 'flex', width: '100%', height: '100%', gap: '0.5rem' }}>
                                {selectedRegion && selectedDistrict && selectedYear &&
--- 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,
--- 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 (
        <div style={{ display: 'flex' }}>
            <div style={{ display: 'flex', flexDirection: 'column', zIndex: 1, backdropFilter: 'blur(8px)', backgroundColor: colorScheme === 'light' ? '#FFFFFFAA' : '#000000AA', borderRadius: '4px' }}>
                <Button icon={<IconExclamationCircle />} appearance='transparent' onClick={() => saveFeatures(map_id)} />

-                <Button icon={<IconArrowBackUp />} appearance='transparent' onClick={() => getDraw(map_id)?.removeLastPoint()} />
+                <Tooltip content={"Отмена"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconArrowBackUp />} appearance='transparent' onClick={() => getDraw(map_id)?.removeLastPoint()} />
+                </Tooltip>

-                <Button icon={<IconTransformPoint />} appearance={currentTool === 'Edit' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'Edit')
-                }} />
+                <Tooltip content={"Редактировать"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconTransformPoint />} appearance={currentTool === 'Edit' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'Edit')
+                    }} />
+                </Tooltip>

-                <Button icon={<IconPoint />} appearance={currentTool === 'Point' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'Point')
-                }} />
+                <Tooltip content={"Точка"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconPoint />} appearance={currentTool === 'Point' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'Point')
+                    }} />
+                </Tooltip>

-                <Button icon={<IconLine />} appearance={currentTool === 'LineString' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'LineString')
-                }} />

-                <Button icon={<IconPolygon />} appearance={currentTool === 'Polygon' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'Polygon')
-                }} />
+                <Tooltip content={"Линия"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconLine />} appearance={currentTool === 'LineString' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'LineString')
+                    }} />
+                </Tooltip>

-                <Button icon={<IconCircle />} appearance={currentTool === 'Circle' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'Circle')
-                }} />
+                <Tooltip content={"Многоугольник"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconPolygon />} appearance={currentTool === 'Polygon' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'Polygon')
+                    }} />
+                </Tooltip>

-                <Button icon={<IconArrowsMove />} appearance={currentTool === 'Mover' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'Mover')
-                }} />
+                <Tooltip content={"Окружность"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconCircle />} appearance={currentTool === 'Circle' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'Circle')
+                    }} />
+                </Tooltip>

-                <Button icon={<IconRuler />} appearance={currentTool === 'Measure' ? 'primary' : 'transparent'} onClick={() => {
-                    setCurrentTool(map_id, 'Measure')
-                }} />
+                <Tooltip content={"Перемещение"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconArrowsMove />} appearance={currentTool === 'Mover' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'Mover')
+                    }} />
+                </Tooltip>
+
+                <Tooltip content={"Линейка"} relationship='label' hideDelay={0} showDelay={0} withArrow>
+                    <Button icon={<IconRuler />} appearance={currentTool === 'Measure' ? 'primary' : 'transparent'} onClick={() => {
+                        setCurrentTool(map_id, 'Measure')
+                    }} />
+                </Tooltip>
            </div>
        </div>
    )