diff --git a/.eslintrc.json b/.eslintrc.json index 948d1e3..056c534 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -66,11 +66,11 @@ ], "prettier/prettier": [ "error", - {}, { "usePrettierrc": true, - "endOfLine": "auto" - } + "singleQuote": true + }, + {} ], "jest/valid-title": "off", "react/button-has-type": "off", diff --git a/setupTests.ts b/setupTests.ts index d0de870..7b0828b 100644 --- a/setupTests.ts +++ b/setupTests.ts @@ -1 +1 @@ -import "@testing-library/jest-dom"; +import '@testing-library/jest-dom'; diff --git a/src/business-logic/core/places/common/model/placesModel.ts b/src/business-logic/core/places/common/model/placesModel.ts index 8c19d54..9b73779 100644 --- a/src/business-logic/core/places/common/model/placesModel.ts +++ b/src/business-logic/core/places/common/model/placesModel.ts @@ -1,9 +1,9 @@ -import Places from "../entity/placeEntity"; +import Places from '../entity/placeEntity'; class PlacesModel { private placesList: Places[]; - private modelTitle = "places"; + private modelTitle = 'places'; constructor(data: Places[]) { this.placesList = data; diff --git a/src/business-logic/core/places/get-places/data/repository/GetPlacesRepo.ts b/src/business-logic/core/places/get-places/data/repository/GetPlacesRepo.ts index 1da8697..dd35037 100644 --- a/src/business-logic/core/places/get-places/data/repository/GetPlacesRepo.ts +++ b/src/business-logic/core/places/get-places/data/repository/GetPlacesRepo.ts @@ -1,6 +1,6 @@ -import PlacesModel from "../../../common/model/placesModel"; -import getPlacesRO from "../response-object/getPlacesRO"; -import { GetPlacesResponse } from "../response-object/protocols"; +import PlacesModel from '../../../common/model/placesModel'; +import getPlacesRO from '../response-object/getPlacesRO'; +import { GetPlacesResponse } from '../response-object/protocols'; const getPlacesRepo = async (httpHandler: () => Promise) => { // call httpHandler diff --git a/src/business-logic/core/places/get-places/data/repository/IGetPlacesRepo.ts b/src/business-logic/core/places/get-places/data/repository/IGetPlacesRepo.ts index 85a02b5..86d6e71 100644 --- a/src/business-logic/core/places/get-places/data/repository/IGetPlacesRepo.ts +++ b/src/business-logic/core/places/get-places/data/repository/IGetPlacesRepo.ts @@ -1,4 +1,4 @@ -import PlacesModel from "../../../common/model/placesModel"; +import PlacesModel from '../../../common/model/placesModel'; type IGetPlacesRepo = () => Promise; diff --git a/src/business-logic/core/places/get-places/data/response-object/getPlacesRO.ts b/src/business-logic/core/places/get-places/data/response-object/getPlacesRO.ts index 8e05296..1b63fe6 100644 --- a/src/business-logic/core/places/get-places/data/response-object/getPlacesRO.ts +++ b/src/business-logic/core/places/get-places/data/response-object/getPlacesRO.ts @@ -1,5 +1,5 @@ /* eslint-disable no-underscore-dangle */ -import { GetPlacesRO, GetPlacesResponse } from "./protocols"; +import { GetPlacesRO, GetPlacesResponse } from './protocols'; const getPlacesRO = (placesResponse: GetPlacesResponse): GetPlacesRO => { return placesResponse.map((placeResponse) => { diff --git a/src/business-logic/core/places/get-places/data/response-object/protocols.ts b/src/business-logic/core/places/get-places/data/response-object/protocols.ts index f7d4565..7455c7c 100644 --- a/src/business-logic/core/places/get-places/data/response-object/protocols.ts +++ b/src/business-logic/core/places/get-places/data/response-object/protocols.ts @@ -1,4 +1,4 @@ -import Places from "../../../common/entity/placeEntity"; +import Places from '../../../common/entity/placeEntity'; export type GetPlacesResponse = { _id: string; diff --git a/src/business-logic/core/places/get-places/index.ts b/src/business-logic/core/places/get-places/index.ts index d654006..505e616 100644 --- a/src/business-logic/core/places/get-places/index.ts +++ b/src/business-logic/core/places/get-places/index.ts @@ -1,3 +1,3 @@ -import getPlaces from "./infra/getPlacesInfra"; +import getPlaces from './infra/getPlacesInfra'; export default getPlaces; diff --git a/src/business-logic/core/places/get-places/infra/getPlacesInfra.ts b/src/business-logic/core/places/get-places/infra/getPlacesInfra.ts index de08285..c89093a 100644 --- a/src/business-logic/core/places/get-places/infra/getPlacesInfra.ts +++ b/src/business-logic/core/places/get-places/infra/getPlacesInfra.ts @@ -1,7 +1,7 @@ -import getPlacesRepo from "../data/repository/GetPlacesRepo"; -import IGetPlacesRepo from "../data/repository/IGetPlacesRepo"; -import GettingPlacesUsecase from "../usecase/getPlaceUsecase"; -import { IgetPlacesInfra, getPlacesReturnType } from "./protocols"; +import getPlacesRepo from '../data/repository/GetPlacesRepo'; +import IGetPlacesRepo from '../data/repository/IGetPlacesRepo'; +import GettingPlacesUsecase from '../usecase/getPlaceUsecase'; +import { IgetPlacesInfra, getPlacesReturnType } from './protocols'; const getPlaces = ({ httpHandler }: IgetPlacesInfra): getPlacesReturnType => { // get httpHandler diff --git a/src/business-logic/core/places/get-places/infra/protocols.ts b/src/business-logic/core/places/get-places/infra/protocols.ts index 5278451..92ca2e7 100644 --- a/src/business-logic/core/places/get-places/infra/protocols.ts +++ b/src/business-logic/core/places/get-places/infra/protocols.ts @@ -1,5 +1,5 @@ -import PlacesModel from "../../common/model/placesModel"; -import { GetPlacesResponse } from "../data/response-object/protocols"; +import PlacesModel from '../../common/model/placesModel'; +import { GetPlacesResponse } from '../data/response-object/protocols'; export interface IgetPlacesInfra { httpHandler: () => Promise; diff --git a/src/business-logic/core/places/get-places/port.ts b/src/business-logic/core/places/get-places/port.ts index 35c01de..844e02d 100644 --- a/src/business-logic/core/places/get-places/port.ts +++ b/src/business-logic/core/places/get-places/port.ts @@ -1,4 +1,4 @@ -import { getPlacesReturnType, type IgetPlacesInfra } from "./infra/protocols"; +import { getPlacesReturnType, type IgetPlacesInfra } from './infra/protocols'; export default IgetPlacesInfra; diff --git a/src/business-logic/core/places/get-places/usecase/__test__/getPlacesUsecase.test.ts b/src/business-logic/core/places/get-places/usecase/__test__/getPlacesUsecase.test.ts index 8be3818..947836c 100644 --- a/src/business-logic/core/places/get-places/usecase/__test__/getPlacesUsecase.test.ts +++ b/src/business-logic/core/places/get-places/usecase/__test__/getPlacesUsecase.test.ts @@ -1,26 +1,24 @@ -import PlacesModel from "../../../common/model/placesModel"; -import IGetPlacesRepo from "../../data/repository/IGetPlacesRepo"; -import { GetPlacesRO } from "../../data/response-object/protocols"; -import GettingPlacesUsecase from "../getPlaceUsecase"; +import PlacesModel from '../../../common/model/placesModel'; +import IGetPlacesRepo from '../../data/repository/IGetPlacesRepo'; +import { GetPlacesRO } from '../../data/response-object/protocols'; +import GettingPlacesUsecase from '../getPlaceUsecase'; const mockedRO: GetPlacesRO = { - availableServices: [""], - createdAt: "createdAt", - id: "id", - name: "name", + availableServices: [''], + createdAt: 'createdAt', + id: 'id', + name: 'name', parentId: null, - placeType: "continent", - updatedAt: "updatedTime", + placeType: 'continent', + updatedAt: 'updatedTime', qr: null, }; const model = new PlacesModel(mockedRO); -const mockedRepo: IGetPlacesRepo = jest - .fn() - .mockImplementation(async () => model); +const mockedRepo: IGetPlacesRepo = jest.fn().mockImplementation(async () => model); -describe("getting places usecase tests", () => { - it("call repository on execute usecase", async () => { +describe('getting places usecase tests', () => { + it('call repository on execute usecase', async () => { const usecase = new GettingPlacesUsecase(mockedRepo); await usecase.execute(); diff --git a/src/business-logic/core/places/get-places/usecase/getPlaceUsecase.ts b/src/business-logic/core/places/get-places/usecase/getPlaceUsecase.ts index eaa79a8..a69bb29 100644 --- a/src/business-logic/core/places/get-places/usecase/getPlaceUsecase.ts +++ b/src/business-logic/core/places/get-places/usecase/getPlaceUsecase.ts @@ -1,5 +1,5 @@ -import PlacesModel from "../../common/model/placesModel"; -import IGetPlacesRepo from "../data/repository/IGetPlacesRepo"; +import PlacesModel from '../../common/model/placesModel'; +import IGetPlacesRepo from '../data/repository/IGetPlacesRepo'; /** * this usecase is responsible for calling the repo and returning the places data from the repository diff --git a/src/business-logic/core/users/common/data/model/usersModel.ts b/src/business-logic/core/users/common/data/model/usersModel.ts index 61ec2b4..90f8d64 100644 --- a/src/business-logic/core/users/common/data/model/usersModel.ts +++ b/src/business-logic/core/users/common/data/model/usersModel.ts @@ -1,9 +1,9 @@ -import Users from "../../entity/entity"; +import Users from '../../entity/entity'; class UsersModel { private usersList: Users[]; - private modelTitle = "users"; + private modelTitle = 'users'; constructor(data: Users[]) { this.usersList = data; diff --git a/src/business-logic/core/users/get-users/data/repository/IGetUserRepo.ts b/src/business-logic/core/users/get-users/data/repository/IGetUserRepo.ts index 25aeda2..7199fc9 100644 --- a/src/business-logic/core/users/get-users/data/repository/IGetUserRepo.ts +++ b/src/business-logic/core/users/get-users/data/repository/IGetUserRepo.ts @@ -1,4 +1,4 @@ -import UsersModel from "../../../common/data/model/usersModel"; +import UsersModel from '../../../common/data/model/usersModel'; type IGetUsersRepo = () => Promise; diff --git a/src/business-logic/core/users/get-users/data/repository/getUserRepo.ts b/src/business-logic/core/users/get-users/data/repository/getUserRepo.ts index acb9909..2c58291 100644 --- a/src/business-logic/core/users/get-users/data/repository/getUserRepo.ts +++ b/src/business-logic/core/users/get-users/data/repository/getUserRepo.ts @@ -1,6 +1,6 @@ -import UsersModel from "../../../common/data/model/usersModel"; -import getUsersResponseObject from "../response-object/usersRO"; -import { GetUsersResponse } from "../response-object/protocols"; +import UsersModel from '../../../common/data/model/usersModel'; +import getUsersResponseObject from '../response-object/usersRO'; +import { GetUsersResponse } from '../response-object/protocols'; const getUsersRepo = async (httpHandler: () => Promise) => { // call httpHandler diff --git a/src/business-logic/core/users/get-users/data/response-object/usersRO.ts b/src/business-logic/core/users/get-users/data/response-object/usersRO.ts index 98724ee..df2b190 100644 --- a/src/business-logic/core/users/get-users/data/response-object/usersRO.ts +++ b/src/business-logic/core/users/get-users/data/response-object/usersRO.ts @@ -1,6 +1,6 @@ /* eslint-disable no-underscore-dangle */ -import Users from "../../../common/entity/entity"; -import { GetUsersResponse } from "./protocols"; +import Users from '../../../common/entity/entity'; +import { GetUsersResponse } from './protocols'; const getUsersResponseObject = (apiResponse: GetUsersResponse): Users[] => { return apiResponse.map((userItem) => { diff --git a/src/business-logic/core/users/get-users/index.ts b/src/business-logic/core/users/get-users/index.ts index 0808670..e875adf 100644 --- a/src/business-logic/core/users/get-users/index.ts +++ b/src/business-logic/core/users/get-users/index.ts @@ -1,3 +1,3 @@ -import getUsers from "./infra/getUsersInfra"; +import getUsers from './infra/getUsersInfra'; export default getUsers; diff --git a/src/business-logic/core/users/get-users/infra/getUsersInfra.ts b/src/business-logic/core/users/get-users/infra/getUsersInfra.ts index 677c752..13e305d 100644 --- a/src/business-logic/core/users/get-users/infra/getUsersInfra.ts +++ b/src/business-logic/core/users/get-users/infra/getUsersInfra.ts @@ -1,7 +1,7 @@ -import IGetUsersRepo from "../data/repository/IGetUserRepo"; -import getUsersRepo from "../data/repository/getUserRepo"; -import GettingUsersUsecase from "../usecase/getUsersUsecase"; -import { IgetusersInfra, getusersReturnType } from "./protocols"; +import IGetUsersRepo from '../data/repository/IGetUserRepo'; +import getUsersRepo from '../data/repository/getUserRepo'; +import GettingUsersUsecase from '../usecase/getUsersUsecase'; +import { IgetusersInfra, getusersReturnType } from './protocols'; const getUsers = ({ httpHandler }: IgetusersInfra): getusersReturnType => { // get httpHandler diff --git a/src/business-logic/core/users/get-users/infra/protocols.ts b/src/business-logic/core/users/get-users/infra/protocols.ts index 339aee8..a668965 100644 --- a/src/business-logic/core/users/get-users/infra/protocols.ts +++ b/src/business-logic/core/users/get-users/infra/protocols.ts @@ -1,5 +1,5 @@ -import UsersModel from "../../common/data/model/usersModel"; -import { GetUsersResponse } from "../data/response-object/protocols"; +import UsersModel from '../../common/data/model/usersModel'; +import { GetUsersResponse } from '../data/response-object/protocols'; export interface IgetusersInfra { httpHandler: () => Promise; diff --git a/src/business-logic/core/users/get-users/usecase/getUsersUsecase.ts b/src/business-logic/core/users/get-users/usecase/getUsersUsecase.ts index 2711a3b..ebec0cc 100644 --- a/src/business-logic/core/users/get-users/usecase/getUsersUsecase.ts +++ b/src/business-logic/core/users/get-users/usecase/getUsersUsecase.ts @@ -1,5 +1,5 @@ -import UsersModel from "../../common/data/model/usersModel"; -import IGetUsersRepo from "../data/repository/IGetUserRepo"; +import UsersModel from '../../common/data/model/usersModel'; +import IGetUsersRepo from '../data/repository/IGetUserRepo'; /** * this usecase is responsible for calling the repo and returning the users data from the repository diff --git a/src/driven/adapters/get-places-adapter/getPlacesAdapter.ts b/src/driven/adapters/get-places-adapter/getPlacesAdapter.ts index 1c66cee..700e89e 100644 --- a/src/driven/adapters/get-places-adapter/getPlacesAdapter.ts +++ b/src/driven/adapters/get-places-adapter/getPlacesAdapter.ts @@ -1,9 +1,9 @@ -import { GetPlacesResponse } from "~/business-logic/core/places/get-places/data/response-object/protocols"; -import IGetPlacesPort from "~/business-logic/core/places/get-places/port"; -import { HTTPPovider } from "~/driven/boundaries/http-boundary/httpBoundary"; -import { HttpOptionsType } from "~/driven/boundaries/http-boundary/protocols"; -import { apiUrls } from "~/driven/utils/configs/appConfig"; -import { getPlacesAdapterReturnType } from "./protocols"; +import { GetPlacesResponse } from '~/business-logic/core/places/get-places/data/response-object/protocols'; +import IGetPlacesPort from '~/business-logic/core/places/get-places/port'; +import { HTTPPovider } from '~/driven/boundaries/http-boundary/httpBoundary'; +import { HttpOptionsType } from '~/driven/boundaries/http-boundary/protocols'; +import { apiUrls } from '~/driven/utils/configs/appConfig'; +import { getPlacesAdapterReturnType } from './protocols'; const getPlacesAdapter = (): IGetPlacesPort & getPlacesAdapterReturnType => { // url of api @@ -11,7 +11,7 @@ const getPlacesAdapter = (): IGetPlacesPort & getPlacesAdapterReturnType => { // make the options of request const options: HttpOptionsType = { url, - method: "GET", + method: 'GET', }; // make the httpHandler const httpProvider = new HTTPPovider(); diff --git a/src/driven/boundaries/http-boundary/httpBoundary.ts b/src/driven/boundaries/http-boundary/httpBoundary.ts index c7f4124..4026b7c 100644 --- a/src/driven/boundaries/http-boundary/httpBoundary.ts +++ b/src/driven/boundaries/http-boundary/httpBoundary.ts @@ -1,7 +1,7 @@ -import axios from "axios"; -import { staticMessages } from "~/driven/utils/constants/staticMessages"; -import { ApiGlobalResponseObject } from "~/driven/utils/protocols/serviceProtocols"; -import { HttpOptionsType } from "./protocols"; +import axios from 'axios'; +import { staticMessages } from '~/driven/utils/constants/staticMessages'; +import { ApiGlobalResponseObject } from '~/driven/utils/protocols/serviceProtocols'; +import { HttpOptionsType } from './protocols'; export class HTTPPovider { async request(customOptions: HttpOptionsType) { @@ -9,8 +9,8 @@ export class HTTPPovider { ...customOptions, headers: { ...customOptions.headers, - mode: "cors", - credentials: "include", + mode: 'cors', + credentials: 'include', Authorization: `Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI4NXh0WnA5eThxVDBXVDkwUFpuUkRja3N4LWw0clVyM0tHQW5JSU9DckJNIn0.eyJleHAiOjE2ODQ2Njc2MTEsImlhdCI6MTY4NDU4MTIxMSwianRpIjoiN2VlNzQ5ZTMtMjdhOC00ZTc1LWE4MTAtOTU0MGY5NDdmNjlkIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwL3JlYWxtcy9kaXBhbF9kZXYiLCJhdWQiOiJhY2NvdW50Iiwic3ViIjoiY2RmYzY3YzQtZGJkOC00NGVhLWI0OWEtYjQ3MjZhMzNmOTAxIiwidHlwIjoiQmVhcmVyIiwiYXpwIjoiY29tZm9ydGVjaCIsInNlc3Npb25fc3RhdGUiOiI3YTFlZDk2OS1lNWY2LTQzZTctOThhMy05OGQ3Zjk3YWM1NDgiLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1tYXN0ZXIiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiY29tZm9ydGVjaCI6eyJyb2xlcyI6WyJ1c2VyIiwib3BlcmF0b3IiXX0sImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsInNpZCI6IjdhMWVkOTY5LWU1ZjYtNDNlNy05OGEzLTk4ZDdmOTdhYzU0OCIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwicHJlZmVycmVkX3VzZXJuYW1lIjoiKzc3Nzc3Nzc3Nzc3In0.qp1GetUEy2LOZWy6Aaiwf_0d0U8wBqXJQhhuSgIO4RkkEgUnwYZ5fFupkp1iTXZMpqWAsmbRp-C0Z8nYT8Hor6XjnE73XwAVVY0Jbx6HSxtcTBOqo2IT0SmVm6z-TFpgYnErHiFZZgsqP4KYkc12xlQH4SrpN-h-oXN4ZtwuOIG65ixt2yKC-8KTyZzfZGa_8llAtnthQBtxX00MdivFpRP-NU1KfCtJqHSTKn40RNs-Nt8Gi_x7vWv9OKD8h-IIp27oOCJZNyL4aa237cuPw9IWbdiDuUAOgxkPw30i9LIDPA70GvdpRKWgLq0-itcT_hpf2RguuALDafaqoGgoGQ`, }, }; diff --git a/src/driven/boundaries/http-boundary/protocols.ts b/src/driven/boundaries/http-boundary/protocols.ts index 5e6f0d1..6690666 100644 --- a/src/driven/boundaries/http-boundary/protocols.ts +++ b/src/driven/boundaries/http-boundary/protocols.ts @@ -1,3 +1,3 @@ -import { AxiosRequestConfig } from "axios"; +import { AxiosRequestConfig } from 'axios'; export type HttpOptionsType = AxiosRequestConfig; diff --git a/src/driven/boundaries/router-boundary/index.tsx b/src/driven/boundaries/router-boundary/index.tsx index 38d83c3..8729e43 100644 --- a/src/driven/boundaries/router-boundary/index.tsx +++ b/src/driven/boundaries/router-boundary/index.tsx @@ -1,9 +1,4 @@ -import { - NavigateFunction, - Outlet, - useLocation, - useNavigate, -} from "react-router-dom"; +import { NavigateFunction, Outlet, useLocation, useNavigate } from 'react-router-dom'; class RouterBoundary { outletRoute = () => ; diff --git a/src/driven/boundaries/state-management/index.ts b/src/driven/boundaries/state-management/index.ts index ce3e86d..7668bcb 100644 --- a/src/driven/boundaries/state-management/index.ts +++ b/src/driven/boundaries/state-management/index.ts @@ -1,3 +1,3 @@ -import StateManagementService from "./stateManagementService"; +import StateManagementService from './stateManagementService'; export default StateManagementService; diff --git a/src/driven/boundaries/state-management/stateManagementService.ts b/src/driven/boundaries/state-management/stateManagementService.ts index 2f93b7f..038dea1 100644 --- a/src/driven/boundaries/state-management/stateManagementService.ts +++ b/src/driven/boundaries/state-management/stateManagementService.ts @@ -1,5 +1,5 @@ -import StateManagementProvider from "./stateManagementProvider"; -import SwrBoundary from "./swrBoundary"; +import StateManagementProvider from './stateManagementProvider'; +import SwrBoundary from './swrBoundary'; export default class StateManagementService implements StateManagementProvider { private provider: StateManagementProvider; diff --git a/src/driven/boundaries/state-management/swrBoundary.ts b/src/driven/boundaries/state-management/swrBoundary.ts index fb23529..c711b54 100644 --- a/src/driven/boundaries/state-management/swrBoundary.ts +++ b/src/driven/boundaries/state-management/swrBoundary.ts @@ -1,5 +1,5 @@ -import useSwr from "swr"; -import StateManagementProvider from "./stateManagementProvider"; +import useSwr from 'swr'; +import StateManagementProvider from './stateManagementProvider'; export default class SwrBoundary implements StateManagementProvider { useGetQuery( diff --git a/src/driven/utils/components/buttons/primary-button/PrimaryButton.tsx b/src/driven/utils/components/buttons/primary-button/PrimaryButton.tsx index ffbbd51..e9bf840 100644 --- a/src/driven/utils/components/buttons/primary-button/PrimaryButton.tsx +++ b/src/driven/utils/components/buttons/primary-button/PrimaryButton.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React from 'react'; interface IPrimaryButtonProps { title: string; diff --git a/src/driven/utils/components/inputs/simple-input/SimpleInput.tsx b/src/driven/utils/components/inputs/simple-input/SimpleInput.tsx index d3fe063..7633e4d 100644 --- a/src/driven/utils/components/inputs/simple-input/SimpleInput.tsx +++ b/src/driven/utils/components/inputs/simple-input/SimpleInput.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React from 'react'; interface ISimpleInput { title: string; @@ -9,13 +9,10 @@ export default function SimpleInput(props: ISimpleInput) { const { title, className } = props; return (
-
); } diff --git a/src/driven/utils/components/loading/Loading.tsx b/src/driven/utils/components/loading/Loading.tsx index 48129bf..cb43672 100644 --- a/src/driven/utils/components/loading/Loading.tsx +++ b/src/driven/utils/components/loading/Loading.tsx @@ -1,5 +1,5 @@ -import React from "react"; -import style from "./style.module.css"; +import React from 'react'; +import style from './style.module.css'; export default function Loading() { return ( diff --git a/src/driven/utils/components/page-title/pageTitle.tsx b/src/driven/utils/components/page-title/pageTitle.tsx index 0126652..519ef93 100644 --- a/src/driven/utils/components/page-title/pageTitle.tsx +++ b/src/driven/utils/components/page-title/pageTitle.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React from 'react'; interface IPageTitleProps { title: string; @@ -7,11 +7,5 @@ interface IPageTitleProps { export default function PageTitle(props: IPageTitleProps) { const { title, className } = props; - return ( -
- {title} -
- ); + return
{title}
; } diff --git a/src/driven/utils/configs/appConfig.ts b/src/driven/utils/configs/appConfig.ts index 19697d1..9043e87 100644 --- a/src/driven/utils/configs/appConfig.ts +++ b/src/driven/utils/configs/appConfig.ts @@ -1,12 +1,12 @@ -import { icons } from "../constants/assertUrls"; -import { ENVs } from "../constants/envs"; -import { staticMessages } from "../constants/staticMessages"; +import { icons } from '../constants/assertUrls'; +import { ENVs } from '../constants/envs'; +import { staticMessages } from '../constants/staticMessages'; export const appConfig = {}; export const routes = { - usersList: "/", - createUser: "/create-user", + usersList: '/', + createUser: '/create-user', }; export const routesData = { diff --git a/src/driven/utils/constants/assertUrls.ts b/src/driven/utils/constants/assertUrls.ts index aea74c8..6917d6c 100644 --- a/src/driven/utils/constants/assertUrls.ts +++ b/src/driven/utils/constants/assertUrls.ts @@ -1,4 +1,4 @@ -const baseAssetsUrl = "assets/"; +const baseAssetsUrl = 'assets/'; const baseIconsUrl = `${baseAssetsUrl}icons/`; export const icons = { logo: `${baseIconsUrl}logo.svg`, diff --git a/src/driven/utils/constants/staticMessages.ts b/src/driven/utils/constants/staticMessages.ts index 6dd125d..9257fca 100644 --- a/src/driven/utils/constants/staticMessages.ts +++ b/src/driven/utils/constants/staticMessages.ts @@ -1,24 +1,24 @@ export const staticMessages = { global: { errors: { - input: "please fill all inputs correctly", + input: 'please fill all inputs correctly', }, - users: "Users", - submit: "Submit", - fistname: "Firstname", - lastname: "Lastname", - place_id: "Place id", - title: "title", - status: "Status", - address: "Address", - qrCode: "qrCode", - createUser: "Create user", - phoneNumber: "Phone Number", + users: 'Users', + submit: 'Submit', + fistname: 'Firstname', + lastname: 'Lastname', + place_id: 'Place id', + title: 'title', + status: 'Status', + address: 'Address', + qrCode: 'qrCode', + createUser: 'Create user', + phoneNumber: 'Phone Number', }, service: { errors: { - 500: "server not respond please try again later!", - 401: "Authentication error!", + 500: 'server not respond please try again later!', + 401: 'Authentication error!', }, }, }; diff --git a/src/driven/utils/helpers/globalHelpers.ts b/src/driven/utils/helpers/globalHelpers.ts index afe81f4..cfbe1e1 100644 --- a/src/driven/utils/helpers/globalHelpers.ts +++ b/src/driven/utils/helpers/globalHelpers.ts @@ -1,7 +1,4 @@ -import { - errorHandlingStateTypes, - UIErrorHandling, -} from "./protocols/globalHelpersProtocols"; +import { errorHandlingStateTypes, UIErrorHandling } from './protocols/globalHelpersProtocols'; export const UIErrorHandlingFactory = ({ state, diff --git a/src/driven/utils/helpers/protocols/globalHelpersProtocols.ts b/src/driven/utils/helpers/protocols/globalHelpersProtocols.ts index 1143fd0..390c86e 100644 --- a/src/driven/utils/helpers/protocols/globalHelpersProtocols.ts +++ b/src/driven/utils/helpers/protocols/globalHelpersProtocols.ts @@ -1,7 +1,7 @@ export enum errorHandlingStateTypes { - error = "error", - warning = "warning", - success = "success", + error = 'error', + warning = 'warning', + success = 'success', } export type UIErrorHandling = { diff --git a/src/driven/utils/protocols/serviceProtocols.ts b/src/driven/utils/protocols/serviceProtocols.ts index 3c59610..152c306 100644 --- a/src/driven/utils/protocols/serviceProtocols.ts +++ b/src/driven/utils/protocols/serviceProtocols.ts @@ -1,7 +1,7 @@ -export type RequestMethods = "get" | "post" | "put" | "delete"; +export type RequestMethods = 'get' | 'post' | 'put' | 'delete'; export type ApiGlobalResponseObject = { - type: "Success" | "client Error" | string; + type: 'Success' | 'client Error' | string; status: 200 | 400 | 401 | 500 | number; message: string; description: string; diff --git a/src/driving/application/core/common/table-row/index.tsx b/src/driving/application/core/common/table-row/index.tsx index 5c44efc..353b34c 100644 --- a/src/driving/application/core/common/table-row/index.tsx +++ b/src/driving/application/core/common/table-row/index.tsx @@ -1,3 +1,3 @@ -import TableRow from "./infra/TableRowInfra"; +import TableRow from './infra/TableRowInfra'; export default TableRow; diff --git a/src/driving/application/core/common/table-row/infra/TableRowInfra.tsx b/src/driving/application/core/common/table-row/infra/TableRowInfra.tsx index b40752e..4ecd83b 100644 --- a/src/driving/application/core/common/table-row/infra/TableRowInfra.tsx +++ b/src/driving/application/core/common/table-row/infra/TableRowInfra.tsx @@ -1,7 +1,7 @@ -import React from "react"; -import useTableRowVM from "../viewmodel/tableRowVM"; -import TableRowView from "../view/TableRow"; -import { ITableRowInfra } from "./protocols"; +import React from 'react'; +import useTableRowVM from '../viewmodel/tableRowVM'; +import TableRowView from '../view/TableRow'; +import { ITableRowInfra } from './protocols'; export default function TableRow(props: ITableRowInfra) { const { rowData, selectedRowId, setSelectedRowId } = props; @@ -9,11 +9,5 @@ export default function TableRow(props: ITableRowInfra) { const { isRowSelected } = useTableRowVM({ selectedRowId, rowId }); - return ( - - ); + return ; } diff --git a/src/driving/application/core/common/table-row/view/TableRow.tsx b/src/driving/application/core/common/table-row/view/TableRow.tsx index 78c4bca..714d674 100644 --- a/src/driving/application/core/common/table-row/view/TableRow.tsx +++ b/src/driving/application/core/common/table-row/view/TableRow.tsx @@ -1,19 +1,12 @@ -import React from "react"; -import RowItem from "./table-row-item/view/RowItem"; -import { ITableRowProps } from "./protocols"; +import React from 'react'; +import RowItem from './table-row-item/view/RowItem'; +import { ITableRowProps } from './protocols'; export default function TableRowView(props: ITableRowProps) { const { isSelected, setSelectedRowId, rowData } = props; const { rowId, rowItemsTitle } = rowData; const columns = rowItemsTitle.map((rowItemTitle, index) => { - return ( - - ); + return ; }); return setSelectedRowId(rowId)}>{columns}; 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 f9b0feb..d3fe46b 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,4 +1,4 @@ -import React from "react"; +import React from 'react'; interface IRowItemProp { title: string; @@ -9,19 +9,15 @@ interface IRowItemProp { export default function RowItem(props: IRowItemProp) { const { title, hasCheckbox, isSelected } = props; return ( - -
+ +
{hasCheckbox && ( - - ✓ - + )} {title} diff --git a/src/driving/application/core/common/table-row/viewmodel/tableRowVM.ts b/src/driving/application/core/common/table-row/viewmodel/tableRowVM.ts index 34677ae..9828d8e 100644 --- a/src/driving/application/core/common/table-row/viewmodel/tableRowVM.ts +++ b/src/driving/application/core/common/table-row/viewmodel/tableRowVM.ts @@ -1,4 +1,4 @@ -import { IUserTableRowVM, tableRowVMReturnType } from "./protocols"; +import { IUserTableRowVM, tableRowVMReturnType } from './protocols'; const useTableRowVM = (dependencies: IUserTableRowVM): tableRowVMReturnType => { const { rowId, selectedRowId } = dependencies; diff --git a/src/driving/application/core/create-user/index.tsx b/src/driving/application/core/create-user/index.tsx index 47823ac..774a305 100644 --- a/src/driving/application/core/create-user/index.tsx +++ b/src/driving/application/core/create-user/index.tsx @@ -1,3 +1,3 @@ -import CreateUser from "./infra/CreateUser"; +import CreateUser from './infra/CreateUser'; export default CreateUser; diff --git a/src/driving/application/core/create-user/infra/CreateUser.tsx b/src/driving/application/core/create-user/infra/CreateUser.tsx index eb7966c..fd4d7b7 100644 --- a/src/driving/application/core/create-user/infra/CreateUser.tsx +++ b/src/driving/application/core/create-user/infra/CreateUser.tsx @@ -1,5 +1,5 @@ -import React from "react"; -import CreateUserView from "../view/CreateUserView"; +import React from 'react'; +import CreateUserView from '../view/CreateUserView'; export default function CreateUser() { return ; diff --git a/src/driving/application/core/create-user/view/CreateUserView.tsx b/src/driving/application/core/create-user/view/CreateUserView.tsx index fa4068d..4083af8 100644 --- a/src/driving/application/core/create-user/view/CreateUserView.tsx +++ b/src/driving/application/core/create-user/view/CreateUserView.tsx @@ -1,30 +1,18 @@ -import React from "react"; -import PrimaryButton from "~/driven/utils/components/buttons/primary-button/PrimaryButton"; -import SimpleInput from "~/driven/utils/components/inputs/simple-input/SimpleInput"; -import { staticMessages } from "~/driven/utils/constants/staticMessages"; +import React from 'react'; +import PrimaryButton from '~/driven/utils/components/buttons/primary-button/PrimaryButton'; +import SimpleInput from '~/driven/utils/components/inputs/simple-input/SimpleInput'; +import { staticMessages } from '~/driven/utils/constants/staticMessages'; export default function CreateUserView() { return ( -
-
- - - +
+
+ + +
-
- null} - title={staticMessages.global.submit} - /> +
+ null} title={staticMessages.global.submit} />
); diff --git a/src/driving/application/core/places-list/index.tsx b/src/driving/application/core/places-list/index.tsx index 43082d5..63340e5 100644 --- a/src/driving/application/core/places-list/index.tsx +++ b/src/driving/application/core/places-list/index.tsx @@ -1,3 +1,3 @@ -import PlacesList from "./infra/PlacesList"; +import PlacesList from './infra/PlacesList'; export default PlacesList; diff --git a/src/driving/application/core/places-list/infra/PlacesList.tsx b/src/driving/application/core/places-list/infra/PlacesList.tsx index b832635..78969cf 100644 --- a/src/driving/application/core/places-list/infra/PlacesList.tsx +++ b/src/driving/application/core/places-list/infra/PlacesList.tsx @@ -1,11 +1,11 @@ -import React from "react"; -import getPlaces from "~/business-logic/core/places/get-places"; -import getPlacesAdapter from "~/driven/adapters/get-places-adapter/getPlacesAdapter"; -import StateManagementService from "~/driven/boundaries/state-management"; -import PlacesModel from "~/business-logic/core/places/common/model/placesModel"; -import PlacesListView from "../view/PlacesListView"; -import usePlacesListVM from "../viewmodel/placesListVM"; -import placesListModel from "../model/placesListModel"; +import React from 'react'; +import getPlaces from '~/business-logic/core/places/get-places'; +import getPlacesAdapter from '~/driven/adapters/get-places-adapter/getPlacesAdapter'; +import StateManagementService from '~/driven/boundaries/state-management'; +import PlacesModel from '~/business-logic/core/places/common/model/placesModel'; +import PlacesListView from '../view/PlacesListView'; +import usePlacesListVM from '../viewmodel/placesListVM'; +import placesListModel from '../model/placesListModel'; const prepareTheLogicForModel = () => { const gettingPlacesDrivenAdapter = getPlacesAdapter(); diff --git a/src/driving/application/core/places-list/model/placesListModel.ts b/src/driving/application/core/places-list/model/placesListModel.ts index 717ffda..050e05d 100644 --- a/src/driving/application/core/places-list/model/placesListModel.ts +++ b/src/driving/application/core/places-list/model/placesListModel.ts @@ -1,4 +1,4 @@ -import { getPlacesModel } from "./protocols"; +import { getPlacesModel } from './protocols'; const placesListModel: getPlacesModel = async (getPlaces) => { // get the method for handling the logic diff --git a/src/driving/application/core/places-list/model/protocols.ts b/src/driving/application/core/places-list/model/protocols.ts index 9646a51..cd68b37 100644 --- a/src/driving/application/core/places-list/model/protocols.ts +++ b/src/driving/application/core/places-list/model/protocols.ts @@ -1,6 +1,4 @@ -import PlacesModel from "~/business-logic/core/places/common/model/placesModel"; -import { getPlacesReturnPort } from "~/business-logic/core/places/get-places/port"; +import PlacesModel from '~/business-logic/core/places/common/model/placesModel'; +import { getPlacesReturnPort } from '~/business-logic/core/places/get-places/port'; -export type getPlacesModel = ( - getPlaces: getPlacesReturnPort -) => Promise; +export type getPlacesModel = (getPlaces: getPlacesReturnPort) => Promise; diff --git a/src/driving/application/core/places-list/view/PlacesListView.tsx b/src/driving/application/core/places-list/view/PlacesListView.tsx index cccddfb..adb7c70 100644 --- a/src/driving/application/core/places-list/view/PlacesListView.tsx +++ b/src/driving/application/core/places-list/view/PlacesListView.tsx @@ -1,8 +1,8 @@ -import React from "react"; -import { staticMessages } from "~/driven/utils/constants/staticMessages"; -import Loading from "~/driven/utils/components/loading/Loading"; -import TableRow from "../../common/table-row"; -import { IPlacesListProps } from "./protocols"; +import React from 'react'; +import { staticMessages } from '~/driven/utils/constants/staticMessages'; +import Loading from '~/driven/utils/components/loading/Loading'; +import TableRow from '../../common/table-row'; +import { IPlacesListProps } from './protocols'; export default function UsersListView(props: IPlacesListProps) { const { selectedRowId, setSelectedRowId, placesList } = props; @@ -10,18 +10,18 @@ export default function UsersListView(props: IPlacesListProps) { const rows = () => { const placesdata = [ { - id: "1", - place_id: "6440020b89366fdcaf15a8c2", - title: "flat demoplace ", - status: "demo", - address: "demoplace", + id: '1', + place_id: '6440020b89366fdcaf15a8c2', + title: 'flat demoplace ', + status: 'demo', + address: 'demoplace', }, { - id: "2", - place_id: "6440020b89366fdcaf15asdfa", - title: "flat demoplace second ", - status: "demo second", - address: "demoplace second", + id: '2', + place_id: '6440020b89366fdcaf15asdfa', + title: 'flat demoplace second ', + status: 'demo second', + address: 'demoplace second', }, ]; @@ -32,7 +32,7 @@ export default function UsersListView(props: IPlacesListProps) { places.title, places.status, places.address, - "", + '', ], rowId: places.id, }; diff --git a/src/driving/application/core/places-list/view/protocols.ts b/src/driving/application/core/places-list/view/protocols.ts index 03be97e..79048e3 100644 --- a/src/driving/application/core/places-list/view/protocols.ts +++ b/src/driving/application/core/places-list/view/protocols.ts @@ -1,4 +1,4 @@ -import PlacesModel from "~/business-logic/core/places/common/model/placesModel"; +import PlacesModel from '~/business-logic/core/places/common/model/placesModel'; export interface IPlacesListProps { placesList: { diff --git a/src/driving/application/core/places-list/viewmodel/placesListVM.ts b/src/driving/application/core/places-list/viewmodel/placesListVM.ts index 2a70d54..c44eabf 100644 --- a/src/driving/application/core/places-list/viewmodel/placesListVM.ts +++ b/src/driving/application/core/places-list/viewmodel/placesListVM.ts @@ -1,6 +1,6 @@ -import { useState } from "react"; -import PlacesModel from "~/business-logic/core/places/common/model/placesModel"; -import { placesListReturnType } from "./protocols"; +import { useState } from 'react'; +import PlacesModel from '~/business-logic/core/places/common/model/placesModel'; +import { placesListReturnType } from './protocols'; interface IPlacesListVM { useGetPlacesList: () => { @@ -12,7 +12,7 @@ interface IPlacesListVM { const usePlacesListVM = (dependencies: IPlacesListVM): placesListReturnType => { const { useGetPlacesList } = dependencies; const placesData = useGetPlacesList(); - const [selectedRowId, setSelectedRowId] = useState(""); + const [selectedRowId, setSelectedRowId] = useState(''); return { selectedRowId, diff --git a/src/driving/application/core/places-list/viewmodel/protocols.ts b/src/driving/application/core/places-list/viewmodel/protocols.ts index 33694de..cd4cf4d 100644 --- a/src/driving/application/core/places-list/viewmodel/protocols.ts +++ b/src/driving/application/core/places-list/viewmodel/protocols.ts @@ -1,5 +1,5 @@ -import React from "react"; -import PlacesModel from "~/business-logic/core/places/common/model/placesModel"; +import React from 'react'; +import PlacesModel from '~/business-logic/core/places/common/model/placesModel'; export type placesListReturnType = { selectedRowId: string; diff --git a/src/driving/application/core/users-list/index.tsx b/src/driving/application/core/users-list/index.tsx index 74d8163..304d5e9 100644 --- a/src/driving/application/core/users-list/index.tsx +++ b/src/driving/application/core/users-list/index.tsx @@ -1,3 +1,3 @@ -import UsersList from "./infra/UsersList"; +import UsersList from './infra/UsersList'; export default UsersList; diff --git a/src/driving/application/core/users-list/infra/UsersList.tsx b/src/driving/application/core/users-list/infra/UsersList.tsx index 01eb05b..ba710d9 100644 --- a/src/driving/application/core/users-list/infra/UsersList.tsx +++ b/src/driving/application/core/users-list/infra/UsersList.tsx @@ -1,13 +1,8 @@ -import React from "react"; -import useUsersListVM from "../viewmodel/usersListVM"; -import UsersListView from "../view/UsersListView"; +import React from 'react'; +import useUsersListVM from '../viewmodel/usersListVM'; +import UsersListView from '../view/UsersListView'; export default function UsersList() { const { selectedRowId, setSelectedRowId } = useUsersListVM(); - return ( - - ); + return ; } diff --git a/src/driving/application/core/users-list/view/UsersListView.tsx b/src/driving/application/core/users-list/view/UsersListView.tsx index dcebb6d..ab3e846 100644 --- a/src/driving/application/core/users-list/view/UsersListView.tsx +++ b/src/driving/application/core/users-list/view/UsersListView.tsx @@ -1,7 +1,7 @@ -import React from "react"; -import { staticMessages } from "~/driven/utils/constants/staticMessages"; -import TableRow from "../../common/table-row"; -import { IUserListProps } from "./protocols"; +import React from 'react'; +import { staticMessages } from '~/driven/utils/constants/staticMessages'; +import TableRow from '../../common/table-row'; +import { IUserListProps } from './protocols'; export default function UsersListView(props: IUserListProps) { const { selectedRowId, setSelectedRowId } = props; @@ -9,14 +9,14 @@ export default function UsersListView(props: IUserListProps) { const rows = () => { const userdata = [ { - id: "1", - firstname: "behnam", - lastname: "rahimpour", + id: '1', + firstname: 'behnam', + lastname: 'rahimpour', }, { - id: "2", - firstname: "Salar", - lastname: "Sali", + id: '2', + firstname: 'Salar', + lastname: 'Sali', }, ]; @@ -37,11 +37,11 @@ export default function UsersListView(props: IUserListProps) { }; return ( - - +
+ - - + + {rows()} diff --git a/src/driving/application/core/users-list/viewmodel/protocols.ts b/src/driving/application/core/users-list/viewmodel/protocols.ts index aa81dec..fe73753 100644 --- a/src/driving/application/core/users-list/viewmodel/protocols.ts +++ b/src/driving/application/core/users-list/viewmodel/protocols.ts @@ -1,4 +1,4 @@ -import React from "react"; +import React from 'react'; export type userListReturnType = { selectedRowId: string; diff --git a/src/driving/application/core/users-list/viewmodel/usersListVM.ts b/src/driving/application/core/users-list/viewmodel/usersListVM.ts index d411f83..ebb9cb3 100644 --- a/src/driving/application/core/users-list/viewmodel/usersListVM.ts +++ b/src/driving/application/core/users-list/viewmodel/usersListVM.ts @@ -1,8 +1,8 @@ -import { useState } from "react"; -import { userListReturnType } from "./protocols"; +import { useState } from 'react'; +import { userListReturnType } from './protocols'; const useUsersListVM = (): userListReturnType => { - const [selectedRowId, setSelectedRowId] = useState(""); + const [selectedRowId, setSelectedRowId] = useState(''); return { selectedRowId, diff --git a/src/driving/application/support/sidebar/index.tsx b/src/driving/application/support/sidebar/index.tsx index 9bd6051..0004865 100644 --- a/src/driving/application/support/sidebar/index.tsx +++ b/src/driving/application/support/sidebar/index.tsx @@ -1,3 +1,3 @@ -import Sidebar from "./view/Sidebar"; +import Sidebar from './view/Sidebar'; export default Sidebar; diff --git a/src/driving/application/support/sidebar/view/Sidebar.tsx b/src/driving/application/support/sidebar/view/Sidebar.tsx index 4c4d51e..726c54e 100644 --- a/src/driving/application/support/sidebar/view/Sidebar.tsx +++ b/src/driving/application/support/sidebar/view/Sidebar.tsx @@ -1,7 +1,7 @@ -import React from "react"; -import { Link, useLocation } from "react-router-dom"; -import { routesData } from "~/driven/utils/configs/appConfig"; -import { icons } from "~/driven/utils/constants/assertUrls"; +import React from 'react'; +import { Link, useLocation } from 'react-router-dom'; +import { routesData } from '~/driven/utils/configs/appConfig'; +import { icons } from '~/driven/utils/constants/assertUrls'; export default function Sidebar() { const isCurrentPage = useLocation(); @@ -13,23 +13,21 @@ export default function Sidebar() { key={key} to={routesData[key].path} className={`flex text-white mb-6 text-sm w-full py-2 pl-2 rounded-lg ${ - isCurrentPage.pathname === routesData[key].path - ? "bg-primary-300" - : "" + isCurrentPage.pathname === routesData[key].path ? 'bg-primary-300' : '' }`} > - page icon + page icon
{routesData[key].title}
); }); return ( -
{staticMessages.global.fistname}{staticMessages.global.lastname}{staticMessages.global.fistname}{staticMessages.global.lastname}