feat: generate landing stub types outside (#33)

README.md

@@ -45,10 +45,12 @@
 ### MVP1
 
 **1. Landing**
+
 - преимущества сервиса
   - оставить заявку (редирект на Страницу оформления заказа)
 
 **2. Страница для оформления заказа**
+
 - форма
   - номер машины (mask input)
   - цвет машины
@@ -58,10 +60,12 @@
 - после заполнения редирект на страницу с деталями заказа
 
 **3. Страница с деталями заказа**
+
 - описание заказа
 - детали заказа (id, статус)
 
 **3. АРМ оператора**
+
 - список заказов (RUD)
   - id заказа
   - статус заказа (готово / не готово)
@@ -72,7 +76,6 @@
   - кнопка "Добавить"
   - кнопка "Удалить"
 
-
 ### Built With
 
 [![React][React.js]][React-url]
@@ -103,6 +106,14 @@
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
+## Instructions
+### Stubs types generation
+1. generate types with json-literal-typer (should be installed globally)
+   ```sh
+   npx json-literal-typer -i <path to json> -o <path to output ts-file>
+   ```
+2. export default type from output file
+
 <!-- PARTICIPANTS -->
 
 ## Participants

bro.config.js

@@ -1,9 +1,9 @@
 /* eslint-disable no-undef */
 /* eslint-disable @typescript-eslint/no-require-imports */
-const pkg = require('./package');
+const pkg = require("./package");
 
 module.exports = {
-  apiPath: 'stubs/api',
+  apiPath: "stubs/api",
   webpackConfig: {
     output: {
       publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
@@ -11,19 +11,17 @@ module.exports = {
   },
   /* use https://admin.bro-js.ru/ to create config, navigations and features */
   navigations: {
-    'dry-wash.main': '/dry-wash',
+    "dry-wash.main": "/dry-wash",
-    'dry-wash.create': '/order',
+    "dry-wash.create": "/order",
-    'dry-wash.view.order': '/order/:orderId',
+    "dry-wash.view.order": "/order/:orderId",
-    'dry-wash.arm.master': '/master',
+    "dry-wash.arm": "/arm",
-    'dry-wash.arm.order': '/order',
-    'dry-wash.arm': '/arm/*',
   },
   features: {
-    'dry-wash-pl': {
+    "dry-wash-pl": {
       // add your features here in the format [featureName]: { value: string }
     },
   },
   config: {
-    'dry-wash-pl.api': '/api',
+    "dry-wash-pl.api": "/api",
   },
 };

locales/en.json

@@ -13,41 +13,5 @@
   "dry-wash.landing.hero-section.headline": "Revitalize Your Ride with Eco-Friendly Care!",
   "dry-wash.landing.make-order-button": "Make order",
   "dry-wash.landing.site-logo": "The logo of the \"Dry Master\" company",
-  "dry-wash.landing.social-proof-section.heading": "We are being chosen",
+  "dry-wash.landing.social-proof-section.heading": "We are being chosen"
-  "dry-wash.arm.master.add": "Add",
-  "dry-wash.arm.order.title": "Orders",
-  "dry-wash.arm.order.status.progress": "In Progress",
-  "dry-wash.arm.order.status.complete": "Completed",
-  "dry-wash.arm.order.status.pending": "Pending",
-  "dry-wash.arm.order.status.working": "Working",
-  "dry-wash.arm.order.status.canceled": "Canceled",
-  "dry-wash.arm.order.status.placeholder": "Select Status",
-  "dry-wash.arm.order.table.header.carNumber": "Car Number",
-  "dry-wash.arm.order.table.header.washingTime": "Washing Time",
-  "dry-wash.arm.order.table.header.orderDate": "Order Date",
-  "dry-wash.arm.order.table.header.status": "Status",
-  "dry-wash.arm.order.table.header.telephone": "Telephone",
-  "dry-wash.arm.order.table.header.location": "Location",
-  "dry-wash.arm.master.title": "Masters",
-  "dry-wash.arm.master.table.header.name": "Name",
-  "dry-wash.arm.master.table.header.currentJob": "Current Job",
-  "dry-wash.arm.master.table.header.phone": "Phone",
-  "dry-wash.arm.master.table.header.actions": "Actions",
-  "dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
-  "dry-wash.arm.master.drawer.title": "Add New Master",
-  "dry-wash.arm.master.drawer.inputName.label": "Full Name",
-  "dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
-  "dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
-  "dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
-  "dry-wash.arm.master.drawer.button.save": "Save",
-  "dry-wash.arm.master.drawer.button.cancel": "Cancel",
-  "dry-wash.arm.master.sideBar.orders": "Orders",
-  "dry-wash.arm.master.sideBar.master": "Masters",
-  "dry-wash.arm.master.sideBar.title": "Dry Master",
-  "dry-wash.notFound.title": "Page Not Found",
-  "dry-wash.notFound.description": "Unfortunately, the page you are looking for does not exist.",
-  "dry-wash.notFound.button.back": "Back to Home",
-  "dry-wash.errorBoundary.title": "Something went wrong",
-  "dry-wash.errorBoundary.description": "We are already working on fixing the issue",
-  "dry-wash.errorBoundary.button.reload": "Reload Page"
 }

locales/ru.json

@@ -3,7 +3,7 @@
   "dry-wash.arm.order.title": "Заказы",
   "dry-wash.arm.order.status.progress": "Выполняется",
   "dry-wash.arm.order.status.complete": "Завершено",
-  "dry-wash.arm.order.status.pending": "В ожидании",
+  "dry-wash.arm.order.status.pending": "в ожидании",
   "dry-wash.arm.order.status.working": "В работе",
   "dry-wash.arm.order.status.canceled": "Отменено",
   "dry-wash.arm.order.status.placeholder": "Выберите статус",
@@ -26,9 +26,9 @@
   "dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
   "dry-wash.arm.master.drawer.button.save": "Сохранить",
   "dry-wash.arm.master.drawer.button.cancel": "Отменить",
-  "dry-wash.arm.master.sideBar.orders": "Заказы",
+  "dry-wash.arm.master.sideBar.title": " Сухой мастер",
-  "dry-wash.arm.master.sideBar.master": "Мастера",
+  "dry-wash.arm.master.sideBar.title.master": "Мастера",
-  "dry-wash.arm.master.sideBar.title": "Сухой мастер",
+  "dry-wash.arm.master.sideBar.title.orders": "Заказы",
   "dry-wash.landing.benefits-section.description": "Откройте для себя преимущества наших услуг по химчистке автомобилей",
   "dry-wash.landing.benefits-section.heading": "Преимущества экологичной автомойки",
   "dry-wash.landing.benefits-section.list.0": "Экологически безопасные продукты",
@@ -46,8 +46,8 @@
   "dry-wash.landing.social-proof-section.heading": "Нас выбирают",
   "dry-wash.notFound.title": "Страница не найдена",
   "dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
-  "dry-wash.notFound.button.back": "Вернуться на главную",
+  "dry-wash.notFound.button.back": " Вернуться на главную",
   "dry-wash.errorBoundary.title":"Что-то пошло не так",
-  "dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
+  "dry-wash.errorBoundary.description": " Мы уже работаем над исправлением проблемы",
   "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу"
 }

package-lock.json

@@ -6958,20 +6958,6 @@
             "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
             "license": "ISC"
         },
-        "node_modules/fsevents": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-            }
-        },
         "node_modules/function-bind": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",

