diff options
Diffstat (limited to 'front/src')
| -rw-r--r-- | front/src/App.js | 25 | ||||
| -rw-r--r-- | front/src/App.test.tsx (renamed from front/src/App.test.js) | 1 | ||||
| -rw-r--r-- | front/src/App.tsx | 27 | ||||
| -rw-r--r-- | front/src/Emelents/ClassList.tsx | 7 | ||||
| -rw-r--r-- | front/src/Emelents/IndexElement.tsx | 9 | ||||
| -rw-r--r-- | front/src/Emelents/Sidebar.tsx | 12 | ||||
| -rw-r--r-- | front/src/index.css | 13 | ||||
| -rw-r--r-- | front/src/index.tsx (renamed from front/src/index.js) | 4 | ||||
| -rw-r--r-- | front/src/react-app-env.d.ts | 1 | ||||
| -rw-r--r-- | front/src/reportWebVitals.ts (renamed from front/src/reportWebVitals.js) | 4 | ||||
| -rw-r--r-- | front/src/setupTests.ts (renamed from front/src/setupTests.js) | 0 |
11 files changed, 71 insertions, 32 deletions
diff --git a/front/src/App.js b/front/src/App.js deleted file mode 100644 index 3784575..0000000 --- a/front/src/App.js +++ /dev/null @@ -1,25 +0,0 @@ -import logo from './logo.svg'; -import './App.css'; - -function App() { - return ( - <div className="App"> - <header className="App-header"> - <img src={logo} className="App-logo" alt="logo" /> - <p> - Edit <code>src/App.js</code> and save to reload. - </p> - <a - className="App-link" - href="https://reactjs.org" - target="_blank" - rel="noopener noreferrer" - > - Learn React - </a> - </header> - </div> - ); -} - -export default App; diff --git a/front/src/App.test.js b/front/src/App.test.tsx index 1f03afe..2a68616 100644 --- a/front/src/App.test.js +++ b/front/src/App.test.tsx @@ -1,3 +1,4 @@ +import React from 'react'; import { render, screen } from '@testing-library/react'; import App from './App'; diff --git a/front/src/App.tsx b/front/src/App.tsx new file mode 100644 index 0000000..47cc1ed --- /dev/null +++ b/front/src/App.tsx @@ -0,0 +1,27 @@ +import './App.css'; +import Sidebar from './Emelents/Sidebar'; +import { createBrowserRouter, RouterProvider } from 'react-router'; +import IndexElement from './Emelents/IndexElement'; +import ClassesList from './Emelents/ClassList'; + +const router = createBrowserRouter([ + { + index: true, + element: (<IndexElement />), + }, + { + path: "/classes", + element: (<ClassesList />), + }, +]); + +function App() { + return ( + <div> + <Sidebar /> + <RouterProvider router={router} /> + </div> + ); +} + +export default App; diff --git a/front/src/Emelents/ClassList.tsx b/front/src/Emelents/ClassList.tsx new file mode 100644 index 0000000..f0f6fcc --- /dev/null +++ b/front/src/Emelents/ClassList.tsx @@ -0,0 +1,7 @@ +function ClassesList() { + return ( + <h1> Classes list </h1> + ); +} + +export default ClassesList; diff --git a/front/src/Emelents/IndexElement.tsx b/front/src/Emelents/IndexElement.tsx new file mode 100644 index 0000000..4eda815 --- /dev/null +++ b/front/src/Emelents/IndexElement.tsx @@ -0,0 +1,9 @@ +function IndexElement() { + return ( + <div> + <h1> Index element </h1> + </div> + ); +} + +export default IndexElement; diff --git a/front/src/Emelents/Sidebar.tsx b/front/src/Emelents/Sidebar.tsx new file mode 100644 index 0000000..c5a4a9c --- /dev/null +++ b/front/src/Emelents/Sidebar.tsx @@ -0,0 +1,12 @@ +function Sidebar() { + return ( + <nav className='Sidebar'> + <h1> Test </h1> + <ul> + <li> <a href="/classes"> Class list </a> </li> + </ul> + </nav> + ) +} + +export default Sidebar; diff --git a/front/src/index.css b/front/src/index.css index ec2585e..dfdc4ba 100644 --- a/front/src/index.css +++ b/front/src/index.css @@ -1,13 +1,16 @@ body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + padding: 0; + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + position: absolute; + top: 0px; } code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace; } diff --git a/front/src/index.js b/front/src/index.tsx index d563c0f..032464f 100644 --- a/front/src/index.js +++ b/front/src/index.tsx @@ -4,7 +4,9 @@ import './index.css'; import App from './App'; import reportWebVitals from './reportWebVitals'; -const root = ReactDOM.createRoot(document.getElementById('root')); +const root = ReactDOM.createRoot( + document.getElementById('root') as HTMLElement +); root.render( <React.StrictMode> <App /> diff --git a/front/src/react-app-env.d.ts b/front/src/react-app-env.d.ts new file mode 100644 index 0000000..6431bc5 --- /dev/null +++ b/front/src/react-app-env.d.ts @@ -0,0 +1 @@ +/// <reference types="react-scripts" /> diff --git a/front/src/reportWebVitals.js b/front/src/reportWebVitals.ts index 5253d3a..49a2a16 100644 --- a/front/src/reportWebVitals.js +++ b/front/src/reportWebVitals.ts @@ -1,4 +1,6 @@ -const reportWebVitals = onPerfEntry => { +import { ReportHandler } from 'web-vitals'; + +const reportWebVitals = (onPerfEntry?: ReportHandler) => { if (onPerfEntry && onPerfEntry instanceof Function) { import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { getCLS(onPerfEntry); diff --git a/front/src/setupTests.js b/front/src/setupTests.ts index 8f2609b..8f2609b 100644 --- a/front/src/setupTests.js +++ b/front/src/setupTests.ts |
