feat: separation of imports (#25)

Reviewed-on: #39
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>

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,17 +11,19 @@ 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": "/arm",
+    'dry-wash.arm.master': '/master',
+    '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',
   },
 };

eslint.config.mjs

@@ -3,6 +3,7 @@ import pluginJs from "@eslint/js";
 import tseslint from "typescript-eslint";
 import pluginReact from "eslint-plugin-react";
 import stylistic from '@stylistic/eslint-plugin';
+import pluginImport from 'eslint-plugin-import';
 
 export default [
   { files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
@@ -12,7 +13,8 @@ export default [
   pluginReact.configs.flat.recommended,
   {
     plugins: {
-      '@stylistic': stylistic
+      '@stylistic': stylistic,
+      'import': pluginImport,
     },
     "rules": {
       "no-unused-vars": "off",
@@ -24,13 +26,20 @@ export default [
           "caughtErrorsIgnorePattern": "^_"
         }
       ],
-      "sort-imports": ["error", {
+      "sort-imports": ["off"],
-        "ignoreCase": false,
+      "import/order": [
-        "ignoreDeclarationSort": true,
+        "error",
-        "ignoreMemberSort": true,
+        {
-        "memberSyntaxSortOrder": ["none", "all", "multiple", "single"],
+          "groups": [
-        "allowSeparatedGroups": true
+            "builtin",
-      }],
+            "external",
+            "internal",
+            "parent",
+            ["sibling", "index"]
+          ],
+          "newlines-between": "always",
+        }
+      ],
       semi: ["error", "always"],
       '@stylistic/indent': ['error', 2],
       'react/prop-types': 'off'

locales/en.json

@@ -13,5 +13,41 @@
   "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.master": "Мастера",
   "dry-wash.arm.master.sideBar.title": "Сухой мастер",
-  "dry-wash.arm.master.sideBar.title.master": "Мастера",
-  "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": "Экологически безопасные продукты",

package-lock.json

@@ -31,6 +31,7 @@
                 "@stylistic/eslint-plugin": "^2.10.1",
                 "@types/react-dom": "^18.3.1",
                 "eslint": "^9.14.0",
+                "eslint-plugin-import": "^2.31.0",
                 "eslint-plugin-react": "^7.37.2",
                 "globals": "^15.11.0",
                 "prettier": "3.3.3",
@@ -3617,6 +3618,13 @@
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/@rtsao/scc": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+            "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@stylistic/eslint-plugin": {
             "version": "2.10.1",
             "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.10.1.tgz",
@@ -3700,6 +3708,13 @@
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
             "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
         },
+        "node_modules/@types/json5": {
+            "version": "0.0.29",
+            "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+            "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/lodash": {
             "version": "4.17.13",
             "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
@@ -3791,16 +3806,17 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.12.2",
+            "version": "8.14.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.14.0.tgz",
-            "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+            "integrity": "sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==",
             "dev": true,
             "license": "BSD-2-Clause",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/scope-manager": "8.14.0",
-                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/types": "8.14.0",
-                "@typescript-eslint/typescript-estree": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.14.0",
-                "@typescript-eslint/visitor-keys": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.14.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -3819,6 +3835,117 @@
                 }
             }
         },
+        "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.14.0.tgz",
+            "integrity": "sha512-aBbBrnW9ARIDn92Zbo7rguLnqQ/pOrUguVpbUwzOhkFg2npFDwTgPGqFqE0H5feXcOoJOfX3SxlJaKEVtq54dw==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@typescript-eslint/types": "8.14.0",
+                "@typescript-eslint/visitor-keys": "8.14.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.14.0.tgz",
+            "integrity": "sha512-yjeB9fnO/opvLJFAsPNYlKPnEM8+z4og09Pk504dkqonT02AyL5Z9SSqlE0XqezS93v6CXn49VHvB2G7XSsl0g==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.14.0.tgz",
+            "integrity": "sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "peer": true,
+            "dependencies": {
+                "@typescript-eslint/types": "8.14.0",
+                "@typescript-eslint/visitor-keys": "8.14.0",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.14.0.tgz",
+            "integrity": "sha512-vG0XZo8AdTH9OE6VFRwAZldNc7qtJ/6NLGWak+BtENuEUXGZgFpihILPiBvKXvJ2nFu27XNGC6rKiwuaoMbYzQ==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@typescript-eslint/types": "8.14.0",
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "peer": true,
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/parser/node_modules/semver": {
+            "version": "7.6.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+            "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+            "dev": true,
+            "license": "ISC",
+            "peer": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/@typescript-eslint/scope-manager": {
             "version": "8.12.2",
             "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
@@ -4377,6 +4504,27 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/array.prototype.findlastindex": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+            "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.2",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.0.0",
+                "es-shim-unscopables": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/array.prototype.flat": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
@@ -5680,6 +5828,124 @@
                 }
             }
         },
