Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2025-11-10 15:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
ajnart
2023-01-03 19:49:25 +09:00
parent ade1534005
commit 908d0f9f09
5 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
View File

@@ -17,7 +17,6 @@ import { AreaType } from '../../../../types/area';
import { IWidget } from '../../../../widgets/widgets';
import { useEditModeStore } from '../../Views/useEditModeStore';
import { initializeGridstack } from './init-gridstack';
import { ShapeType } from '../../../../types/shape';
interface UseGristackReturnType {
apps: AppType[];
@@ -81,47 +80,51 @@ export const useGridstack = (
// change column count depending on the width and the gridRef
useEffect(() => {
if (areaType === 'sidebar') return;
gridRef.current?.column(isLargerThanSm || typeof isLargerThanSm === 'undefined' ? 12 : 6, (column, prevColumn, newNodes, nodes) => {
let nextRow = 0;
let available = 6;
gridRef.current?.column(
isLargerThanSm || typeof isLargerThanSm === 'undefined' ? 12 : 6,
(column, prevColumn, newNodes, nodes) => {
let nextRow = 0;
let available = 6;
if (column === prevColumn) {
newNodes.concat(nodes);
return;
}
if (column === prevColumn) {
newNodes.concat(nodes);
return;
}
nodes.reverse().forEach(node => {
const width = parseInt(node.el!.getAttribute('data-gridstack-w')!, 10);
const height = parseInt(node.el!.getAttribute('data-gridstack-h')!, 10);
const x = parseInt(node.el!.getAttribute('data-gridstack-x')!, 10);
const y = parseInt(node.el!.getAttribute('data-gridstack-y')!, 10);
nodes.reverse().forEach((node) => {
const newnode = node;
const width = parseInt(newnode.el!.getAttribute('data-gridstack-w')!, 10);
const height = parseInt(newnode.el!.getAttribute('data-gridstack-h')!, 10);
const x = parseInt(newnode.el!.getAttribute('data-gridstack-x')!, 10);
const y = parseInt(newnode.el!.getAttribute('data-gridstack-y')!, 10);
if (column === 6) {
node.x = available >= width ? 6 - available : 0;
node.y = nextRow;
if (column === 6) {
newnode.x = available >= width ? 6 - available : 0;
newnode.y = nextRow;
if (width > 6) {
node.w = 6;
nextRow += 2;
available = 6;
} else if (available >= width) {
available -= width;
if (available === 0) {
if (width > 6) {
newnode.w = 6;
nextRow += 2;
available = 6;
} else if (available >= width) {
available -= width;
if (available === 0) {
nextRow += 2;
available = 6;
}
} else if (available < width) {
newnode.y = newnode.y! + 2;
available = 6 - width;
nextRow += 2;
}
} else if (available < width) {
node.y = node.y! + 2;
available = 6 - width;
nextRow += 2;
} else {
newnode.x = y % 2 === 1 ? x + 6 : x;
newnode.y = Math.floor(y / 2);
}
} else {
node.x = y % 2 === 1 ? x + 6 : x;
node.y = Math.floor(y / 2);
}
newNodes.push(node);
});
});
newNodes.push(newnode);
});
}
);
}, [isLargerThanSm]);
const onChange = isEditMode

2
src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx
View File

@@ -1,6 +1,6 @@
import axios from 'axios';
import Consola from 'consola';
import { ActionIcon, Button, Group, Paper, Popover, Space, Text } from '@mantine/core';
import { ActionIcon, Button, Group, Popover, Text } from '@mantine/core';
import { IconEditCircle, IconEditCircleOff, IconX } from '@tabler/icons';
import { getCookie } from 'cookies-next';
import { Trans, useTranslation } from 'next-i18next';

1
src/components/layout/header/Header.tsx
View File

@@ -4,7 +4,6 @@ import { CURRENT_VERSION, REPO_URL } from '../../../../data/constants';
import { useConfigContext } from '../../../config/provider';
import { Logo } from '../Logo';
import { useCardStyles } from '../useCardStyles';
import { AddElementAction } from './Actions/AddElementAction/AddElementAction';
import DockerMenuButton from './Actions/Docker/DockerModule';
import { ToggleEditModeAction } from './Actions/ToggleEditMode/ToggleEditMode';
import { Search } from './Search';

2
src/components/layout/header/SettingsMenu.tsx
View File

@@ -1,4 +1,4 @@
import { ActionIcon, Badge, Menu, Tooltip } from '@mantine/core';
import { ActionIcon, Badge, Menu } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';
import { IconInfoCircle, IconMenu2, IconSettings } from '@tabler/icons';
import { useTranslation } from 'next-i18next';

2
src/pages/login.tsx
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { PasswordInput, Paper, Title, Text, Container, Group, Button } from '@mantine/core';
import { PasswordInput, Paper, Title, Text, Container, Button } from '@mantine/core';
import { setCookie } from 'cookies-next';
import { showNotification, updateNotification } from '@mantine/notifications';
import axios from 'axios';