diff --git a/src/driven/utils/helpers/globalHelpers.ts b/src/driven/utils/helpers/globalHelpers.ts
index 92fb772..c5b9613 100644
--- a/src/driven/utils/helpers/globalHelpers.ts
+++ b/src/driven/utils/helpers/globalHelpers.ts
@@ -1,7 +1,10 @@
import StateManagementService from '~/driven/boundaries/state-management';
import StorageService from '~/driven/boundaries/storage-boundary';
import { NavigateFunction } from 'react-router-dom';
+import { QrPlace } from '~/business-logic/core/places/common/entity/placeEntity';
+import { ITableRowInfra } from '~/driving/application/core/common/table-row/infra/protocols';
import { appConfig, routes } from '../configs/appConfig';
+import { staticMessages } from '../constants/staticMessages';
import { errorHandlingStateTypes, UIErrorHandling } from './protocols/globalHelpersProtocols';
import { IUserContext } from './contexts/userContext';
@@ -48,3 +51,13 @@ export const navigateToAuth = (userCtx: IUserContext, navigate: NavigateFunction
setUser(null);
navigate(routes.authentication);
};
+
+export const returnPlacesDetailsMessage = (dep: { QrCodeData: QrPlace; rowData: ITableRowInfra['rowData'] }) => {
+ const { QrCodeData, rowData } = dep;
+
+ const placeType = rowData.rowItemsTitle[1];
+ const placeTitle = rowData.rowItemsTitle[0];
+ const isOneTime = !QrCodeData.oneTime ? staticMessages.global.multipleTimes : staticMessages.global.oneTime;
+ const message = `${placeType} ${placeTitle} ${staticMessages.global.and} ${staticMessages.global.canUseFor} ${isOneTime}`;
+ return message;
+};
diff --git a/src/driving/application/core/common/table-row/view/table-row-item/view/RowItem.tsx b/src/driving/application/core/common/table-row/view/table-row-item/view/RowItem.tsx
index d01181f..e02b97e 100644
--- a/src/driving/application/core/common/table-row/view/table-row-item/view/RowItem.tsx
+++ b/src/driving/application/core/common/table-row/view/table-row-item/view/RowItem.tsx
@@ -1,10 +1,10 @@
+/* eslint-disable react/no-unused-prop-types */
/* eslint-disable import/no-extraneous-dependencies */
import React, { useState } from 'react';
import { QrPlace } from '~/business-logic/core/places/common/entity/placeEntity';
import Modal from '~/driven/utils/components/modal/Modal';
import { icons } from '~/driven/utils/constants/assertUrls';
import { QRCodeCanvas } from 'qrcode.react';
-import { staticMessages } from '~/driven/utils/constants/staticMessages';
import { ITableRowInfra } from '../../../infra/protocols';
interface IRowItemProp {
@@ -14,13 +14,13 @@ interface IRowItemProp {
rowData: ITableRowInfra['rowData'];
}
-function QrCodeReader(props: { QrCodeData: QrPlace; rowData: ITableRowInfra['rowData'] }) {
- const { QrCodeData, rowData } = props;
- const placeType = rowData.rowItemsTitle[1];
- const placeTitle = rowData.rowItemsTitle[0];
- const isOneTime = !QrCodeData.oneTime ? staticMessages.global.multipleTimes : staticMessages.global.oneTime;
+const returnQrCodeIdMessage = (dep: { QrCodeData: QrPlace }) => {
+ const { QrCodeData } = dep;
- const message = `${placeType} ${placeTitle} ${staticMessages.global.and} ${staticMessages.global.canUseFor} ${isOneTime}`;
+ return QrCodeData.id;
+};
+function QrCodeReader(props: { QrCodeData: QrPlace; rowData: ITableRowInfra['rowData'] }) {
+ const message = returnQrCodeIdMessage(props);
return ;
}
diff --git a/src/driving/application/core/places-list/index.tsx b/src/driving/application/core/places/places-list/index.tsx
similarity index 100%
rename from src/driving/application/core/places-list/index.tsx
rename to src/driving/application/core/places/places-list/index.tsx
diff --git a/src/driving/application/core/places-list/infra/PlacesList.tsx b/src/driving/application/core/places/places-list/infra/PlacesList.tsx
similarity index 100%
rename from src/driving/application/core/places-list/infra/PlacesList.tsx
rename to src/driving/application/core/places/places-list/infra/PlacesList.tsx
diff --git a/src/driving/application/core/places-list/model/placesListModel.ts b/src/driving/application/core/places/places-list/model/placesListModel.ts
similarity index 100%
rename from src/driving/application/core/places-list/model/placesListModel.ts
rename to src/driving/application/core/places/places-list/model/placesListModel.ts
diff --git a/src/driving/application/core/places-list/model/protocols.ts b/src/driving/application/core/places/places-list/model/protocols.ts
similarity index 100%
rename from src/driving/application/core/places-list/model/protocols.ts
rename to src/driving/application/core/places/places-list/model/protocols.ts
diff --git a/src/driving/application/core/places-list/view/PlacesListView.tsx b/src/driving/application/core/places/places-list/view/PlacesListView.tsx
similarity index 96%
rename from src/driving/application/core/places-list/view/PlacesListView.tsx
rename to src/driving/application/core/places/places-list/view/PlacesListView.tsx
index 16bb9ba..ede5e7c 100644
--- a/src/driving/application/core/places-list/view/PlacesListView.tsx
+++ b/src/driving/application/core/places/places-list/view/PlacesListView.tsx
@@ -1,7 +1,7 @@
import React, { useMemo } from 'react';
import { staticMessages } from '~/driven/utils/constants/staticMessages';
import Loading from '~/driven/utils/components/loading/Loading';
-import TableRow from '../../common/table-row';
+import TableRow from '../../../common/table-row';
import { IPlacesListProps } from './protocols';
export default function PlacesListView(props: IPlacesListProps) {
diff --git a/src/driving/application/core/places-list/view/protocols.ts b/src/driving/application/core/places/places-list/view/protocols.ts
similarity index 100%
rename from src/driving/application/core/places-list/view/protocols.ts
rename to src/driving/application/core/places/places-list/view/protocols.ts
diff --git a/src/driving/application/core/places-list/viewmodel/placesListVM.ts b/src/driving/application/core/places/places-list/viewmodel/placesListVM.ts
similarity index 100%
rename from src/driving/application/core/places-list/viewmodel/placesListVM.ts
rename to src/driving/application/core/places/places-list/viewmodel/placesListVM.ts
diff --git a/src/driving/application/core/places-list/viewmodel/protocols.ts b/src/driving/application/core/places/places-list/viewmodel/protocols.ts
similarity index 100%
rename from src/driving/application/core/places-list/viewmodel/protocols.ts
rename to src/driving/application/core/places/places-list/viewmodel/protocols.ts
diff --git a/src/driving/application/core/create-user/index.tsx b/src/driving/application/core/users/create-user/index.tsx
similarity index 100%
rename from src/driving/application/core/create-user/index.tsx
rename to src/driving/application/core/users/create-user/index.tsx
diff --git a/src/driving/application/core/create-user/infra/CreateUser.tsx b/src/driving/application/core/users/create-user/infra/CreateUser.tsx
similarity index 100%
rename from src/driving/application/core/create-user/infra/CreateUser.tsx
rename to src/driving/application/core/users/create-user/infra/CreateUser.tsx
diff --git a/src/driving/application/core/create-user/model/createUserModel.ts b/src/driving/application/core/users/create-user/model/createUserModel.ts
similarity index 100%
rename from src/driving/application/core/create-user/model/createUserModel.ts
rename to src/driving/application/core/users/create-user/model/createUserModel.ts
diff --git a/src/driving/application/core/create-user/view/CreateUserView.tsx b/src/driving/application/core/users/create-user/view/CreateUserView.tsx
similarity index 100%
rename from src/driving/application/core/create-user/view/CreateUserView.tsx
rename to src/driving/application/core/users/create-user/view/CreateUserView.tsx
diff --git a/src/driving/application/core/create-user/view/protocols.ts b/src/driving/application/core/users/create-user/view/protocols.ts
similarity index 100%
rename from src/driving/application/core/create-user/view/protocols.ts
rename to src/driving/application/core/users/create-user/view/protocols.ts
diff --git a/src/driving/application/core/create-user/viewmodel/CreateUserVM.ts b/src/driving/application/core/users/create-user/viewmodel/CreateUserVM.ts
similarity index 100%
rename from src/driving/application/core/create-user/viewmodel/CreateUserVM.ts
rename to src/driving/application/core/users/create-user/viewmodel/CreateUserVM.ts
diff --git a/src/driving/application/core/create-user/viewmodel/protocols.ts b/src/driving/application/core/users/create-user/viewmodel/protocols.ts
similarity index 100%
rename from src/driving/application/core/create-user/viewmodel/protocols.ts
rename to src/driving/application/core/users/create-user/viewmodel/protocols.ts
diff --git a/src/driving/application/core/users-list/index.tsx b/src/driving/application/core/users/users-list/index.tsx
similarity index 100%
rename from src/driving/application/core/users-list/index.tsx
rename to src/driving/application/core/users/users-list/index.tsx
diff --git a/src/driving/application/core/users-list/infra/UsersList.tsx b/src/driving/application/core/users/users-list/infra/UsersList.tsx
similarity index 100%
rename from src/driving/application/core/users-list/infra/UsersList.tsx
rename to src/driving/application/core/users/users-list/infra/UsersList.tsx
diff --git a/src/driving/application/core/users-list/model/protocols.ts b/src/driving/application/core/users/users-list/model/protocols.ts
similarity index 100%
rename from src/driving/application/core/users-list/model/protocols.ts
rename to src/driving/application/core/users/users-list/model/protocols.ts
diff --git a/src/driving/application/core/users-list/model/usersListModel.ts b/src/driving/application/core/users/users-list/model/usersListModel.ts
similarity index 100%
rename from src/driving/application/core/users-list/model/usersListModel.ts
rename to src/driving/application/core/users/users-list/model/usersListModel.ts
diff --git a/src/driving/application/core/users-list/view/UsersListView.tsx b/src/driving/application/core/users/users-list/view/UsersListView.tsx
similarity index 97%
rename from src/driving/application/core/users-list/view/UsersListView.tsx
rename to src/driving/application/core/users/users-list/view/UsersListView.tsx
index 18ef379..33f3338 100644
--- a/src/driving/application/core/users-list/view/UsersListView.tsx
+++ b/src/driving/application/core/users/users-list/view/UsersListView.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
import { staticMessages } from '~/driven/utils/constants/staticMessages';
import Users from '~/business-logic/core/users/common/entity/entity';
import Loading from '~/driven/utils/components/loading/Loading';
-import TableRow from '../../common/table-row';
+import TableRow from '../../../common/table-row';
import { IUserListProps } from './protocols';
export default function UsersListView(props: IUserListProps) {
diff --git a/src/driving/application/core/users-list/view/protocols.ts b/src/driving/application/core/users/users-list/view/protocols.ts
similarity index 100%
rename from src/driving/application/core/users-list/view/protocols.ts
rename to src/driving/application/core/users/users-list/view/protocols.ts
diff --git a/src/driving/application/core/users-list/viewmodel/protocols.ts b/src/driving/application/core/users/users-list/viewmodel/protocols.ts
similarity index 100%
rename from src/driving/application/core/users-list/viewmodel/protocols.ts
rename to src/driving/application/core/users/users-list/viewmodel/protocols.ts
diff --git a/src/driving/application/core/users-list/viewmodel/usersListVM.ts b/src/driving/application/core/users/users-list/viewmodel/usersListVM.ts
similarity index 100%
rename from src/driving/application/core/users-list/viewmodel/usersListVM.ts
rename to src/driving/application/core/users/users-list/viewmodel/usersListVM.ts
diff --git a/src/driving/main/pages/CreateUser.tsx b/src/driving/main/pages/CreateUser.tsx
index a984828..435d5ab 100644
--- a/src/driving/main/pages/CreateUser.tsx
+++ b/src/driving/main/pages/CreateUser.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import PageTitle from '~/driven/utils/components/page-title/pageTitle';
import { staticMessages } from '~/driven/utils/constants/staticMessages';
-import CreateUser from '~/driving/application/core/create-user';
+import CreateUser from '~/driving/application/core/users/create-user';
export default function CreateUserPage() {
return (
diff --git a/src/driving/main/pages/index.tsx b/src/driving/main/pages/index.tsx
index f2edfca..5261730 100644
--- a/src/driving/main/pages/index.tsx
+++ b/src/driving/main/pages/index.tsx
@@ -8,8 +8,8 @@ import PageTitle from '~/driven/utils/components/page-title/pageTitle';
import { apiUrls } from '~/driven/utils/configs/appConfig';
import { staticMessages } from '~/driven/utils/constants/staticMessages';
import useGetNavigatorAndTokenUpdater from '~/driven/utils/helpers/hooks/getNavigatorAndAccessTokenUpdator';
-import PlacesList from '~/driving/application/core/places-list';
-import UsersList from '~/driving/application/core/users-list';
+import PlacesList from '~/driving/application/core/places/places-list';
+import UsersList from '~/driving/application/core/users/users-list';
export default function index() {
const [selectedUserRowId, setSelectedUserRowId] = useState('');