+        "node_modules/eslint-import-resolver-node": {
+            "version": "0.3.9",
+            "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+            "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^3.2.7",
+                "is-core-module": "^2.13.0",
+                "resolve": "^1.22.4"
+            }
+        },
+        "node_modules/eslint-import-resolver-node/node_modules/debug": {
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.1"
+            }
+        },
+        "node_modules/eslint-module-utils": {
+            "version": "2.12.0",
+            "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+            "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^3.2.7"
+            },
+            "engines": {
+                "node": ">=4"
+            },
+            "peerDependenciesMeta": {
+                "eslint": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-module-utils/node_modules/debug": {
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.1"
+            }
+        },
+        "node_modules/eslint-plugin-import": {
+            "version": "2.31.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+            "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@rtsao/scc": "^1.1.0",
+                "array-includes": "^3.1.8",
+                "array.prototype.findlastindex": "^1.2.5",
+                "array.prototype.flat": "^1.3.2",
+                "array.prototype.flatmap": "^1.3.2",
+                "debug": "^3.2.7",
+                "doctrine": "^2.1.0",
+                "eslint-import-resolver-node": "^0.3.9",
+                "eslint-module-utils": "^2.12.0",
+                "hasown": "^2.0.2",
+                "is-core-module": "^2.15.1",
+                "is-glob": "^4.0.3",
+                "minimatch": "^3.1.2",
+                "object.fromentries": "^2.0.8",
+                "object.groupby": "^1.0.3",
+                "object.values": "^1.2.0",
+                "semver": "^6.3.1",
+                "string.prototype.trimend": "^1.0.8",
+                "tsconfig-paths": "^3.15.0"
+            },
+            "engines": {
+                "node": ">=4"
+            },
+            "peerDependencies": {
+                "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+            }
+        },
+        "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/eslint-plugin-import/node_modules/debug": {
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.1"
+            }
+        },
+        "node_modules/eslint-plugin-import/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/eslint-plugin-react": {
             "version": "7.37.2",
             "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz",
@@ -8351,6 +8617,21 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/object.groupby": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+            "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/object.values": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
@@ -10148,6 +10429,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/strip-bom": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+            "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/strip-json-comments": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -10413,6 +10704,32 @@
                 "typescript": ">=4.2.0"
             }
         },
+        "node_modules/tsconfig-paths": {
+            "version": "3.15.0",
+            "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+            "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json5": "^0.0.29",
+                "json5": "^1.0.2",
+                "minimist": "^1.2.6",
+                "strip-bom": "^3.0.0"
+            }
+        },
+        "node_modules/tsconfig-paths/node_modules/json5": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+            "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.0"
+            },
+            "bin": {
+                "json5": "lib/cli.js"
+            }
+        },
         "node_modules/tslib": {
             "version": "2.8.0",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
@@ -10572,6 +10889,35 @@
                 }
             }
         },
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+            "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/uglify-js": {
             "version": "3.19.3",
             "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",

package.json

@@ -39,6 +39,7 @@
         "@stylistic/eslint-plugin": "^2.10.1",
         "@types/react-dom": "^18.3.1",
         "eslint": "^9.14.0",
+        "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.2",
         "globals": "^15.11.0",
         "prettier": "3.3.3",

src/__data__/urls.ts

@@ -1,24 +1,40 @@
-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/app.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
-import Routers from './routes';
 import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
+
+import Routers from './routes';
 import ErrorBoundary from './components/ErrorBoundary';
 
 const App = () => {

src/components/ErrorBoundary/ErrorBoundary.tsx

@@ -34,15 +34,16 @@ 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'
@@ -50,7 +51,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

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

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -7,16 +7,18 @@ import {
   IconButton,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
-import i18next from 'i18next';
+import { useTranslation } from 'react-i18next';
 
 const MasterActionsMenu = () => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
+  });
+
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem>
+        <MenuItem>{t('delete')}</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 i18next from 'i18next';
+import { useTranslation } from 'react-i18next';
 
 const MasterDrawer = ({ isOpen, onClose }) => {
   const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
@@ -22,51 +22,44 @@ 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>
+        <DrawerHeader>{t('title')}</DrawerHeader>
-          {i18next.t('dry-wash.arm.master.drawer.title')}
-        </DrawerHeader>
         <DrawerBody>
           <FormControl mb='4'>
-            <FormLabel>
+            <FormLabel>{t('inputName.label')}</FormLabel>
-              {i18next.t('dry-wash.arm.master.drawer.inputName.label')}
-            </FormLabel>
             <Input
               value={newMaster.name}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, name: e.target.value })
               }
