@redneckz/wildless-cms-uni-blocks 0.5.10 → 0.5.11

package/mobile/src/components/Bonus/Bonus.ui.json

@@ -0,0 +1,16 @@
+{
+  "content": {
+    "bonusItems": {
+      "items": {
+        "bonusItemContent": {
+          "bonusType": {
+            "ui:widget": "hidden"
+          },
+          "image": {
+            "ui:field": "icon"
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/Bonus/BonusContent.ts

@@ -1,15 +1,46 @@
+import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { Picture } from '../../model/Picture';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
- * @title Плитка
+ * @title Изображение
  */
-export type BonusItem = HeadlineCommonProps & {
+export type BonusImageDef = {
+  /** @default image */
+  bonusType?: 'image';
+  image?: Picture;
+};
+
+/**
+ * @title Баллы
+ */
+export type BonusCountDef = {
+  /** @default count */
+  bonusType?: 'count';
   /** @title Количество баллов */
   bonusCount?: string;
   /** @title Наименование */
   bonusName?: string;
 };
 
+/**
+ * @title Вид контента
+ */
+export type BonusItemContentDef = EmptyOption | BonusImageDef | BonusCountDef;
+
+/**
+ * @title Плитка
+ */
+export type BonusItem = HeadlineCommonProps & {
+  bonusItemContent?: BonusItemContentDef;
+  /**
+   * @title Кнопка
+   * @maxItems 1
+   */
+  buttons?: ButtonWithIconProps[];
+};
+
 /**
  * @title Блок Бонусы
  */

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.example.json

@@ -10,7 +10,7 @@
           "width": 160,
           "height": 180
         },
-        "icon": "WateringCan"
+        "icon": "WateringCanIcon"
       }
     },
     {

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.ui.json

@@ -0,0 +1,11 @@
+{
+  "content": {
+    "bonusBenefits": {
+      "items": {
+        "icon": {
+          "ui:field": "icon"
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/Calculator/Calculator.example.json

@@ -14,7 +14,8 @@
             "text": "Кнопка 1",
             "version": "primary"
           }
-        ]
+        ],
+        "footnote": "Расчёт является предварительным. Точные условия будут предоставлены в отделении Банка. "
       }
     }
   ]

package/mobile/src/components/Calculator/Calculator.ui.json

@@ -0,0 +1,31 @@
+{
+  "content": {
+    "calculatorTabs": {
+      "items": {
+        "nav": {
+          "icon": {
+            "ui:field": "icon"
+          }
+        },
+        "calculatorBlock": {
+          "sourceBookDir": {
+            "ui:widget": "sourceBook"
+          },
+          "calcType": {
+            "ui:widget": "hidden"
+          },
+          "buttons": {
+            "items": {
+              "icon": {
+                "ui:field": "icon"
+              },
+              "iconRight": {
+                "ui:field": "icon"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/CardTransfer/CardTransfer.example.json

@@ -1,6 +1,11 @@
 {
   "title": "Укажите сумму перевода",
   "label": "Сумма перевода",
-  "buttonText": "Далее",
-  "placeholder": "1500"
+  "placeholder": "1500",
+  "button": {
+    "href": "",
+    "text": "Далее",
+    "target": "_blank",
+    "version": "primary"
+  }
 }

package/mobile/src/components/CardTransfer/CardTransfer.tsx

@@ -1,26 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { CardTransferContent } from './CardTransferContent';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import type { GetButtonClassParams } from '../../ui-kit/Button/GetButtonClassParams';
-import { getDisabledButtonClasses } from '../../ui-kit/Button/getDisabledButtonClasses';
-import { getRegularButtonClasses } from '../../ui-kit/Button/getRegularButtonClasses';
 import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import type { CardTransferContent } from './CardTransferContent';
+import { getDisabledButtonClasses } from '../../ui-kit/Button/getDisabledButtonClasses';
+import { getRegularButtonClasses } from '../../ui-kit/Button/getRegularButtonClasses';
+import { useLink } from '../../hooks/useLink';
 
 const AMOUNT_KEY = 'amount';
 const FORM_URL = 'https://www.rshb.ru/p2p/';
-
 const DEFAULT_TITLE = 'Укажите сумму перевода';
 const DEFAULT_LABEL = 'Сумма перевода';
 const DEFAULT_PLACEHOLDER = '1500';
-const DEFAULT_BUTTON_TEXT = 'Далее';
-
-const BUTTON_CLASS_PARAMS: GetButtonClassParams = {
-  version: 'primary',
-  className: 'w-full h-[56px] px-9 mt-6',
-};
 
 export interface CardTransferProps extends CardTransferContent, UniBlockProps {}
 
@@ -30,15 +23,22 @@ export const CardTransfer = JSX<CardTransferProps>(
     title = DEFAULT_TITLE,
     label = DEFAULT_LABEL,
     placeholder = DEFAULT_PLACEHOLDER,
-    buttonText = DEFAULT_BUTTON_TEXT,
+    button,
+    context,
     ...rest
   }) => {
+    const router = context.useRouter();
+    const { handlerDecorator } = context;
     const [value, setValue] = useState<string>('');
     const isDisabled = !Number(value);
+    const buttonStyle = isDisabled
+      ? getDisabledButtonClasses({ version: button?.version })
+      : getRegularButtonClasses({ className: 'text-white', version: button?.version });
 
     return (
       <BlockWrapper
         className={`p-[50px] flex flex-col items-center font-sans bg-white ${className}`}
+        context={context}
         {...rest}
       >
         {title ? <Heading className="max-w-[684px] pb-9" headingType="h2" title={title} /> : null}
@@ -50,17 +50,16 @@ export const CardTransfer = JSX<CardTransferProps>(
             placeholder={placeholder}
             label={label}
           />
-          <button
-            type="submit"
-            className={
-              isDisabled
-                ? getDisabledButtonClasses(BUTTON_CLASS_PARAMS)
-                : getRegularButtonClasses(BUTTON_CLASS_PARAMS)
-            }
-            disabled={isDisabled}
-          >
-            {buttonText}
-          </button>
+          {button?.text ? (
+            <button
+              type="submit"
+              className={`w-full p-4 mt-6 ${buttonStyle} `}
+              disabled={isDisabled}
+              {...useLink({ router, handlerDecorator }, button)}
+            >
+              {button.text}
+            </button>
+          ) : null}
         </form>
       </BlockWrapper>
     );

package/mobile/src/components/CardTransfer/CardTransfer.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/CardTransfer/CardTransferContent.ts

@@ -1,4 +1,5 @@
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Перевод с карты на карту
@@ -7,6 +8,5 @@ export type CardTransferContent = LabelProps &
   TitleProps & {
     /** @title Плейсхолдер */
     placeholder?: string;
-    /** @title Текст кнопки */
-    buttonText?: string;
+    button?: ButtonProps;
   };

package/mobile/src/components/Catalog/Catalog.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/ComparisonTable/ComparisonTable.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/ComparisonTable/TableColumn.tsx

@@ -48,23 +48,29 @@ export const TableColumn = JSX<TableColumnProps>(
             ))
           : null}
 
-        {showRow && renderButton({ header, buttonVersion })}
+        {showRow ? renderButton({ header, buttonVersion }) : null}
         {renderToggleButton({ onToggleColumn, isFillGradient, showRow })}
       </div>
     );
   },
 );
 
-const renderButton = ({ header, buttonVersion }) => (
-  <Button
-    href={header.link.href}
-    target={header.link.target}
-    version={buttonVersion}
-    className="text-s font-medium mt-4 py-[11px]"
-  >
-    {header.link.text}
-  </Button>
-);
+const renderButton = ({ header, buttonVersion }) => {
+  if (!header.link) {
+    return null;
+  }
+
+  return (
+    <Button
+      href={header.link.href}
+      target={header.link.target}
+      version={buttonVersion}
+      className="text-s font-medium mt-4 py-[11px]"
+    >
+      {header.link.text}
+    </Button>
+  );
+};
 
 const renderToggleButton = ({ onToggleColumn, isFillGradient, showRow }) => (
   <div className="mt-5" role="cell">

package/mobile/src/components/ContentPage/ContentPage.page.json

@@ -57,6 +57,18 @@
         ]
       }
     },
+    {
+      "type": "Tabs",
+      "style": ["col-span-12"],
+      "content": {
+        "isSticky": true,
+        "tabs": [
+          { "type": "link", "href": "#placeholder", "text": "В разработке" },
+          { "type": "link", "href": "#products", "text": "Продукты" },
+          { "type": "link", "href": "#gallery", "text": "Галерея" }
+        ]
+      }
+    },
     {
       "type": "ProductGallery",
       "style": ["col-span-12"],
@@ -477,6 +489,7 @@
     {
       "type": "Placeholder",
       "style": ["col-span-12"],
+      "anchor": "placeholder",
       "content": {
         "title": "Какой то новый блок"
       }
@@ -557,6 +570,7 @@
     {
       "type": "ProductTile",
       "style": ["col-span-6"],
+      "anchor": "products",
       "content": {
         "title": "Акция! “Кредит На все, что хочется!”",
         "description": "Потребительский кредит на любые цели, без залога и поручительства",
@@ -882,6 +896,7 @@
     {
       "type": "MiniGallery",
       "style": ["col-span-12"],
+      "anchor": "gallery",
       "content": {
         "title": "Вы можете оплатить бонусными баллами",
         "description": "Удобный каталог с большим ассортиментом товаров и сервисов",
@@ -1421,7 +1436,6 @@
     {
       "type": "LinkDocs",
       "style": ["col-span-12"],
-      "anchor": "documents",
       "content": {
         "title": "Дополнительные документы",
         "description": "Ответы на часто задаваемые вопросы",

package/mobile/src/components/ErrorBlock/ErrorBlock.ui.json

@@ -0,0 +1,12 @@
+{
+  "content": {
+    "error": {
+      "errorContentType": {
+        "ui:widget": "hidden"
+      },
+      "image": {
+        "ui:field": "picture"
+      }
+    }
+  }
+}

package/mobile/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -1,13 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/ContentPageDef';
 import { Button } from '../../ui-kit/Button/Button';
-import { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { renderInput } from './renderInput';
 import { calculateResult, formatValue } from './calculateResult';
 import { callbackCurrencySelect } from './callbackCurrencySelect';
 import { Currency } from './CurrencyProps';
-import { renderInput } from './renderInput';
+import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+
 export interface ExchangeCurrencyItem {
   code?: Currency;
   buy?: number;

package/mobile/src/components/ExchangeRateTile/ExchangeRateTile.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/ExchangeRateTile/renderInput.tsx

@@ -1,6 +1,6 @@
 import { Input } from '../../ui-kit/Input/Input';
-import { SelectCustom } from '../../ui-kit/SelectCustom/SelectCustom';
-import type { OptionProps } from '../../ui-kit/SelectCustom/SelectCustom';
+import { Select } from '../../ui-kit/Select/Select';
+import type { OptionProps } from '../../ui-kit/Select/Select';
 import type { Currency } from './CurrencyProps';
 import type { ExchangeCurrencyItem } from './ExchangeCurrencyCalculator';
 
@@ -28,7 +28,7 @@ export function renderInput(props: InputProps) {
         onChange={setValue}
       />
       {ratesOptions.length ? (
-        <SelectCustom
+        <Select
           isBorder={false}
           onChange={(_) => setSelected(_.key as Currency)}
           options={ratesOptions}

package/mobile/src/components/Footer/Footer.ui.json

@@ -0,0 +1,11 @@
+{
+  "content": {
+    "subMenu": {
+      "items": {
+        "icon": {
+          "ui:field": "icon"
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/Gallery/Gallery.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/GracePeriod/GracePeriod.tsx

@@ -47,7 +47,7 @@ const renderCalendar = (calendar) => {
     }));
 
   return (
-    <div className="w-full flex flex-col justify-center mt-[54px]">
+    <div className="w-full flex flex-col justify-center mt-13">
       <div className="flex w-full mb-3 text-h6 text-center">
         {mappedCalendar.map((_) => renderMonthNames(_, colSize))}
       </div>
@@ -71,13 +71,14 @@ const renderCalendar = (calendar) => {
 };
 
 const renderMonthNames = (item, colSize) =>
-  item.month.map((_, i) => (
+  item.month?.map((_, i) => (
     <div key={`monthName-${i}`} style={{ flexBasis: `${colSize}%` }}>
-      {_.text}
+      {_.name}
     </div>
   ));
+
 const renderMonthImages = (item) =>
-  item.month.map((_) =>
+  item.month?.map((_) =>
     _.image?.src ? (
       <div
         key={`monthImage-${_.image.src}`}

package/mobile/src/components/GracePeriod/GracePeriod.ui.json

@@ -0,0 +1,15 @@
+{
+  "content": {
+    "calendar": {
+      "items": {
+        "month": {
+          "items": {
+            "image": {
+              "ui:field": "picture"
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/GracePeriod/GracePeriodContent.ts

@@ -3,7 +3,7 @@ import type { Picture } from '../../model/Picture';
 
 export interface Month {
   /** @title Название месяца */
-  text?: string;
+  name?: string;
   /**
    * @title Изображение календарного месяца
    * @default {

package/mobile/src/components/Header/Header.ui.json

@@ -0,0 +1,11 @@
+{
+  "content": {
+    "burgerSubMenu": {
+      "items": {
+        "icon": {
+          "ui:field": "icon"
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/Headline/Headline.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/InsuranceAmountBlock/InsuranceAmountBlock.ui.json

@@ -0,0 +1,15 @@
+{
+  "content": {
+    "insuranceTabs": {
+      "items": {
+        "cards": {
+          "items": {
+            "icon": {
+              "ui:field": "icon"
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/LinkDocs/LinkDocs.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/LinkList/LinkList.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/MiniGallery/MiniGallery.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/MobileAppTile/MobileAppTile.ui.json

@@ -0,0 +1,7 @@
+{
+  "content": {
+    "qr": {
+      "ui:field": "qr"
+    }
+  }
+}

package/mobile/src/components/OfficeServicesBlock/OfficeServicesBlock.ui.json

@@ -0,0 +1,11 @@
+{
+  "content": {
+    "servicesList": {
+      "items": {
+        "icon": {
+          "ui:field": "icon"
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/OtherProducts/OtherProducts.ui.json

@@ -0,0 +1,76 @@
+{
+  "content": {
+    "blockItems": {
+      "items": {
+        "blocks": {
+          "items": {
+            "blockListType": {
+              "ui:widget": "hidden"
+            },
+            "image": {
+              "ui:field": "picture"
+            },
+            "benefitList": {
+              "items": {
+                "description": {
+                  "benefitType": {
+                    "ui:widget": "hidden"
+                  }
+                },
+                "icon": {
+                  "ui:field": "icon"
+                }
+              }
+            },
+            "style": {
+              "ui:field": "style"
+            },
+            "benefits": {
+              "items": {
+                "icon": {
+                  "ui:field": "icon"
+                }
+              }
+            },
+            "buttons": {
+              "items": {
+                "icon": {
+                  "ui:field": "icon"
+                },
+                "iconRight": {
+                  "ui:field": "icon"
+                }
+              }
+            },
+            "icon": {
+              "ui:field": "icon"
+            },
+            "backwardButton": {
+              "icon": {
+                "ui:field": "icon"
+              },
+              "iconRight": {
+                "ui:field": "icon"
+              }
+            },
+            "cards": {
+              "items": {
+                "image": {
+                  "ui:field": "picture"
+                },
+                "button": {
+                  "icon": {
+                    "ui:field": "icon"
+                  },
+                  "iconRight": {
+                    "ui:field": "icon"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/PictureText/PictureText.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/Placeholder/Placeholder.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/ProductBlock/ProductBlock.ui.json

@@ -0,0 +1,12 @@
+{
+  "content": {
+    "backwardButton": {
+      "icon": {
+        "ui:field": "icon"
+      },
+      "iconRight": {
+        "ui:field": "icon"
+      }
+    }
+  }
+}

package/mobile/src/components/ProductGallery/ProductGallery.ui.json

@@ -0,0 +1,30 @@
+{
+  "content": {
+    "slides": {
+      "items": {
+        "productBlock": {
+          "image": {
+            "ui:field": "picture"
+          },
+          "benefits": {
+            "items": {
+              "icon": {
+                "ui:field": "icon"
+              }
+            }
+          },
+          "buttons": {
+            "items": {
+              "icon": {
+                "ui:field": "icon"
+              },
+              "iconRight": {
+                "ui:field": "icon"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/ProductTile/ProductTile.ui.json

@@ -0,0 +1 @@
+{}