src/__data__/urls.ts

@@ -1,40 +1,25 @@
-import { generatePath } from 'react-router-dom';
+import { generatePath } from "react-router-dom";
-import { getNavigationValue } from '@brojs/cli';
+import { getNavigationValue } from "@brojs/cli";
 
-import { Order } from '../models';
+import { Order } from "../models";
-
-const getFullUrls = (url: string) =>
-  `${getNavigationValue('dry-wash.main')}${url}`;
 
 export const URLs = {
   landing: {
-    url: getNavigationValue('dry-wash.main'),
+    url: getNavigationValue("dry-wash.main"),
     getUrl() {
       return this.url;
-    },
+    }
   },
   orderForm: {
-    url: getNavigationValue('dry-wash.create'),
+    url: getNavigationValue("dry-wash.create"),
     getUrl() {
       return this.url;
-    },
+    }
   },
   orderView: {
-    url: getNavigationValue('dry-wash.view.order'),
+    url: getNavigationValue("dry-wash.view.order"),
     getUrl(orderId: Order.Id) {
       return generatePath(this.url, { orderId });
-    },
+    }
-  },
+  }
-  armMaster: {
+};
-    url: getNavigationValue('dry-wash.arm.master'),
-    isOn: Boolean(getNavigationValue('dry-wash.arm.master')),
-  },
-  armOrder: {
-    url: getNavigationValue('dry-wash.arm.order'),
-    isOn: Boolean(getNavigationValue('dry-wash.arm.order')),
-  },
-  armBase: {
-    url: getFullUrls(getNavigationValue('dry-wash.arm')),
-    isOn: Boolean(getNavigationValue('dry-wash.arm')),
-  },
-};

