From 3907249dd337c1f3bb58bf79aa576cb3a103951a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chif=20Gerg=C5=91?= <chifgeri97@gmail.com>
Date: Sun, 24 Jan 2021 16:23:50 +0100
Subject: [PATCH] Remove core directory, add pages and types dir
---
src/{core => }/App.tsx | 6 +++---
src/{core/components/MainRouting.tsx => Routes.tsx} | 8 ++++----
src/{core => }/components/CustomModal.tsx | 0
src/{core => }/components/Footer.tsx | 0
src/{core => }/components/Header.tsx | 0
src/{core => }/components/ProfileButton.tsx | 0
src/{core => }/components/ProfileModal.tsx | 0
src/{core => }/context/UserContext.tsx | 2 +-
src/hooks/useAddNews.ts | 2 +-
src/hooks/useGetNewsList.ts | 2 +-
src/index.tsx | 2 +-
src/{components => pages}/NewsPage.tsx | 2 +-
src/{core => types}/types.ts | 0
13 files changed, 12 insertions(+), 12 deletions(-)
rename src/{core => }/App.tsx (88%)
rename src/{core/components/MainRouting.tsx => Routes.tsx} (57%)
rename src/{core => }/components/CustomModal.tsx (100%)
rename src/{core => }/components/Footer.tsx (100%)
rename src/{core => }/components/Header.tsx (100%)
rename src/{core => }/components/ProfileButton.tsx (100%)
rename src/{core => }/components/ProfileModal.tsx (100%)
rename src/{core => }/context/UserContext.tsx (93%)
rename src/{components => pages}/NewsPage.tsx (76%)
rename src/{core => types}/types.ts (100%)
diff --git a/src/core/App.tsx b/src/App.tsx
similarity index 88%
rename from src/core/App.tsx
rename to src/App.tsx
index 00d70f3..a978a39 100644
--- a/src/core/App.tsx
+++ b/src/App.tsx
@@ -1,11 +1,11 @@
import React, { useEffect } from 'react';
import { BrowserRouter as Router } from 'react-router-dom';
import styled from 'styled-components';
-import useAddNews from '../hooks/useAddNews';
import Footer from './components/Footer';
import Header from './components/Header';
-import MainRouting from './components/MainRouting';
import { UserStateProvider } from './context/UserContext';
+import useAddNews from './hooks/useAddNews';
+import Routes from './Routes';
const Container = styled.div`
height: 100%;
@@ -37,7 +37,7 @@ function App(): React.ReactElement {
<Container>
<Header />
<MainContent>
- <MainRouting />
+ <Routes />
</MainContent>
<Footer />
</Container>
diff --git a/src/core/components/MainRouting.tsx b/src/Routes.tsx
similarity index 57%
rename from src/core/components/MainRouting.tsx
rename to src/Routes.tsx
index 9de8dc4..d11cc5a 100644
--- a/src/core/components/MainRouting.tsx
+++ b/src/Routes.tsx
@@ -1,9 +1,9 @@
import React from 'react';
import { Route, Switch } from 'react-router';
-import NewsPage from '../../components/NewsPage';
-import ProfileButton from './ProfileButton';
+import ProfileButton from './components/ProfileButton';
+import NewsPage from './pages/NewsPage';
-const MainRouting: React.FC = () => (
+const Routes: React.FC = () => (
<Switch>
<Route path="/" exact>
<ProfileButton />
@@ -14,4 +14,4 @@ const MainRouting: React.FC = () => (
</Switch>
);
-export default MainRouting;
+export default Routes;
diff --git a/src/core/components/CustomModal.tsx b/src/components/CustomModal.tsx
similarity index 100%
rename from src/core/components/CustomModal.tsx
rename to src/components/CustomModal.tsx
diff --git a/src/core/components/Footer.tsx b/src/components/Footer.tsx
similarity index 100%
rename from src/core/components/Footer.tsx
rename to src/components/Footer.tsx
diff --git a/src/core/components/Header.tsx b/src/components/Header.tsx
similarity index 100%
rename from src/core/components/Header.tsx
rename to src/components/Header.tsx
diff --git a/src/core/components/ProfileButton.tsx b/src/components/ProfileButton.tsx
similarity index 100%
rename from src/core/components/ProfileButton.tsx
rename to src/components/ProfileButton.tsx
diff --git a/src/core/components/ProfileModal.tsx b/src/components/ProfileModal.tsx
similarity index 100%
rename from src/core/components/ProfileModal.tsx
rename to src/components/ProfileModal.tsx
diff --git a/src/core/context/UserContext.tsx b/src/context/UserContext.tsx
similarity index 93%
rename from src/core/context/UserContext.tsx
rename to src/context/UserContext.tsx
index 0c87308..4a9de33 100644
--- a/src/core/context/UserContext.tsx
+++ b/src/context/UserContext.tsx
@@ -1,5 +1,5 @@
import React, { createContext, useState } from 'react';
-import { Profile, Role } from '../types';
+import { Profile, Role } from '../types/types';
interface ContextProps {
profile: Profile;
diff --git a/src/hooks/useAddNews.ts b/src/hooks/useAddNews.ts
index 51d2eb1..240921f 100644
--- a/src/hooks/useAddNews.ts
+++ b/src/hooks/useAddNews.ts
@@ -1,4 +1,4 @@
-import { News } from '../core/types';
+import { News } from '../types/types';
import useRequest from './useRequest';
import useRestQueries from './useRestQueries';
diff --git a/src/hooks/useGetNewsList.ts b/src/hooks/useGetNewsList.ts
index 8505723..d129df7 100644
--- a/src/hooks/useGetNewsList.ts
+++ b/src/hooks/useGetNewsList.ts
@@ -1,4 +1,4 @@
-import { News } from '../core/types';
+import { News } from '../types/types';
import useRequest from './useRequest';
import useRestQueries from './useRestQueries';
diff --git a/src/index.tsx b/src/index.tsx
index 65d5ef9..57a536c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import App from './core/App';
+import App from './App';
import './index.css';
import * as serviceWorker from './serviceWorker';
diff --git a/src/components/NewsPage.tsx b/src/pages/NewsPage.tsx
similarity index 76%
rename from src/components/NewsPage.tsx
rename to src/pages/NewsPage.tsx
index 82b744c..e9b9732 100644
--- a/src/components/NewsPage.tsx
+++ b/src/pages/NewsPage.tsx
@@ -1,6 +1,6 @@
import { Container } from '@material-ui/core';
import React from 'react';
-import NewsContainer from './NewsContainer';
+import NewsContainer from '../components/NewsContainer';
const NewsPage: React.FC = () => (
<Container>
diff --git a/src/core/types.ts b/src/types/types.ts
similarity index 100%
rename from src/core/types.ts
rename to src/types/types.ts
--
GitLab