-              placeholder={i18next.t(
+              placeholder={t('inputName.placeholder')}
-                'dry-wash.arm.master.drawer.inputName.placeholder',
-              )}
             />
           </FormControl>
           <FormControl>
-            <FormLabel>
+            <FormLabel> {t('inputPhone.label')}</FormLabel>
-              {' '}
-              {i18next.t('dry-wash.arm.master.drawer.inputPhone.label')}
-            </FormLabel>
             <Input
               value={newMaster.phone}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, phone: e.target.value })
               }
-              placeholder={i18next.t(
+              placeholder={t('inputPhone.placeholder')}
-                'dry-wash.arm.master.drawer.inputPhone.placeholder',
-              )}
             />
           </FormControl>
         </DrawerBody>
         <DrawerFooter>
           <Button colorScheme='teal' mr={3} onClick={handleSave}>
-            {i18next.t('dry-wash.arm.master.drawer.button.save')}
+            {t('button.save')}
           </Button>
           <Button variant='ghost' onClick={onClose}>
-            {i18next.t('dry-wash.arm.master.drawer.button.cancel')}
+            {t('button.cancel')}
           </Button>
         </DrawerFooter>
       </DrawerContent>

src/components/MasterItem/MasterItem.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
+
 import MasterActionsMenu from '../MasterActionsMenu';
 
 const MasterItem = ({ name, schedule, phone }) => {

src/components/Masters/Masters.tsx

@@ -11,31 +11,39 @@ import {
   useDisclosure,
   Flex,
 } from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
+
 import { mastersData } from '../../mocks';
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import i18next from 'i18next';
 
-const TABLE_HEADERS = ['name', 'currentJob', 'phone', 'actions'];
+const TABLE_HEADERS = [
+  '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'> {i18next.t('dry-wash.arm.master.title')}</Heading>
+        <Heading size='lg'> {t('title')}</Heading>
         <Button colorScheme='green' onClick={onOpen}>
-          + {i18next.t('dry-wash.arm.master.add')}
+          + {t('add')}
         </Button>
       </Flex>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name) => (
-              <Th key={name}>
+              <Th key={name}>{t(`table.header.${name}`)}</Th>
-                {i18next.t(`dry-wash.arm.master.table.header.${name}`)}
-              </Th>
             ))}
           </Tr>
         </Thead>

src/components/OrderItem/OrderItem.tsx

