From 145827ab6d4dc80e5c29196409a2d2ca6a9cec4b Mon Sep 17 00:00:00 2001 From: popovspiridon99 Date: Fri, 1 Aug 2025 11:08:33 +0900 Subject: [PATCH] nestjs rewrite --- .gitignore | 6 +- client/.env.example | 4 +- client/package-lock.json | 60 +-- client/package.json | 2 +- client/public/template_1.docx | Bin 0 -> 13592 bytes client/public/template_table_1.docx | Bin 0 -> 14187 bytes client/src/components/Tree/ObjectTree.tsx | 2 +- client/src/components/map/MapComponent.tsx | 283 ++--------- .../components/map/MapLegend/MapLegend.tsx | 58 ++- client/src/components/map/MapLineTest.tsx | 125 +++++ .../src/components/map/MapPrint/MapPrint.tsx | 234 +++++++++ client/src/components/map/ObjectData.tsx | 2 +- client/src/components/map/ObjectParameter.tsx | 2 +- .../map/ObjectParameters/ObjectParameters.tsx | 2 +- client/src/constants/app.tsx | 24 +- client/src/dto/fuel/fuel.dto.ts | 29 ++ client/src/http/axiosInstanceNest.ts | 27 ++ client/src/layouts/MainLayout.tsx | 2 - client/src/main.tsx | 7 +- client/src/pages/Fuel.tsx | 207 ++++++++ client/src/pages/MapTest.tsx | 4 +- client/src/pages/PrintReport.tsx | 162 +++---- client/src/store/map.ts | 13 +- client/yarn.lock | 46 +- ems/DATABASE.md | 35 ++ ems/package-lock.json | 448 +++++++++++------- ems/src/api/general/index.ts | 29 +- ems/src/api/gis/index.ts | 30 +- 28 files changed, 1220 insertions(+), 623 deletions(-) create mode 100644 client/public/template_1.docx create mode 100644 client/public/template_table_1.docx create mode 100644 client/src/components/map/MapLineTest.tsx create mode 100644 client/src/components/map/MapPrint/MapPrint.tsx create mode 100644 client/src/dto/fuel/fuel.dto.ts create mode 100644 client/src/http/axiosInstanceNest.ts create mode 100644 client/src/pages/Fuel.tsx create mode 100644 ems/DATABASE.md diff --git a/.gitignore b/.gitignore index 34037ff..7c7c2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,8 @@ __pycache__ .env redis_data -psql_data \ No newline at end of file +psql_data +postgis_db +tools/import_bounds/*/*.geojson +tools/import_bounds/*/*.md +storage \ No newline at end of file diff --git a/client/.env.example b/client/.env.example index dc03d37..b3c7dbd 100644 --- a/client/.env.example +++ b/client/.env.example @@ -11,4 +11,6 @@ VITE_API_FUEL_URL= VITE_API_SERVERS_URL= # API EMS -VITE_API_EMS_URL= \ No newline at end of file +VITE_API_EMS_URL= + +VITE_API_NEST_URL= \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index 09c7289..fe51df0 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -37,12 +37,12 @@ "@tiptap/starter-kit": "^2.7.3", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@^3.5.0", "@uidotdev/usehooks": "^2.4.1", + "ag-grid-react": "^33.3.2", "autoprefixer": "^10.4.19", "axios": "^1.7.2", "buffer": "^6.0.3", "dayjs": "^1.11.13", "docx-templates": "^4.13.0", - "easy-template-x": "^5.1.0", "embla-carousel-react": "^8.3.0", "file-type": "^19.0.0", "html2canvas": "^1.4.1", @@ -4259,15 +4259,6 @@ "vite": "^4 || ^5" } }, - "node_modules/@xmldom/xmldom": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", - "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/@zeit/schemas": { "version": "2.36.0", "resolved": "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.36.0.tgz", @@ -4308,6 +4299,35 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/ag-charts-types": { + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-11.3.2.tgz", + "integrity": "sha512-trPGqgGYiTeLgtf9nLuztDYOPOFOLbqHn1g2D99phf7QowcwdX0TPx0wfWG8Hm90LjB8IH+G2s3AZe2vrdAtMQ==", + "license": "MIT" + }, + "node_modules/ag-grid-community": { + "version": "33.3.2", + "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-33.3.2.tgz", + "integrity": "sha512-9bx0e/+ykOyLvUxHqmdy0cRVANH6JAtv0yZdnBZEXYYqBAwN+G5a4NY+2I1KvoOCYzbk8SnStG7y4hCdVAAWOQ==", + "license": "MIT", + "dependencies": { + "ag-charts-types": "11.3.2" + } + }, + "node_modules/ag-grid-react": { + "version": "33.3.2", + "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-33.3.2.tgz", + "integrity": "sha512-5bv4JIJvGov23sduIUIyQTqpa/qhoQrRkQm5pFOQb7RMwusfx6xBPrkLwIIlCJiQ8g0OOinxWzZ2kQ2Zml6tLw==", + "license": "MIT", + "dependencies": { + "ag-grid-community": "33.3.2", + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -5972,18 +5992,6 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "dev": true }, - "node_modules/easy-template-x": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/easy-template-x/-/easy-template-x-5.1.0.tgz", - "integrity": "sha512-vypMbIMLWLXoooA9rsL3SVN2oQtZwmmx1m4H8gi6JfbEXQQ5VLHGOUHYi9APbvN9R8Gx93r1fphdSFRHxozeYw==", - "license": "MIT", - "dependencies": { - "@xmldom/xmldom": "0.8.10", - "json5": "2.2.3", - "jszip": "3.10.1", - "lodash.get": "4.4.2" - } - }, "node_modules/ejs": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", @@ -7872,6 +7880,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -8067,13 +8076,6 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", - "license": "MIT" - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", diff --git a/client/package.json b/client/package.json index 3c5cddd..cdedae8 100644 --- a/client/package.json +++ b/client/package.json @@ -40,12 +40,12 @@ "@tiptap/starter-kit": "^2.7.3", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@^3.5.0", "@uidotdev/usehooks": "^2.4.1", + "ag-grid-react": "^33.3.2", "autoprefixer": "^10.4.19", "axios": "^1.7.2", "buffer": "^6.0.3", "dayjs": "^1.11.13", "docx-templates": "^4.13.0", - "easy-template-x": "^5.1.0", "embla-carousel-react": "^8.3.0", "file-type": "^19.0.0", "html2canvas": "^1.4.1", diff --git a/client/public/template_1.docx b/client/public/template_1.docx new file mode 100644 index 0000000000000000000000000000000000000000..9f6330caff0859e475665f869761bbdbb85d7a3b GIT binary patch literal 13592 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 literal 0 HcmV?d00001 diff --git a/client/public/template_table_1.docx b/client/public/template_table_1.docx new file mode 100644 index 0000000000000000000000000000000000000000..b4b8ccdcde615dce3707c0a01bdd141c30fbacb6 GIT binary patch literal 14187 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 literal 0 HcmV?d00001 diff --git a/client/src/components/Tree/ObjectTree.tsx b/client/src/components/Tree/ObjectTree.tsx index 408879d..93ebf98 100644 --- a/client/src/components/Tree/ObjectTree.tsx +++ b/client/src/components/Tree/ObjectTree.tsx @@ -1,4 +1,4 @@ -import { useEffect, useMemo, useState } from 'react' +import { useMemo, useState } from 'react' import useSWR from 'swr' import { fetcher } from '../../http/axiosInstance' import { BASE_URL } from '../../constants' diff --git a/client/src/components/map/MapComponent.tsx b/client/src/components/map/MapComponent.tsx index 356e255..e23b726 100644 --- a/client/src/components/map/MapComponent.tsx +++ b/client/src/components/map/MapComponent.tsx @@ -1,5 +1,4 @@ import { useEffect, useRef, useState } from 'react' -import { jsPDF } from "jspdf" import 'ol/ol.css' import { Modify } from 'ol/interaction' import { ImageStatic, Vector as VectorSource } from 'ol/source' @@ -8,20 +7,20 @@ import { IRectCoords, SatelliteMapsProvider } from '../../interfaces/map' import { Extent, getCenter } from 'ol/extent' import { highlightStyleRed, highlightStyleYellow } from './MapStyles' import { customMapSource, googleMapsSatelliteSource, yandexMapsSatelliteSource } from './MapSources' -import { Geometry, LineString, SimpleGeometry } from 'ol/geom' +import { Geometry, SimpleGeometry } from 'ol/geom' import { fromExtent } from 'ol/geom/Polygon' import { Coordinate } from 'ol/coordinate' import { addInteractions, handleImageDrop, loadFeatures, processFigure, processLine } from './mapUtils' import useSWR, { SWRConfiguration } from 'swr' import { fetcher } from '../../http/axiosInstance' import { BASE_URL } from '../../constants' -import { ActionIcon, Autocomplete, CloseButton, Flex, Select as MantineSelect, MantineStyleProp, rem, useMantineColorScheme, Portal, Menu, Button, Group, Divider, LoadingOverlay, Stack, Container, Modal, Transition, Text, Select, Switch, Checkbox, Radio, ScrollAreaAutosize } from '@mantine/core' -import { IconArrowsMaximize, IconArrowsMinimize, IconBoxMultiple, IconBoxPadding, IconChevronCompactLeft, IconChevronDown, IconChevronLeft, IconChevronsDown, IconHelp, IconPlus, IconSearch, IconUpload, IconWindowMaximize, IconWindowMinimize } from '@tabler/icons-react' +import { ActionIcon, Autocomplete, CloseButton, Flex, Select as MantineSelect, MantineStyleProp, rem, useMantineColorScheme, Portal, Menu, Button, Group, Divider, LoadingOverlay, Stack, Container, Transition, } from '@mantine/core' +import { IconBoxMultiple, IconBoxPadding, IconChevronDown, IconChevronLeft, IconPlus, IconSearch, IconUpload, } from '@tabler/icons-react' import { ICitySettings, IFigure, ILine } from '../../interfaces/gis' import axios from 'axios' import MapToolbar from './MapToolbar/MapToolbar' import MapStatusbar from './MapStatusbar/MapStatusbar' -import { setAlignMode, setSatMapsProvider, setTypeRoles, useMapStore, setMapLabel, clearPrintArea, setPreviousView, setMode, setPrintScale, PrintScale, setPrintScaleLine } from '../../store/map' +import { setAlignMode, setSatMapsProvider, setTypeRoles, useMapStore, setMapLabel, } from '../../store/map' import { useThrottle } from '@uidotdev/usehooks' import ObjectTree from '../Tree/ObjectTree' import { setCurrentObjectId, setSelectedDistrict, setSelectedRegion, setSelectedYear, useObjectsStore } from '../../store/objects' @@ -33,11 +32,8 @@ import GeoJSON from 'ol/format/GeoJSON' import MapLegend from './MapLegend/MapLegend' import GisService from '../../services/GisService' import MapMode from './MapMode' -import ScaleLine from 'ol/control/ScaleLine' -import { getPointResolution } from 'ol/proj' -import { PrintFormat, PrintOrientation, printResolutions, setPrintOrientation, setPrintResolution, usePrintStore } from '../../store/print' -import { printDimensions, satMapsProviders, scaleOptions, schemas } from '../../constants/map' -import { modals } from "@mantine/modals"; +import { satMapsProviders, schemas } from '../../constants/map' +import MapPrint from './MapPrint/MapPrint' const swrOptions: SWRConfiguration = { revalidateOnFocus: false @@ -69,17 +65,23 @@ const MapComponent = ({ mode, map, currentTool, alignMode, satMapsProvider, selectedObjectType, file, measureDraw, polygonExtent, rectCoords, draw, snap, translate, - nodeLayerSource, drawingLayerSource, + drawingLayerSource, satLayer, staticMapLayer, figuresLayer, linesLayer, regionsLayer, districtBoundLayer, baseLayer, - previousView, printArea, printSource, printAreaDraw, printScale, printScaleLine, + printAreaDraw, } = useMapStore().id[id] - const { printOrientation, printResolution, printFormat } = usePrintStore() - // Tab settings - const objectsPane: ITabsPane[] = [{ title: 'Объекты', value: 'objects', view: }, { title: 'Неразмещенные', value: 'unplaced', view: <> }, { title: 'Другие', value: 'other', view: <> },] - const paramsPane: ITabsPane[] = [{ title: 'История изменений', value: 'history', view: <> }, { title: 'Параметры', value: 'parameters', view: }, { title: 'Вычисляемые', value: 'calculated', view: <> }] + const objectsPane: ITabsPane[] = [ + { title: 'Объекты', value: 'objects', view: }, + { title: 'Неразмещенные', value: 'unplaced', view: <> }, + { title: 'Другие', value: 'other', view: <> }, + ] + const paramsPane: ITabsPane[] = [ + { title: 'История изменений', value: 'history', view: <> }, + { title: 'Параметры', value: 'parameters', view: }, + { title: 'Вычисляемые', value: 'calculated', view: <> } + ] // Map const mapElement = useRef(null) @@ -124,7 +126,6 @@ const MapComponent = ({ // map.current?.setView(new View({ // extent: bounds.getExtent() // })) - console.log(bounds.getFeatures().length) }) } }, [selectedDistrict, selectedYear]) @@ -183,26 +184,26 @@ const MapComponent = ({ backdropFilter: 'blur(8px)', } - const { data: nodes } = useSWR('/nodes/all', () => fetcher('/nodes/all', BASE_URL.ems), { revalidateOnFocus: false }) + // const { data: nodes } = useSWR('/nodes/all', () => fetcher('/nodes/all', BASE_URL.ems), { revalidateOnFocus: false }) - useEffect(() => { - // Draw features based on database data - if (Array.isArray(nodes)) { - nodes.map(node => { - if (node.shape_type === 'LINE') { - const coordinates: Coordinate[] = [] - if (Array.isArray(node.shape)) { - node.shape.map((point: { x: number, y: number }) => { - const coordinate = [point.x as number, point.y as number] as Coordinate - coordinates.push(coordinate) - }) - } - //console.log(coordinates) - nodeLayerSource.addFeature(new Feature({ geometry: new LineString(coordinates) })) - } - }) - } - }, [nodes, nodeLayerSource]) + // useEffect(() => { + // // Draw features based on database data + // if (Array.isArray(nodes)) { + // nodes.map(node => { + // if (node.shape_type === 'LINE') { + // const coordinates: Coordinate[] = [] + // if (Array.isArray(node.shape)) { + // node.shape.map((point: { x: number, y: number }) => { + // const coordinate = [point.x as number, point.y as number] as Coordinate + // coordinates.push(coordinate) + // }) + // } + // //console.log(coordinates) + // nodeLayerSource.addFeature(new Feature({ geometry: new LineString(coordinates) })) + // } + // }) + // } + // }, [nodes, nodeLayerSource]) const [searchObject, setSearchObject] = useState("") const throttledSearchObject = useThrottle(searchObject, 500) @@ -271,11 +272,15 @@ const MapComponent = ({ } }, [currentObjectId]) - const { data: regionsData } = useSWR(`/general/regions/all`, (url) => fetcher(url, BASE_URL.ems), swrOptions) + const { data: regionsData } = useSWR(`/general/regions`, (url) => fetcher(url, BASE_URL.ems), swrOptions) - const { data: districtsData } = useSWR(selectedRegion ? `/general/districts/all?region_id=${selectedRegion}` : null, (url) => fetcher(url, BASE_URL.ems), swrOptions) + const { data: districtsData } = useSWR(selectedRegion ? `/general/districts/?region_id=${selectedRegion}` : null, (url) => fetcher(url, BASE_URL.ems), swrOptions) - const { data: searchData } = useSWR(throttledSearchObject !== "" && selectedDistrict && selectedYear ? `/general/search/objects?q=${throttledSearchObject}&id_city=${selectedDistrict}&year=${selectedYear}` : null, (url) => fetcher(url, BASE_URL.ems), swrOptions) + const { data: searchData } = useSWR( + throttledSearchObject !== "" && selectedDistrict && selectedYear ? `/general/search/objects?q=${throttledSearchObject}&id_city=${selectedDistrict}&year=${selectedYear}` : null, + (url) => fetcher(url, BASE_URL.ems), + swrOptions + ) const { data: figuresData, isValidating: figuresValidating } = useSWR( selectedDistrict && selectedYear ? `/gis/figures/all?city_id=${selectedDistrict}&year=${selectedYear}&offset=0&limit=${10000}` : null, @@ -385,7 +390,7 @@ const MapComponent = ({ if (selectedDistrict && districtData) { const settings = getCitySettings() - const imageUrl = `${import.meta.env.VITE_API_EMS_URL}/static/${selectedDistrict}` + const imageUrl = `${import.meta.env.VITE_API_EMS_URL}/tiles/static/${selectedDistrict}` const img = new Image() img.src = imageUrl img.onload = () => { @@ -420,6 +425,8 @@ const MapComponent = ({ } }, [selectedDistrict, districtData, staticMapLayer]) + + // Light/dark theme useEffect(() => { if (baseLayer) { baseLayer.on('prerender', function (e) { @@ -446,12 +453,6 @@ const MapComponent = ({ } }, [colorScheme]) - const scaleLine = useRef(new ScaleLine({ - bar: true, - text: true, - minWidth: 125 - })) - useEffect(() => { if (map) { if (mode === 'print') { @@ -462,197 +463,9 @@ const MapComponent = ({ } }, [mode, map, printAreaDraw]) - useEffect(() => { - if (printArea) { - // backup view before entering print mode - setPreviousView(id, map?.getView()) - - map?.setTarget('print-portal') - - printSource.clear() - map?.getView().setCenter(getCenter(printArea)) - map?.getView().fit(printArea, { - size: printOrientation === 'horizontal' ? [594, 420] : [420, 594] - }) - map?.removeInteraction(printAreaDraw) - } - }, [printArea, map]) - - const exportToPDF = (format: PrintFormat, resolution: number, orientation: PrintOrientation) => { - const dim = printDimensions[format] - - const width = Math.round((dim[orientation === 'horizontal' ? 0 : 1] * resolution) / 25.4) - const height = Math.round((dim[orientation === 'horizontal' ? 1 : 0] * resolution) / 25.4) - - if (!map) return - - // Store original size and scale - const originalSize = map.getSize() - const originalResolution = map.getView().getResolution() - - if (!originalSize || !originalResolution) return - - // Calculate new resolution to fit high DPI - const scaleFactor = width / originalSize[0] - const newResolution = originalResolution / scaleFactor - - // console.log(`New resolution: ${newResolution}`) - - const center = map.getView().getCenter() - let scaleResolution - if (center) { - scaleResolution = Number(printScale) / getPointResolution(map.getView().getProjection(), Number(resolution) / 25.4, center) - // console.log(`Scaled resolution: ${scaleResolution}`) - } - - console.log(width, height) - // Set new high-resolution rendering - map.setSize([width, height]) - map.getView().setResolution(newResolution) - map.renderSync() - - map.once("rendercomplete", function () { - const mapCanvas = document.createElement("canvas") - mapCanvas.width = width - mapCanvas.height = height - const mapContext = mapCanvas.getContext("2d") - - if (!mapContext) return - - const canvas = document.querySelector('canvas') - if (canvas) { - if (canvas.width > 0) { - const opacity = canvas.parentElement?.style.opacity || "1" - mapContext.globalAlpha = parseFloat(opacity) - - const transform = canvas.style.transform - const matrixMatch = transform.match(/^matrix\(([^)]+)\)$/) - if (matrixMatch) { - const matrix = matrixMatch[1].split(",").map(Number) - mapContext.setTransform(...matrix as [number, number, number, number, number, number]) - } - - mapContext.drawImage(canvas, 0, 0) - } - } - - mapContext.globalAlpha = 1 - mapContext.setTransform(1, 0, 0, 1, 0, 0) - - // Restore original map settings - map.setSize(originalSize) - map.getView().setResolution(originalResolution) - map.renderSync() - - // Generate PDF - const pdf = new jsPDF(orientation === 'horizontal' ? "landscape" : 'portrait', undefined, format) - pdf.addImage(mapCanvas.toDataURL("image/jpeg"), "JPEG", 0, 0, orientation === 'horizontal' ? dim[0] : dim[1], orientation === 'horizontal' ? dim[1] : dim[0]) - - const filename = `${selectedYear}-${selectedRegion}-${selectedDistrict}-${new Date().toISOString()}.pdf` - pdf.save(filename, { - returnPromise: true - }).then(() => { - - }) - }) - } - - useEffect(() => { - if (printScaleLine) { - map?.addControl(scaleLine.current) - } else { - map?.removeControl(scaleLine.current) - } - }, [printScaleLine]) - - const [fullscreen, setFullscreen] = useState(false) - return ( <> - { - clearPrintArea(id) - map?.setTarget(mapElement.current as HTMLDivElement) - map?.addInteraction(printAreaDraw) - }} fullScreen={fullscreen}> - - - - - Предпросмотр области печати - - - - - - - setFullscreen(!fullscreen)}> - {fullscreen ? : } - - - - - - - Область печати можно передвигать. - - - - - setPrintOrientation(value as PrintOrientation)} - > - - - - - - - setPrintScale(id, value as PrintScale)} - /> - - setPrintScaleLine(id, event.currentTarget.checked)} - /> - - - - - - - - - - + {active && diff --git a/client/src/components/map/MapLegend/MapLegend.tsx b/client/src/components/map/MapLegend/MapLegend.tsx index cc5a05d..7384f71 100644 --- a/client/src/components/map/MapLegend/MapLegend.tsx +++ b/client/src/components/map/MapLegend/MapLegend.tsx @@ -1,7 +1,9 @@ -import { Accordion, ColorSwatch, Flex, MantineStyleProp, ScrollAreaAutosize, Stack, Text, useMantineColorScheme } from '@mantine/core' -import useSWR from 'swr'; -import { fetcher } from '../../../http/axiosInstance'; -import { BASE_URL } from '../../../constants'; +import { Accordion, ActionIcon, Collapse, ColorSwatch, Flex, MantineStyleProp, ScrollAreaAutosize, Stack, Text, useMantineColorScheme } from '@mantine/core' +import useSWR from 'swr' +import { fetcher } from '../../../http/axiosInstance' +import { BASE_URL } from '../../../constants' +import { useDisclosure } from '@mantine/hooks' +import { IconChevronDown } from '@tabler/icons-react' const MapLegend = ({ selectedDistrict, @@ -12,7 +14,7 @@ const MapLegend = ({ selectedYear: number | null, style: MantineStyleProp }) => { - const { colorScheme } = useMantineColorScheme(); + const { colorScheme } = useMantineColorScheme() const { data: existingObjectsList } = useSWR( selectedYear && selectedDistrict ? `/general/objects/list?year=${selectedYear}&city_id=${selectedDistrict}&planning=0` : null, @@ -30,28 +32,38 @@ const MapLegend = ({ } ) + const [opened, { toggle }] = useDisclosure(false) + return ( - + - - Легенда - + + + Легенда + - - - Существующие - - {existingObjectsList && } - - + + + + - - Планируемые - - {planningObjectsList && } - - - + + + + Существующие + + {existingObjectsList && } + + + + + Планируемые + + {planningObjectsList && } + + + + ) diff --git a/client/src/components/map/MapLineTest.tsx b/client/src/components/map/MapLineTest.tsx new file mode 100644 index 0000000..90efb61 --- /dev/null +++ b/client/src/components/map/MapLineTest.tsx @@ -0,0 +1,125 @@ +import { useEffect, useRef } from 'react' +import 'ol/ol.css' +import { Container, Stack, Tabs } from '@mantine/core' +import OlMap from 'ol/Map' +import { v4 as uuidv4 } from 'uuid' +import TileLayer from 'ol/layer/Tile' +import { OSM } from 'ol/source' +import View from 'ol/View' +import { transform } from 'ol/proj' +import VectorLayer from 'ol/layer/Vector' +import VectorSource from 'ol/source/Vector' +import Feature from 'ol/Feature' +import { LineString } from 'ol/geom' +import { Stroke, Style, Text } from 'ol/style' + +const center = [14443331.466543002, 8878970.176309839] + +const style = new Style({ + stroke: new Stroke({ color: 'blue', width: 2 }), + text: new Text({ + font: 'bold 14px', + placement: 'line', + offsetY: -14 + }), +}) + +const MapLineTest = () => { + const lines = [ + { name: 'A', points: [[100, 100], [200, 200]] }, + { name: 'B', points: [[200, 200], [300, 200]] }, + { name: 'X', points: [[200, 200], [300, 300]] }, + { name: 'L', points: [[300, 300], [350, 300]] }, + { name: 'N', points: [[300, 300], [250, 300]] }, + { name: 'I', points: [[300, 200], [300, 100]] }, + { name: 'J', points: [[300, 100], [250, 50]] }, + { name: 'C', points: [[300, 200], [400, 150]] }, + { name: 'D', points: [[400, 150], [400, 100]] }, + ] + + const map = useRef(null) + const vectorLayer = useRef(new VectorLayer({ + source: new VectorSource(), + style: feature => { + style.getText()?.setText(feature.get('label')) + return style + } + })) + + const mapElement = useRef(null) + + useEffect(() => { + map.current = new OlMap({ + controls: [], + layers: [ + new TileLayer({ source: new OSM(), properties: { id: uuidv4(), name: 'OpenStreetMap' } }), + vectorLayer.current + ] + }) + map.current.setTarget(mapElement.current as HTMLDivElement) + map.current.setView(new View({ + center: transform([129.7466541, 62.083504], 'EPSG:4326', 'EPSG:3857'), + zoom: 16, + maxZoom: 21, + })) + }, []) + + useEffect(() => { + if (map.current) { + const graph = new Map() + + // build graph adjacency list + lines.forEach(({ points }) => { + const [start, end] = points.map(pt => pt.join(',')) + const distance = Math.hypot(points[1][0] - points[0][0], points[1][1] - points[0][1]) + + if (!graph.has(start)) graph.set(start, []) + if (!graph.has(end)) graph.set(end, []) + + graph.get(start)?.push({ node: end, distance }) + graph.get(end)?.push({ node: start, distance }) + }) + + // perform DFS to calculate distances from "A" + const startNode = lines[0].points[0].join(',') + const distances = new Map() + const dfs = (node: string, currentDist: number) => { + if (distances.has(node) && distances.get(node)! <= currentDist) return + distances.set(node, currentDist) + for (const { node: neighbor, distance } of graph.get(node) || []) { + dfs(neighbor, currentDist + distance) + } + } + dfs(startNode, 0) + + // render features + lines.forEach(({ name, points }) => { + const lineCoords = points.map(point => [point[0] + center[0], point[1] + center[1]]) + const feature = new Feature(new LineString(lineCoords)) + + const lastNode = points[1].join(',') + const label = `${name} ${feature.getGeometry()?.getLength().toFixed(2)} (${distances.get(lastNode)?.toFixed(1) ?? '∞'})` + + feature.set('label', label) + vectorLayer.current.getSource()?.addFeature(feature) + }) + } + }, []) + + return ( + + + + + Map + + + + + + + + ) +} + +export default MapLineTest diff --git a/client/src/components/map/MapPrint/MapPrint.tsx b/client/src/components/map/MapPrint/MapPrint.tsx new file mode 100644 index 0000000..391af83 --- /dev/null +++ b/client/src/components/map/MapPrint/MapPrint.tsx @@ -0,0 +1,234 @@ +import { ActionIcon, Button, Checkbox, Flex, Modal, Radio, ScrollAreaAutosize, Select, Stack, Text } from '@mantine/core' +import { IconHelp, IconWindowMaximize, IconWindowMinimize } from '@tabler/icons-react' +import React, { useEffect, useRef, useState } from 'react' +import { clearPrintArea, PrintScale, setPreviousView, setPrintScale, setPrintScaleLine, useMapStore } from '../../../store/map' +import { PrintFormat, PrintOrientation, printResolutions, setPrintOrientation, setPrintResolution, usePrintStore } from '../../../store/print' +import { printDimensions, scaleOptions } from '../../../constants/map' +import { useObjectsStore } from '../../../store/objects' +// import { getPointResolution } from 'ol/proj' +import jsPDF from 'jspdf' +import { getCenter } from 'ol/extent' +import ScaleLine from 'ol/control/ScaleLine' + +const MapPrint = ({ + id, + mapElement +}: { + id: string + mapElement: React.MutableRefObject +}) => { + const [fullscreen, setFullscreen] = useState(false) + const { printOrientation, printResolution, printFormat } = usePrintStore() + const { selectedYear, selectedRegion, selectedDistrict } = useObjectsStore().id[id] + + const { + map, + previousView, printArea, printSource, printAreaDraw, printScale, printScaleLine, + } = useMapStore().id[id] + + const exportToPDF = (format: PrintFormat, resolution: number, orientation: PrintOrientation) => { + const dim = printDimensions[format] + + const width = Math.round((dim[orientation === 'horizontal' ? 0 : 1] * resolution) / 25.4) + const height = Math.round((dim[orientation === 'horizontal' ? 1 : 0] * resolution) / 25.4) + + if (!map) return + + // Store original size and scale + const originalSize = map.getSize() + const originalResolution = map.getView().getResolution() + + if (!originalSize || !originalResolution) return + + // Calculate new resolution to fit high DPI + const scaleFactor = width / originalSize[0] + const newResolution = originalResolution / scaleFactor + + // console.log(`New resolution: ${newResolution}`) + + // const center = map.getView().getCenter() + // let scaleResolution = 1 + // if (center) { + // scaleResolution = Number(printScale) / getPointResolution(map.getView().getProjection(), Number(resolution) / 25.4, center) + // // console.log(`Scaled resolution: ${scaleResolution}`) + // } + + console.log(width, height) + // Set new high-resolution rendering + map.setSize([width, height]) + map.getView().setResolution(newResolution) + map.renderSync() + + map.once("rendercomplete", function () { + const mapCanvas = document.createElement("canvas") + mapCanvas.width = width + mapCanvas.height = height + const mapContext = mapCanvas.getContext("2d") + + if (!mapContext) return + + const canvas = document.querySelector('canvas') + if (canvas) { + if (canvas.width > 0) { + const opacity = canvas.parentElement?.style.opacity || "1" + mapContext.globalAlpha = parseFloat(opacity) + + const transform = canvas.style.transform + const matrixMatch = transform.match(/^matrix\(([^)]+)\)$/) + if (matrixMatch) { + const matrix = matrixMatch[1].split(",").map(Number) + mapContext.setTransform(...matrix as [number, number, number, number, number, number]) + } + + mapContext.drawImage(canvas, 0, 0) + } + } + + mapContext.globalAlpha = 1 + mapContext.setTransform(1, 0, 0, 1, 0, 0) + + // Restore original map settings + map.setSize(originalSize) + map.getView().setResolution(originalResolution) + map.renderSync() + + const dimensions = { + w: orientation === 'horizontal' ? dim[0] : dim[1], + h: orientation === 'horizontal' ? dim[1] : dim[0] + } + + // Generate PDF + const pdf = new jsPDF(orientation === 'horizontal' ? "landscape" : 'portrait', undefined, format) + pdf.addImage(mapCanvas.toDataURL("image/jpeg"), "JPEG", 0, 0, dimensions.w, dimensions.h) + + const filename = `${selectedYear}-${selectedRegion}-${selectedDistrict}-${new Date().toISOString()}.pdf` + pdf.save(filename, { + returnPromise: true + }).then(() => { + + }) + }) + } + + const scaleLine = useRef(new ScaleLine({ + bar: true, + text: true, + minWidth: 125 + })) + + useEffect(() => { + if (printArea) { + // backup view before entering print mode + setPreviousView(id, map?.getView()) + + map?.setTarget('print-portal') + + printSource.clear() + map?.getView().setCenter(getCenter(printArea)) + map?.getView().fit(printArea, { + size: printOrientation === 'horizontal' ? [594, 420] : [420, 594] + }) + map?.removeInteraction(printAreaDraw) + } + }, [printArea, map]) + + useEffect(() => { + if (printScaleLine && printArea) { + map?.addControl(scaleLine.current) + } else { + map?.removeControl(scaleLine.current) + } + }, [printScaleLine, printArea]) + + return ( + { + clearPrintArea(id) + map?.setTarget(mapElement.current as HTMLDivElement) + map?.addInteraction(printAreaDraw) + }} fullScreen={fullscreen}> + + + + + Предпросмотр области печати + + + + + + + setFullscreen(!fullscreen)}> + {fullscreen ? : } + + + + + + + Область печати можно передвигать. + + + + + setPrintOrientation(value as PrintOrientation)} + > + + + + + + + setPrintScale(id, value as PrintScale)} + /> + + setPrintScaleLine(id, event.currentTarget.checked)} + /> + + + + + + + + + + ) +} + +export default MapPrint \ No newline at end of file diff --git a/client/src/components/map/ObjectData.tsx b/client/src/components/map/ObjectData.tsx index 18e0b44..382759d 100644 --- a/client/src/components/map/ObjectData.tsx +++ b/client/src/components/map/ObjectData.tsx @@ -6,7 +6,7 @@ import { BASE_URL } from '../../constants' const ObjectData = (object_data: IObjectData) => { const { data: typeData } = useSWR( - object_data.type ? `/general/types/all` : null, + object_data.type ? `/general/types` : null, (url) => fetcher(url, BASE_URL.ems), { revalidateOnFocus: false diff --git a/client/src/components/map/ObjectParameter.tsx b/client/src/components/map/ObjectParameter.tsx index 17efba5..0f76a41 100644 --- a/client/src/components/map/ObjectParameter.tsx +++ b/client/src/components/map/ObjectParameter.tsx @@ -16,7 +16,7 @@ const ObjectParameter = ({ map_id }: ObjectParameterProps) => { const { data: paramData } = useSWR( - `/general/params/all?param_id=${param.id_param}`, + `/general/params/?param_id=${param.id_param}`, (url) => fetcher(url, BASE_URL.ems).then(res => res[0] as IParam), { revalidateOnFocus: false, diff --git a/client/src/components/map/ObjectParameters/ObjectParameters.tsx b/client/src/components/map/ObjectParameters/ObjectParameters.tsx index dc900c3..06be0cc 100644 --- a/client/src/components/map/ObjectParameters/ObjectParameters.tsx +++ b/client/src/components/map/ObjectParameters/ObjectParameters.tsx @@ -15,7 +15,7 @@ const ObjectParameters = ({ const { currentObjectId } = useObjectsStore().id[map_id] const { data: valuesData, isValidating: valuesValidating } = useSWR( - currentObjectId ? `/general/values/all?object_id=${currentObjectId}` : null, + currentObjectId ? `/general/values/?object_id=${currentObjectId}` : null, (url) => fetcher(url, BASE_URL.ems), { revalidateOnFocus: false, diff --git a/client/src/constants/app.tsx b/client/src/constants/app.tsx index a880d7b..7589915 100644 --- a/client/src/constants/app.tsx +++ b/client/src/constants/app.tsx @@ -1,4 +1,4 @@ -import { IconBuildingFactory2, IconComponents, IconDeviceDesktopAnalytics, IconFiles, IconHome, IconLogin, IconLogin2, IconMap, IconPassword, IconReport, IconServer, IconSettings, IconShield, IconUsers } from "@tabler/icons-react"; +import { IconBuildingFactory2, IconComponents, IconDeviceDesktopAnalytics, IconFiles, IconFlame, IconHome, IconLogin, IconLogin2, IconMap, IconPassword, IconReport, icons, IconServer, IconSettings, IconShield, IconUsers } from "@tabler/icons-react"; import SignIn from "../pages/auth/SignIn"; import SignUp from "../pages/auth/SignUp"; import PasswordReset from "../pages/auth/PasswordReset"; @@ -15,6 +15,8 @@ import Boilers from "../pages/Boilers"; import MapTest from "../pages/MapTest"; import PrintReport from "../pages/PrintReport"; import DBManager from "../pages/DBManager"; +import MapLineTest from "../components/map/MapLineTest"; +import FuelPage from "../pages/Fuel"; // Определение страниц с путями и компонентом для рендера @@ -127,6 +129,15 @@ const pages = [ dashboard: true, enabled: true, }, + { + label: "Map line test", + path: "/map-line-test", + icon: , + component: , + drawer: true, + dashboard: true, + enabled: true, + }, { label: "Монитор", path: "/monitor", @@ -152,7 +163,7 @@ const pages = [ component: , drawer: true, dashboard: true, - enabled: false, + enabled: true, }, { label: "Тест БД", @@ -163,6 +174,15 @@ const pages = [ dashboard: true, enabled: true, }, + { + label: 'Fuel', + path: '/fuel', + icon: , + component: , + drawer: true, + dashboard: true, + enabled: true + } ] export { diff --git a/client/src/dto/fuel/fuel.dto.ts b/client/src/dto/fuel/fuel.dto.ts new file mode 100644 index 0000000..7e5489e --- /dev/null +++ b/client/src/dto/fuel/fuel.dto.ts @@ -0,0 +1,29 @@ +export class FuelExpenseDto { + id_boiler?: string + id_fuel?: number + date?: Date + value?: number +} + +export const FuelExpenseDtoHeaders = { + id_boiler: 'Boiler ID', + id_fuel: 'Fuel ID', + date: 'Date', + value: 'Value', +} + +export class FuelLimitDto { + id_boiler?: string + id_fuel?: number + month?: Date + year?: number + value?: number +} + +export const FuelLimitDtoHeaders = { + id_boiler: 'Boiler ID', + id_fuel: 'Fuel ID', + month: 'Month', + year: 'Year', + value: 'Value' +} \ No newline at end of file diff --git a/client/src/http/axiosInstanceNest.ts b/client/src/http/axiosInstanceNest.ts new file mode 100644 index 0000000..01fc82b --- /dev/null +++ b/client/src/http/axiosInstanceNest.ts @@ -0,0 +1,27 @@ +import axios, { ResponseType } from 'axios'; +import { useAuthStore } from '../store/auth'; + +const axiosInstance = axios.create(); + +axiosInstance.interceptors.request.use( + (config) => { + const token = useAuthStore.getState().token; + if (token) { + config.headers['Authorization'] = `Bearer ${token}`; + } + return config; + }, + (error) => { + return Promise.reject(error); + } +); + +export const fetcher = (url: string, baseURL?: string, responseType?: ResponseType) => axiosInstance.get(url, { + baseURL: baseURL || import.meta.env.VITE_API_NEST_URL, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + responseType: responseType ? responseType : "json" +}).then(res => res.data) + +export default axiosInstance; \ No newline at end of file diff --git a/client/src/layouts/MainLayout.tsx b/client/src/layouts/MainLayout.tsx index 45a838c..c180b1a 100644 --- a/client/src/layouts/MainLayout.tsx +++ b/client/src/layouts/MainLayout.tsx @@ -1,5 +1,3 @@ -// Layout for fullscreen pages - import { Flex } from "@mantine/core"; import { Outlet } from "react-router-dom"; diff --git a/client/src/main.tsx b/client/src/main.tsx index 68a77fb..7f7f42a 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -1,10 +1,13 @@ import "@fontsource/inter"; import '@mantine/core/styles.css'; +import '@mantine/dates/styles.css'; import React from 'react' import ReactDOM from 'react-dom/client' import App from './App.tsx' import './index.css' import { createTheme, DEFAULT_THEME, MantineProvider, mergeMantineTheme } from '@mantine/core'; +import 'dayjs/locale/ru'; +import { DatesProvider } from "@mantine/dates"; const overrides = createTheme({ // Set this color to `--mantine-color-body` CSS variable @@ -19,7 +22,9 @@ const theme = mergeMantineTheme(DEFAULT_THEME, overrides); ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( - + + + , ) \ No newline at end of file diff --git a/client/src/pages/Fuel.tsx b/client/src/pages/Fuel.tsx new file mode 100644 index 0000000..e0f5900 --- /dev/null +++ b/client/src/pages/Fuel.tsx @@ -0,0 +1,207 @@ +import { ActionIcon, Button, Flex, Input, Loader, LoadingOverlay, Modal, Overlay, Table, Tabs, TextInput, useMantineColorScheme } from "@mantine/core"; +import { IconMathMax, IconPlus, IconTableMinus, IconTablePlus } from "@tabler/icons-react"; +import { FuelExpenseDto, FuelExpenseDtoHeaders, FuelLimitDto, FuelLimitDtoHeaders } from "../dto/fuel/fuel.dto"; +import useSWR from "swr"; +import { fetcher } from "../http/axiosInstanceNest"; +import { useEffect, useState } from "react"; +import { useDisclosure } from "@mantine/hooks"; +import { DateInput, DatePicker } from '@mantine/dates' +import { SubmitHandler, useForm } from "react-hook-form"; + +import { AgGridReact } from "ag-grid-react"; +import { AllCommunityModule, ColDef, ModuleRegistry } from 'ag-grid-community' + +ModuleRegistry.registerModules([AllCommunityModule]) + +type FieldType = 'text' | 'number' | 'select' | 'date' + +interface IPostInclude { + field: string + field_type: FieldType +} + +interface ITableSchema { + label: string + value: string + get: string + post: string + headers: { [key: string]: string } + post_include: IPostInclude[] + icon: JSX.Element +} + +export default function FuelPage() { + const tables: ITableSchema[] = [ + { + label: 'Расходы', + value: 'expenses', + get: '/fuel/expenses', + post: '/fuel/expenses', + headers: FuelExpenseDtoHeaders, + post_include: [ + { + field: 'id_boiler', + field_type: 'text' + }, + { + field: 'id_fuel', + field_type: 'text' + }, + { + field: 'date', + field_type: 'date' + }, + { + field: 'value', + field_type: 'text' + } + ], + icon: + }, + { + label: 'Лимиты', + value: 'limits', + get: '/fuel/limits', + post: '/fuel/limits', + headers: FuelLimitDtoHeaders, + post_include: [ + { + field: 'id_boiler', + field_type: 'text' + }, + { + field: 'id_fuel', + field_type: 'text' + }, + { + field: 'month', + field_type: 'number' + }, + { + field: 'year', + field_type: 'number' + }, + { + field: 'value', + field_type: 'text' + } + ], + icon: , + } + ] + + const [currentTab, setCurrentTab] = useState(tables[0]) + + const { data, isLoading } = useSWR(currentTab.get, () => fetcher(currentTab.get), { revalidateOnFocus: false }) + + const [openedCreateModal, { open: openCreateModal, close: closeCreateModal }] = useDisclosure(false) + + const { colorScheme } = useMantineColorScheme() + + useEffect(() => { + if (colorScheme === 'dark') { + document.body.dataset.agThemeMode = 'dark' + } else { + document.body.dataset.agThemeMode = 'light' + } + }, [colorScheme]) + + return ( + <> + + + setCurrentTab(tables.find(table => table.value === tab) || tables[0])}> + + {tables.map((table, index) => ( + + {table.label} + + ))} + + + + + + + {tables.map((table, index) => ( + + {isLoading ? + + + + : + <> + ({ ...obj, [key]: 'test' }), {}), + Object.keys(table.headers).reduce((obj, key) => ({ ...obj, [key]: 'test' }), {}) + ]} + columnDefs={Object.keys(table.headers).map((header) => ({ + field: header + })) as ColDef[]} + defaultColDef={{ + flex: 1, + }} + /> + + } + + ))} + + + ) +} + +const ModalCreate = ({ + openedCreateModal, + closeCreateModal, + currentTab +}: { + openedCreateModal: boolean + closeCreateModal: () => void + currentTab: ITableSchema +}) => { + const { register, handleSubmit, reset, watch, formState: { errors, isSubmitting, dirtyFields, isValid } } = useForm({ + mode: 'onChange', + }) + + const onSubmit: SubmitHandler = async (values: any) => { + console.log('Values to submit:', values) + } + + return ( + + + + + {currentTab.post_include.map((header, index) => { + switch (header.field_type) { + case 'date': + return ( + + ) + case 'text': + return ( + + ) + default: + return ( + + ) + } + })} + + + + + ) +} \ No newline at end of file diff --git a/client/src/pages/MapTest.tsx b/client/src/pages/MapTest.tsx index e6d61a6..e6cde0f 100644 --- a/client/src/pages/MapTest.tsx +++ b/client/src/pages/MapTest.tsx @@ -13,9 +13,9 @@ function MapTest() { const tabs = [ { id: uuidv4(), - year: 2023, + year: 2018, region: 11, - district: 145, + district: 146, }, // { // id: uuidv4(), diff --git a/client/src/pages/PrintReport.tsx b/client/src/pages/PrintReport.tsx index f310f8f..bdd61bd 100644 --- a/client/src/pages/PrintReport.tsx +++ b/client/src/pages/PrintReport.tsx @@ -1,11 +1,10 @@ -import { ActionIcon, Button, Flex, Group, Input, Stack, Text, TextInput } from "@mantine/core" +import { ActionIcon, Button, Flex, Group, Stack, Text, TextInput } from "@mantine/core" import { useEffect, useState } from "react" import createReport, { listCommands } from 'docx-templates' -import { Dropzone, DropzoneProps, IMAGE_MIME_TYPE, MS_WORD_MIME_TYPE } from '@mantine/dropzone' -import { IconFile, IconFileTypeDocx, IconPhoto, IconPlus, IconUpload, IconX } from "@tabler/icons-react" +import { Dropzone, IMAGE_MIME_TYPE } from '@mantine/dropzone' +import { IconFileTypeDocx, IconPlus, IconUpload, IconX } from "@tabler/icons-react" import { CommandSummary } from "docx-templates/lib/types" import { Control, Controller, FieldValues, SubmitHandler, useFieldArray, useForm, UseFormRegister } from "react-hook-form" -import { TemplateHandler } from 'easy-template-x' const xslTemplate = ` @@ -962,54 +961,6 @@ const handleGenerateExcel = () => { URL.revokeObjectURL(url) } -const TemplateFormET = ({ - templateUrl -}: { - templateUrl: string -}) => { - const [templateUint8Array, setTemplateUint8Array] = useState(null) - const [loading, setLoading] = useState(false) - - const loadTemplate = async (templateUrl: string) => { - setLoading(true) - try { - const response = await fetch(templateUrl) - const templateArrayBuffer = await response.arrayBuffer() - - setTemplateUint8Array(new Uint8Array(templateArrayBuffer)) - } catch (error) { - console.error("Error generating DOCX:", error) - } finally { - setLoading(false) - } - } - - const loadTags = async (templateUint8Array: Uint8Array) => { - const handler = new TemplateHandler() - const tags = await handler.parseTags(templateUint8Array) - - console.log(tags) - } - - useEffect(() => { - if (templateUint8Array) { - loadTags(templateUint8Array) - } - }, [templateUint8Array]) - - useEffect(() => { - if (templateUrl) { - loadTemplate(templateUrl) - } - }, [templateUrl]) - - return ( -
- -
- ) -} - interface TemplateCommand extends CommandSummary { children?: CommandSummary[] } @@ -1098,6 +1049,7 @@ const FormLoop = ({ )) } + { if (command.children) { append(command.children.map(c => c.code).reduce((acc, key) => { @@ -1132,51 +1084,51 @@ const renderCommand = ( if (command.type === 'IMAGE') { return ( - ( - console.log('rejected files', files)} - onDrop={(files) => { - console.log(files[0]) - files[0].arrayBuffer().then(res => { - onChange({ - width: 6, - height: 6, - data: new Uint8Array(res), - extension: files[0]?.path?.match(/\.[^.]+$/)?.[0] || "" + + {command.code} + ( + console.log('rejected files', files)} + onDrop={(files) => { + console.log(files[0]) + files[0].arrayBuffer().then(res => { + onChange({ + width: 6, + height: 6, + data: new Uint8Array(res), + extension: files[0]?.path?.match(/\.[^.]+$/)?.[0] || "" + }) }) - }) - }} - maxFiles={1} - > - - - - - - - - - - + }} + maxFiles={1} + > + + + + + + + + + + -
- - Drag files here or click to select files - - - Attach as many files as you like, each file should not exceed 5mb - -
- - - )} - /> +
+ + Перетащите файлы сюда или нажмите, чтобы выбрать их + +
+ + + )} + /> + ) } } @@ -1186,7 +1138,7 @@ const TemplateForm = ({ }: { templateUrl: string, }) => { - const { register, control, handleSubmit, reset, watch, formState } = useForm({ + const { register, control, handleSubmit } = useForm({ mode: 'onChange', }) @@ -1276,6 +1228,15 @@ const TemplateForm = ({ } }, [templateUrl]) + useEffect(() => { + console.log(loading) + }, [loading]) + + useEffect(() => { + console.log(saving) + }, [saving]) + + if (commandList) { return (
@@ -1283,13 +1244,16 @@ const TemplateForm = ({ {commandList.map(command => { if (command.type === 'FOR') { return ( - + + {command.code} + + ) } else { return renderCommand(control, register, command, command.code, command.code, command.code) } })} - + ) @@ -1297,8 +1261,6 @@ const TemplateForm = ({ } const PrintReport = () => { - const [loading, setLoading] = useState(false) - return ( diff --git a/client/src/store/map.ts b/client/src/store/map.ts index 648f033..46898b3 100644 --- a/client/src/store/map.ts +++ b/client/src/store/map.ts @@ -235,7 +235,7 @@ export const initializeMapState = ( const printAreaDraw = new Draw({ source: printSource, type: 'Circle', - style: (feature) => { + style: () => { return new Style({ fill: new Fill({ color: "rgba(0, 0, 255, 0.3)", // Semi-transparent blue fill @@ -331,12 +331,13 @@ export const initializeMapState = ( if (pixel) { map?.forEachFeatureAtPixel(pixel, function (feature, layer) { - if (layer.get('type') === 'region') { - console.log("clicked on region") - zoomToFeature(id, feature as Feature) + if (layer) { + if (layer.get('type') === 'region') { + zoomToFeature(id, feature as Feature) - if (feature.get('entity_id')) { - setSelectedRegion(id, feature.get('entity_id')) + if (feature.get('entity_id')) { + setSelectedRegion(id, feature.get('entity_id')) + } } } }) diff --git a/client/yarn.lock b/client/yarn.lock index e35451d..f9119f8 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1869,11 +1869,6 @@ dependencies: "@swc/core" "^1.5.7" -"@xmldom/xmldom@0.8.10": - version "0.8.10" - resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz" - integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== - "@zeit/schemas@2.36.0": version "2.36.0" resolved "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.36.0.tgz" @@ -1897,6 +1892,26 @@ acorn-jsx@^5.3.2: resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz" integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== +ag-charts-types@11.3.2: + version "11.3.2" + resolved "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-11.3.2.tgz" + integrity sha512-trPGqgGYiTeLgtf9nLuztDYOPOFOLbqHn1g2D99phf7QowcwdX0TPx0wfWG8Hm90LjB8IH+G2s3AZe2vrdAtMQ== + +ag-grid-community@33.3.2: + version "33.3.2" + resolved "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-33.3.2.tgz" + integrity sha512-9bx0e/+ykOyLvUxHqmdy0cRVANH6JAtv0yZdnBZEXYYqBAwN+G5a4NY+2I1KvoOCYzbk8SnStG7y4hCdVAAWOQ== + dependencies: + ag-charts-types "11.3.2" + +ag-grid-react@^33.3.2: + version "33.3.2" + resolved "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-33.3.2.tgz" + integrity sha512-5bv4JIJvGov23sduIUIyQTqpa/qhoQrRkQm5pFOQb7RMwusfx6xBPrkLwIIlCJiQ8g0OOinxWzZ2kQ2Zml6tLw== + dependencies: + ag-grid-community "33.3.2" + prop-types "^15.8.1" + ajv@^6.12.4: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" @@ -2937,16 +2952,6 @@ eastasianwidth@^0.2.0: resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -easy-template-x@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/easy-template-x/-/easy-template-x-5.1.0.tgz" - integrity sha512-vypMbIMLWLXoooA9rsL3SVN2oQtZwmmx1m4H8gi6JfbEXQQ5VLHGOUHYi9APbvN9R8Gx93r1fphdSFRHxozeYw== - dependencies: - "@xmldom/xmldom" "0.8.10" - json5 "2.2.3" - jszip "3.10.1" - lodash.get "4.4.2" - ejs@^3.1.6: version "3.1.10" resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz" @@ -4071,7 +4076,7 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== -json5@^2.2.0, json5@^2.2.3, json5@2.2.3: +json5@^2.2.0, json5@^2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -4105,7 +4110,7 @@ jspdf@^2.5.1, jspdf@^2.5.2: dompurify "^2.5.4" html2canvas "^1.0.0-rc.5" -jszip@^3.10.1, jszip@3.10.1: +jszip@^3.10.1: version "3.10.1" resolved "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz" integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g== @@ -4191,11 +4196,6 @@ lodash.debounce@^4.0.8: resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.get@4.4.2: - version "4.4.2" - resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz" - integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== - lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" @@ -5136,7 +5136,7 @@ rc@^1.0.1, rc@^1.1.6: minimist "^1.2.0" strip-json-comments "~2.0.1" -"react-dom@^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom@^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=16.8.0, react-dom@>=18.0.0: +"react-dom@^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom@^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=16.8.0, react-dom@>=18.0.0: version "18.3.1" resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz" integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== diff --git a/ems/DATABASE.md b/ems/DATABASE.md new file mode 100644 index 0000000..c5442bb --- /dev/null +++ b/ems/DATABASE.md @@ -0,0 +1,35 @@ +Make sure to use PostGIS + +Create tables first: + +```sql +CREATE TABLE IF NOT EXISTS bounds ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + entity_id INT NOT NULL, + entity_type TEXT NOT NULL, + geometry GEOMETRY(MULTIPOLYGON, 3857) NOT NULL, + UNIQUE (entity_id, entity_type) +); +``` + +```sql +CREATE TABLE IF NOT EXISTS lines ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + object_id UUID NOT NULL, + geometry GEOMETRY(LINESTRING, 3857) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW(), + schema TEXT NOT NULL +); +``` + +```sql +CREATE TABLE IF NOT EXISTS shapes ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + object_id UUID NOT NULL, + geometry GEOMETRY(POLYGON, 3857) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW(), + schema TEXT NOT NULL +); +``` \ No newline at end of file diff --git a/ems/package-lock.json b/ems/package-lock.json index f6492c8..af6f9e1 100644 --- a/ems/package-lock.json +++ b/ems/package-lock.json @@ -683,48 +683,53 @@ } }, "node_modules/@prisma/debug": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.19.1.tgz", - "integrity": "sha512-lAG6A6QnG2AskAukIEucYJZxxcSqKsMK74ZFVfCTOM/7UiyJQi48v6TQ47d6qKG3LbMslqOvnTX25dj/qvclGg==", - "devOptional": true + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz", + "integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==", + "devOptional": true, + "license": "Apache-2.0" }, "node_modules/@prisma/engines": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.19.1.tgz", - "integrity": "sha512-kR/PoxZDrfUmbbXqqb8SlBBgCjvGaJYMCOe189PEYzq9rKqitQ2fvT/VJ8PDSe8tTNxhc2KzsCfCAL+Iwm/7Cg==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.22.0.tgz", + "integrity": "sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==", "devOptional": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { - "@prisma/debug": "5.19.1", - "@prisma/engines-version": "5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3", - "@prisma/fetch-engine": "5.19.1", - "@prisma/get-platform": "5.19.1" + "@prisma/debug": "5.22.0", + "@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2", + "@prisma/fetch-engine": "5.22.0", + "@prisma/get-platform": "5.22.0" } }, "node_modules/@prisma/engines-version": { - "version": "5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3.tgz", - "integrity": "sha512-xR6rt+z5LnNqTP5BBc+8+ySgf4WNMimOKXRn6xfNRDSpHvbOEmd7+qAOmzCrddEc4Cp8nFC0txU14dstjH7FXA==", - "devOptional": true + "version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz", + "integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==", + "devOptional": true, + "license": "Apache-2.0" }, "node_modules/@prisma/fetch-engine": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.19.1.tgz", - "integrity": "sha512-pCq74rtlOVJfn4pLmdJj+eI4P7w2dugOnnTXpRilP/6n5b2aZiA4ulJlE0ddCbTPkfHmOL9BfaRgA8o+1rfdHw==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz", + "integrity": "sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==", "devOptional": true, + "license": "Apache-2.0", "dependencies": { - "@prisma/debug": "5.19.1", - "@prisma/engines-version": "5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3", - "@prisma/get-platform": "5.19.1" + "@prisma/debug": "5.22.0", + "@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2", + "@prisma/get-platform": "5.22.0" } }, "node_modules/@prisma/get-platform": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.19.1.tgz", - "integrity": "sha512-sCeoJ+7yt0UjnR+AXZL7vXlg5eNxaFOwC23h0KvW1YIXUoa7+W2ZcAUhoEQBmJTW4GrFqCuZ8YSP0mkDa4k3Zg==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.22.0.tgz", + "integrity": "sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==", "devOptional": true, + "license": "Apache-2.0", "dependencies": { - "@prisma/debug": "5.19.1" + "@prisma/debug": "5.22.0" } }, "node_modules/@redis/bloom": { @@ -1145,9 +1150,10 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", - "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz", + "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -1226,9 +1232,10 @@ } }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -1238,7 +1245,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1322,16 +1329,27 @@ "node": ">= 0.8" } }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", "dependencies": { - "es-define-property": "^1.0.0", "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -1468,9 +1486,10 @@ } }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1519,22 +1538,6 @@ "ms": "2.0.0" } }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -1604,6 +1607,20 @@ "url": "https://dotenvx.com" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -1618,9 +1635,10 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -1634,12 +1652,10 @@ } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1648,6 +1664,19 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, "engines": { "node": ">= 0.4" } @@ -1655,12 +1684,14 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" }, "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1682,36 +1713,37 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -1720,6 +1752,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express-validator": { @@ -1747,12 +1783,13 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -1807,6 +1844,7 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1829,6 +1867,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1843,15 +1882,21 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -1860,6 +1905,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -1873,11 +1931,12 @@ } }, "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1892,32 +1951,11 @@ "node": ">=4" } }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -1929,6 +1967,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -2317,6 +2356,15 @@ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/md5": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", @@ -2336,9 +2384,13 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -2352,6 +2404,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -2513,9 +2566,10 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2568,14 +2622,16 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "license": "MIT" }, "node_modules/pg": { "version": "8.13.1", @@ -2721,13 +2777,14 @@ "dev": true }, "node_modules/prisma": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.19.1.tgz", - "integrity": "sha512-c5K9MiDaa+VAAyh1OiYk76PXOme9s3E992D7kvvIOhCrNsBQfy2mP2QAQtX0WNj140IgG++12kwZpYB9iIydNQ==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.22.0.tgz", + "integrity": "sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==", "devOptional": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { - "@prisma/engines": "5.19.1" + "@prisma/engines": "5.22.0" }, "bin": { "prisma": "build/index.js" @@ -2785,11 +2842,12 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -2802,6 +2860,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2923,9 +2982,10 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -2945,41 +3005,36 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -3024,14 +3079,69 @@ } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" diff --git a/ems/src/api/general/index.ts b/ems/src/api/general/index.ts index 513c61f..41e9492 100644 --- a/ems/src/api/general/index.ts +++ b/ems/src/api/general/index.ts @@ -3,6 +3,7 @@ import { tediousQuery } from '../../utils/tedious'; import { GeneralDB, GisDB } from '../../constants/db'; const router = express.Router() +// ✅ router.get('/regions/all', async (req: Request, res: Response) => { try { const result = await tediousQuery( @@ -16,6 +17,7 @@ router.get('/regions/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/districts/all', async (req: Request, res: Response) => { try { const { region_id } = req.query @@ -34,6 +36,7 @@ router.get('/districts/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/cities/all', async (req: Request, res: Response) => { try { const { offset, limit, search, id } = req.query @@ -54,6 +57,7 @@ router.get('/cities/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/types/all', async (req: Request, res: Response) => { try { const result = await tediousQuery( @@ -68,6 +72,7 @@ router.get('/types/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/objects/all', async (req: Request, res: Response) => { try { const { offset, limit, city_id } = req.query @@ -87,31 +92,13 @@ router.get('/objects/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/objects/list', async (req: Request, res: Response) => { try { const { city_id, year, planning, type } = req.query if (type) { const result = await tediousQuery( - // ` - // SELECT - // * - // FROM - // vObjects - // WHERE - // vObjects.id_city = ${city_id} - // AND vObjects.year = ${year} - // AND type = ${type} - // AND - // ( - // CASE - // WHEN TRY_CAST(vObjects.planning AS BIT) IS NOT NULL THEN TRY_CAST(vObjects.planning AS BIT) - // WHEN vObjects.planning = 'TRUE' THEN 1 - // WHEN vObjects.planning = 'FALSE' THEN 0 - // ELSE NULL - // END - // ) = ${planning}; - // ` ` WITH cte_split(type_id, split_value, caption_params) AS ( @@ -226,6 +213,7 @@ router.get('/objects/:id([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F } }) +// ✅ router.get('/values/all', async (req: Request, res: Response) => { try { const { object_id } = req.query @@ -257,6 +245,7 @@ router.get('/values/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/params/all', async (req: Request, res: Response) => { try { const { param_id } = req.query @@ -289,6 +278,7 @@ const tcbParamQuery = (vtable: string, id_city: string) => { } } +// ✅ // Get value from TCB parameter router.get('/params/tcb', async (req: Request, res: Response) => { try { @@ -323,6 +313,7 @@ router.get('/params/tcb', async (req: Request, res: Response) => { } }) +// ✅ router.get('/search/objects', async (req: Request, res: Response) => { try { const { q, id_city, year } = req.query diff --git a/ems/src/api/gis/index.ts b/ems/src/api/gis/index.ts index 8537ad9..a456d80 100644 --- a/ems/src/api/gis/index.ts +++ b/ems/src/api/gis/index.ts @@ -2,8 +2,22 @@ import express, { Request, Response } from 'express'; import { tediousQuery } from '../../utils/tedious'; import { GeneralDB, GisDB } from '../../constants/db'; import { pgQuery } from '../../utils/postgres'; + const router = express.Router() +router.get('/migrate/lines', async (req: Request, res: Response) => { + try { + const result = await tediousQuery( + ` + SELECT * FROM ${GisDB}..lines + ` + ) + } catch (error) { + res.status(500) + } +}) + +// ✅ router.get('/type-roles', async (req: Request, res: Response) => { try { const result = await tediousQuery( @@ -17,13 +31,15 @@ router.get('/type-roles', async (req: Request, res: Response) => { } }) + +// ✅ router.get('/bounds/:entity_type', async (req: Request, res: Response) => { try { const { entity_type } = req.params const result = await pgQuery( ` - SELECT * FROM bounds + SELECT entity_id, entity_type, ST_AsGeoJSON(geometry)::JSON AS geometry FROM bounds WHERE entity_type = $1 `, [entity_type] @@ -31,7 +47,7 @@ router.get('/bounds/:entity_type', async (req: Request, res: Response) => { if (Array.isArray(result)) { if (result.length > 0) { - const geometries = result.map((bound: { id: number, entity_id: number, entity_type: string, geometry: JSON, published_at: string, deleted_at: string | null }) => { + const geometries = result.map((bound: { id: string, entity_id: number, entity_type: string, geometry: JSON, published_at: string, deleted_at: string | null }) => { return { ...bound.geometry, properties: { @@ -54,14 +70,15 @@ router.get('/bounds/:entity_type', async (req: Request, res: Response) => { } }) +// ✅ router.get('/bounds/:entity_type/:entity_id', async (req: Request, res: Response) => { try { const { entity_type, entity_id } = req.params const result = await pgQuery( ` - SELECT * FROM bounds - WHERE entity_type = $1 + SELECT entity_id, entity_type, ST_AsGeoJSON(geometry)::JSON AS geometry FROM bounds + WHERE entity_type = $1 AND entity_id = $2 `, [entity_type, entity_id] @@ -81,6 +98,7 @@ router.get('/bounds/:entity_type/:entity_id', async (req: Request, res: Response } }) +// ✅ router.get('/images/all', async (req: Request, res: Response) => { try { const { offset, limit, city_id } = req.query @@ -100,7 +118,7 @@ router.get('/images/all', async (req: Request, res: Response) => { } }) - +// ✅ // Get figures by year and city id router.get('/figures/all', async (req: Request, res: Response) => { try { @@ -121,6 +139,7 @@ router.get('/figures/all', async (req: Request, res: Response) => { } }) +// ✅ // Get lines by year and city id router.get('/lines/all', async (req: Request, res: Response) => { try { @@ -138,6 +157,7 @@ router.get('/lines/all', async (req: Request, res: Response) => { } }) +// ✅ router.get('/regions/borders', async (req: Request, res: Response) => { try { const result = await tediousQuery(