use same input for badge color & text color

varianter · Nov 27, 2024 · b1e638b · b1e638b
1 parent aaae161
commit b1e638b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/src/components/customerCases/customerCase/CustomerCase.tsx b/src/components/customerCases/customerCase/CustomerCase.tsx
@@ -29,7 +29,7 @@ export default async function CustomerCase({
         <ColoredTitle
           title={customerCase.basicTitle}
           colorPart={customerCase.basicTitleColorPart}
-          color={customerCase.clientColors.title}
+          color={customerCase.clientColors.color}
         />
         <hr className={styles.divider} />
         {consultantsResult.ok && (

diff --git a/src/components/customerCases/customerCase/projectInfo/CustomerCaseProjectInfo.tsx b/src/components/customerCases/customerCase/projectInfo/CustomerCaseProjectInfo.tsx
@@ -40,7 +40,7 @@ export default async function CustomerCaseProjectInfo({
                 {projectInfo.customerSectors.map((sector: CustomerSector) => (
                   <Badge
                     key={sector._key}
-                    badgeColor={clientColors.badge}
+                    badgeColor={clientColors.color}
                     textColor={clientColors.badgeText}
                   >
                     {sector.customerSector}

diff --git a/studioShared/lib/interfaces/customerCases.ts b/studioShared/lib/interfaces/customerCases.ts
@@ -61,8 +61,7 @@ export interface CustomerCaseBase {
 }
 
 export interface CustomerCaseClientColors {
-  title?: string;
-  badge?: string;
+  color?: string;
   badgeText?: string;
 }
 

diff --git a/studioShared/lib/queries/customerCases.ts b/studioShared/lib/queries/customerCases.ts
@@ -23,8 +23,7 @@ const CUSTOMER_CASE_BASE_FRAGMENT = groq`
     ${INTERNATIONALIZED_IMAGE_FRAGMENT}
   },
   "clientColors": {
-    "title": clientColorTitle.hex,
-    "badge": clientColorBadge.hex,
+    "color": clientColor.hex,
     "badgeText": clientColorBadgeText.hex
   }
 `;

diff --git a/studioShared/schemas/documents/customerCase.ts b/studioShared/schemas/documents/customerCase.ts
@@ -47,25 +47,22 @@ const customerCase = defineType({
     }),
     defineField({ ...domainsField, validation: (rule) => rule.required() }),
     defineField({
-      name: "clientColorTitle",
+      name: "clientColor",
       type: "color",
-      title: "Client Color (Title)",
-      description: "This color will be used for parts of the title",
-      options: { disableAlpha: true },
-    }),
-    defineField({
-      name: "clientColorBadge",
-      type: "color",
-      title: "Client Color (Badge)",
-      description: "This color will be used for the badges under project info",
+      title: "Client Color (Title & Badges)",
+      description: "This color will be used for parts of the title and badges",
       options: { disableAlpha: true },
     }),
     defineField({
       name: "clientColorBadgeText",
       type: "color",
       title: "Client Color (Badge Text)",
-      description: "This color will be used for the text on the badges",
-      options: { disableAlpha: true },
+      description:
+        "This color will be used for the text on the badges. There are predefined colors for text in the component",
+      options: {
+        disableAlpha: true,
+        colorList: ["#222424", "#faf8f5"],
+      },
     }),
     defineField({
       name: "description",