Skip to content
Snippets Groups Projects
Commit 3907249d authored by Chif Gergő's avatar Chif Gergő
Browse files

Remove core directory, add pages and types dir

parent d0d2f07e
No related branches found
No related tags found
2 merge requests!19fix type imports,!8Refactor structure
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { BrowserRouter as Router } from 'react-router-dom'; import { BrowserRouter as Router } from 'react-router-dom';
import styled from 'styled-components'; import styled from 'styled-components';
import useAddNews from '../hooks/useAddNews';
import Footer from './components/Footer'; import Footer from './components/Footer';
import Header from './components/Header'; import Header from './components/Header';
import MainRouting from './components/MainRouting';
import { UserStateProvider } from './context/UserContext'; import { UserStateProvider } from './context/UserContext';
import useAddNews from './hooks/useAddNews';
import Routes from './Routes';
const Container = styled.div` const Container = styled.div`
height: 100%; height: 100%;
...@@ -37,7 +37,7 @@ function App(): React.ReactElement { ...@@ -37,7 +37,7 @@ function App(): React.ReactElement {
<Container> <Container>
<Header /> <Header />
<MainContent> <MainContent>
<MainRouting /> <Routes />
</MainContent> </MainContent>
<Footer /> <Footer />
</Container> </Container>
......
import React from 'react'; import React from 'react';
import { Route, Switch } from 'react-router'; import { Route, Switch } from 'react-router';
import NewsPage from '../../components/NewsPage'; import ProfileButton from './components/ProfileButton';
import ProfileButton from './ProfileButton'; import NewsPage from './pages/NewsPage';
const MainRouting: React.FC = () => ( const Routes: React.FC = () => (
<Switch> <Switch>
<Route path="/" exact> <Route path="/" exact>
<ProfileButton /> <ProfileButton />
...@@ -14,4 +14,4 @@ const MainRouting: React.FC = () => ( ...@@ -14,4 +14,4 @@ const MainRouting: React.FC = () => (
</Switch> </Switch>
); );
export default MainRouting; export default Routes;
File moved
File moved
import React, { createContext, useState } from 'react'; import React, { createContext, useState } from 'react';
import { Profile, Role } from '../types'; import { Profile, Role } from '../types/types';
interface ContextProps { interface ContextProps {
profile: Profile; profile: Profile;
......
import { News } from '../core/types'; import { News } from '../types/types';
import useRequest from './useRequest'; import useRequest from './useRequest';
import useRestQueries from './useRestQueries'; import useRestQueries from './useRestQueries';
......
import { News } from '../core/types'; import { News } from '../types/types';
import useRequest from './useRequest'; import useRequest from './useRequest';
import useRestQueries from './useRestQueries'; import useRestQueries from './useRestQueries';
......
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import App from './core/App'; import App from './App';
import './index.css'; import './index.css';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
......
import { Container } from '@material-ui/core'; import { Container } from '@material-ui/core';
import React from 'react'; import React from 'react';
import NewsContainer from './NewsContainer'; import NewsContainer from '../components/NewsContainer';
const NewsPage: React.FC = () => ( const NewsPage: React.FC = () => (
<Container> <Container>
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment