Client: Full localization, dynamic title

This commit is contained in:
Donkie
2023-07-13 22:20:54 +02:00
parent e5ef306aa2
commit f21834ce2d
22 changed files with 546 additions and 264 deletions

View File

@@ -16,6 +16,7 @@
"@refinedev/simple-rest": "^4.5.0", "@refinedev/simple-rest": "^4.5.0",
"@tanstack/react-query": "^4.29.19", "@tanstack/react-query": "^4.29.19",
"antd": "^5.6.4", "antd": "^5.6.4",
"flag-icons": "^6.7.0",
"i18next": "^23.2.8", "i18next": "^23.2.8",
"i18next-browser-languagedetector": "^7.1.0", "i18next-browser-languagedetector": "^7.1.0",
"i18next-xhr-backend": "^3.2.2", "i18next-xhr-backend": "^3.2.2",
@@ -4837,6 +4838,11 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/flag-icons": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/flag-icons/-/flag-icons-6.7.0.tgz",
"integrity": "sha512-+KXrrrXN2jiETFxisFl+3f83Bq7tj5nuIWnbv9fX59k05lvldEXRCOffybb5hAIjMWt4nmG0E8OfKt7Flm99Eg=="
},
"node_modules/flat-cache": { "node_modules/flat-cache": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",

View File

@@ -15,6 +15,7 @@
"@refinedev/simple-rest": "^4.5.0", "@refinedev/simple-rest": "^4.5.0",
"@tanstack/react-query": "^4.29.19", "@tanstack/react-query": "^4.29.19",
"antd": "^5.6.4", "antd": "^5.6.4",
"flag-icons": "^6.7.0",
"i18next": "^23.2.8", "i18next": "^23.2.8",
"i18next-browser-languagedetector": "^7.1.0", "i18next-browser-languagedetector": "^7.1.0",
"i18next-xhr-backend": "^3.2.2", "i18next-xhr-backend": "^3.2.2",

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="640" height="480" viewBox="0 0 640 480"><defs><clipPath id="a"><path fill-opacity=".67" d="M-85.333 0h682.67v512h-682.67z"/></clipPath></defs><g clip-path="url(#a)" transform="translate(80) scale(.94)"><g stroke-width="1pt"><path fill="#006" d="M-256 0H768.02v512.01H-256z"/><path fill="#fff" d="M-256 0v57.244l909.535 454.768H768.02V454.77L-141.515 0H-256zM768.02 0v57.243L-141.515 512.01H-256v-57.243L653.535 0H768.02z"/><path fill="#fff" d="M170.675 0v512.01h170.67V0h-170.67zM-256 170.67v170.67H768.02V170.67H-256z"/><path fill="#c00" d="M-256 204.804v102.402H768.02V204.804H-256zM204.81 0v512.01h102.4V0h-102.4zM-256 512.01L85.34 341.34h76.324l-341.34 170.67H-256zM-256 0L85.34 170.67H9.016L-256 38.164V0zm606.356 170.67L691.696 0h76.324L426.68 170.67h-76.324zM768.02 512.01L426.68 341.34h76.324L768.02 473.848v38.162z"/></g></g></svg>

Before

Width:  |  Height:  |  Size: 888 B

View File

@@ -0,0 +1,48 @@
{
"actions": {
"list": "Aufführen",
"create": "Erstellen",
"edit": "Bearbeiten",
"show": "Zeigen"
},
"buttons": {
"create": "Erstellen",
"save": "Speichern",
"logout": "Abmelden",
"delete": "Löschen",
"edit": "Bearbeiten",
"cancel": "Abbrechen",
"confirm": "Sicher?",
"filter": "Filter",
"clear": "Löschen",
"refresh": "Erneuern",
"show": "Zeigen",
"undo": "Undo",
"import": "Importieren",
"clone": "Klon",
"notAccessTitle": "Sie haben keine zugriffsberechtigung"
},
"warnWhenUnsavedChanges": "Nicht gespeicherte Änderungen werden nicht übernommen.",
"notifications": {
"success": "Erfolg",
"error": "Fehler (status code: {{statusCode}})",
"undoable": "Sie haben {{seconds}} Sekunden Zeit für Undo.",
"createSuccess": "{{resource}} erfolgreich erstellt.",
"createError": "Fehler beim Erstellen {{resource}} (status code: {{statusCode}})",
"deleteSuccess": "{{resource}} erfolgreich gelöscht.",
"deleteError": "Fehler beim Löschen {{resource}} (status code: {{statusCode}})",
"editSuccess": "{{resource}} erfolgreich bearbeitet.",
"editError": "Fehler beim Bearbeiten {{resource}} (status code: {{statusCode}})",
"importProgress": "{{processed}}/{{total}} importiert"
},
"loading": "Wird geladen",
"tags": {
"clone": "Klon"
},
"dashboard": {
"title": "Dashboard"
},
"table": {
"actions": "Aktionen"
}
}

View File

@@ -1,70 +1,4 @@
{ {
"pages": {
"login": {
"title": "Sign in to your account",
"signin": "Sign in",
"signup": "Sign up",
"divider": "or",
"fields": {
"email": "Email",
"password": "Password"
},
"errors": {
"validEmail": "Invalid email address"
},
"buttons": {
"submit": "Login",
"forgotPassword": "Forgot password?",
"noAccount": "Dont have an account?",
"rememberMe": "Remember me"
}
},
"forgotPassword": {
"title": "Forgot your password?",
"fields": {
"email": "Email"
},
"errors": {
"validEmail": "Invalid email address"
},
"buttons": {
"submit": "Send reset instructions"
}
},
"register": {
"title": "Sign up for your account",
"fields": {
"email": "Email",
"password": "Password"
},
"errors": {
"validEmail": "Invalid email address"
},
"buttons": {
"submit": "Register",
"haveAccount": "Have an account?"
}
},
"updatePassword": {
"title": "Update password",
"fields": {
"password": "New Password",
"confirmPassword": "Confirm new password"
},
"errors": {
"confirmPasswordNotMatch": "Passwords do not match"
},
"buttons": {
"submit": "Update"
}
},
"error": {
"info": "You may have forgotten to add the {{action}} component to {{resource}} resource.",
"404": "Sorry, the page you visited does not exist.",
"resource404": "Are you sure you have created the {{resource}} resource.",
"backHome": "Back Home"
}
},
"actions": { "actions": {
"list": "List", "list": "List",
"create": "Create", "create": "Create",
@@ -87,7 +21,9 @@
"undo": "Undo", "undo": "Undo",
"import": "Import", "import": "Import",
"clone": "Clone", "clone": "Clone",
"notAccessTitle": "You don't have permission to access" "notAccessTitle": "You don't have permission to access",
"hideColumns": "Hide Columns",
"clearFilters": "Clear Filters"
}, },
"warnWhenUnsavedChanges": "Are you sure you want to leave? You have unsaved changes.", "warnWhenUnsavedChanges": "Are you sure you want to leave? You have unsaved changes.",
"notifications": { "notifications": {
@@ -103,25 +39,33 @@
"importProgress": "Importing: {{processed}}/{{total}}" "importProgress": "Importing: {{processed}}/{{total}}"
}, },
"loading": "Loading", "loading": "Loading",
"version": "Version",
"tags": { "tags": {
"clone": "Clone" "clone": "Clone"
}, },
"dashboard": { "dashboard": {
"title": "Dashboard" "title": "Dashboard"
}, },
"spools": { "spool": {
"spools": "Spools", "spool": "Spools",
"fields": { "fields": {
"id": "Id", "id": "Id",
"filament_name": "Filament Name", "filament_name": "Filament",
"filament": "Filament",
"used_weight": "Used Weight", "used_weight": "Used Weight",
"remaining_weight": "Remaining Weight", "remaining_weight": "Remaining Weight",
"location": "Location", "location": "Location",
"lot_nr": "Lot Nr", "lot_nr": "Lot Nr",
"first_used": "First Used", "first_used": "First Used",
"last_used": "Last Used", "last_used": "Last Used",
"registered": "Registered",
"comment": "Comment" "comment": "Comment"
}, },
"fields_help": {
"used_weight": "How much filament has been used from the spool. A new spool should have 0g used.",
"location": "Where the spool is located if you have multiple locations where you store your spools.",
"lot_nr": "Manufacturer's lot number. Can be used to ensure a print has consistent color if multiple spools are used."
},
"titles": { "titles": {
"create": "Create Spool", "create": "Create Spool",
"clone": "Clone Spool", "clone": "Clone Spool",
@@ -130,11 +74,12 @@
"show": "Show Spool" "show": "Show Spool"
} }
}, },
"filaments": { "filament": {
"filaments": "Filaments", "filament": "Filaments",
"fields": { "fields": {
"id": "Id", "id": "Id",
"vendor_name": "Vendor Name", "vendor_name": "Vendor",
"vendor": "Vendor",
"name": "Name", "name": "Name",
"material": "Material", "material": "Material",
"price": "Price", "price": "Price",
@@ -149,6 +94,14 @@
"settings_bed_temp": "Bed Temp", "settings_bed_temp": "Bed Temp",
"color_hex": "Color" "color_hex": "Color"
}, },
"fields_help": {
"name": "Filament name, to distinguish this filament type among others from the same vendor. Should contain the color for example.",
"material": "E.g. PLA, ABS, PETG, etc.",
"price": "Price of a full spool in the system configured currency.",
"weight": "The filament weight of a full spool (net weight). This should not include the weight of the spool itself, only the filament. It is what is usually written on the packaging.",
"spool_weight": "The weight of an empty spool. Currently not used for anything, but could be used by thirdparty apps to e.g. calculate the filament weight from a weight measurement.",
"article_number": "E.g. EAN, UPC, etc."
},
"titles": { "titles": {
"create": "Create Filament", "create": "Create Filament",
"clone": "Clone Filament", "clone": "Clone Filament",
@@ -157,8 +110,8 @@
"show": "Show Filament" "show": "Show Filament"
} }
}, },
"vendors": { "vendor": {
"vendors": "Vendors", "vendor": "Vendors",
"fields": { "fields": {
"id": "Id", "id": "Id",
"name": "Name", "name": "Name",
@@ -175,5 +128,30 @@
}, },
"table": { "table": {
"actions": "Actions" "actions": "Actions"
},
"documentTitle": {
"default": "Spoolman",
"suffix": " | Spoolman",
"filament": {
"list": "Filaments | Spoolman",
"show": "#{{id}} Show Filament | Spoolman",
"edit": "#{{id}} Edit Filament | Spoolman",
"create": "Create Filament | Spoolman",
"clone": "#{{id}} Clone Filament | Spoolman"
},
"spool": {
"list": "Spools | Spoolman",
"show": "#{{id}} Show Spool | Spoolman",
"edit": "#{{id}} Edit Spool | Spoolman",
"create": "Create Spool | Spoolman",
"clone": "#{{id}} Clone Spool | Spoolman"
},
"vendor": {
"list": "Vendors | Spoolman",
"show": "#{{id}} Show Vendor | Spoolman",
"edit": "#{{id}} Edit Vendor | Spoolman",
"create": "Create Vendor | Spoolman",
"clone": "#{{id}} Clone Vendor | Spoolman"
}
} }
} }

View File

@@ -0,0 +1,157 @@
{
"actions": {
"list": "Lista",
"create": "Skapa",
"edit": "Ändra",
"show": "Visa",
"clone": "Klona"
},
"buttons": {
"create": "Skapa",
"save": "Spara",
"logout": "Logga ut",
"delete": "Ta bort",
"edit": "Ändra",
"cancel": "Avbryt",
"confirm": "Är du säker?",
"filter": "Filtrera",
"clear": "Rensa",
"refresh": "Uppdatera",
"show": "Visa",
"undo": "Ångra",
"import": "Importera",
"clone": "Klona",
"notAccessTitle": "Du har inte tillgång till denna sida",
"hideColumns": "Dölj kolumner",
"clearFilters": "Rensa filter"
},
"warnWhenUnsavedChanges": "Du har osparade ändringar. Är du säker på att du vill lämna sidan?",
"notifications": {
"success": "Lyckades!",
"error": "Fel (statuskod: {{statusCode}})",
"undoable": "Du har {{seconds}} sekunder på dig att ångra",
"createSuccess": "Lyckades skapa {{resource}}",
"createError": "Det gick inte att skapa {{resource}} (statuskod: {{statusCode}})",
"deleteSuccess": "Lyckades ta bort {{resource}}",
"deleteError": "Det gick inte att ta bort {{resource}} (statuskod: {{statusCode}})",
"editSuccess": "Lyckades ändra {{resource}}",
"editError": "Det gick inte att ändra {{resource}} (statuskod: {{statusCode}})",
"importProgress": "Importerar: {{processed}}/{{total}}"
},
"loading": "Laddar...",
"version": "Version",
"tags": {
"clone": "Klona"
},
"dashboard": {
"title": "Hem"
},
"spool": {
"spool": "Spolar",
"fields": {
"id": "Id",
"filament_name": "Filament",
"filament": "Filament",
"used_weight": "Använd vikt",
"remaining_weight": "Återstående vikt",
"location": "Plats",
"lot_nr": "Batchnummer",
"first_used": "Användes först",
"last_used": "Användes senast",
"registered": "Registrerad",
"comment": "Kommentar"
},
"fields_help": {
"used_weight": "Hur mycket filament som använts på spolen. En ny spole har värdet 0g.",
"location": "Vart spolen finns om du har flera platser att förvara spolar på.",
"lot_nr": "Tillverkarens batchnummer. Kan användas för att se till att en utskrift har jämn färg ifall flera spolar används."
},
"titles": {
"create": "Skapa spole",
"clone": "Klona spole",
"edit": "Ändra spole",
"list": "Spolar",
"show": "Visa spole"
}
},
"filament": {
"filament": "Filament",
"fields": {
"id": "Id",
"vendor_name": "Leverantör",
"vendor": "Leverantör",
"name": "Namn",
"material": "Material",
"price": "Pris",
"density": "Densitet",
"diameter": "Diameter",
"weight": "Vikt",
"spool_weight": "Spolvikt",
"article_number": "Artikelnummer",
"registered": "Registrerad",
"comment": "Kommentar",
"settings_extruder_temp": "Extrudertemp",
"settings_bed_temp": "Bäddtemp",
"color_hex": "Färg"
},
"fields_help": {
"name": "Filamentets namn, för att skilja detta filament från andra från samma leverantör. Bör innehålla färgen till exempel.",
"material": "T.ex. PLA, ABS, PETG, etc.",
"price": "Pris för en full spole i systemets valuta.",
"weight": "Vikten på en full spole (nettovikt). Detta ska inte inkludera vikten på spolen själv, bara filamentet. Det är vad som vanligtvis står på förpackningen.",
"spool_weight": "Vikten på en tom spole. Detta används inte till något i dagsläget, men skulle kunna användas av tredjepartsappar för att t.ex. beräkna filamentvikten från en viktmätning.",
"article_number": "T.ex. EAN, UPC, etc."
},
"titles": {
"create": "Skapa filament",
"clone": "Klona filament",
"edit": "Ändra filament",
"list": "Filament",
"show": "Visa filament"
}
},
"vendor": {
"vendor": "Leverantörer",
"fields": {
"id": "Id",
"name": "Namn",
"registered": "Registrerad",
"comment": "Kommentar"
},
"titles": {
"create": "Skapa leverantör",
"clone": "Klona leverantör",
"edit": "Ändra leverantör",
"list": "Leverantörer",
"show": "Visa leverantör"
}
},
"table": {
"actions": "Åtgärder"
},
"documentTitle": {
"default": "Spoolman",
"suffix": " | Spoolman",
"filament": {
"list": "Filament | Spoolman",
"show": "#{{id}} Visa filament | Spoolman",
"edit": "#{{id}} Redigera filament | Spoolman",
"create": "Skapa filament | Spoolman",
"clone": "#{{id}} Klona filament | Spoolman"
},
"spool": {
"list": "Spolar | Spoolman",
"show": "#{{id}} Visa spole | Spoolman",
"edit": "#{{id}} Redigera spole | Spoolman",
"create": "Skapa spole | Spoolman",
"clone": "#{{id}} Klona spole | Spoolman"
},
"vendor": {
"list": "Leverantörer | Spoolman",
"show": "#{{id}} Visa leverantör | Spoolman",
"edit": "#{{id}} Redigera leverantör | Spoolman",
"create": "Skapa leverantör | Spoolman",
"clone": "#{{id}} Klona leverantör | Spoolman"
}
}
}

View File

@@ -11,6 +11,7 @@ import {
import "@refinedev/antd/dist/reset.css"; import "@refinedev/antd/dist/reset.css";
import routerBindings, { import routerBindings, {
DocumentTitleHandler,
NavigateToResource, NavigateToResource,
UnsavedChangesNotifier, UnsavedChangesNotifier,
} from "@refinedev/react-router-v6"; } from "@refinedev/react-router-v6";
@@ -41,6 +42,9 @@ import {
import { ConfigProvider } from "antd"; import { ConfigProvider } from "antd";
import { Footer } from "antd/es/layout/layout"; import { Footer } from "antd/es/layout/layout";
import { Version } from "./components/version"; import { Version } from "./components/version";
import React from "react";
import { Locale } from "antd/es/locale";
import { languages } from "./i18n";
function App() { function App() {
const { t, i18n } = useTranslation(); const { t, i18n } = useTranslation();
@@ -51,6 +55,20 @@ function App() {
getLocale: () => i18n.language, getLocale: () => i18n.language,
}; };
// Fetch the antd locale using dynamic imports
const [antdLocale, setAntdLocale] = React.useState<Locale | undefined>();
React.useEffect(() => {
const fetchLocale = async () => {
const locale = await import(
`./../node_modules/antd/es/locale/${languages[
i18n.language
].fullCode.replace("-", "_")}.js`
);
setAntdLocale(locale.default);
};
fetchLocale().catch(console.error);
}, [i18n.language]);
if (!import.meta.env.VITE_APIURL) { if (!import.meta.env.VITE_APIURL) {
return ( return (
<> <>
@@ -68,6 +86,7 @@ function App() {
<RefineKbarProvider> <RefineKbarProvider>
<ColorModeContextProvider> <ColorModeContextProvider>
<ConfigProvider <ConfigProvider
locale={antdLocale}
theme={{ theme={{
token: { token: {
colorPrimary: "#dc7734", colorPrimary: "#dc7734",
@@ -142,7 +161,7 @@ function App() {
)} )}
Footer={() => ( Footer={() => (
<Footer style={{ textAlign: "center" }}> <Footer style={{ textAlign: "center" }}>
Spoolman - Version <Version /> Spoolman - {t("version")} <Version />
</Footer> </Footer>
)} )}
> >
@@ -199,6 +218,7 @@ function App() {
<RefineKbar /> <RefineKbar />
<UnsavedChangesNotifier /> <UnsavedChangesNotifier />
<DocumentTitleHandler />
</Refine> </Refine>
</ConfigProvider> </ConfigProvider>
</ColorModeContextProvider> </ColorModeContextProvider>

View File

@@ -14,12 +14,13 @@ import utc from "dayjs/plugin/utc";
import { DateField, TextField } from "@refinedev/antd"; import { DateField, TextField } from "@refinedev/antd";
import Icon from "@ant-design/icons"; import Icon from "@ant-design/icons";
import { ReactComponent as SpoolIcon } from "../icon_spool.svg"; import { ReactComponent as SpoolIcon } from "../icon_spool.svg";
import { useTranslate } from "@refinedev/core";
dayjs.extend(utc); dayjs.extend(utc);
interface BaseColumnProps<Obj> { interface BaseColumnProps<Obj> {
id: keyof Obj & string; id: keyof Obj & string;
title: string; i18ncat: string;
dataSource: Obj[]; dataSource: Obj[];
tableState: TableState; tableState: TableState;
} }
@@ -42,6 +43,7 @@ interface CustomColumnProps<Obj> {
function Column<Obj>( function Column<Obj>(
props: BaseColumnProps<Obj> & FilteredColumnProps & CustomColumnProps<Obj> props: BaseColumnProps<Obj> & FilteredColumnProps & CustomColumnProps<Obj>
) { ) {
const t = useTranslate();
if ( if (
props.tableState.showColumns && props.tableState.showColumns &&
!props.tableState.showColumns.includes(props.id) !props.tableState.showColumns.includes(props.id)
@@ -51,7 +53,7 @@ function Column<Obj>(
const typedSorters = typeSorters<Obj>(props.tableState.sorters); const typedSorters = typeSorters<Obj>(props.tableState.sorters);
const columnProps: AntdColumnProps<Obj> = { const columnProps: AntdColumnProps<Obj> = {
dataIndex: props.id, dataIndex: props.id,
title: props.title, title: t(`${props.i18ncat}.fields.${props.id}`),
sorter: true, sorter: true,
sortOrder: getSortOrderForField(typedSorters, props.id), sortOrder: getSortOrderForField(typedSorters, props.id),
}; };

View File

@@ -1,8 +1,7 @@
import { DownOutlined } from "@ant-design/icons"; import { DownOutlined } from "@ant-design/icons";
import type { RefineThemedLayoutV2HeaderProps } from "@refinedev/antd"; import type { RefineThemedLayoutV2HeaderProps } from "@refinedev/antd";
import { useGetIdentity, useGetLocale, useSetLocale } from "@refinedev/core"; import { useGetLocale, useSetLocale } from "@refinedev/core";
import { import {
Avatar,
Button, Button,
Dropdown, Dropdown,
Layout as AntdLayout, Layout as AntdLayout,
@@ -10,20 +9,15 @@ import {
Space, Space,
Switch, Switch,
theme, theme,
Typography,
} from "antd"; } from "antd";
import React, { useContext } from "react"; import React, { useContext } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ColorModeContext } from "../../contexts/color-mode"; import { ColorModeContext } from "../../contexts/color-mode";
const { Text } = Typography; import "/node_modules/flag-icons/css/flag-icons.min.css";
const { useToken } = theme; import { languages } from "../../i18n";
type IUser = { const { useToken } = theme;
id: number;
name: string;
avatar: string;
};
export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
sticky, sticky,
@@ -32,7 +26,6 @@ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
const { i18n } = useTranslation(); const { i18n } = useTranslation();
const locale = useGetLocale(); const locale = useGetLocale();
const changeLanguage = useSetLocale(); const changeLanguage = useSetLocale();
const { data: user } = useGetIdentity<IUser>();
const { mode, setMode } = useContext(ColorModeContext); const { mode, setMode } = useContext(ColorModeContext);
const currentLocale = locale(); const currentLocale = locale();
@@ -43,11 +36,12 @@ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
key: lang, key: lang,
onClick: () => changeLanguage(lang), onClick: () => changeLanguage(lang),
icon: ( icon: (
<span style={{ marginRight: 8 }}> <span
<Avatar size={16} src={`/images/flags/${lang}.svg`} /> className={"fi fi-" + languages[lang].countryCode}
</span> style={{ marginRight: 8 }}
/>
), ),
label: lang === "en" ? "English" : "German", label: languages[lang].name,
})); }));
const headerStyles: React.CSSProperties = { const headerStyles: React.CSSProperties = {
@@ -76,8 +70,12 @@ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
> >
<Button type="text"> <Button type="text">
<Space> <Space>
<Avatar size={16} src={`/images/flags/${currentLocale}.svg`} /> <span
{currentLocale === "en" ? "English" : "German"} className={
"fi fi-" + languages[currentLocale ?? "en"].countryCode
}
/>
{languages[currentLocale ?? "en"].name}
<DownOutlined /> <DownOutlined />
</Space> </Space>
</Button> </Button>
@@ -88,10 +86,6 @@ export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
onChange={() => setMode(mode === "light" ? "dark" : "light")} onChange={() => setMode(mode === "light" ? "dark" : "light")}
defaultChecked={mode === "dark"} defaultChecked={mode === "dark"}
/> />
<Space style={{ marginLeft: "8px" }} size="middle">
{user?.name && <Text strong>{user.name}</Text>}
{user?.avatar && <Avatar src={user?.avatar} alt={user?.name} />}
</Space>
</Space> </Space>
</AntdLayout.Header> </AntdLayout.Header>
); );

View File

@@ -3,17 +3,41 @@ import detector from "i18next-browser-languagedetector";
import Backend from "i18next-xhr-backend"; import Backend from "i18next-xhr-backend";
import { initReactI18next } from "react-i18next"; import { initReactI18next } from "react-i18next";
interface Language {
name: string;
countryCode: string;
fullCode: string;
}
export const languages: { [key: string]: Language } = {
["en"]: {
name: "English",
countryCode: "gb",
fullCode: "en-GB",
},
["sv"]: {
name: "Svenska",
countryCode: "se",
fullCode: "sv-SE",
},
["de"]: {
name: "Deutsch",
countryCode: "de",
fullCode: "de-DE",
},
}
i18n i18n
.use(Backend) .use(Backend)
.use(detector) .use(detector)
.use(initReactI18next) .use(initReactI18next)
.init({ .init({
supportedLngs: ["en"], supportedLngs: Object.keys(languages),
backend: { backend: {
loadPath: "/locales/{{lng}}/{{ns}}.json", loadPath: "/locales/{{lng}}/{{ns}}.json",
}, },
defaultNS: "common", defaultNS: "common",
fallbackLng: ["en"], fallbackLng: Object.keys(languages),
}); });
export default i18n; export default i18n;

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps } from "@refinedev/core"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Create, useForm, useSelect } from "@refinedev/antd"; import { Create, useForm, useSelect } from "@refinedev/antd";
import { Form, Input, Select, InputNumber, ColorPicker } from "antd"; import { Form, Input, Select, InputNumber, ColorPicker } from "antd";
import TextArea from "antd/es/input/TextArea"; import TextArea from "antd/es/input/TextArea";
@@ -14,6 +14,8 @@ interface CreateOrCloneProps {
export const FilamentCreate: React.FC< export const FilamentCreate: React.FC<
IResourceComponentsProps & CreateOrCloneProps IResourceComponentsProps & CreateOrCloneProps
> = (props) => { > = (props) => {
const t = useTranslate();
const { formProps, saveButtonProps, formLoading } = useForm<IFilament>(); const { formProps, saveButtonProps, formLoading } = useForm<IFilament>();
if (props.mode === "clone" && formProps.initialValues) { if (props.mode === "clone" && formProps.initialValues) {
@@ -36,8 +38,8 @@ export const FilamentCreate: React.FC<
> >
<Form {...formProps} layout="vertical"> <Form {...formProps} layout="vertical">
<Form.Item <Form.Item
label="Name" label={t("filament.fields.name")}
help="Filament name, to distinguish this filament type among others from the same vendor. Should contain the color for example." help={t("filament.fields_help.name")}
name={["name"]} name={["name"]}
rules={[ rules={[
{ {
@@ -48,7 +50,7 @@ export const FilamentCreate: React.FC<
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Vendor" label={t("filament.fields.vendor")}
name={["vendor_id"]} name={["vendor_id"]}
rules={[ rules={[
{ {
@@ -59,7 +61,7 @@ export const FilamentCreate: React.FC<
<Select {...selectProps} allowClear /> <Select {...selectProps} allowClear />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Color" label={t("filament.fields.color_hex")}
name={["color_hex"]} name={["color_hex"]}
rules={[ rules={[
{ {
@@ -73,8 +75,8 @@ export const FilamentCreate: React.FC<
<ColorPicker format="hex" /> <ColorPicker format="hex" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Material" label={t("filament.fields.material")}
help="E.g. PLA, ABS, PETG, etc." help={t("filament.fields_help.material")}
name={["material"]} name={["material"]}
rules={[ rules={[
{ {
@@ -85,8 +87,8 @@ export const FilamentCreate: React.FC<
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Price" label={t("filament.fields.price")}
help="Price of a full spool in the system configured currency." help={t("filament.fields_help.price")}
name={["price"]} name={["price"]}
rules={[ rules={[
{ {
@@ -102,7 +104,7 @@ export const FilamentCreate: React.FC<
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Density" label={t("filament.fields.density")}
name={["density"]} name={["density"]}
rules={[ rules={[
{ {
@@ -119,7 +121,7 @@ export const FilamentCreate: React.FC<
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Diameter" label={t("filament.fields.diameter")}
name={["diameter"]} name={["diameter"]}
rules={[ rules={[
{ {
@@ -136,8 +138,8 @@ export const FilamentCreate: React.FC<
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Weight" label={t("filament.fields.weight")}
help="The filament weight of a full spool (net weight). This should not include the weight of the spool itself, only the filament. It is what is usually written on the packaging." help={t("filament.fields_help.weight")}
name={["weight"]} name={["weight"]}
rules={[ rules={[
{ {
@@ -148,8 +150,8 @@ export const FilamentCreate: React.FC<
<InputNumber min={0} addonAfter="g" precision={0} /> <InputNumber min={0} addonAfter="g" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Spool Weight" label={t("filament.fields.spool_weight")}
help="The weight of an empty spool. Currently not used for anything, but could be used by thirdparty apps to e.g. calculate the filament weight from a weight measurement." help={t("filament.fields_help.spool_weight")}
name={["spool_weight"]} name={["spool_weight"]}
rules={[ rules={[
{ {
@@ -160,8 +162,7 @@ export const FilamentCreate: React.FC<
<InputNumber min={0} addonAfter="g" precision={0} /> <InputNumber min={0} addonAfter="g" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Override Extruder Temperature" label={t("filament.fields.settings_extruder_temp")}
help="Override the extruder temperature for this filament type."
name={["settings_extruder_temp"]} name={["settings_extruder_temp"]}
rules={[ rules={[
{ {
@@ -172,8 +173,7 @@ export const FilamentCreate: React.FC<
<InputNumber min={0} addonAfter="°C" precision={0} /> <InputNumber min={0} addonAfter="°C" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Override Bed Temperature" label={t("filament.fields.settings_bed_temp")}
help="Override the bed temperature for this filament type."
name={["settings_bed_temp"]} name={["settings_bed_temp"]}
rules={[ rules={[
{ {
@@ -184,9 +184,9 @@ export const FilamentCreate: React.FC<
<InputNumber min={0} addonAfter="°C" precision={0} /> <InputNumber min={0} addonAfter="°C" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Article Number" label={t("filament.fields.article_number")}
help={t("filament.fields_help.article_number")}
name={["article_number"]} name={["article_number"]}
help="E.g. EAN, UPC, etc."
rules={[ rules={[
{ {
required: false, required: false,
@@ -196,7 +196,7 @@ export const FilamentCreate: React.FC<
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Comment" label={t("filament.fields.comment")}
name={["comment"]} name={["comment"]}
rules={[ rules={[
{ {

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps } from "@refinedev/core"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Edit, useForm, useSelect } from "@refinedev/antd"; import { Edit, useForm, useSelect } from "@refinedev/antd";
import { import {
Form, Form,
@@ -16,6 +16,8 @@ import { IVendor } from "../vendors/model";
import { IFilament } from "./model"; import { IFilament } from "./model";
export const FilamentEdit: React.FC<IResourceComponentsProps> = () => { export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
const { formProps, saveButtonProps } = useForm<IFilament>(); const { formProps, saveButtonProps } = useForm<IFilament>();
const { selectProps } = useSelect<IVendor>({ const { selectProps } = useSelect<IVendor>({
@@ -32,7 +34,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<Edit saveButtonProps={saveButtonProps}> <Edit saveButtonProps={saveButtonProps}>
<Form {...formProps} layout="vertical"> <Form {...formProps} layout="vertical">
<Form.Item <Form.Item
label="Id" label={t("filament.fields.id")}
name={["id"]} name={["id"]}
rules={[ rules={[
{ {
@@ -43,7 +45,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<Input readOnly disabled /> <Input readOnly disabled />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Registered" label={t("filament.fields.registered")}
name={["registered"]} name={["registered"]}
rules={[ rules={[
{ {
@@ -57,8 +59,8 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Name" label={t("filament.fields.name")}
help="Filament name, to distinguish this filament type among others from the same vendor. Should contain the color for example." help={t("filament.fields_help.name")}
name={["name"]} name={["name"]}
rules={[ rules={[
{ {
@@ -69,7 +71,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Vendor" label={t("filament.fields.vendor")}
name={["vendor_id"]} name={["vendor_id"]}
rules={[ rules={[
{ {
@@ -87,7 +89,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<Select {...selectProps} allowClear /> <Select {...selectProps} allowClear />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Color" label={t("filament.fields.color_hex")}
name={["color_hex"]} name={["color_hex"]}
rules={[ rules={[
{ {
@@ -101,8 +103,8 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<ColorPicker format="hex" /> <ColorPicker format="hex" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Material" label={t("filament.fields.material")}
help="E.g. PLA, ABS, PETG, etc." help={t("filament.fields_help.material")}
name={["material"]} name={["material"]}
rules={[ rules={[
{ {
@@ -113,8 +115,8 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Price" label={t("filament.fields.price")}
help="Price of a full spool in the system configured currency." help={t("filament.fields_help.price")}
name={["price"]} name={["price"]}
rules={[ rules={[
{ {
@@ -130,7 +132,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Density" label={t("filament.fields.density")}
name={["density"]} name={["density"]}
rules={[ rules={[
{ {
@@ -147,7 +149,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Diameter" label={t("filament.fields.diameter")}
name={["diameter"]} name={["diameter"]}
rules={[ rules={[
{ {
@@ -164,8 +166,8 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Weight" label={t("filament.fields.weight")}
help="The filament weight of a full spool (net weight). This should not include the weight of the spool itself, only the filament. It is what is usually written on the packaging." help={t("filament.fields_help.weight")}
name={["weight"]} name={["weight"]}
rules={[ rules={[
{ {
@@ -176,8 +178,8 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<InputNumber min={0} addonAfter="g" precision={0} /> <InputNumber min={0} addonAfter="g" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Spool Weight" label={t("filament.fields.spool_weight")}
help="The weight of an empty spool. Currently not used for anything, but could be used by thirdparty apps to e.g. calculate the filament weight from a weight measurement." help={t("filament.fields_help.spool_weight")}
name={["spool_weight"]} name={["spool_weight"]}
rules={[ rules={[
{ {
@@ -188,8 +190,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<InputNumber min={0} addonAfter="g" precision={0} /> <InputNumber min={0} addonAfter="g" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Override Extruder Temperature" label={t("filament.fields.settings_extruder_temp")}
help="Override the extruder temperature for this filament type."
name={["settings_extruder_temp"]} name={["settings_extruder_temp"]}
rules={[ rules={[
{ {
@@ -200,8 +201,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<InputNumber min={0} addonAfter="°C" precision={0} /> <InputNumber min={0} addonAfter="°C" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Override Bed Temperature" label={t("filament.fields.settings_bed_temp")}
help="Override the bed temperature for this filament type."
name={["settings_bed_temp"]} name={["settings_bed_temp"]}
rules={[ rules={[
{ {
@@ -212,9 +212,9 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<InputNumber min={0} addonAfter="°C" precision={0} /> <InputNumber min={0} addonAfter="°C" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Article Number" label={t("filament.fields.article_number")}
help={t("filament.fields_help.article_number")}
name={["article_number"]} name={["article_number"]}
help="E.g. EAN, UPC, etc."
rules={[ rules={[
{ {
required: false, required: false,
@@ -224,7 +224,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Comment" label={t("filament.fields.comment")}
name={["comment"]} name={["comment"]}
rules={[ rules={[
{ {

View File

@@ -1,5 +1,9 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps, BaseRecord } from "@refinedev/core"; import {
IResourceComponentsProps,
BaseRecord,
useTranslate,
} from "@refinedev/core";
import { import {
useTable, useTable,
List, List,
@@ -26,7 +30,6 @@ import {
SortedColumn, SortedColumn,
SpoolIconColumn, SpoolIconColumn,
} from "../../components/column"; } from "../../components/column";
import i18n from "../../i18n";
dayjs.extend(utc); dayjs.extend(utc);
@@ -35,6 +38,8 @@ interface IFilamentCollapsed extends Omit<IFilament, "vendor"> {
} }
export const FilamentList: React.FC<IResourceComponentsProps> = () => { export const FilamentList: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
// Load initial state // Load initial state
const initialState = useInitialTableState("filamentList"); const initialState = useInitialTableState("filamentList");
@@ -133,14 +138,14 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
setCurrent(1); setCurrent(1);
}} }}
> >
Clear Filters {t("buttons.clearFilters")}
</Button> </Button>
<Dropdown <Dropdown
trigger={["click"]} trigger={["click"]}
menu={{ menu={{
items: allColumns.map((column_id) => ({ items: allColumns.map((column_id) => ({
key: column_id, key: column_id,
label: i18n.t(`filaments.fields.${column_id}`), label: t(`filament.fields.${column_id}`),
})), })),
selectedKeys: showColumns, selectedKeys: showColumns,
selectable: true, selectable: true,
@@ -154,7 +159,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
}} }}
> >
<Button type="primary" icon={<EditOutlined />}> <Button type="primary" icon={<EditOutlined />}>
Hide Columns {t("buttons.hideColumns")}
</Button> </Button>
</Dropdown> </Dropdown>
{defaultButtons} {defaultButtons}
@@ -177,38 +182,38 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
> >
{SortedColumn({ {SortedColumn({
id: "id", id: "id",
title: "Id", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
{FilteredColumn({ {FilteredColumn({
id: "vendor_name", id: "vendor_name",
title: "Vendor", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
{SpoolIconColumn({ {SpoolIconColumn({
id: "name", id: "name",
title: "Name", i18ncat: "filament",
color: (record: IFilamentCollapsed) => record.color_hex, color: (record: IFilamentCollapsed) => record.color_hex,
dataSource, dataSource,
tableState, tableState,
})} })}
{FilteredColumn({ {FilteredColumn({
id: "material", id: "material",
title: "Material", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
{SortedColumn({ {SortedColumn({
id: "price", id: "price",
title: "Price", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
{NumberColumn({ {NumberColumn({
id: "density", id: "density",
title: "Density", i18ncat: "filament",
unit: "g/cm³", unit: "g/cm³",
decimals: 2, decimals: 2,
dataSource, dataSource,
@@ -216,7 +221,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
})} })}
{NumberColumn({ {NumberColumn({
id: "diameter", id: "diameter",
title: "Diameter", i18ncat: "filament",
unit: "mm", unit: "mm",
decimals: 2, decimals: 2,
dataSource, dataSource,
@@ -224,7 +229,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
})} })}
{NumberColumn({ {NumberColumn({
id: "weight", id: "weight",
title: "Weight", i18ncat: "filament",
unit: "g", unit: "g",
decimals: 1, decimals: 1,
dataSource, dataSource,
@@ -232,7 +237,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
})} })}
{NumberColumn({ {NumberColumn({
id: "spool_weight", id: "spool_weight",
title: "Spool Weight", i18ncat: "filament",
unit: "g", unit: "g",
decimals: 1, decimals: 1,
dataSource, dataSource,
@@ -240,42 +245,41 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
})} })}
{FilteredColumn({ {FilteredColumn({
id: "article_number", id: "article_number",
title: "Article Number", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
{DateColumn({ {DateColumn({
id: "registered", id: "registered",
title: "Registered", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
{SortedColumn({ {SortedColumn({
id: "comment", id: "comment",
title: "Comment", i18ncat: "filament",
dataSource, dataSource,
tableState, tableState,
})} })}
<Table.Column <Table.Column
title="Actions" title={t("table.actions")}
dataIndex="actions"
render={(_, record: BaseRecord) => ( render={(_, record: BaseRecord) => (
<Space> <Space>
<EditButton <EditButton
hideText hideText
title="Edit" title={t("buttons.edit")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />
<ShowButton <ShowButton
hideText hideText
title="Show" title={t("buttons.show")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />
<CloneButton <CloneButton
hideText hideText
title="Clone" title={t("buttons.clone")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />

View File

@@ -1,5 +1,9 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps, useShow } from "@refinedev/core"; import {
IResourceComponentsProps,
useShow,
useTranslate,
} from "@refinedev/core";
import { Show, NumberField, DateField, TextField } from "@refinedev/antd"; import { Show, NumberField, DateField, TextField } from "@refinedev/antd";
import { Typography } from "antd"; import { Typography } from "antd";
import { NumberFieldUnit } from "../../components/numberField"; import { NumberFieldUnit } from "../../components/numberField";
@@ -12,6 +16,8 @@ dayjs.extend(utc);
const { Title } = Typography; const { Title } = Typography;
export const FilamentShow: React.FC<IResourceComponentsProps> = () => { export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
const { queryResult } = useShow<IFilament>(); const { queryResult } = useShow<IFilament>();
const { data, isLoading } = queryResult; const { data, isLoading } = queryResult;
@@ -19,25 +25,25 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
return ( return (
<Show isLoading={isLoading}> <Show isLoading={isLoading}>
<Title level={5}>Id</Title> <Title level={5}>{t("filament.fields.id")}</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>Registered</Title> <Title level={5}>{t("filament.fields.registered")}</Title>
<DateField <DateField
value={dayjs.utc(record?.registered).local()} value={dayjs.utc(record?.registered).local()}
title={dayjs.utc(record?.registered).local().format()} title={dayjs.utc(record?.registered).local().format()}
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
/> />
<Title level={5}>Name</Title> <Title level={5}>{t("filament.fields.name")}</Title>
<TextField value={record?.name} /> <TextField value={record?.name} />
<Title level={5}>Vendor</Title> {/* <Title level={5}>{t("filament.fields.id")}</Title>
{/* {vendorIsLoading ? <>Loading...</> : <>{vendorData?.data?.id}</>} */} {vendorIsLoading ? <>Loading...</> : <>{vendorData?.data?.id}</>} */}
<Title level={5}>Color</Title> <Title level={5}>{t("filament.fields.color_hex")}</Title>
<TextField value={record?.color_hex} /> <TextField value={record?.color_hex} />
<Title level={5}>Material</Title> <Title level={5}>{t("filament.fields.material")}</Title>
<TextField value={record?.material} /> <TextField value={record?.material} />
<Title level={5}>Price</Title> <Title level={5}>{t("filament.fields.price")}</Title>
<NumberField value={record?.price ?? ""} /> <NumberField value={record?.price ?? ""} />
<Title level={5}>Density</Title> <Title level={5}>{t("filament.fields.density")}</Title>
<NumberFieldUnit <NumberFieldUnit
value={record?.density ?? ""} value={record?.density ?? ""}
unit="g/cm³" unit="g/cm³"
@@ -45,7 +51,7 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
maximumFractionDigits: 2, maximumFractionDigits: 2,
}} }}
/> />
<Title level={5}>Diameter</Title> <Title level={5}>{t("filament.fields.diameter")}</Title>
<NumberFieldUnit <NumberFieldUnit
value={record?.diameter ?? ""} value={record?.diameter ?? ""}
unit="mm" unit="mm"
@@ -53,7 +59,7 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
maximumFractionDigits: 2, maximumFractionDigits: 2,
}} }}
/> />
<Title level={5}>Weight</Title> <Title level={5}>{t("filament.fields.weight")}</Title>
<NumberFieldUnit <NumberFieldUnit
value={record?.weight ?? ""} value={record?.weight ?? ""}
unit="g" unit="g"
@@ -61,7 +67,7 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
maximumFractionDigits: 1, maximumFractionDigits: 1,
}} }}
/> />
<Title level={5}>Spool Weight</Title> <Title level={5}>{t("filament.fields.spool_weight")}</Title>
<NumberFieldUnit <NumberFieldUnit
value={record?.spool_weight ?? ""} value={record?.spool_weight ?? ""}
unit="g" unit="g"
@@ -69,7 +75,7 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
maximumFractionDigits: 1, maximumFractionDigits: 1,
}} }}
/> />
<Title level={5}>Overridden Extruder Temperature</Title> <Title level={5}>{t("filament.fields.settings_extruder_temp")}</Title>
{!record?.settings_extruder_temp ? ( {!record?.settings_extruder_temp ? (
<TextField value="Not Set" /> <TextField value="Not Set" />
) : ( ) : (
@@ -78,15 +84,15 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
unit="°C" unit="°C"
/> />
)} )}
<Title level={5}>Overridden Bed Temperature</Title> <Title level={5}>{t("filament.fields.settings_bed_temp")}</Title>
{!record?.settings_bed_temp ? ( {!record?.settings_bed_temp ? (
<TextField value="Not Set" /> <TextField value="Not Set" />
) : ( ) : (
<NumberFieldUnit value={record?.settings_bed_temp ?? ""} unit="°C" /> <NumberFieldUnit value={record?.settings_bed_temp ?? ""} unit="°C" />
)} )}
<Title level={5}>Article Number</Title> <Title level={5}>{t("filament.fields.article_number")}</Title>
<TextField value={record?.article_number} /> <TextField value={record?.article_number} />
<Title level={5}>Comment</Title> <Title level={5}>{t("filament.fields.comment")}</Title>
<TextField value={record?.comment} /> <TextField value={record?.comment} />
</Show> </Show>
); );

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps } from "@refinedev/core"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Create, useForm, useSelect } from "@refinedev/antd"; import { Create, useForm, useSelect } from "@refinedev/antd";
import { Form, Input, DatePicker, Select, InputNumber } from "antd"; import { Form, Input, DatePicker, Select, InputNumber } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
@@ -14,6 +14,8 @@ interface CreateOrCloneProps {
export const SpoolCreate: React.FC< export const SpoolCreate: React.FC<
IResourceComponentsProps & CreateOrCloneProps IResourceComponentsProps & CreateOrCloneProps
> = (props) => { > = (props) => {
const t = useTranslate();
const { formProps, saveButtonProps, formLoading } = useForm<ISpool>(); const { formProps, saveButtonProps, formLoading } = useForm<ISpool>();
if (props.mode === "clone" && formProps.initialValues) { if (props.mode === "clone" && formProps.initialValues) {
@@ -49,13 +51,17 @@ export const SpoolCreate: React.FC<
return ( return (
<Create <Create
title={props.mode === "create" ? "Create Spool" : "Clone Spool"} title={
props.mode === "create"
? t("spool.titles.create")
: t("spool.titles.clone")
}
saveButtonProps={saveButtonProps} saveButtonProps={saveButtonProps}
isLoading={formLoading} isLoading={formLoading}
> >
<Form {...formProps} layout="vertical"> <Form {...formProps} layout="vertical">
<Form.Item <Form.Item
label="First Used" label={t("spool.fields.first_used")}
name={["first_used"]} name={["first_used"]}
rules={[ rules={[
{ {
@@ -69,7 +75,7 @@ export const SpoolCreate: React.FC<
<DatePicker showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Last Used" label={t("spool.fields.last_used")}
name={["last_used"]} name={["last_used"]}
rules={[ rules={[
{ {
@@ -83,7 +89,7 @@ export const SpoolCreate: React.FC<
<DatePicker showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Filament" label={t("spool.fields.filament")}
name={["filament_id"]} name={["filament_id"]}
rules={[ rules={[
{ {
@@ -94,7 +100,8 @@ export const SpoolCreate: React.FC<
<Select options={filamentOptions} /> <Select options={filamentOptions} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Used Weight" label={t("spool.fields.used_weight")}
help={t("spool.fields_help.used_weight")}
name={["used_weight"]} name={["used_weight"]}
rules={[ rules={[
{ {
@@ -105,7 +112,8 @@ export const SpoolCreate: React.FC<
<InputNumber min={0} addonAfter="g" precision={0} /> <InputNumber min={0} addonAfter="g" precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Location" label={t("spool.fields.location")}
help={t("spool.fields_help.location")}
name={["location"]} name={["location"]}
rules={[ rules={[
{ {
@@ -116,7 +124,8 @@ export const SpoolCreate: React.FC<
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Lot Nr" label={t("spool.fields.lot_nr")}
help={t("spool.fields_help.lot_nr")}
name={["lot_nr"]} name={["lot_nr"]}
rules={[ rules={[
{ {
@@ -127,7 +136,7 @@ export const SpoolCreate: React.FC<
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Comment" label={t("spool.fields.comment")}
name={["comment"]} name={["comment"]}
rules={[ rules={[
{ {

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps } from "@refinedev/core"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Edit, useForm, useSelect } from "@refinedev/antd"; import { Edit, useForm, useSelect } from "@refinedev/antd";
import { Form, Input, DatePicker, Select, InputNumber } from "antd"; import { Form, Input, DatePicker, Select, InputNumber } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
@@ -8,6 +8,8 @@ import { IFilament } from "../filaments/model";
import { ISpool } from "./model"; import { ISpool } from "./model";
export const SpoolEdit: React.FC<IResourceComponentsProps> = () => { export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
const { formProps, saveButtonProps } = useForm<ISpool>(); const { formProps, saveButtonProps } = useForm<ISpool>();
const { queryResult } = useSelect<IFilament>({ const { queryResult } = useSelect<IFilament>({
@@ -40,7 +42,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<Edit saveButtonProps={saveButtonProps}> <Edit saveButtonProps={saveButtonProps}>
<Form {...formProps} layout="vertical"> <Form {...formProps} layout="vertical">
<Form.Item <Form.Item
label="Id" label={t("spool.fields.id")}
name={["id"]} name={["id"]}
rules={[ rules={[
{ {
@@ -51,7 +53,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<Input readOnly disabled /> <Input readOnly disabled />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Registered" label={t("spool.fields.registered")}
name={["registered"]} name={["registered"]}
rules={[ rules={[
{ {
@@ -65,7 +67,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="First Used" label={t("spool.fields.first_used")}
name={["first_used"]} name={["first_used"]}
rules={[ rules={[
{ {
@@ -79,7 +81,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<DatePicker showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Last Used" label={t("spool.fields.last_used")}
name={["last_used"]} name={["last_used"]}
rules={[ rules={[
{ {
@@ -93,7 +95,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<DatePicker showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Filament" label={t("spool.fields.filament")}
name={["filament_id"]} name={["filament_id"]}
rules={[ rules={[
{ {
@@ -104,7 +106,8 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<Select options={filamentOptions} /> <Select options={filamentOptions} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Used Weight" label={t("spool.fields.used_weight")}
help={t("spool.fields_help.used_weight")}
name={["used_weight"]} name={["used_weight"]}
rules={[ rules={[
{ {
@@ -118,7 +121,8 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
more elegantly for locales which use , as a thousands separator. */} more elegantly for locales which use , as a thousands separator. */}
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Location" label={t("spool.fields.location")}
help={t("spool.fields_help.location")}
name={["location"]} name={["location"]}
rules={[ rules={[
{ {
@@ -129,7 +133,8 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Lot Nr" label={t("spool.fields.lot_nr")}
help={t("spool.fields_help.lot_nr")}
name={["lot_nr"]} name={["lot_nr"]}
rules={[ rules={[
{ {
@@ -140,7 +145,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Comment" label={t("spool.fields.comment")}
name={["comment"]} name={["comment"]}
rules={[ rules={[
{ {

View File

@@ -1,5 +1,9 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps, BaseRecord } from "@refinedev/core"; import {
IResourceComponentsProps,
BaseRecord,
useTranslate,
} from "@refinedev/core";
import { import {
useTable, useTable,
List, List,
@@ -26,7 +30,6 @@ import {
SortedColumn, SortedColumn,
SpoolIconColumn, SpoolIconColumn,
} from "../../components/column"; } from "../../components/column";
import i18n from "../../i18n";
dayjs.extend(utc); dayjs.extend(utc);
@@ -35,6 +38,8 @@ interface ISpoolCollapsed extends ISpool {
} }
export const SpoolList: React.FC<IResourceComponentsProps> = () => { export const SpoolList: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
// Load initial state // Load initial state
const initialState = useInitialTableState("spoolList"); const initialState = useInitialTableState("spoolList");
@@ -131,14 +136,14 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
setCurrent(1); setCurrent(1);
}} }}
> >
Clear Filters {t("buttons.clearFilters")}
</Button> </Button>
<Dropdown <Dropdown
trigger={["click"]} trigger={["click"]}
menu={{ menu={{
items: allColumns.map((column) => ({ items: allColumns.map((column) => ({
key: column, key: column,
label: i18n.t(`spools.fields.${column}`), label: t(`spool.fields.${column}`),
})), })),
selectedKeys: showColumns, selectedKeys: showColumns,
selectable: true, selectable: true,
@@ -152,7 +157,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
}} }}
> >
<Button type="primary" icon={<EditOutlined />}> <Button type="primary" icon={<EditOutlined />}>
Hide Columns {t("buttons.hideColumns")}
</Button> </Button>
</Dropdown> </Dropdown>
{defaultButtons} {defaultButtons}
@@ -175,20 +180,20 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
> >
{SortedColumn({ {SortedColumn({
id: "id", id: "id",
title: "Id", i18ncat: "spool",
dataSource, dataSource,
tableState, tableState,
})} })}
{SpoolIconColumn({ {SpoolIconColumn({
id: "filament_name", id: "filament_name",
title: "Filament", i18ncat: "spool",
color: (record: ISpoolCollapsed) => record.filament.color_hex, color: (record: ISpoolCollapsed) => record.filament.color_hex,
dataSource, dataSource,
tableState, tableState,
})} })}
{NumberColumn({ {NumberColumn({
id: "used_weight", id: "used_weight",
title: "Used Weight", i18ncat: "spool",
unit: "g", unit: "g",
decimals: 1, decimals: 1,
dataSource, dataSource,
@@ -196,7 +201,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
})} })}
{NumberColumn({ {NumberColumn({
id: "remaining_weight", id: "remaining_weight",
title: "Estimated Remaining Weight", i18ncat: "spool",
unit: "g", unit: "g",
decimals: 1, decimals: 1,
dataSource, dataSource,
@@ -204,53 +209,53 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
})} })}
{FilteredColumn({ {FilteredColumn({
id: "location", id: "location",
title: "Location", i18ncat: "spool",
dataSource, dataSource,
tableState, tableState,
})} })}
{FilteredColumn({ {FilteredColumn({
id: "lot_nr", id: "lot_nr",
title: "Lot Nr", i18ncat: "spool",
dataSource, dataSource,
tableState, tableState,
})} })}
{DateColumn({ {DateColumn({
id: "first_used", id: "first_used",
title: "First Used", i18ncat: "spool",
dataSource, dataSource,
tableState, tableState,
})} })}
{DateColumn({ {DateColumn({
id: "last_used", id: "last_used",
title: "Last Used", i18ncat: "spool",
dataSource, dataSource,
tableState, tableState,
})} })}
{SortedColumn({ {SortedColumn({
id: "comment", id: "comment",
title: "Comment", i18ncat: "spool",
dataSource, dataSource,
tableState, tableState,
})} })}
<Table.Column <Table.Column
title="Actions" title={t("table.actions")}
render={(_, record: BaseRecord) => ( render={(_, record: BaseRecord) => (
<Space> <Space>
<EditButton <EditButton
hideText hideText
title="Edit" title={t("buttons.edit")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />
<ShowButton <ShowButton
hideText hideText
title="Show" title={t("buttons.show")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />
<CloneButton <CloneButton
hideText hideText
title="Clone" title={t("buttons.clone")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />

View File

@@ -1,5 +1,9 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps, useShow } from "@refinedev/core"; import {
IResourceComponentsProps,
useShow,
useTranslate,
} from "@refinedev/core";
import { Show, NumberField, DateField, TextField } from "@refinedev/antd"; import { Show, NumberField, DateField, TextField } from "@refinedev/antd";
import { Typography } from "antd"; import { Typography } from "antd";
import { NumberFieldUnit } from "../../components/numberField"; import { NumberFieldUnit } from "../../components/numberField";
@@ -12,6 +16,8 @@ dayjs.extend(utc);
const { Title } = Typography; const { Title } = Typography;
export const SpoolShow: React.FC<IResourceComponentsProps> = () => { export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
const { queryResult } = useShow<ISpool>(); const { queryResult } = useShow<ISpool>();
const { data, isLoading } = queryResult; const { data, isLoading } = queryResult;
@@ -19,35 +25,35 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
return ( return (
<Show isLoading={isLoading}> <Show isLoading={isLoading}>
<Title level={5}>Id</Title> <Title level={5}>{t("spool.fields.id")}</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>Registered</Title> <Title level={5}>{t("spool.fields.registered")}</Title>
<DateField <DateField
value={dayjs.utc(record?.registered).local()} value={dayjs.utc(record?.registered).local()}
title={dayjs.utc(record?.registered).local().format()} title={dayjs.utc(record?.registered).local().format()}
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
/> />
<Title level={5}>First Used</Title> <Title level={5}>{t("spool.fields.first_used")}</Title>
<DateField <DateField
hidden={!record?.first_used} hidden={!record?.first_used}
value={dayjs.utc(record?.first_used).local()} value={dayjs.utc(record?.first_used).local()}
title={dayjs.utc(record?.first_used).local().format()} title={dayjs.utc(record?.first_used).local().format()}
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
/> />
<Title level={5}>Last Used</Title> <Title level={5}>{t("spool.fields.last_used")}</Title>
<DateField <DateField
hidden={!record?.last_used} hidden={!record?.last_used}
value={dayjs.utc(record?.last_used).local()} value={dayjs.utc(record?.last_used).local()}
title={dayjs.utc(record?.last_used).local().format()} title={dayjs.utc(record?.last_used).local().format()}
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
/> />
<Title level={5}>Filament</Title> {/* <Title level={5}>{t("spool.fields.filament_id")}</Title>
{/* {filamentIsLoading ? ( {filamentIsLoading ? (
<>Loading...</> <>Loading...</>
) : ( ) : (
<>{filamentData?.data?.id}</> <>{filamentData?.data?.id}</>
)} */} )} */}
<Title level={5}>Remaining Weight</Title> <Title level={5}>{t("spool.fields.remaining_weight")}</Title>
<NumberFieldUnit <NumberFieldUnit
value={record?.remaining_weight ?? ""} value={record?.remaining_weight ?? ""}
unit="g" unit="g"
@@ -55,7 +61,7 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
maximumFractionDigits: 1, maximumFractionDigits: 1,
}} }}
/> />
<Title level={5}>Used Weight</Title> <Title level={5}>{t("spool.fields.used_weight")}</Title>
<NumberFieldUnit <NumberFieldUnit
value={record?.used_weight ?? ""} value={record?.used_weight ?? ""}
unit="g" unit="g"
@@ -63,11 +69,11 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
maximumFractionDigits: 1, maximumFractionDigits: 1,
}} }}
/> />
<Title level={5}>Location</Title> <Title level={5}>{t("spool.fields.location")}</Title>
<TextField value={record?.location} /> <TextField value={record?.location} />
<Title level={5}>Lot Nr</Title> <Title level={5}>{t("spool.fields.lot_nr")}</Title>
<TextField value={record?.lot_nr} /> <TextField value={record?.lot_nr} />
<Title level={5}>Comment</Title> <Title level={5}>{t("spool.fields.comment")}</Title>
<TextField value={record?.comment} /> <TextField value={record?.comment} />
</Show> </Show>
); );

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps } from "@refinedev/core"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Create, useForm } from "@refinedev/antd"; import { Create, useForm } from "@refinedev/antd";
import { Form, Input } from "antd"; import { Form, Input } from "antd";
import TextArea from "antd/es/input/TextArea"; import TextArea from "antd/es/input/TextArea";
@@ -12,17 +12,23 @@ interface CreateOrCloneProps {
export const VendorCreate: React.FC< export const VendorCreate: React.FC<
IResourceComponentsProps & CreateOrCloneProps IResourceComponentsProps & CreateOrCloneProps
> = (props) => { > = (props) => {
const t = useTranslate();
const { formProps, saveButtonProps, formLoading } = useForm<IVendor>(); const { formProps, saveButtonProps, formLoading } = useForm<IVendor>();
return ( return (
<Create <Create
title={props.mode === "create" ? "Create Vendor" : "Clone Vendor"} title={
props.mode === "create"
? t("vendor.titles.create")
: t("vendor.titles.clone")
}
isLoading={formLoading} isLoading={formLoading}
saveButtonProps={saveButtonProps} saveButtonProps={saveButtonProps}
> >
<Form {...formProps} layout="vertical"> <Form {...formProps} layout="vertical">
<Form.Item <Form.Item
label="Name" label={t("vendor.fields.name")}
name={["name"]} name={["name"]}
rules={[ rules={[
{ {
@@ -33,7 +39,7 @@ export const VendorCreate: React.FC<
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Comment" label={t("vendor.fields.comment")}
name={["comment"]} name={["comment"]}
rules={[ rules={[
{ {

View File

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps } from "@refinedev/core"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Edit, useForm } from "@refinedev/antd"; import { Edit, useForm } from "@refinedev/antd";
import { Form, Input, DatePicker } from "antd"; import { Form, Input, DatePicker } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
@@ -7,13 +7,15 @@ import TextArea from "antd/es/input/TextArea";
import { IVendor } from "./model"; import { IVendor } from "./model";
export const VendorEdit: React.FC<IResourceComponentsProps> = () => { export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
const { formProps, saveButtonProps } = useForm<IVendor>(); const { formProps, saveButtonProps } = useForm<IVendor>();
return ( return (
<Edit saveButtonProps={saveButtonProps}> <Edit saveButtonProps={saveButtonProps}>
<Form {...formProps} layout="vertical"> <Form {...formProps} layout="vertical">
<Form.Item <Form.Item
label="Id" label={t("vendor.fields.id")}
name={["id"]} name={["id"]}
rules={[ rules={[
{ {
@@ -24,7 +26,7 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
<Input readOnly disabled /> <Input readOnly disabled />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Registered" label={t("vendor.fields.registered")}
name={["registered"]} name={["registered"]}
rules={[ rules={[
{ {
@@ -38,7 +40,7 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
<DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" /> <DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Name" label={t("vendor.fields.name")}
name={["name"]} name={["name"]}
rules={[ rules={[
{ {
@@ -49,7 +51,7 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
<Input maxLength={64} /> <Input maxLength={64} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Comment" label={t("vendor.fields.comment")}
name={["comment"]} name={["comment"]}
rules={[ rules={[
{ {

View File

@@ -1,5 +1,9 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps, BaseRecord } from "@refinedev/core"; import {
IResourceComponentsProps,
BaseRecord,
useTranslate,
} from "@refinedev/core";
import { import {
useTable, useTable,
List, List,
@@ -19,12 +23,13 @@ import {
useStoreInitialState, useStoreInitialState,
} from "../../utils/saveload"; } from "../../utils/saveload";
import { EditOutlined, FilterOutlined } from "@ant-design/icons"; import { EditOutlined, FilterOutlined } from "@ant-design/icons";
import i18n from "../../i18n";
import { DateColumn, SortedColumn } from "../../components/column"; import { DateColumn, SortedColumn } from "../../components/column";
dayjs.extend(utc); dayjs.extend(utc);
export const VendorList: React.FC<IResourceComponentsProps> = () => { export const VendorList: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
// Load initial state // Load initial state
const initialState = useInitialTableState("vendorList"); const initialState = useInitialTableState("vendorList");
@@ -106,14 +111,14 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
setCurrent(1); setCurrent(1);
}} }}
> >
Clear Filters {t("buttons.clearFilters")}
</Button> </Button>
<Dropdown <Dropdown
trigger={["click"]} trigger={["click"]}
menu={{ menu={{
items: allColumns.map((column) => ({ items: allColumns.map((column) => ({
key: column, key: column,
label: i18n.t(`vendors.fields.${column}`), label: t(`vendor.fields.${column}`),
})), })),
selectedKeys: showColumns, selectedKeys: showColumns,
selectable: true, selectable: true,
@@ -127,7 +132,7 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
}} }}
> >
<Button type="primary" icon={<EditOutlined />}> <Button type="primary" icon={<EditOutlined />}>
Hide Columns {t("buttons.hideColumns")}
</Button> </Button>
</Dropdown> </Dropdown>
{defaultButtons} {defaultButtons}
@@ -150,48 +155,47 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
> >
{SortedColumn({ {SortedColumn({
id: "id", id: "id",
title: "Id", i18ncat: "vendor",
dataSource, dataSource,
tableState, tableState,
})} })}
{SortedColumn({ {SortedColumn({
id: "name", id: "name",
title: "Name", i18ncat: "vendor",
dataSource, dataSource,
tableState, tableState,
})} })}
{DateColumn({ {DateColumn({
id: "registered", id: "registered",
title: "Registered", i18ncat: "vendor",
dataSource, dataSource,
tableState, tableState,
})} })}
{SortedColumn({ {SortedColumn({
id: "comment", id: "comment",
title: "Comment", i18ncat: "vendor",
dataSource, dataSource,
tableState, tableState,
})} })}
<Table.Column <Table.Column
title="Actions" title={t("table.actions")}
dataIndex="actions"
render={(_, record: BaseRecord) => ( render={(_, record: BaseRecord) => (
<Space> <Space>
<EditButton <EditButton
hideText hideText
title="Edit" title={t("buttons.edit")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />
<ShowButton <ShowButton
hideText hideText
title="Show" title={t("buttons.show")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />
<CloneButton <CloneButton
hideText hideText
title="Clone" title={t("buttons.clone")}
size="small" size="small"
recordItemId={record.id} recordItemId={record.id}
/> />

View File

@@ -1,5 +1,9 @@
import React from "react"; import React from "react";
import { IResourceComponentsProps, useShow } from "@refinedev/core"; import {
IResourceComponentsProps,
useShow,
useTranslate,
} from "@refinedev/core";
import { Show, NumberField, DateField, TextField } from "@refinedev/antd"; import { Show, NumberField, DateField, TextField } from "@refinedev/antd";
import { Typography } from "antd"; import { Typography } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
@@ -11,6 +15,8 @@ dayjs.extend(utc);
const { Title } = Typography; const { Title } = Typography;
export const VendorShow: React.FC<IResourceComponentsProps> = () => { export const VendorShow: React.FC<IResourceComponentsProps> = () => {
const t = useTranslate();
const { queryResult } = useShow<IVendor>(); const { queryResult } = useShow<IVendor>();
const { data, isLoading } = queryResult; const { data, isLoading } = queryResult;
@@ -18,17 +24,17 @@ export const VendorShow: React.FC<IResourceComponentsProps> = () => {
return ( return (
<Show isLoading={isLoading}> <Show isLoading={isLoading}>
<Title level={5}>Id</Title> <Title level={5}>{t("vendor.fields.id")}</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>Registered</Title> <Title level={5}>{t("vendor.fields.registered")}</Title>
<DateField <DateField
value={dayjs.utc(record?.registered).local()} value={dayjs.utc(record?.registered).local()}
title={dayjs.utc(record?.registered).local().format()} title={dayjs.utc(record?.registered).local().format()}
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
/> />
<Title level={5}>Name</Title> <Title level={5}>{t("vendor.fields.name")}</Title>
<TextField value={record?.name} /> <TextField value={record?.name} />
<Title level={5}>Comment</Title> <Title level={5}>{t("vendor.fields.comment")}</Title>
<TextField value={record?.comment} /> <TextField value={record?.comment} />
</Show> </Show>
); );