src/components/ErrorBoundary/ErrorBoundary.tsx

@@ -34,16 +34,15 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
   render() {
     const { hasError } = this.state;
     //TODO: добавить анимацию после залива 404 страницы
-    //TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
     if (hasError) {
       return (
         <Center minH='100vh'>
           <VStack spacing={4} textAlign='center'>
             <Heading as='h1' size='2xl'>
-              {i18next.t('~:dry-wash.errorBoundary.title')}
+              {i18next.t('dry-wash.errorBoundary.title')}
             </Heading>
             <Text fontSize='lg'>
-              {i18next.t('~:dry-wash.errorBoundary.description')}
+              {i18next.t('dry-wash.errorBoundary.description')}
             </Text>
             <Button
               colorScheme='teal'
@@ -51,7 +50,7 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
               variant='outline'
               onClick={() => window.location.reload()}
             >
-              {i18next.t('~:dry-wash.errorBoundary.button.reload')}
+              {i18next.t('dry-wash.errorBoundary.button.reload')}
             </Button>
           </VStack>
         </Center>

src/components/LayoutArm/LayoutArm.tsx

@@ -5,33 +5,20 @@ import { Navigate, Route, Routes } from 'react-router-dom';
 import Sidebar from '../Sidebar';
 import Orders from '../Orders';
 import Masters from '../Masters';
-import { URLs } from '../../__data__/urls';
 
-const LayoutArm = () => {
+const LayoutArm = () => (
-  let defaultRedirect = null;
+  <Flex h='100vh'>
-
+    <Sidebar />
-  if (URLs.armOrder.isOn) {
+    <Box flex='1' bg='gray.50'>
-    defaultRedirect = URLs.armOrder.url;
+      <Routes>
-  } else if (URLs.armMaster.isOn) {
+        <Route>
-    defaultRedirect = URLs.armMaster.url;
+          <Route index element={<Navigate to='orders' replace />} />
-  }
+          <Route path='orders' element={<Orders />} />
-
+          <Route path='masters' element={<Masters />} />
-  return (
+        </Route>
-    <Flex h='100vh'>
+      </Routes>
-      <Sidebar />
+    </Box>
-      <Box flex='1' bg='gray.50'>
+  </Flex>
-        <Routes>
+);
-          <Route index element={<Navigate to={defaultRedirect} replace />} />
-          {URLs.armOrder.isOn && (
-            <Route path={URLs.armOrder.url} element={<Orders />} />
-          )}
-          {URLs.armMaster.isOn && (
-            <Route path={URLs.armMaster.url} element={<Masters />} />
-          )}
-        </Routes>
-      </Box>
-    </Flex>
-  );
-};
 
 export default LayoutArm;

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -7,18 +7,16 @@ import {
   IconButton,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 const MasterActionsMenu = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
-  });
-
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem>{t('delete')}</MenuItem>
+        <MenuItem>
+          {i18next.t('dry-wash.arm.master.table.actionsMenu.delete')}
+        </MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterDrawer/MasterDrawer.tsx

@@ -12,7 +12,7 @@ import {
   DrawerHeader,
   DrawerOverlay,
 } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 const MasterDrawer = ({ isOpen, onClose }) => {
   const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
@@ -22,44 +22,51 @@ const MasterDrawer = ({ isOpen, onClose }) => {
     onClose();
   };
 
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.drawer',
-  });
-
   return (
     <Drawer isOpen={isOpen} onClose={onClose} size='md'>
       <DrawerOverlay />
       <DrawerContent>
         <DrawerCloseButton />
-        <DrawerHeader>{t('title')}</DrawerHeader>
+        <DrawerHeader>
+          {i18next.t('dry-wash.arm.master.drawer.title')}
+        </DrawerHeader>
         <DrawerBody>
           <FormControl mb='4'>
-            <FormLabel>{t('inputName.label')}</FormLabel>
+            <FormLabel>
+              {i18next.t('dry-wash.arm.master.drawer.inputName.label')}
+            </FormLabel>
             <Input
               value={newMaster.name}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, name: e.target.value })
               }
-              placeholder={t('inputName.placeholder')}
+              placeholder={i18next.t(
+                'dry-wash.arm.master.drawer.inputName.placeholder',
+              )}
             />
           </FormControl>
           <FormControl>
