Merge branch 'development' into different_versions_buttons

breatheco-de · Jan 24, 2025 · e43edf6 · e43edf6
2 parents c21a3bc + 4d91522
commit e43edf6
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 13 deletions.
diff --git a/prismicio-types.d.ts b/prismicio-types.d.ts
@@ -951,6 +951,36 @@ export interface OneColumnSliceDefaultPrimary {
    */
   id_key: prismic.KeyTextField;
 
+  /**
+   * padding field in *OneColumn → Primary*
+   *
+   * - **Field Type**: Text
+   * - **Placeholder**: *None*
+   * - **API ID Path**: one_column.primary.padding
+   * - **Documentation**: https://prismic.io/docs/field#key-text
+   */
+  padding: prismic.KeyTextField;
+
+  /**
+   * Grid Column field in *OneColumn → Primary*
+   *
+   * - **Field Type**: Text
+   * - **Placeholder**: *None*
+   * - **API ID Path**: one_column.primary.grid_column
+   * - **Documentation**: https://prismic.io/docs/field#key-text
+   */
+  grid_column: prismic.KeyTextField;
+
+  /**
+   * Width field in *OneColumn → Primary*
+   *
+   * - **Field Type**: Text
+   * - **Placeholder**: *None*
+   * - **API ID Path**: one_column.primary.width
+   * - **Documentation**: https://prismic.io/docs/field#key-text
+   */
+  width: prismic.KeyTextField;
+
   /**
    * Margin Top field in *OneColumn → Primary*
    *

diff --git a/public/plans-info.es.json b/public/plans-info.es.json
@@ -13,7 +13,7 @@
         "background": "#0084FF",
         "title": "Obtener Plan"
       },    
-      "button_link": "https://4geeksacademy.com/programs",
+      "button_link": "https://4geeks.com/es/checkout?plan=jump-start",
       "featured_info": [
         {
           "service": {
@@ -95,7 +95,7 @@
         "background": "#0084FF",
         "title": "Obtener Plan"
       },
-      "button_link": "https://buy.stripe.com/eVafZc3r9aVWgCI9AU",
+      "button_link": "https://4geeks.com/es/checkout?plan=basic-plan",
       "featured_info": [
         {
           "service": {
@@ -174,7 +174,7 @@
         "background": "white",
         "title": "Obtener Plan"
       },
-      "button_link": "https://buy.stripe.com/bIYdR43r92pq9ag00j",
+      "button_link": "https://4geeks.com/es/checkout?plan=standard-plan",
       "featured_card": {
         "color": "#0084FF"
       },
@@ -245,7 +245,7 @@
         "background": "#0084FF",
         "title": "Obtener Plan"
       },
-      "button_link": "https://buy.stripe.com/aEU3cqd1JfccfyE4gB",
+      "button_link": "https://4geeks.com/es/checkout?plan=premium-plan",
       "featured_info": [
         {
           "service": {
@@ -316,4 +316,4 @@
         ]
       }
     }
-  ]
+  ]
diff --git a/public/plans-info.json b/public/plans-info.json
@@ -13,7 +13,7 @@
       "background": "#0084FF",
       "title": "Get Plan"
     },
-    "button_link": "https://4geeksacademy.com/programs",
+    "button_link": "https://4geeks.com/checkout?plan=jump-start",
     "featured_info": [
       {
         "service": {
@@ -95,7 +95,7 @@
       "background": "#0084FF",
       "title": "Get Plan"
     },
-    "button_link": "https://buy.stripe.com/eVafZc3r9aVWgCI9AU",
+    "button_link": "https://4geeks.com/checkout?plan=basic-plan",
     "featured_info": [
       {
         "service": {
@@ -174,7 +174,7 @@
       "background": "white",
       "title": "Get Plan"
     },
-    "button_link": "https://buy.stripe.com/bIYdR43r92pq9ag00j",
+    "button_link": "https://4geeks.com/checkout?plan=standard-plan",
     "featured_card": {
       "color": "#0084FF"
     },
@@ -245,7 +245,7 @@
       "background": "#0084FF",
       "title": "Get Plan"
     },
-    "button_link": "https://buy.stripe.com/aEU3cqd1JfccfyE4gB",
+    "button_link": "https://4geeks.com/checkout?plan=premium-plan",
     "featured_info": [
       {
         "service": {
@@ -316,4 +316,4 @@
       ]
     }
   }
-]
+]
diff --git a/slices/OneColumn/index.jsx b/slices/OneColumn/index.jsx
@@ -1,5 +1,6 @@
 /* eslint-disable react/prop-types */
 import React from 'react';
+// import { SliderFilledTrack } from '@chakra-ui/react';
 import MktOneColumnKPI from '../../src/common/components/MktOneColumnKPI';
 
 /**
@@ -52,6 +53,9 @@ function OneColumn({ slice }) {
       descriptionTextAlign={slice?.primary?.description_text_align}
       descriptionJustifyItems={slice?.primary?.description_justify_items}
       descriptionLineHeight={slice?.primary?.description_line_height}
+      width={slice?.primary?.width}
+      padding={slice?.primary?.padding}
+      gridColumn={slice?.primary?.grid_column}
     />
   );
 }

diff --git a/slices/OneColumn/mocks.json b/slices/OneColumn/mocks.json
@@ -174,6 +174,21 @@
 				"__TYPE__": "FieldContent",
 				"value": "kill",
 				"type": "Text"
+			},
+			"width": {
+				"__TYPE__": "FieldContent",
+				"value": "rear",
+				"type": "Text"
+			},
+			"padding": {
+				"__TYPE__": "FieldContent",
+				"value": "half",
+				"type": "Text"
+			},
+			"grid_column": {
+				"__TYPE__": "FieldContent",
+				"value": "reason",
+				"type": "Text"
 			}
 		},
 		"items": [

diff --git a/slices/OneColumn/model.json b/slices/OneColumn/model.json
@@ -15,6 +15,18 @@
           "type": "Text",
           "config": { "label": "ID Key", "placeholder": "" }
         },
+        "padding": {
+          "type": "Text",
+          "config": { "label": "padding", "placeholder": "" }
+        },
+        "grid_column": {
+          "type": "Text",
+          "config": { "label": "Grid Column", "placeholder": "" }
+        },
+        "width": {
+          "type": "Text",
+          "config": { "label": "Width", "placeholder": "" }
+        },
         "margin_top": {
           "type": "Text",
           "config": { "label": "Margin Top", "placeholder": "" }

diff --git a/src/common/components/MktOneColumnKPI.jsx b/src/common/components/MktOneColumnKPI.jsx
@@ -65,6 +65,9 @@ function MktOneColumnKPI({
   marginBottom,
   marginTop,
   maxWidth,
+  width,
+  gridColumn,
+  padding,
   ...rest
 }) {
   const { fontColor2, hexColor } = useStyle();
@@ -74,12 +77,13 @@ function MktOneColumnKPI({
       <GridContainer
         id={id}
         gridTemplateColumns="repeat(10, 1fr)"
-        gridColumn="2 / span 8"
+        gridColumn={gridColumn || '2 / span 8'}
         background={slice?.primary?.background}
         borderRadius={borderRadius}
         maxWidth={maxWidth}
+        width={width}
       >
-        <Box display="grid" padding="50px" fontFamily={fontFamily} textAlign="center" justifyItems={justifyItems} gridGap="14px" style={{ direction: 'initial' }} gridColumn="2 / span 8" px="10px">
+        <Box display="grid" padding={padding || '50px'} fontFamily={fontFamily} textAlign="center" justifyItems={justifyItems} gridGap="14px" style={{ direction: 'initial' }} gridColumn={gridColumn || '2 / span 8'} px={padding || '10px'}>
           {subTitle && (
             <Heading marginBottom="15px" as="h4" fontSize="14px" color={hexColor.blueDefault}>
               {subTitle}
@@ -161,6 +165,8 @@ MktOneColumnKPI.propTypes = {
   marginBottom: PropTypes.string,
   marginTop: PropTypes.string,
   maxWidth: PropTypes.string,
+  width: PropTypes.string,
+  gridColumn: PropTypes.string,
 };
 
 MktOneColumnKPI.defaultProps = {
@@ -185,6 +191,8 @@ MktOneColumnKPI.defaultProps = {
   marginBottom: '',
   marginTop: '',
   maxWidth: '',
+  width: '',
+  gridColumn: '',
 };
 
 export default MktOneColumnKPI;
diff --git a/src/common/components/MktTestimonials.jsx b/src/common/components/MktTestimonials.jsx
@@ -25,7 +25,7 @@ function TestimonialBox({ picture, name, rating, description, version }) {
     v1: {
       box: {
         background: backgroundColor,
-        border: '1px solid',
+        border: '1px solid #dadada',
         width: '250px',
       },
       textName: {