Merge pull request #50 from FRC2713/configurable-newline

Configurable line delimiter
FRC2713 · Dec 3, 2024 · da266fc · da266fc
2 parents b00991e + dddc5cd
commit da266fc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/config/2024/config.json b/config/2024/config.json
@@ -2,6 +2,7 @@
   "$schema": "../schema.json",
   "title": "QRScout",
   "page_title": "Crescendo",
+  "delimiter": "\t",
   "sections": [
     {
       "name": "Prematch",
@@ -111,7 +112,8 @@
             "6": "Midline 3 (Middle)",
             "7": "Midline 2",
             "8": "Midline 1 (Amp Edge)"
-          }
+          },
+          "required": false
         },
         {
           "code": "auf",
@@ -245,4 +247,4 @@
       ]
     }
   ]
-}
+}
diff --git a/config/schema.json b/config/schema.json
@@ -14,14 +14,21 @@
         "page_title": {
           "type": "string"
         },
+        "delimiter": {
+          "type": "string"
+        },
         "sections": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/Section"
           }
         }
       },
-      "required": ["title", "page_title", "sections"],
+      "required": [
+        "title",
+        "page_title",
+        "sections"
+      ],
       "additionalProperties": false
     },
     "Section": {
@@ -41,7 +48,10 @@
           }
         }
       },
-      "required": ["name", "fields"],
+      "required": [
+        "name",
+        "fields"
+      ],
       "additionalProperties": false
     },
     "InputProps": {
@@ -87,7 +97,12 @@
           "type": "boolean"
         }
       },
-      "required": ["title", "type", "required", "code"],
+      "required": [
+        "title",
+        "type",
+        "required",
+        "code"
+      ],
       "additionalProperties": false
     },
     "InputTypes": {
@@ -104,4 +119,4 @@
       ]
     }
   }
-}
+}
diff --git a/src/components/QR/PreviewText.tsx b/src/components/QR/PreviewText.tsx
@@ -1,10 +1,12 @@
+import { useQRScoutState } from '../../store/store';
 import { CopyButton } from './CopyButton';
 
 export type PreviewTextProps = {
   data: string;
 };
 export function PreviewText(props: PreviewTextProps) {
-  const chunks = props.data.split('\t');
+  const formData = useQRScoutState(state => state.formData);
+  const chunks = props.data.split(formData.delimiter);
   return (
     <div className="flex flex-col items-center gap-2 shadow-md bg-gray-600 m-2 p-2 rounded-md">
       <div className="text-justify p-2 rounded bg-gray-600 ">

diff --git a/src/components/QR/QRModal.tsx b/src/components/QR/QRModal.tsx
@@ -15,7 +15,7 @@ export function getQRCodeData(formData: Config): string {
     .map(s => s.fields)
     .flat()
     .map(v => `${v.value}`.replace(/\n/g, ' '))
-    .join('\t');
+    .join(formData.delimiter);
 }
 
 export function QRModal(props: QRModalProps) {

diff --git a/src/components/inputs/BaseInputProps.ts b/src/components/inputs/BaseInputProps.ts
@@ -5,6 +5,7 @@ export default interface BaseInputProps extends InputProps {
 export interface Config {
   title: string;
   page_title: string;
+  delimiter: string;
   sections: SectionProps[];
 }