popovspiridon99/tests
1
0
Fork 0
forked from VinokurovVE/tests
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
cracklesparkle
2024-09-26 12:09:38 +09:00
parent 108dc5082c
commit b88d83cd74
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/TableEditable.tsx
View File

@ -92,7 +92,7 @@ export default function FullFeaturedCrudGrid({
initialRows, initialRows,
columns, columns,
actions = false, actions = false,
onRowClick, //onRowClick,
onSave, onSave,
onDelete, onDelete,
autoComplete, autoComplete,

13
client/src/components/map/MapComponent.tsx
View File

@ -6,9 +6,9 @@ import View from 'ol/View'
import { Draw, Modify, Select, Snap, Translate } from 'ol/interaction' import { Draw, Modify, Select, Snap, Translate } from 'ol/interaction'
import { ImageStatic, OSM, Vector as VectorSource, XYZ } from 'ol/source' import { ImageStatic, OSM, Vector as VectorSource, XYZ } from 'ol/source'
import { Tile as TileLayer, Vector as VectorLayer } from 'ol/layer' import { Tile as TileLayer, Vector as VectorLayer } from 'ol/layer'
import { Divider, IconButton, Slider, Stack, Select as MUISelect, MenuItem, Box, Typography, Drawer, Button, Modal, Accordion, AccordionSummary, AccordionDetails, SxProps, Theme } from '@mui/material' import { Divider, IconButton, Slider, Stack, Select as MUISelect, MenuItem, Box, Typography, Accordion, AccordionSummary, AccordionDetails, SxProps, Theme } from '@mui/material'
import { Add, Adjust, Api, CircleOutlined, ExpandMore, OpenWith, RectangleOutlined, Straighten, Timeline, Undo, Upload, Warning } from '@mui/icons-material' import { Add, Adjust, Api, CircleOutlined, ExpandMore, OpenWith, RectangleOutlined, Straighten, Timeline, Undo, Upload, Warning } from '@mui/icons-material'
import Geometry, { Type } from 'ol/geom/Geometry' import { Type } from 'ol/geom/Geometry'
import { click, never, noModifierKeys, platformModifierKeyOnly, primaryAction, shiftKeyOnly } from 'ol/events/condition' import { click, never, noModifierKeys, platformModifierKeyOnly, primaryAction, shiftKeyOnly } from 'ol/events/condition'
import Feature from 'ol/Feature' import Feature from 'ol/Feature'
import { SatelliteMapsProvider } from '../../interfaces/map' import { SatelliteMapsProvider } from '../../interfaces/map'
@ -124,8 +124,13 @@ const MapComponent = () => {
switch (s.feature.getGeometry()?.getType()) { switch (s.feature.getGeometry()?.getType()) {
case 'LineString': case 'LineString':
type = 'LINE' type = 'LINE'
break
case 'Polygon': case 'Polygon':
type = 'POLYGON' type = 'POLYGON'
break
default:
type = 'POLYGON'
break
} }
const coordinates = (s.feature.getGeometry() as SimpleGeometry).getCoordinates() const coordinates = (s.feature.getGeometry() as SimpleGeometry).getCoordinates()
uploadCoordinates(coordinates, type) uploadCoordinates(coordinates, type)
@ -414,7 +419,7 @@ const MapComponent = () => {
const paddingBottom = Math.abs(newExtent[1] - newMinY) const paddingBottom = Math.abs(newExtent[1] - newMinY)
const pixelWidth = Math.abs(minX - (maxX + 1)) * 256 const pixelWidth = Math.abs(minX - (maxX + 1)) * 256
const pixelHeight = Math.abs(minY - (maxY + 1)) * 256 //const pixelHeight = Math.abs(minY - (maxY + 1)) * 256
const width = Math.abs(newMinX - newMaxX) const width = Math.abs(newMinX - newMaxX)
const perPixel = width / pixelWidth const perPixel = width / pixelWidth
@ -607,7 +612,7 @@ const MapComponent = () => {
const sqDistances = result.sqDistances const sqDistances = result.sqDistances
const rsq = minRadius * minRadius const rsq = minRadius * minRadius
if (Array.isArray(sqDistances)) { if (Array.isArray(sqDistances)) {
const points = coordinates.filter(function (coordinate, index) { const points = coordinates.filter(function (_coordinate, index) {
return sqDistances[index] > rsq return sqDistances[index] > rsq
}) })
styles.push( styles.push(

1
client/src/layouts/DashboardLayout.tsx
View File

@ -9,7 +9,6 @@ import List from '@mui/material/List';
import Typography from '@mui/material/Typography'; import Typography from '@mui/material/Typography';
import Divider from '@mui/material/Divider'; import Divider from '@mui/material/Divider';
import IconButton from '@mui/material/IconButton'; import IconButton from '@mui/material/IconButton';
import Container from '@mui/material/Container';
import MenuIcon from '@mui/icons-material/Menu'; import MenuIcon from '@mui/icons-material/Menu';
import { colors, ListItem, ListItemButton, ListItemIcon, ListItemText, } from '@mui/material'; import { colors, ListItem, ListItemButton, ListItemIcon, ListItemText, } from '@mui/material';
import { Outlet, useNavigate } from 'react-router-dom'; import { Outlet, useNavigate } from 'react-router-dom';

2
client/src/pages/MonitorPage.tsx
View File

@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { Card, Stack } from '@mui/material'; import { Card, Stack } from '@mui/material';
function CardComponent({ function CardComponent({

1
client/src/pages/Servers.tsx
View File

@ -4,7 +4,6 @@ import ServersView from "../components/ServersView"
import ServerIpsView from "../components/ServerIpsView" import ServerIpsView from "../components/ServerIpsView"
import ServerHardware from "../components/ServerHardware" import ServerHardware from "../components/ServerHardware"
import ServerStorage from "../components/ServerStorages" import ServerStorage from "../components/ServerStorages"
import { BarChart } from '@mui/x-charts/BarChart';
export default function Servers() { export default function Servers() {
const [currentTab, setCurrentTab] = useState(0) const [currentTab, setCurrentTab] = useState(0)