diff --git a/src/App.js b/src/App.js index a330bec..ebd62d0 100644 --- a/src/App.js +++ b/src/App.js @@ -3,8 +3,7 @@ import "bootstrap/dist/js/bootstrap.bundle.min"; import './App.css'; import Navigation from './UI/Navigation'; -import ContentItem from './Content/ContentItem'; -import Sidebar from './UI/Sidebar'; + function App() { return ( @@ -12,10 +11,6 @@ function App() {
-
- - -
); } diff --git a/src/Content/ContentItem.js b/src/Content/ContentItem.js index 4698c3f..d3aa94c 100644 --- a/src/Content/ContentItem.js +++ b/src/Content/ContentItem.js @@ -4,6 +4,7 @@ import React from 'react'; const ContentItem = (props) => { return (
+

{props.title}

Item 1

diff --git a/src/Pages/Linux/Linux.js b/src/Pages/Linux/Linux.js new file mode 100644 index 0000000..bb7ff50 --- /dev/null +++ b/src/Pages/Linux/Linux.js @@ -0,0 +1,14 @@ +import React from 'react'; +import ContentItem from '../../Content/ContentItem'; +import Sidebar from '../../UI/Sidebar'; + +function Linux (){ + return ( +

+ + +
+ ) +} + +export default Linux; \ No newline at end of file diff --git a/src/Pages/Radio/Radio.js b/src/Pages/Radio/Radio.js new file mode 100644 index 0000000..b277485 --- /dev/null +++ b/src/Pages/Radio/Radio.js @@ -0,0 +1,14 @@ +import React from 'react'; +import ContentItem from '../../Content/ContentItem'; +import Sidebar from '../../UI/Sidebar'; + +function Radio (){ + return ( +
+ + +
+ ) +} + +export default Radio; \ No newline at end of file diff --git a/src/Pages/Software/Software.js b/src/Pages/Software/Software.js new file mode 100644 index 0000000..905d19a --- /dev/null +++ b/src/Pages/Software/Software.js @@ -0,0 +1,14 @@ +import React from 'react'; +import ContentItem from '../../Content/ContentItem'; +import Sidebar from '../../UI/Sidebar'; + +function Software (){ + return ( +
+ + +
+ ) +} + +export default Software; \ No newline at end of file diff --git a/src/Pages/Test.js b/src/Pages/Test.js new file mode 100644 index 0000000..a8afabc --- /dev/null +++ b/src/Pages/Test.js @@ -0,0 +1,14 @@ +import React from 'react'; +import ContentItem from '../Content/ContentItem'; +import Sidebar from '../UI/Sidebar'; + +function Test (){ + return ( +
+ + +
+ ) +} + +export default Test; \ No newline at end of file diff --git a/src/UI/Navigation.js b/src/UI/Navigation.js index 5b631b7..520a4f5 100644 --- a/src/UI/Navigation.js +++ b/src/UI/Navigation.js @@ -1,9 +1,17 @@ import React from 'react'; +import {BrowserRouter as Router, Routes, Route, Link} from 'react-router-dom'; + +import Test from '../Pages/Test'; +import Linux from '../Pages/Linux/Linux'; +import Radio from '../Pages/Radio/Radio'; +import Software from '../Pages/Software/Software'; + import './Navigation.css'; const Navigation = (props) => { - return ( + return ( + + + }> + }> + }> + }> + + ) }