Restructure project (#124)

This commit is contained in:
Charles Bochet
2023-05-17 22:31:16 +02:00
committed by GitHub
parent baca6150f5
commit 434e020846
76 changed files with 295 additions and 304 deletions

View File

@ -1,6 +1,6 @@
import { useSearchParams, useNavigate } from 'react-router-dom';
import { useEffect, useState } from 'react';
import { refreshAccessToken } from '../../services/AuthService';
import { refreshAccessToken } from '../../services/auth/AuthService';
function Callback() {
const [searchParams] = useSearchParams();

View File

@ -1,6 +1,6 @@
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { hasAccessToken } from '../../services/AuthService';
import { hasAccessToken } from '../../services/auth/AuthService';
function Login() {
const navigate = useNavigate();

View File

@ -9,9 +9,12 @@ import {
deleteCompanies,
insertCompany,
useCompaniesQuery,
} from '../../services/companies';
} from '../../services/api/companies';
import Table from '../../components/table/Table';
import { Company, mapToCompany } from '../../interfaces/company.interface';
import {
Company,
mapToCompany,
} from '../../interfaces/entities/company.interface';
import {
useCompaniesColumns,
availableFilters,
@ -25,9 +28,9 @@ import {
Companies_Bool_Exp,
Companies_Order_By,
} from '../../generated/graphql';
import { SelectedFilterType } from '../../components/table/table-header/interface';
import { useSearch } from '../../services/search/search';
import { useSearch } from '../../services/api/search/search';
import ActionBar from '../../components/table/action-bar/ActionBar';
import { SelectedFilterType } from '../../interfaces/filters/interface';
const StyledCompaniesContainer = styled.div`
display: flex;

View File

@ -2,11 +2,11 @@ import { MemoryRouter } from 'react-router-dom';
import Companies from '../Companies';
import { ThemeProvider } from '@emotion/react';
import { lightTheme } from '../../../layout/styles/themes';
import { GET_COMPANIES } from '../../../services/companies';
import { GET_COMPANIES } from '../../../services/api/companies';
import { mockData } from '../__tests__/__data__/mock-data';
import { MockedProvider } from '@apollo/client/testing';
import { SEARCH_COMPANY_QUERY } from '../../../services/search/search';
import { mockCompanySearchData } from '../../../services/search/__data__/mock-search-data';
import { SEARCH_COMPANY_QUERY } from '../../../services/api/search/search';
import { mockCompanySearchData } from '../../../services/api/search/__data__/mock-search-data';
const component = {
title: 'Companies',

View File

@ -5,11 +5,11 @@ import { act } from 'react-dom/test-utils';
import {
GraphqlMutationCompany,
GraphqlQueryCompany,
} from '../../../interfaces/company.interface';
} from '../../../interfaces/entities/company.interface';
jest.mock('../../../apollo', () => {
const companyInterface = jest.requireActual(
'../../../interfaces/company.interface',
'../../../interfaces/entities/company.interface',
);
return {
apiClient: {

View File

@ -1,9 +1,12 @@
import { CellContext, createColumnHelper } from '@tanstack/react-table';
import { Company, mapToCompany } from '../../interfaces/company.interface';
import { updateCompany } from '../../services/companies';
import {
Company,
mapToCompany,
} from '../../interfaces/entities/company.interface';
import { updateCompany } from '../../services/api/companies';
import ColumnHead from '../../components/table/ColumnHead';
import CompanyChip from '../../components/chips/CompanyChip';
import EditableText from '../../components/table/editable-cell/EditableText';
import EditableText from '../../components/editable-cell/EditableText';
import {
FaRegBuilding,
FaCalendar,
@ -16,23 +19,21 @@ import {
import PersonChip, {
PersonChipPropsType,
} from '../../components/chips/PersonChip';
import EditableChip from '../../components/table/editable-cell/EditableChip';
import {
FilterConfigType,
SearchConfigType,
SortType,
} from '../../components/table/table-header/interface';
import EditableChip from '../../components/editable-cell/EditableChip';
import { Companies_Order_By } from '../../generated/graphql';
import {
SEARCH_COMPANY_QUERY,
SEARCH_USER_QUERY,
} from '../../services/search/search';
import EditableDate from '../../components/table/editable-cell/EditableDate';
import EditableRelation from '../../components/table/editable-cell/EditableRelation';
import { User, mapToUser } from '../../interfaces/user.interface';
} from '../../services/api/search/search';
import EditableDate from '../../components/editable-cell/EditableDate';
import EditableRelation from '../../components/editable-cell/EditableRelation';
import { User, mapToUser } from '../../interfaces/entities/user.interface';
import { useMemo } from 'react';
import { SelectAllCheckbox } from '../../components/table/SelectAllCheckbox';
import Checkbox from '../../components/form/Checkbox';
import { SortType } from '../../interfaces/sorts/interface';
import { FilterConfigType } from '../../interfaces/filters/interface';
import { SearchConfigType } from '../../interfaces/search/interface';
export const availableSorts = [
{

View File

@ -8,7 +8,10 @@ import {
availableSorts,
usePeopleColumns,
} from './people-table';
import { Person, mapToPerson } from '../../interfaces/person.interface';
import {
Person,
mapToPerson,
} from '../../interfaces/entities/person.interface';
import { useCallback, useEffect, useRef, useState } from 'react';
import {
PeopleSelectedSortType,
@ -16,15 +19,15 @@ import {
deletePeople,
insertPerson,
usePeopleQuery,
} from '../../services/people';
import { useSearch } from '../../services/search/search';
} from '../../services/api/people';
import { useSearch } from '../../services/api/search/search';
import { People_Bool_Exp } from '../../generated/graphql';
import { SelectedFilterType } from '../../components/table/table-header/interface';
import {
reduceFiltersToWhere,
reduceSortsToOrderBy,
} from '../../components/table/table-header/helpers';
import ActionBar from '../../components/table/action-bar/ActionBar';
import { SelectedFilterType } from '../../interfaces/filters/interface';
const StyledPeopleContainer = styled.div`
display: flex;

View File

@ -4,8 +4,8 @@ import { ThemeProvider } from '@emotion/react';
import { lightTheme } from '../../../layout/styles/themes';
import { MockedProvider } from '@apollo/client/testing';
import { mockData } from '../__tests__/__data__/mock-data';
import { GET_PEOPLE } from '../../../services/people';
import { SEARCH_PEOPLE_QUERY } from '../../../services/search/search';
import { GET_PEOPLE } from '../../../services/api/people';
import { SEARCH_PEOPLE_QUERY } from '../../../services/api/search/search';
const component = {
title: 'People',

View File

@ -5,11 +5,11 @@ import { act } from 'react-dom/test-utils';
import {
GraphqlMutationPerson,
GraphqlQueryPerson,
} from '../../../interfaces/person.interface';
} from '../../../interfaces/entities/person.interface';
jest.mock('../../../apollo', () => {
const personInterface = jest.requireActual(
'../../../interfaces/person.interface',
'../../../interfaces/entities/person.interface',
);
return {
apiClient: {

View File

@ -14,26 +14,30 @@ import Checkbox from '../../components/form/Checkbox';
import CompanyChip, {
CompanyChipPropsType,
} from '../../components/chips/CompanyChip';
import { Person, mapToPerson } from '../../interfaces/person.interface';
import EditableText from '../../components/table/editable-cell/EditableText';
import {
FilterConfigType,
SearchConfigType,
SortType,
} from '../../components/table/table-header/interface';
Person,
mapToPerson,
} from '../../interfaces/entities/person.interface';
import EditableText from '../../components/editable-cell/EditableText';
import { Order_By, People_Order_By } from '../../generated/graphql';
import {
SEARCH_COMPANY_QUERY,
SEARCH_PEOPLE_QUERY,
} from '../../services/search/search';
import { Company, mapToCompany } from '../../interfaces/company.interface';
import EditablePhone from '../../components/table/editable-cell/EditablePhone';
import EditableFullName from '../../components/table/editable-cell/EditableFullName';
import EditableDate from '../../components/table/editable-cell/EditableDate';
import EditableRelation from '../../components/table/editable-cell/EditableRelation';
import { updatePerson } from '../../services/people';
} from '../../services/api/search/search';
import {
Company,
mapToCompany,
} from '../../interfaces/entities/company.interface';
import EditablePhone from '../../components/editable-cell/EditablePhone';
import EditableFullName from '../../components/editable-cell/EditableFullName';
import EditableDate from '../../components/editable-cell/EditableDate';
import EditableRelation from '../../components/editable-cell/EditableRelation';
import { updatePerson } from '../../services/api/people';
import { useMemo } from 'react';
import { SelectAllCheckbox } from '../../components/table/SelectAllCheckbox';
import { SortType } from '../../interfaces/sorts/interface';
import { FilterConfigType } from '../../interfaces/filters/interface';
import { SearchConfigType } from '../../interfaces/search/interface';
export const availableSorts = [
{