@@ -1,8 +1,26 @@
 import React, { useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
-import i18next from 'i18next';
+import { useTranslation } from 'react-i18next';
 
-const statuses = ['pending', 'progress', 'working', 'canceled', 'complete'];
+const statuses = [
+  '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,
@@ -11,7 +29,11 @@ const OrderItem = ({
   status,
   phone,
   location,
-}) => {
+}: OrderProps) => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.order',
+  });
+
   const [statusSelect, setStatus] = useState(status);
 
   return (
@@ -22,12 +44,12 @@ const OrderItem = ({
       <Td>
         <Select
           value={statusSelect}
-          onChange={(e) => setStatus(e.target.value)}
+          onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
-          placeholder={i18next.t(`dry-wash.arm.order.status.placeholder`)}
+          placeholder={t(`status.placeholder`)}
         >
           {statuses.map((status) => (
             <option key={status} value={status}>
-              {i18next.t(`dry-wash.arm.order.status.${status}`)}
+              {t(`status.${status}`)}
             </option>
           ))}
         </Select>

src/components/Orders/Orders.tsx

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

src/components/Sidebar/Sidebar.tsx

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

src/components/landing/BenefitsSection/BenefitsSection.tsx

@@ -7,7 +7,9 @@ import {
   MdHandshake,
 } from 'react-icons/md';
 import { Heading, HStack, List, Text, VStack } from '@chakra-ui/react';
+
 import { CtaButton, PageSection } from '../';
+
 import { ListItem } from './ListItem';
 
 export const BenefitsSection: FC = () => {

src/components/landing/CtaButton/CtaButton.tsx

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

src/components/landing/Footer/Footer.tsx

@@ -2,7 +2,9 @@ import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, List, ListItem } from '@chakra-ui/react';
 import { Link as RouterLink } from 'react-router-dom';
+
 import { SiteLogo, PageSection } from '../';
+
 import { Copyright } from './Copyright';
 
 export const Footer: FC = () => {

src/components/landing/HeroSection/HeroSection.tsx

@@ -1,6 +1,7 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Box, Heading, Text, Center, VStack, BoxProps } from '@chakra-ui/react';
+
 import { DemoVideoPosterImg } from '../../../assets/images';
 import { CtaButton, SiteLogo, PageSection } from '../';
 

src/components/landing/SiteLogo/SiteLogo.tsx

@@ -1,12 +1,13 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Image } from '@chakra-ui/react';
+
 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/ReviewsSlider/ReviewsSlider.tsx

@@ -8,8 +8,10 @@ import {
   Tabs,
   Text,
 } from '@chakra-ui/react';
+
 import { mockReview } from '../../../../mocks/landing';
 import { Review } from '../../../../models';
+
 import { ReviewCard } from './ReviewCard';
 
 const SLIDE_CHANGE_INTERVAL = 5000;

src/components/landing/SocialProofSection/SocialProofSection.tsx

@@ -1,7 +1,9 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Heading, HStack } from '@chakra-ui/react';
+
 import { CtaButton, PageSection } from '../';
+
 import { ReviewsSlider } from './ReviewsSlider';
 
 export const SocialProofSection: FC = () => {

src/containers/LandingThemeProvider/LandingThemeProvider.tsx

@@ -1,5 +1,6 @@
 import React, { FC, PropsWithChildren } from 'react';
 import { ChakraProvider } from '@chakra-ui/react';
+
 import { default as landingTheme } from './theme-config';
 import Fonts from './Fonts';
 

src/index.tsx

@@ -2,9 +2,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { i18nextReactInitConfig } from '@brojs/cli';
-import App from './app';
 import i18next from 'i18next';
 
+import App from './app';
+
 i18next.t = i18next.t.bind(i18next);
 const i18nextPromise = i18nextReactInitConfig(i18next);
 export default () => <App />;

src/pages/arm/index.tsx

@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import React from 'react';
+
 import LayoutArm from '../../components/LayoutArm';
 
 const Page = () => {

src/pages/landing/index.tsx

@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
 import { Container, VStack } from '@chakra-ui/react';
+
 import {
   BenefitsSection,
   Footer,

src/pages/notFound/notFound.tsx

@@ -2,9 +2,10 @@ import React from 'react';
 import { Text, Button, Center, VStack, Heading } from '@chakra-ui/react';
 import { Link } from 'react-router-dom';
 import { Player } from '@lottiefiles/react-lottie-player';
-import animate from '../../assets/animation/notFound.json';
 import i18next from 'i18next';
 
+import animate from '../../assets/animation/notFound.json';
+
 const NotFound = () => {
   return (
     <Center minH='100vh'>

src/pages/order-form/index.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import { Button } from '@chakra-ui/react';
+
 import { URLs } from '../../__data__/urls';
 import { mockOrder } from '../../mocks/landing';
 

src/routes.tsx

@@ -1,5 +1,6 @@
 import React, { lazy, Suspense } from 'react';
 import { Routes, Route } from 'react-router-dom';
+
 import { PageSpinner } from './components';
 import Arm from './pages/arm';
 import { URLs } from './__data__/urls';
@@ -16,7 +17,9 @@ const Routers = () => {
         <Route path={URLs.landing.url} element={<Landing />} />
         <Route path={URLs.orderForm.url} element={<OrderForm />} />
         <Route path={URLs.orderView.url} element={<OrderView />} />
-        <Route path='/dry-wash/arm/*' element={<Arm />}></Route>
+        {URLs.armBase.isOn && (
+          <Route path={URLs.armBase.url} element={<Arm />}></Route>
+        )}
         <Route path='*' element={<NotFound />} />
       </Routes>
     </Suspense>