-            <FormLabel> {t('inputPhone.label')}</FormLabel>
+            <FormLabel>
+              {' '}
+              {i18next.t('dry-wash.arm.master.drawer.inputPhone.label')}
+            </FormLabel>
             <Input
               value={newMaster.phone}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, phone: e.target.value })
               }
-              placeholder={t('inputPhone.placeholder')}
+              placeholder={i18next.t(
+                'dry-wash.arm.master.drawer.inputPhone.placeholder',
+              )}
             />
           </FormControl>
         </DrawerBody>
         <DrawerFooter>
           <Button colorScheme='teal' mr={3} onClick={handleSave}>
-            {t('button.save')}
+            {i18next.t('dry-wash.arm.master.drawer.button.save')}
           </Button>
           <Button variant='ghost' onClick={onClose}>
-            {t('button.cancel')}
+            {i18next.t('dry-wash.arm.master.drawer.button.cancel')}
           </Button>
         </DrawerFooter>
       </DrawerContent>

src/components/Masters/Masters.tsx

@@ -11,39 +11,32 @@ import {
   useDisclosure,
   Flex,
 } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 import { mastersData } from '../../mocks';
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
 
-const TABLE_HEADERS = [
+const TABLE_HEADERS = ['name', 'currentJob', 'phone', 'actions'];
-  'name' as const,
-  'currentJob' as const,
-  'phone' as const,
-  'actions' as const,
-];
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
 
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master',
-  });
-
   return (
     <Box p='8'>
       <Flex justifyContent='space-between' alignItems='center' mb='5'>
-        <Heading size='lg'> {t('title')}</Heading>
+        <Heading size='lg'> {i18next.t('dry-wash.arm.master.title')}</Heading>
         <Button colorScheme='green' onClick={onOpen}>
-          + {t('add')}
+          + {i18next.t('dry-wash.arm.master.add')}
         </Button>
       </Flex>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name) => (
-              <Th key={name}>{t(`table.header.${name}`)}</Th>
+              <Th key={name}>
+                {i18next.t(`dry-wash.arm.master.table.header.${name}`)}
+              </Th>
             ))}
           </Tr>
         </Thead>

src/components/OrderItem/OrderItem.tsx

@@ -1,26 +1,8 @@
 import React, { useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
-const statuses = [
+const statuses = ['pending', 'progress', 'working', 'canceled', 'complete'];
-  'pending' as const,
-  'progress' as const,
-  'working' as const,
-  'canceled' as const,
-  'complete' as const,
-];
-
-type GetArrItemType<ArrType> =
-  ArrType extends Array<infer ItemType> ? ItemType : never;
-
-export type OrderProps = {
-  carNumber?: string;
-  washTime?: string;
-  orderDate?: string;
-  status?: GetArrItemType<typeof statuses>;
-  phone?: string;
-  location?: string;
-};
 
 const OrderItem = ({
   carNumber,
@@ -29,11 +11,7 @@ const OrderItem = ({
   status,
   phone,
   location,
-}: OrderProps) => {
+}) => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.order',
-  });
-
   const [statusSelect, setStatus] = useState(status);
 
   return (
@@ -44,12 +22,12 @@ const OrderItem = ({
       <Td>
         <Select
           value={statusSelect}
-          onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
+          onChange={(e) => setStatus(e.target.value)}
-          placeholder={t(`status.placeholder`)}
+          placeholder={i18next.t(`dry-wash.arm.order.status.placeholder`)}
         >
           {statuses.map((status) => (
             <option key={status} value={status}>
-              {t(`status.${status}`)}
+              {i18next.t(`dry-wash.arm.order.status.${status}`)}
             </option>
           ))}
         </Select>

src/components/Orders/Orders.tsx

@@ -1,45 +1,36 @@
-import React from 'react';
 import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import React from 'react';
+import i18next from 'i18next';
 
 import { ordersData } from '../../mocks';
 import OrderItem from '../OrderItem';
-import { OrderProps } from '../OrderItem/OrderItem';
-
 const Orders = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.order',
-  });
-
   const TABLE_HEADERS = [
-    'carNumber' as const,
+    'carNumber',
-    'washingTime' as const,
+    'washingTime',
-    'orderDate' as const,
+    'orderDate',
-    'status' as const,
+    'status',
-    'telephone' as const,
+    'telephone',
-    'location' as const,
+    'location',
   ];
-
   return (
     <Box p='8'>
       <Heading size='lg' mb='5'>
-        {t('title')}
+        {i18next.t('dry-wash.arm.order.title')}
       </Heading>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name, key) => (
-              <Th key={key}>{t(`table.header.${name}`)}</Th>
+              <Th key={key}>
+                {i18next.t(`dry-wash.arm.order.table.header.${name}`)}
+              </Th>
             ))}
           </Tr>
         </Thead>
         <Tbody>
           {ordersData.map((order, index) => (
-            <OrderItem
+            <OrderItem key={index} {...order} />
-              key={index}
-              {...order}
-              status={order.status as OrderProps['status']}
-            />
           ))}
         </Tbody>
       </Table>

