From ebfbccb9f4dee6fde0d81cc92a5151ed2ceb9b05 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:20:57 -0500 Subject: [PATCH] [U] Router --- frontend/src/App.sass | 19 ------------------- frontend/src/App.test.tsx | 9 --------- frontend/src/App.tsx | 15 --------------- frontend/src/index.tsx | 12 ++++++++++-- frontend/src/pages/Welcome.tsx | 9 +++++++++ 5 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 frontend/src/App.sass delete mode 100644 frontend/src/App.test.tsx delete mode 100644 frontend/src/App.tsx create mode 100644 frontend/src/pages/Welcome.tsx diff --git a/frontend/src/App.sass b/frontend/src/App.sass deleted file mode 100644 index dcf1123..0000000 --- a/frontend/src/App.sass +++ /dev/null @@ -1,19 +0,0 @@ -.App - text-align: center - -.App-logo - height: 40vmin - pointer-events: none - -.App-header - background-color: #282c34 - min-height: 100vh - display: flex - flex-direction: column - align-items: center - justify-content: center - font-size: calc(10px + 2vmin) - color: white - -.App-link - color: #61dafb diff --git a/frontend/src/App.test.tsx b/frontend/src/App.test.tsx deleted file mode 100644 index 2a68616..0000000 --- a/frontend/src/App.test.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - render(); - const linkElement = screen.getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx deleted file mode 100644 index 056178d..0000000 --- a/frontend/src/App.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import './App.sass'; -import {Route, BrowserRouter as Router} from "react-router-dom"; - -function App() { - return -
- - - -
-
-} - -export default App; diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 0410b7b..05a2dc4 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -1,15 +1,23 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.sass'; -import App from './App'; import reportWebVitals from './reportWebVitals'; +import {createBrowserRouter, RouterProvider} from "react-router-dom"; +import Welcome from "./pages/Welcome"; + +const router = createBrowserRouter([ + { + path: '/', + element: , + } +]) const root = ReactDOM.createRoot( document.getElementById('root') as HTMLElement ); root.render( - + ); diff --git a/frontend/src/pages/Welcome.tsx b/frontend/src/pages/Welcome.tsx new file mode 100644 index 0000000..be14f07 --- /dev/null +++ b/frontend/src/pages/Welcome.tsx @@ -0,0 +1,9 @@ +export default function Welcome() +{ + return <> +
Duolingo++
+ + + + +}