diff --git a/src/App.js b/src/App.js index 756d5a6..81cfc52 100644 --- a/src/App.js +++ b/src/App.js @@ -2,27 +2,30 @@ import './variables.css'; import './App.css'; import React, { Component } from 'react'; +import { BrowserRouter as Router, Route } from 'react-router-dom'; import NavigationDrawer from './components/NavigationDrawer.js' -import Header from './components/Header.js' -import PageArea from './components/PageArea.js' import BottomMenu from './components/BottomMenu.js' +import Tickets from './components/pages/Tickets.js'; +import TicketsBuy from './components/pages/TicketsBuy.js'; +import Travel from './components/pages/Travel.js'; + class App extends Component { render() { return ( -
- {/* -
+ +
+ + + + + + + + +
+
); } } diff --git a/src/components/BottomMenu.js b/src/components/BottomMenu.js index 0f98a17..afdf4f9 100644 --- a/src/components/BottomMenu.js +++ b/src/components/BottomMenu.js @@ -1,17 +1,28 @@ import React, { Component } from 'react'; +import { Link } from 'react-router-dom'; + +import BottomMenuButton from './BottomMenuButton'; + import './css/BottomMenu.css'; import ticketsIcon from '../img/tickets.svg'; -import buyTicketsIcon from '../img/tickets+.svg'; +import ticketsBuyIcon from '../img/tickets+.svg'; import travelIcon from '../img/tram.svg'; -import BottomMenuButton from './BottomMenuButton'; class BottomMenu extends Component { render() { return (
- - - + + + + + + + + + + +
); } diff --git a/src/components/css/BottomMenu.css b/src/components/css/BottomMenu.css index 5aa7d54..baee283 100644 --- a/src/components/css/BottomMenu.css +++ b/src/components/css/BottomMenu.css @@ -8,6 +8,11 @@ border-top: 2px solid rgba(0, 0, 0, 0.05); } +#bottomMenu a { + display: contents; + text-decoration: none; +} + #bottomMenu button { background: none; border: none; diff --git a/src/components/pages/Tickets.js b/src/components/pages/Tickets.js new file mode 100644 index 0000000..3e14766 --- /dev/null +++ b/src/components/pages/Tickets.js @@ -0,0 +1,17 @@ +import React, { Component } from 'react'; + +import Header from '../Header.js' +import MainArea from '../MainArea.js' + +class Tickets extends Component { + render() { + return ( + <> +
+ + + ); + } +} + +export default Tickets; \ No newline at end of file diff --git a/src/components/pages/TicketsBuy.js b/src/components/pages/TicketsBuy.js new file mode 100644 index 0000000..6343e13 --- /dev/null +++ b/src/components/pages/TicketsBuy.js @@ -0,0 +1,17 @@ +import React, { Component } from 'react'; + +import Header from '../Header.js' +import MainArea from '../MainArea.js' + +class TicketsBuy extends Component { + render() { + return ( + <> +
+ + + ); + } +} + +export default TicketsBuy; \ No newline at end of file diff --git a/src/components/pages/Travel.js b/src/components/pages/Travel.js new file mode 100644 index 0000000..930c7bc --- /dev/null +++ b/src/components/pages/Travel.js @@ -0,0 +1,17 @@ +import React, { Component } from 'react'; + +import Header from '../Header.js' +import MainArea from '../MainArea.js' + +class Travel extends Component { + render() { + return ( + <> +
+ + + ); + } +} + +export default Travel; \ No newline at end of file