src/components/Sidebar/Sidebar.tsx

@@ -1,57 +1,46 @@
-import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
+import { Box, Button, Heading, VStack } from '@chakra-ui/react';
 import React from 'react';
+import { Divider } from '@chakra-ui/react';
+import i18next from 'i18next';
 import { Link } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
 
-import { URLs } from '../../__data__/urls';
+const Sidebar = () => (
+  <Box
+    borderRight='1px solid black'
+    bg='gray.50'
+    color='white'
+    w='250px'
+    p='5'
+    pt='8'
+  >
+    <Heading color='green' size='lg' mb='5'>
+      {i18next.t(`dry-wash.arm.master.sideBar.title`)}
+    </Heading>
 
-const Sidebar = () => {
+    <VStack align='start' spacing='4'>
-  const { t } = useTranslation('~', {
+      <Divider />
-    keyPrefix: 'dry-wash.arm.master.sideBar',
+      <Button
-  });
+        as={Link}
-
+        to='orders'
-  return (
+        w='100%'
-    <Box
+        colorScheme='green'
-      borderRight='1px solid black'
+        variant='ghost'
-      bg='gray.50'
+      >
-      color='white'
+        {i18next.t(`dry-wash.arm.master.sideBar.title.orders`)}
-      w='250px'
+      </Button>
-      p='5'
+      <Divider />
-      pt='8'
+      <Button
-    >
+        as={Link}
-      <Heading color='green' size='lg' mb='5'>
+        to='masters'
-        {t('title')}
+        w='100%'
-      </Heading>
+        colorScheme='green'
-
+        variant='ghost'
-      <VStack align='start' spacing='4'>
+      >
-        <Divider />
+        {i18next.t(`dry-wash.arm.master.sideBar.title.master`)}
-        {URLs.armOrder.isOn && (
+      </Button>
-          <Button
+      <Divider />
-            as={Link}
+    </VStack>
-            to={URLs.armOrder.url}
+  </Box>
-            w='100%'
+);
-            colorScheme='green'
-            variant='ghost'
-          >
-            {t('orders')}
-          </Button>
-        )}
-        <Divider />
-        {URLs.armMaster.isOn && (
-          <Button
-            as={Link}
-            to={URLs.armMaster.url}
-            w='100%'
-            colorScheme='green'
-            variant='ghost'
-          >
-            {t('master')}
-          </Button>
-        )}
-        <Divider />
-      </VStack>
-    </Box>
-  );
-};
 
 export default Sidebar;

src/components/landing/BenefitsSection/BenefitsSection.tsx

@@ -1,52 +1,29 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import {
-  MdEco,
-  MdMiscellaneousServices,
-  MdPlace,
-  MdHandshake,
-} from 'react-icons/md';
 import { Heading, HStack, List, Text, VStack } from '@chakra-ui/react';
 
 import { CtaButton, PageSection } from '../';
 
 import { ListItem } from './ListItem';
+import { BenefitsSectionProps } from './types';
+import { iconsMap } from './helper';
 
