Merge pull request #526 from Pantastisch/feature/hex-color-code-in-filament-page

Add Color Code Display for Single Color Filaments

client/src/components/spoolIcon.css

@@ -15,6 +15,10 @@
   height: 4em;
 }
 
+.spool-icon.no-margin {
+  margin: 0;
+}
+
 .spool-icon * {
   flex: 1 1 0px;
   border-radius: 2px;

client/src/components/spoolIcon.tsx

@@ -3,12 +3,14 @@ import "./spoolIcon.css";
 interface Props {
   color: string | { colors: string[]; vertical: boolean };
   size?: "small" | "large";
+  no_margin? : boolean
 }
 
-export default function SpoolIcon(props: Props) {
+export default function SpoolIcon(props: Readonly<Props>) {
   let dirClass = "vertical";
   let cols = [];
   let size = props.size ? props.size : "small";
+  let no_margin = props.no_margin ? "no-margin" : "";
   
   if (typeof props.color === "string") {
     cols = [props.color];
@@ -18,7 +20,7 @@ export default function SpoolIcon(props: Props) {
   }
 
   return (
-    <div className={"spool-icon " + dirClass + " " + size}>
+    <div className={"spool-icon " + dirClass + " " + size + " " + no_margin}>
       {cols.map((col) => (
         <div
           key={col}

client/src/pages/filaments/show.tsx

@@ -88,7 +88,8 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
       <Title level={5}>{t("filament.fields.name")}</Title>
       <TextField value={record?.name} />
       <Title level={5}>{t("filament.fields.color_hex")}</Title>
-      {colorObj && <SpoolIcon color={colorObj} size="large" />}
+      {colorObj && <SpoolIcon color={colorObj} size="large" no_margin />}
+      {record?.color_hex && <TextField value={`#${record?.color_hex}`} />}
       <Title level={5}>{t("filament.fields.material")}</Title>
       <TextField value={record?.material} />
       <Title level={5}>{t("filament.fields.price")}</Title>

client/src/pages/spools/show.tsx

@@ -139,7 +139,8 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
       <Title level={5}>{t("spool.fields.id")}</Title>
       <NumberField value={record?.id ?? ""} />
       <Title level={5}>{t("spool.fields.filament")}</Title>
-      {colorObj && <SpoolIcon color={colorObj} />} <TextField value={record ? filamentURL(record?.filament) : ""} />
+      {colorObj && <SpoolIcon color={colorObj} size="large" no_margin />}
+      <TextField value={record ? filamentURL(record?.filament) : ""} />
       <Title level={5}>{t("spool.fields.price")}</Title>
       <NumberField
         value={record ? spoolPrice(record) : ""}