bro.config.js

@@ -12,8 +12,8 @@ module.exports = {
   /* use https://admin.bro-js.ru/ to create config, navigations and features */
   navigations: {
     'dry-wash.main': '/dry-wash',
-    'dry-wash.create': '/order',
-    'dry-wash.view.order': '/order/:orderId',
+    'dry-wash.order.create': '/order',
+    'dry-wash.order.view': '/order/:orderId',
     'dry-wash.arm.master': 'master',
     'dry-wash.arm.order': 'order',
     'dry-wash.arm': '/arm/*',

src/__data__/urls.ts

@@ -1,7 +1,7 @@
 import { generatePath } from 'react-router-dom';
 import { getNavigationValue } from '@brojs/cli';
 
-import { Order } from '../models';
+import { Order } from '../models/landing';
 
 const getFullUrls = (url: string) =>
   `${getNavigationValue('dry-wash.main')}${url}`;
@@ -13,14 +13,14 @@ export const URLs = {
       return this.url;
     },
   },
-  orderForm: {
-    url: getNavigationValue('dry-wash.create'),
+  orderCreate: {
+    url: getFullUrls(getNavigationValue('dry-wash.order.create')),
     getUrl() {
       return this.url;
     },
   },
   orderView: {
-    url: getNavigationValue('dry-wash.view.order'),
+    url: getFullUrls(getNavigationValue('dry-wash.order.view')),
     getUrl(orderId: Order.Id) {
       return generatePath(this.url, { orderId });
     },

src/components/landing/CtaButton/CtaButton.tsx

@@ -11,7 +11,7 @@ export const CtaButton: FC<ButtonProps> = (props) => {
   return (
     <Button
       as={RouterLink}
-      to={URLs.orderForm.getUrl()}
+      to={URLs.orderCreate.getUrl()}
       colorScheme='primary'
       {...props}
     >

src/routes.tsx

@@ -7,16 +7,18 @@ import { URLs } from './__data__/urls';
 import NotFound from './pages/notFound/notFound';
 
 const Landing = lazy(() => import('./pages/landing'));
-const OrderForm = lazy(() => import('./pages/order-form'));
+const OrderCreate = lazy(() => import('./pages/order-create'));
 const OrderView = lazy(() => import('./pages/order-view'));
 
 const Routers = () => {
   return (
     <Suspense fallback={<PageSpinner />}>
       <Routes>
-        <Route path={URLs.landing.url} element={<Landing />} />
-        <Route path={URLs.orderForm.url} element={<OrderForm />} />
-        <Route path={URLs.orderView.url} element={<OrderView />} />
+        <Route path={URLs.landing.url}>
+          <Route index element={<Landing />} />
+          <Route path={URLs.orderCreate.url} element={<OrderCreate />} />
+          <Route path={URLs.orderView.url} element={<OrderView />} />
+        </Route>
         {URLs.armBase.isOn && (
           <Route path={URLs.armBase.url} element={<Arm />}></Route>
         )}