refactor: combine core and app dirs

mairisb · Oct 10, 2024 · 921ea88 · 921ea88
1 parent 33f79ee
commit 921ea88
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 11 deletions.
diff --git a/.../client/src/core/api-client/api.client.ts → ...s/client/src/app/api-client/api.client.ts b/.../client/src/core/api-client/api.client.ts → ...s/client/src/app/api-client/api.client.ts
diff --git a/packages/client/src/core/api/api.ts → packages/client/src/app/api/api.ts b/packages/client/src/core/api/api.ts → packages/client/src/app/api/api.ts
diff --git a/...s/client/src/core/api/axios-base-query.ts → ...es/client/src/app/api/axios-base-query.ts b/...s/client/src/core/api/axios-base-query.ts → ...es/client/src/app/api/axios-base-query.ts
diff --git a/packages/client/src/app/app.tsx b/packages/client/src/app/app.tsx
@@ -2,7 +2,7 @@ import { ThemeProvider } from '@emotion/react';
 import { Container, useMediaQuery } from '@mui/material';
 import { useEffect } from 'react';
 import { useRoutes } from 'react-router-dom';
-import { useAppDispatch } from '../core/hooks/app-dispatch.hook';
+import { useAppDispatch } from './hooks/app-dispatch.hook';
 import { authThunks } from '../features/auth/auth.thunks';
 import { appRoutes } from './app.routes';
 import { NavigationBar } from './components/navigation-bar/navigation-bar';

diff --git a/packages/client/src/app/components/navigation-bar/navigation-bar.tsx b/packages/client/src/app/components/navigation-bar/navigation-bar.tsx
@@ -11,7 +11,7 @@ import {
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { useAppDispatch } from '../../../core/hooks/app-dispatch.hook';
+import { useAppDispatch } from '../../hooks/app-dispatch.hook';
 import { authSelectors } from '../../../features/auth/auth.selectors';
 import { authThunks } from '../../../features/auth/auth.thunks';
 

diff --git a/packages/client/src/core/config.ts → packages/client/src/app/config.ts b/packages/client/src/core/config.ts → packages/client/src/app/config.ts
diff --git a/...nt/src/core/helpers/error.helpers.spec.ts → ...ent/src/app/helpers/error.helpers.spec.ts b/...nt/src/core/helpers/error.helpers.spec.ts → ...ent/src/app/helpers/error.helpers.spec.ts
diff --git a/.../client/src/core/helpers/error.helpers.ts → ...s/client/src/app/helpers/error.helpers.ts b/.../client/src/core/helpers/error.helpers.ts → ...s/client/src/app/helpers/error.helpers.ts
diff --git a/...lient/src/core/hooks/app-dispatch.hook.ts → ...client/src/app/hooks/app-dispatch.hook.ts b/...lient/src/core/hooks/app-dispatch.hook.ts → ...client/src/app/hooks/app-dispatch.hook.ts
diff --git a/...lient/src/core/hooks/app-selector.hook.ts → ...client/src/app/hooks/app-selector.hook.ts b/...lient/src/core/hooks/app-selector.hook.ts → ...client/src/app/hooks/app-selector.hook.ts
diff --git a/packages/client/src/app/pages/page.tsx b/packages/client/src/app/pages/page.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import { config } from '../../core/config';
+import { config } from '../config';
 import { authSelectors } from '../../features/auth/auth.selectors';
 
 export interface PageProps extends React.PropsWithChildren {

diff --git a/packages/client/src/core/store.ts → packages/client/src/app/store.ts b/packages/client/src/core/store.ts → packages/client/src/app/store.ts
diff --git a/packages/client/src/features/auth/auth.api.ts b/packages/client/src/features/auth/auth.api.ts
@@ -5,8 +5,8 @@ import {
   RegisterRequest,
   UserDto,
 } from '@tspark/common';
-import { axiosBaseQuery } from '../../core/api/axios-base-query';
-import { config } from '../../core/config';
+import { axiosBaseQuery } from '../../app/api/axios-base-query';
+import { config } from '../../app/config';
 
 export const authApi = createApi({
   reducerPath: 'authApi',

diff --git a/packages/client/src/features/auth/auth.selectors.ts b/packages/client/src/features/auth/auth.selectors.ts
@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from '../../core/store';
+import { RootState } from '../../app/store';
 
 const selectAuth = (state: RootState) => state.auth;
 

diff --git a/packages/client/src/features/auth/pages/login/login.page.tsx b/packages/client/src/features/auth/pages/login/login.page.tsx
@@ -2,7 +2,7 @@ import { Stack } from '@mui/material';
 import { Link } from 'react-router-dom';
 import { useNotification } from '../../../../app/hooks/notification.hook';
 import { Page } from '../../../../app/pages/page';
-import { useAppDispatch } from '../../../../core/hooks/app-dispatch.hook';
+import { useAppDispatch } from '../../../../app/hooks/app-dispatch.hook';
 import { authThunks } from '../../auth.thunks';
 import {
   LoginForm,

diff --git a/packages/client/src/features/auth/pages/register/register.page.tsx b/packages/client/src/features/auth/pages/register/register.page.tsx
@@ -1,6 +1,6 @@
 import { useNotification } from '../../../../app/hooks/notification.hook';
 import { Page } from '../../../../app/pages/page';
-import { useAppDispatch } from '../../../../core/hooks/app-dispatch.hook';
+import { useAppDispatch } from '../../../../app/hooks/app-dispatch.hook';
 import { authThunks } from '../../auth.thunks';
 import {
   RegisterForm,

diff --git a/packages/client/src/features/card/card.api.ts b/packages/client/src/features/card/card.api.ts
@@ -1,7 +1,7 @@
 import { createApi } from '@reduxjs/toolkit/query/react';
 import { CardDto } from '@tspark/common';
-import { axiosBaseQuery } from '../../core/api/axios-base-query';
-import { config } from '../../core/config';
+import { axiosBaseQuery } from '../../app/api/axios-base-query';
+import { config } from '../../app/config';
 
 export const cardApi = createApi({
   reducerPath: 'cardApi',

diff --git a/packages/client/src/index.tsx b/packages/client/src/index.tsx
@@ -7,7 +7,7 @@ import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
 import { App } from './app/app';
 import { NotificationProvider } from './app/components/notifications/NotificationProvider';
-import { setupStore } from './core/store';
+import { setupStore } from './app/store';
 
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement,