refactor: move Service to lib/

14 files changed, 21 insertions, 21 deletions

diff --git a/src/containers/Page.tsx b/src/containers/Page.tsx
index 73b122e..ae9e231 100644
--- a/src/containers/Page.tsx
+++ b/src/containers/Page.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import Paper from '../components/Paper';
 import Button from '../components/Button';
-import { Action } from './Service/ServiceContext';
+import { Action } from '../lib/ServiceContext';
 
 interface Props {
   title?: string;
diff --git a/src/index.tsx b/src/index.tsx
index 1005a9d..2ea3201 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -8,8 +8,8 @@ import {
 } from 'react-router-dom';
 import Header from './components/Header';
 import Home from './containers/Home';
-import Service from './containers/Service/Service';
-import { ServiceProvider } from './containers/Service/ServiceContext';
+import Service from './lib/Service';
+import { ServiceProvider } from './lib/ServiceContext';
 import services from './services';
 
 const navigation = [
diff --git a/src/containers/Service/Service.tsx b/src/lib/Service.tsx
index b527531..b527531 100644
--- a/src/containers/Service/Service.tsx
+++ b/src/lib/Service.tsx
diff --git a/src/containers/Service/ServiceContext.tsx b/src/lib/ServiceContext.tsx
index 0cccc93..93cac4e 100644
--- a/src/containers/Service/ServiceContext.tsx
+++ b/src/lib/ServiceContext.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormikProps } from 'formik';
-import { Props as ButtonProps } from '../../components/Button';
-import { Field } from '../../components/ListTable';
+import { Props as ButtonProps } from '../components/Button';
+import { Field } from '../components/ListTable';
 
 export interface Action extends ButtonProps {
   name: string;
@@ -15,8 +15,8 @@ export interface PanelProps {
 export interface ServiceParams {
   route: string;
   name: string;
-  nameSingular?: string;
   tableFields: Field[];
+  nameSingular?: string;
   default?: Record<string, any>;
   routes?: Record<string, React.FC>;
   actions?: Action[];
diff --git a/src/containers/Service/ServiceItem.tsx b/src/lib/ServiceItem.tsx
index 0e24895..6a0a99b 100644
--- a/src/containers/Service/ServiceItem.tsx
+++ b/src/lib/ServiceItem.tsx
@@ -2,10 +2,10 @@ import React, { useContext } from 'react';
 import { useParams, useHistory } from 'react-router-dom';
 import { Formik } from 'formik';
 import _ from 'lodash';
-import Page from '../Page';
-import hooks from '../../hooks/useAPIClient';
-import useQuery from '../../hooks/useQuery';
-import { post, patch, del } from '../../requests';
+import Page from '../containers/Page';
+import hooks from '../hooks/useAPIClient';
+import useQuery from '../hooks/useQuery';
+import { post, patch, del } from '../requests';
 import ServiceContext, { Action } from './ServiceContext';
 
 interface Params {
diff --git a/src/containers/Service/ServiceList.tsx b/src/lib/ServiceList.tsx
index f716b24..74ad10b 100644
--- a/src/containers/Service/ServiceList.tsx
+++ b/src/lib/ServiceList.tsx
@@ -1,8 +1,8 @@
 import React, { useContext } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import Page from '../Page';
-import ListTable from '../../components/ListTable';
-import hooks from '../../hooks/useAPIClient';
+import Page from '../containers/Page';
+import ListTable from '../components/ListTable';
+import hooks from '../hooks/useAPIClient';
 import ServiceContext from './ServiceContext';
 
 const ServiceList: React.FC = () => {
diff --git a/src/services/account/index.ts b/src/services/account/index.ts
index 7cc28b4..cbe56f5 100644
--- a/src/services/account/index.ts
+++ b/src/services/account/index.ts
@@ -1,4 +1,4 @@
-import { ServiceParams } from '../../containers/Service/ServiceContext';
+import { ServiceParams } from '../../lib/ServiceContext';
 
 const service: ServiceParams = {
   route: 'account',
diff --git a/src/services/contractors/ContractorPanel.tsx b/src/services/contractors/ContractorPanel.tsx
index a3650ef..f7ed8ad 100644
--- a/src/services/contractors/ContractorPanel.tsx
+++ b/src/services/contractors/ContractorPanel.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Button from '../../components/Button';
-import { PanelProps } from '../../containers/Service/ServiceContext';
+import { PanelProps } from '../../lib/ServiceContext';
 
 
 const ContractorPanel: React.FC<PanelProps> = ({ item }) => {
diff --git a/src/services/contractors/index.ts b/src/services/contractors/index.ts
index c9e71a1..2341f3a 100644
--- a/src/services/contractors/index.ts
+++ b/src/services/contractors/index.ts
@@ -1,6 +1,6 @@
 import Form from './ContractorForm';
 import Panel from './ContractorPanel';
-import { ServiceParams } from '../../containers/Service/ServiceContext';
+import { ServiceParams } from '../../lib/ServiceContext';
 
 const service: ServiceParams = {
   route: 'contractors',
diff --git a/src/services/products/index.ts b/src/services/products/index.ts
index 8d42c56..c869541 100644
--- a/src/services/products/index.ts
+++ b/src/services/products/index.ts
@@ -1,5 +1,5 @@
 import Form from './ProductForm';
-import { ServiceParams } from '../../containers/Service/ServiceContext';
+import { ServiceParams } from '../../lib/ServiceContext';
 
 const service: ServiceParams = {
   route: 'products',
diff --git a/src/services/transfers/TransfersUpload.tsx b/src/services/transfers/TransfersUpload.tsx
index aefc72c..c14a5c1 100644
--- a/src/services/transfers/TransfersUpload.tsx
+++ b/src/services/transfers/TransfersUpload.tsx
@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { Form, Formik } from 'formik';
 import Input from '../../components/Input';
 import Page from '../../containers/Page';
-import { Action } from '../../containers/Service/ServiceContext';
+import { Action } from '../../lib/ServiceContext';
 import { post } from '../../requests';
 
 const TransfersUpload: React.FC = () => {
diff --git a/src/services/transfers/index.ts b/src/services/transfers/index.ts
index 51be7e3..37f7b11 100644
--- a/src/services/transfers/index.ts
+++ b/src/services/transfers/index.ts
@@ -1,7 +1,7 @@
 import Form from './TransferForm';
 import UploadPage from './TransfersUpload';
 import { transformOperation } from '../transforms';
-import { ServiceParams } from '../../containers/Service/ServiceContext';
+import { ServiceParams } from '../../lib/ServiceContext';
 
 
 const service: ServiceParams = {
diff --git a/src/services/waybills/WaybillPanel.tsx b/src/services/waybills/WaybillPanel.tsx
index 101a871..1d1701d 100644
--- a/src/services/waybills/WaybillPanel.tsx
+++ b/src/services/waybills/WaybillPanel.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 import Button from '../../components/Button';
 import { patch, baseURL } from '../../requests';
-import { PanelProps } from '../../containers/Service/ServiceContext';
+import { PanelProps } from '../../lib/ServiceContext';
 
 
 const WaybillPanel: React.FC<PanelProps> = ({ item, mutate }) => {
diff --git a/src/services/waybills/index.ts b/src/services/waybills/index.ts
index 4e50f54..8cd6c0c 100644
--- a/src/services/waybills/index.ts
+++ b/src/services/waybills/index.ts
@@ -1,7 +1,7 @@
 import Form from './WaybillForm';
 import Panel from './WaybillPanel';
 import { transformOperation, transformStatus } from '../transforms';
-import { ServiceParams } from '../../containers/Service/ServiceContext';
+import { ServiceParams } from '../../lib/ServiceContext';
 
 const service: ServiceParams = {
   route: 'waybills',