tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Reformatted all files with new line length

Browse Source
This commit is contained in:
Donkie
2023-08-12 19:54:24 +02:00
parent 163aa2badc
commit e81bf8b8e7
18 changed files with 159 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/components/column.tsx
View File

@@ -1,11 +1,7 @@
import { Col, Row, Table } from "antd";
import { ColumnProps as AntdColumnProps } from "antd/es/table";
import { ColumnFilterItem } from "antd/es/table/interface";
import {
getFiltersForField,
typeFilters,
useListFiltersForField,
} from "../utils/filtering";
import { getFiltersForField, typeFilters, useListFiltersForField } from "../utils/filtering";
import { TableState } from "../utils/saveload";
import { getSortOrderForField, typeSorters } from "../utils/sorting";
import { NumberFieldUnit } from "./numberField";
@@ -40,14 +36,9 @@ interface CustomColumnProps<Obj> {
) => React.HTMLAttributes<any> | React.TdHTMLAttributes<any>;
}
function Column<Obj>(
props: BaseColumnProps<Obj> & FilteredColumnProps & CustomColumnProps<Obj>
) {
function Column<Obj>(props: BaseColumnProps<Obj> & FilteredColumnProps & CustomColumnProps<Obj>) {
const t = useTranslate();
if (
props.tableState.showColumns &&
!props.tableState.showColumns.includes(props.id)
) {
if (props.tableState.showColumns && !props.tableState.showColumns.includes(props.id)) {
return <></>;
}
const typedSorters = typeSorters<Obj>(props.tableState.sorters);

39
client/src/components/header/index.tsx
View File

@@ -1,15 +1,7 @@
import { DownOutlined } from "@ant-design/icons";
import type { RefineThemedLayoutV2HeaderProps } from "@refinedev/antd";
import { useGetLocale, useSetLocale } from "@refinedev/core";
import {
Button,
Dropdown,
Layout as AntdLayout,
MenuProps,
Space,
Switch,
theme,
} from "antd";
import { Button, Dropdown, Layout as AntdLayout, MenuProps, Space, Switch, theme } from "antd";
import React, { useContext } from "react";
import { ColorModeContext } from "../../contexts/color-mode";
@@ -19,9 +11,7 @@ import QRCodeScannerModal from "../qrCodeScanner";
const { useToken } = theme;
export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
sticky,
}) => {
export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({ sticky }) => {
const { token } = useToken();
const locale = useGetLocale();
const changeLanguage = useSetLocale();
@@ -29,19 +19,12 @@ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
const currentLocale = locale();
const menuItems: MenuProps["items"] = [...(Object.keys(languages) || [])]
.sort()
.map((lang: string) => ({
key: lang,
onClick: () => changeLanguage(lang),
icon: (
<span
className={"fi fi-" + languages[lang].countryCode}
style={{ marginRight: 8 }}
/>
),
label: languages[lang].name,
}));
const menuItems: MenuProps["items"] = [...(Object.keys(languages) || [])].sort().map((lang: string) => ({
key: lang,
onClick: () => changeLanguage(lang),
icon: <span className={"fi fi-" + languages[lang].countryCode} style={{ marginRight: 8 }} />,
label: languages[lang].name,
}));
const headerStyles: React.CSSProperties = {
backgroundColor: token.colorBgElevated,
@@ -69,11 +52,7 @@ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
>
<Button type="text">
<Space>
<span
className={
"fi fi-" + languages[currentLocale ?? "en"].countryCode
}
/>
<span className={"fi fi-" + languages[currentLocale ?? "en"].countryCode} />
{languages[currentLocale ?? "en"].name}
<DownOutlined />
</Space>

18
client/src/components/numberField.tsx
View File

@@ -5,11 +5,7 @@ import { NumberFieldProps } from "@refinedev/antd/dist/components/fields/types";
const { Text } = Typography;
function toLocaleStringSupportsOptions() {
return !!(
typeof Intl == "object" &&
Intl &&
typeof Intl.NumberFormat == "function"
);
return !!(typeof Intl == "object" && Intl && typeof Intl.NumberFormat == "function");
}
type Props = NumberFieldProps & {
@@ -21,20 +17,12 @@ type Props = NumberFieldProps & {
*
* @see {@link https://refine.dev/docs/ui-frameworks/antd/components/fields/number} for more details.
*/
export const NumberFieldUnit: React.FC<Props> = ({
value,
locale,
options,
...rest
}) => {
export const NumberFieldUnit: React.FC<Props> = ({ value, locale, options, ...rest }) => {
const number = Number(value);
return (
<Text {...rest}>
{toLocaleStringSupportsOptions()
? number.toLocaleString(locale, options)
: number}{" "}
{rest.unit}
{toLocaleStringSupportsOptions() ? number.toLocaleString(locale, options) : number} {rest.unit}
</Text>
);
};

17
client/src/components/qrCodeScanner.tsx
View File

@@ -22,18 +22,8 @@ const QRCodeScannerModal: React.FC = () => {
return (
<>
<FloatButton
type="primary"
onClick={() => setVisible(true)}
icon={<CameraOutlined />}
shape="circle"
/>
<Modal
open={visible}
onCancel={() => setVisible(false)}
footer={null}
title={t("scanner.title")}
>
<FloatButton type="primary" onClick={() => setVisible(true)} icon={<CameraOutlined />} shape="circle" />
<Modal open={visible} onCancel={() => setVisible(false)} footer={null} title={t("scanner.title")}>
<Space direction="vertical" style={{ width: "100%" }}>
<p>{t("scanner.description")}</p>
<QrScanner
@@ -60,8 +50,7 @@ const QRCodeScannerModal: React.FC = () => {
setLastError(t("scanner.error.notAllowed"));
} else if (
error.name === "InsecureContextError" ||
(location.protocol !== "https:" &&
navigator.mediaDevices === undefined)
(location.protocol !== "https:" && navigator.mediaDevices === undefined)
) {
setLastError(t("scanner.error.insecureContext"));
} else if (error.name === "StreamApiNotSupportedError") {

35
client/src/components/spoolSelectModal.tsx
View File

@@ -20,12 +20,7 @@ interface ISpoolCollapsed extends ISpool {
material?: string;
}
const SpoolSelectModal: React.FC<Props> = ({
visible,
description,
onCancel,
onContinue,
}) => {
const SpoolSelectModal: React.FC<Props> = ({ visible, description, onCancel, onContinue }) => {
const [selectedItems, setSelectedItems] = useState<number[]>([]);
const [showArchived, setShowArchived] = useState(false);
const [messageApi, contextHolder] = message.useMessage();
@@ -65,8 +60,7 @@ const SpoolSelectModal: React.FC<Props> = ({
if (element.filament.vendor && "name" in element.filament.vendor) {
filament_name = `${element.filament.vendor.name} - ${element.filament.name}`;
} else {
filament_name =
element.filament.name ?? element.filament.id.toString();
filament_name = element.filament.name ?? element.filament.id.toString();
}
return {
...element,
@@ -91,9 +85,7 @@ const SpoolSelectModal: React.FC<Props> = ({
// Function to add/remove all filtered items from selected items
const selectUnselectFiltered = (select: boolean) => {
setSelectedItems((prevSelected) => {
const filtered = filteredDataSource
.map((spool) => spool.id)
.filter((spool) => !prevSelected.includes(spool));
const filtered = filteredDataSource.map((spool) => spool.id).filter((spool) => !prevSelected.includes(spool));
return select ? [...prevSelected, ...filtered] : filtered;
});
};
@@ -101,16 +93,12 @@ const SpoolSelectModal: React.FC<Props> = ({
// Handler for selecting/unselecting individual items
const handleSelectItem = (item: number) => {
setSelectedItems((prevSelected) =>
prevSelected.includes(item)
? prevSelected.filter((selected) => selected !== item)
: [...prevSelected, item]
prevSelected.includes(item) ? prevSelected.filter((selected) => selected !== item) : [...prevSelected, item]
);
};
// State for the select/unselect all checkbox
const isAllFilteredSelected = filteredDataSource.every((spool) =>
selectedItems.includes(spool.id)
);
const isAllFilteredSelected = filteredDataSource.every((spool) => selectedItems.includes(spool.id));
return (
<Modal
@@ -125,9 +113,7 @@ const SpoolSelectModal: React.FC<Props> = ({
});
return;
}
onContinue(
dataSource.filter((spool) => selectedItems.includes(spool.id))
);
onContinue(dataSource.filter((spool) => selectedItems.includes(spool.id)));
}}
width={600}
>
@@ -144,10 +130,7 @@ const SpoolSelectModal: React.FC<Props> = ({
<Table.Column
width={50}
render={(_, item: ISpool) => (
<Checkbox
checked={selectedItems.includes(item.id)}
onChange={() => handleSelectItem(item.id)}
/>
<Checkbox checked={selectedItems.includes(item.id)} onChange={() => handleSelectItem(item.id)} />
)}
/>
{SortedColumn({
@@ -197,9 +180,7 @@ const SpoolSelectModal: React.FC<Props> = ({
// Remove archived spools from selected items
setSelectedItems((prevSelected) =>
prevSelected.filter(
(selected) =>
dataSource.find((spool) => spool.id === selected)
?.archived !== true
(selected) => dataSource.find((spool) => spool.id === selected)?.archived !== true
)
);
}