Moved routes from App.tsx and stores from index.tsx
This commit is contained in:
parent
d1c0ae0a15
commit
76a20d7685
@ -1,22 +1,13 @@
|
||||
import { Routes, Route } from 'react-router-dom';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
|
||||
import BrowseLayout from './components/BrowseLayout';
|
||||
import CategoryPage from './pages/CategoryPage';
|
||||
import ChannelPage from './pages/ChannelPage';
|
||||
import LoginPage from './pages/LoginPage';
|
||||
import SignupPage from './pages/SignupPage';
|
||||
import Routes from './routes';
|
||||
import './styles/global.css';
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<Routes>
|
||||
<Route path="/login" element={<LoginPage />} />
|
||||
<Route path="/signup" element={<SignupPage />} />
|
||||
<Route element={<BrowseLayout />}>
|
||||
<Route path="/:channel" element={<ChannelPage />} />
|
||||
<Route path="/category/:category" element={<CategoryPage />} />
|
||||
<Route path="/" element={<h1>Hi</h1>} />
|
||||
</Route>
|
||||
</Routes>
|
||||
<BrowserRouter>
|
||||
<Routes />
|
||||
</BrowserRouter>
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -1,14 +1,10 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
|
||||
import App from './App';
|
||||
import './styles/global.css';
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
|
||||
<React.StrictMode>
|
||||
<BrowserRouter>
|
||||
<App />
|
||||
</BrowserRouter>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
|
24
client/src/routes/index.tsx
Normal file
24
client/src/routes/index.tsx
Normal file
@ -0,0 +1,24 @@
|
||||
import { FC } from 'react';
|
||||
import { Routes, Route } from 'react-router-dom';
|
||||
|
||||
import BrowseLayout from '../components/BrowseLayout';
|
||||
import CategoryPage from '../pages/CategoryPage';
|
||||
import ChannelPage from '../pages/ChannelPage';
|
||||
import LoginPage from '../pages/LoginPage';
|
||||
import SignupPage from '../pages/SignupPage';
|
||||
|
||||
const Router: FC = () => {
|
||||
return (
|
||||
<Routes>
|
||||
<Route path="/login" element={<LoginPage />} />
|
||||
<Route path="/signup" element={<SignupPage />} />
|
||||
<Route element={<BrowseLayout />}>
|
||||
<Route path="/:channel" element={<ChannelPage />} />
|
||||
<Route path="/category/:category" element={<CategoryPage />} />
|
||||
<Route path="/" element={<h1>Hi</h1>} />
|
||||
</Route>
|
||||
</Routes>
|
||||
);
|
||||
};
|
||||
|
||||
export default Router;
|
Loading…
x
Reference in New Issue
Block a user