diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..8ace1e0f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "src/lib"] + path = src/lib + url = git@github.com:bitia-ru/gekkon-js-lib.git + branch = a8297271305cb3381ea925dacbded5b147e5790a diff --git a/src/lib b/src/lib new file mode 160000 index 00000000..a8297271 --- /dev/null +++ b/src/lib @@ -0,0 +1 @@ +Subproject commit a8297271305cb3381ea925dacbded5b147e5790a diff --git a/src/v1/components/RouteCard/RouteCard.js b/src/v1/components/RouteCard/RouteCard.js index 2e46e5f3..e2943748 100644 --- a/src/v1/components/RouteCard/RouteCard.js +++ b/src/v1/components/RouteCard/RouteCard.js @@ -11,6 +11,7 @@ import RouteContext from '../../contexts/RouteContext'; import { avail, notAvail } from '../../utils'; import getArrayFromObject from '../../utils/getArrayFromObject'; import './RouteCard.css'; +import { routeCategoryToString } from '@/lib/routeHelpers'; class RouteCard extends Component { constructor(props) { @@ -105,7 +106,7 @@ class RouteCard extends Component { ) } -
{route.category}
+
{routeCategoryToString(route)}
diff --git a/src/v1/components/RouteDataTable/RouteDataTable.js b/src/v1/components/RouteDataTable/RouteDataTable.js index 531ddc3d..70898199 100644 --- a/src/v1/components/RouteDataTable/RouteDataTable.js +++ b/src/v1/components/RouteDataTable/RouteDataTable.js @@ -7,6 +7,7 @@ import { GetUserName } from '../../Constants/User'; import { ROUTE_KINDS } from '../../Constants/Route'; import RouteColorPicker from '@/v2/components/RouteColorPicker/RouteColorPicker'; import './RouteDataTable.css'; +import { routeCategoryToString } from '@/lib/routeHelpers'; const RouteDataTable = ({ user, route, @@ -29,7 +30,9 @@ const RouteDataTable = ({ Категория:
-
{route.category}
+
+ {routeCategoryToString(route)} +
{ const isCurrentUserRoute = user && route.author_id === user.id; @@ -30,7 +31,7 @@ const RouteRow = ({ onRouteClick, route, user }) => { {route.number ? `№${route.number}` : `#${route.id}`}
{route.name}
-
{route.category}
+
{routeCategoryToString(route)}
diff --git a/src/v1/components/Scheme/Scheme.js b/src/v1/components/Scheme/Scheme.js index 66dce518..632de0d2 100644 --- a/src/v1/components/Scheme/Scheme.js +++ b/src/v1/components/Scheme/Scheme.js @@ -8,6 +8,7 @@ import { HIDE_DELAY } from '../../Constants/Scheme'; import SchemePointer from '../SchemePointer/SchemePointer'; import SectorContext from '../../contexts/SectorContext'; import './Scheme.css'; +import { routeCategoryToString } from '@/lib/routeHelpers'; class Scheme extends Component { constructor(props) { @@ -86,7 +87,7 @@ class Scheme extends Component { ? onStartMoving : null } - category={route.category} + category={routeCategoryToString(route)} transparent={!R.contains(route.id, currentRoutes)} color={ route.holds_color === null ? undefined : route.holds_color.color diff --git a/src/v2/components/RouteCard/RouteCard.js b/src/v2/components/RouteCard/RouteCard.js index 7f8aa2e5..3f632c4e 100644 --- a/src/v2/components/RouteCard/RouteCard.js +++ b/src/v2/components/RouteCard/RouteCard.js @@ -9,6 +9,7 @@ import { timeFromNow } from '@/v1/Constants/DateTimeFormatter'; import RouteContext from '@/v1/contexts/RouteContext'; import { css } from '../../aphrodite'; import styles from './styles'; +import { routeCategoryToString } from '@/lib/routeHelpers'; class RouteCard extends Component { @@ -105,7 +106,7 @@ class RouteCard extends Component { className={css(styles.routeCardCategory)} style={{ borderColor: route.marks_color?.color || 'rgba(0, 0, 0, 0)' }} > - {route.category} + {routeCategoryToString(route)}
{ route.holds_color && ( diff --git a/src/v2/components/RouteDataEditableTable/RouteDataEditableTable.js b/src/v2/components/RouteDataEditableTable/RouteDataEditableTable.js index 1e2f00f4..63a640c3 100644 --- a/src/v2/components/RouteDataEditableTable/RouteDataEditableTable.js +++ b/src/v2/components/RouteDataEditableTable/RouteDataEditableTable.js @@ -13,6 +13,7 @@ import DatePicker from '@/v1/components/DatePicker/DatePicker'; import RouteContext from '@/v1/contexts/RouteContext'; import { css } from '@/v2/aphrodite'; import styles from './styles'; +import { routeCategoryToString } from '@/lib/routeHelpers'; class RouteDataEditableTable extends Component { constructor(props) { @@ -76,7 +77,7 @@ class RouteDataEditableTable extends Component { onClick={() => this.setState({ showSlider: !showSlider })} >
- {route.category} + {routeCategoryToString(route)}
-
{route.category}
+
+ {routeCategoryToString(route)} +
{