-export const BenefitsSection: FC = () => {
+export const BenefitsSection: FC<BenefitsSectionProps> = ({
-  const { t } = useTranslation('~', {
+  data: { heading, description, list } = {},
-    keyPrefix: 'dry-wash.landing.benefits-section',
+}) => {
-  });
+  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
-
-  const listData = [
-    {
-      Icon: MdEco,
-      children: t('list.0'),
-    },
-    {
-      Icon: MdMiscellaneousServices,
-      children: t('list.1'),
-    },
-    {
-      Icon: MdPlace,
-      children: t('list.2'),
-    },
-    {
-      Icon: MdHandshake,
-      children: t('list.3'),
-    },
-  ];
 
   return (
     <PageSection>
       <VStack w='full' spacing={2}>
-        <Heading as='h2'>{t('heading')}</Heading>
+        <Heading as='h2'>{t(heading)}</Heading>
-        <Text>
+        <Text>{t(description)}</Text>
-          {t('description')}
-        </Text>
       </VStack>
       <List display='flex' flexDirection='column' spacing={3}>
-        {listData.map((props, i) => (
+        {list.map((itemKey, i) => (
-          <ListItem key={i} {...props} />
+          <ListItem key={i} Icon={iconsMap[itemKey]}>
+            {t(itemKey)}
+          </ListItem>
         ))}
       </List>
       <HStack w='full' justify='flex-end'>

src/components/landing/BenefitsSection/helper.ts

@@ -0,0 +1,13 @@
+import { IconType } from "react-icons";
+import { MdEco, MdMiscellaneousServices, MdPlace, MdHandshake } from "react-icons/md";
+
+import { ArrElement } from "../../../lib";
+
+import { BenefitsList } from "./types";
+
+export const iconsMap: Record<ArrElement<BenefitsList>, IconType> = {
+  "benefits-section.list.0": MdEco,
+  "benefits-section.list.1": MdMiscellaneousServices,
+  "benefits-section.list.2": MdPlace,
+  "benefits-section.list.3": MdHandshake,
+};

src/components/landing/BenefitsSection/index.ts

@@ -1 +1,2 @@
+export type { BenefitsSectionProps } from './types';
 export { BenefitsSection } from './BenefitsSection';

src/components/landing/BenefitsSection/types.ts

@@ -0,0 +1,14 @@
+export type BenefitsList = [
+  'benefits-section.list.0',
+  'benefits-section.list.1',
+  'benefits-section.list.2',
+  'benefits-section.list.3',
+];
+
+export type BenefitsSectionProps = {
+  data: {
+    heading: 'benefits-section.heading';
+    description: 'benefits-section.description';
+    list: BenefitsList;
+  };
+};

src/components/landing/CtaButton/CtaButton.tsx

@@ -6,7 +6,7 @@ import { ButtonProps, Button } from '@chakra-ui/react';
 import { URLs } from '../../../__data__/urls';
 
 export const CtaButton: FC<ButtonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
     <Button
@@ -15,7 +15,7 @@ export const CtaButton: FC<ButtonProps> = (props) => {
       colorScheme='primary'
       {...props}
     >
-      {t('~:dry-wash.landing.make-order-button')}
+      {t('make-order-button')}
     </Button>
   );
 };

src/components/landing/HeroSection/HeroSection.tsx

@@ -1,22 +1,23 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Box, Heading, Text, Center, VStack, BoxProps } from '@chakra-ui/react';
+import { Box, Heading, Text, Center, VStack } from '@chakra-ui/react';
 
 import { DemoVideoPosterImg } from '../../../assets/images';
 import { CtaButton, SiteLogo, PageSection } from '../';
 
-type HeroSectionProps = Pick<BoxProps, 'flexShrink'>;
+import { HeroSectionProps } from './types';
 
-export const HeroSection: FC<HeroSectionProps> = ({ flexShrink }) => {
+export const HeroSection: FC<HeroSectionProps> = ({
-  const { t } = useTranslation('~', {
+  data: { headline, description, video } = {},
-    keyPrefix: 'dry-wash.landing.hero-section',
+  flexShrink,
-  });
+}) => {
+  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
     <Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
       <Box
         as='video'
-        src={`${__webpack_public_path__}/remote-assets/demo.mp4`}
+        src={`${__webpack_public_path__}/remote-assets/${video}`}
         poster={DemoVideoPosterImg}
         autoPlay
         loop
@@ -47,14 +48,14 @@ export const HeroSection: FC<HeroSectionProps> = ({ flexShrink }) => {
             color='white'
             __css={{ textWrap: 'balance' }}
           >
-            {t('headline')}
+            {t(headline)}
           </Heading>
           <Text
             textAlign='center'
             __css={{ textWrap: 'balance' }}
             color='white'
           >
-            {t('description')}
+            {t(description)}
           </Text>
         </VStack>
         <CtaButton size='lg' />

src/components/landing/HeroSection/types.ts

@@ -0,0 +1,9 @@
+import { BoxProps } from "@chakra-ui/react";
+
+export type HeroSectionProps = {
+  data: {
+    headline: 'hero-section.headline';
+    description: 'hero-section.description';
+    video: string;
+  };
+} & Pick<BoxProps, 'flexShrink'>;

src/components/landing/SiteLogo/SiteLogo.tsx

@@ -7,7 +7,7 @@ import { LogoSvg } from '../../../assets/icons';
 export const SiteLogo: FC = () => {
   const { t } = useTranslation();
 
-  return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
+  return <Image src={LogoSvg} alt={t('dry-wash.landing.site-logo')} w={40} />;
 };
 
 // todo: replace Image by SVG React component

src/components/landing/SocialProofSection/SocialProofSection.tsx

@@ -5,15 +5,16 @@ import { Heading, HStack } from '@chakra-ui/react';
 import { CtaButton, PageSection } from '../';
 
 import { ReviewsSlider } from './ReviewsSlider';
+import { SocialProofSectionProps } from './types';
 
-export const SocialProofSection: FC = () => {
+export const SocialProofSection: FC<SocialProofSectionProps> = ({
-  const { t } = useTranslation('~', {
+  data: { heading } = {},
-    keyPrefix: 'dry-wash.landing.social-proof-section',
+}) => {
-  });
+  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
     <PageSection>
-      <Heading as='h2'>{t('heading')}</Heading>
+      <Heading as='h2'>{t(heading)}</Heading>
       <ReviewsSlider />
       <HStack w='full' justify='flex-end'>
         <CtaButton />

src/components/landing/SocialProofSection/index.ts

@@ -1 +1,2 @@
+export type { SocialProofSectionProps } from './types';
 export { SocialProofSection } from './SocialProofSection';

src/components/landing/SocialProofSection/types.ts

@@ -0,0 +1,5 @@
+export type SocialProofSectionProps = {
+  data: {
+    heading: 'social-proof-section.heading';
+  };
+};

src/lib/index.ts

@@ -0,0 +1 @@
+export * from './types';

src/lib/types.ts

@@ -0,0 +1,41 @@
+/**
+ * @example type Output = ArrElement<['a', 'b', 'c']>;
+ * // "a" | "b" | "c"
+ */
+export type ArrElement<ArrType> = ArrType extends readonly (infer ElementType)[]
+  ? ElementType
+  : never;
+
+/** 
+ * @example type Output = Split<'a.b1' | 'a.b2', '.'>;
+ * // ["a", "b1"] | ["a", "b2"]
+*/
+type Split<S extends string, D extends string> =
+  S extends `${infer A}${D}${infer B}` ? [A, ...Split<B, D>] : [S];
+
+/** 
+ * @example type Output = NestedObject<["a", "b1"] | ["a", "b2"]>;
+ * // { a: { b1: string; }; } | { a: { b2: string; }; }
+*/
+type NestedObject<T extends string[]> =
+  T extends [infer Head, ...infer Tail] ?
+    Head extends string ?
+      { [key in Head]: NestedObject<Tail extends string[] ? Tail : []> } : never :
+    string;
+
+/** 
+ * @example type Output = UnionToIntersection<{ a: { b1: string; }; } | { a: { b2: string; }; }>;
+ * // { a: { b1: string; }; } & { a: { b2: string; }; }
+*/
+type UnionToIntersection<U> =
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+
+/** 
+ * @example type Output = CreateTree<'a.b1' | 'a.b2', '.'>;
+ * // { a: { b1: string; }; } & { a: { b2: string; }; }
+*/
+export type CreateTree<T> =
+  UnionToIntersection<T extends infer U ?
+    U extends string ?
+      NestedObject<Split<U, '.'>> : never : never>;

src/models/i18next.d.ts

@@ -1,24 +1,5 @@
 import defaultLocale from '../../locales/ru.json';
-
+import { CreateTree } from '../lib';
-type Split<S extends string, D extends string> =
-  S extends `${infer A}${D}${infer B}` ? [A, ...Split<B, D>] : [S];
-
-type NestedObject<T extends string[]> =
-  T extends [infer Head, ...infer Tail] ?
-    Head extends string ?
-      { [key in Head]: NestedObject<Tail extends string[] ? Tail : []> } : never :
-    string;
-
-// Основная утилита для обработки union type
-type CreateTree<T> =
-  UnionToIntersection<T extends infer U ?
-    U extends string ?
-      NestedObject<Split<U, '.'>> : never : never>;
-
-// Утилита для объединения типов
-type UnionToIntersection<U> =
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 
 type LanguageResource = CreateTree<keyof typeof defaultLocale>;
 
@@ -26,6 +7,6 @@ declare module "i18next" {
   interface CustomTypeOptions {
     resources: {
       '~': LanguageResource
-    };
+    }
   }
 }

src/models/landing/index.ts

@@ -0,0 +1 @@
+export * from './stubs';

src/models/landing/stubs/index.ts

@@ -0,0 +1 @@
+export { default as LandingSuccessStub } from './success';

src/models/landing/stubs/success.ts

@@ -0,0 +1,27 @@
+// Generated by json-literal-typer
+// <-- BEGIN
+interface HeroXsection {
+  description: "hero-section.description";
+  headline: "hero-section.headline";
+  video: "demo.mp4";
+}
+
+interface Sections {
+  description?: "benefits-section.description";
+  heading: "benefits-section.heading" | "social-proof-section.heading";
+  list?: ("benefits-section.list.0" | "benefits-section.list.1" | "benefits-section.list.2" | "benefits-section.list.3")[];
+  type: "benefits-section" | "social-proof-section";
+}
+
+interface Body {
+  "hero-section": HeroXsection;
+  sections: Sections[];
+}
+
+interface Root {
+  body: Body;
+  success: true;
+}
+// END -->
+
+export default Root;

src/pages/arm/index.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 
 import LayoutArm from '../../components/LayoutArm';
 

src/pages/landing/index.tsx

@@ -8,6 +8,12 @@ import {
   SocialProofSection,
 } from '../../components/landing';
 import { LandingThemeProvider } from '../../containers';
+import { LandingSuccessStub } from '../../models/landing';
+const landingSuccessStub = import(
+  '../../../stubs/json/landing/success.json'
+) as unknown as LandingSuccessStub;
+
+import { isBenefitsSectionData, isSocialProofSectionData } from './types';
 
 const Page: FC = () => {
   return (
@@ -21,10 +27,19 @@ const Page: FC = () => {
         centerContent
       >
         <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
-          <HeroSection flexShrink={0} />
+          <HeroSection
+            data={landingSuccessStub['body']['hero-section']}
+            flexShrink={0}
+          />
           <VStack as='main' flexGrow={1}>
-            <BenefitsSection />
+            {landingSuccessStub.body.sections.map(({ type, ...data }, i) => {
-            <SocialProofSection />
+              if (isBenefitsSectionData(type, data)) {
+                return <BenefitsSection key={i} data={data} />;
+              }
+              if (isSocialProofSectionData(type, data)) {
+                return <SocialProofSection key={i} data={data} />;
+              }
+            })}
           </VStack>
           <Footer />
         </VStack>

src/pages/landing/types.ts

@@ -0,0 +1,15 @@
+import LandingSuccess from "../../../stubs/json/landing/success.json";
+import { BenefitsSectionProps, SocialProofSectionProps } from "../../components/landing";
+import { ArrElement } from "../../lib";
+
+type SectionsItemData = ArrElement<typeof LandingSuccess['body']['sections']>;
+type SectionType = SectionsItemData['type'];
+type SectionData = Omit<SectionsItemData, 'type'>;
+
+export const isBenefitsSectionData = (type: SectionType, data: SectionData): data is BenefitsSectionProps['data'] => {
+  return type === 'benefits-section';
+};
+
+export const isSocialProofSectionData = (type: SectionType, data: SectionData): data is SocialProofSectionProps['data'] => {
+  return type === 'social-proof-section';
+};

src/routes.tsx

@@ -17,9 +17,7 @@ const Routers = () => {
         <Route path={URLs.landing.url} element={<Landing />} />
         <Route path={URLs.orderForm.url} element={<OrderForm />} />
         <Route path={URLs.orderView.url} element={<OrderView />} />
-        {URLs.armBase.isOn && (
+        <Route path='/dry-wash/arm/*' element={<Arm />}></Route>
-          <Route path={URLs.armBase.url} element={<Arm />}></Route>
-        )}
         <Route path='*' element={<NotFound />} />
       </Routes>
     </Suspense>

stubs/json/landing/success.json

@@ -0,0 +1,27 @@
+{
+  "success": true,
+  "body": {
+    "hero-section": {
+      "headline": "hero-section.headline",
+      "description": "hero-section.description",
+      "video": "demo.mp4"
+    },
+    "sections": [
+      {
+        "type": "benefits-section",
+        "heading": "benefits-section.heading",
+        "description": "benefits-section.description",
+        "list": [
+          "benefits-section.list.0",
+          "benefits-section.list.1",
+          "benefits-section.list.2",
+          "benefits-section.list.3"
+        ]
+      },
+      {
+        "type": "social-proof-section",
+        "heading": "social-proof-section.heading"
+      }
+    ]
+  }
+}