diff --git a/frontend/src/App.css b/frontend/src/App.css deleted file mode 100644 index 23d7f20b588a3868e08f881ede82f821e154a74d..0000000000000000000000000000000000000000 --- a/frontend/src/App.css +++ /dev/null @@ -1,21 +0,0 @@ -html, -body { - height: 100%; - color: white; - text-align: center; -} - -/* Demo styling */ - -body { - background: #4568DC; - background: -webkit-linear-gradient(to right, #B06AB3, #4568DC); - background: linear-gradient(to right, #B06AB3, #4568DC); -} - -code { - color: #665; - background: #fff; - padding: 0.2rem; - border-radius: 0.2rem; -} \ No newline at end of file diff --git a/frontend/src/App.js b/frontend/src/App.js deleted file mode 100644 index 144eaeae368ef92cabdd17cd8ca700b82c5855e2..0000000000000000000000000000000000000000 --- a/frontend/src/App.js +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react" -import {BrowserRouter as Router, Routes, Route } from 'react-router-dom' - -import { Header, Footer } from "./components" -import { HomePage, Eiffel, NotFoundPage } from "./views" - -import 'bootstrap/dist/css/bootstrap.min.css'; -import styles from "./App.css" - - -export default function App() { - return ( - <div className="App"> - <Router> - <Header /> - <Routes> - <Route exact path='/' element={<HomePage />}/> - <Route path='/eiffel' element={<Eiffel />}/> - <Route path='/*' element={<NotFoundPage />}/> - </Routes> - <Footer /> - </Router> - </div> - ) -} \ No newline at end of file diff --git a/frontend/src/components/Footer.js b/frontend/src/components/Footer.js index ed3ec40aaa9c540298894e0c2944680cf1ba5821..df100b05045e988d80300f0528b42c7ad547c28c 100644 --- a/frontend/src/components/Footer.js +++ b/frontend/src/components/Footer.js @@ -1,6 +1,6 @@ import React from "react" -import styles from "./Footer.css" +import styles from "../styles/Footer.css" export default function Footer() { diff --git a/frontend/src/components/Timetable.js b/frontend/src/components/Timetable.js index 7a99a7c97a17d9542c2c5884c50e024d62f92317..23a123a60a1914bfd127ee0ff139f9bc617142c5 100644 --- a/frontend/src/components/Timetable.js +++ b/frontend/src/components/Timetable.js @@ -1,7 +1,7 @@ import React from "react" import Table from "react-bootstrap/Table" -import styles from "./Timetable.css" +import styles from "../styles/Timetable.css" export default function Timetable (schedule) { diff --git a/frontend/src/index.js b/frontend/src/index.js index c96d6242b041e75318e98644f8b1940e34588ee2..95eeb676ad816e6413fb289ced1daf95de8019b9 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,6 +1,31 @@ import React from "react" import ReactDOM from "react-dom" -import { App } from "./views" +import {BrowserRouter as Router, Routes, Route } from 'react-router-dom' + +import { Header, Footer } from "./components" +import { HomePage, Eiffel, NotFoundPage } from "./views" + +import 'bootstrap/dist/css/bootstrap.min.css'; +import styles from "./styles/index.css" + + +export default function App() { + return ( + <div className="App"> + <Router> + <Header /> + <Routes> + <Route exact path='/' element={<HomePage />}/> + <Route path='/eiffel' element={<Eiffel />}/> + <Route path='/*' element={<NotFoundPage />}/> + </Routes> + <Footer /> + </Router> + </div> + ) +} + + ReactDOM.render( <React.StrictMode> <App /> diff --git a/frontend/src/components/Footer.css b/frontend/src/styles/Footer.css similarity index 100% rename from frontend/src/components/Footer.css rename to frontend/src/styles/Footer.css diff --git a/frontend/src/components/Header.css b/frontend/src/styles/Header.css similarity index 100% rename from frontend/src/components/Header.css rename to frontend/src/styles/Header.css diff --git a/frontend/src/components/Timetable.css b/frontend/src/styles/Timetable.css similarity index 100% rename from frontend/src/components/Timetable.css rename to frontend/src/styles/Timetable.css diff --git a/frontend/src/styles/index.css b/frontend/src/styles/index.css new file mode 100644 index 0000000000000000000000000000000000000000..c465979c99ce95a21c223f4c25aeb961a5cab7d1 --- /dev/null +++ b/frontend/src/styles/index.css @@ -0,0 +1,7 @@ +body { + height: 100%; + color: white; + text-align: center; + background: linear-gradient(to right, #B06AB3, #4568DC); +} + diff --git a/frontend/src/views/index.js b/frontend/src/views/index.js index 2a745ccfd2db832f0ca636527a8fa75d0d67e946..bcf00a8ce71495066f16234528c42c4a963f37f1 100644 --- a/frontend/src/views/index.js +++ b/frontend/src/views/index.js @@ -1,4 +1,3 @@ export { default as HomePage } from "./HomePage" export { default as Eiffel } from "./Eiffel" export { default as NotFoundPage } from "./NotFoundPage" -export { default as App } from "../App"