From 0f9903952a9d6f701f6aecaa6a06be95d056be13 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Mon, 6 Nov 2017 14:22:02 +0100 Subject: [PATCH] - Added routing --- static/src/About/About.js | 12 +++++++++ static/src/Header/Header.js | 13 ++++++++++ static/src/{App => Home}/App.test.js | 0 static/src/{App/App.css => Home/Home.css} | 0 static/src/{App/App.js => Home/Home.js} | 9 +++---- static/src/index.js | 30 +++++++++++++++-------- 6 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 static/src/About/About.js create mode 100644 static/src/Header/Header.js rename static/src/{App => Home}/App.test.js (100%) rename static/src/{App/App.css => Home/Home.css} (100%) rename static/src/{App/App.js => Home/Home.js} (97%) diff --git a/static/src/About/About.js b/static/src/About/About.js new file mode 100644 index 0000000..951b620 --- /dev/null +++ b/static/src/About/About.js @@ -0,0 +1,12 @@ +import React, { Component } from 'react' +import { Container } from 'semantic-ui-react' + +export default class AppComponent extends Component { + render() { + return ( + +
About
+
+ ) + } +}; diff --git a/static/src/Header/Header.js b/static/src/Header/Header.js new file mode 100644 index 0000000..5c0a2e2 --- /dev/null +++ b/static/src/Header/Header.js @@ -0,0 +1,13 @@ +import React, { Component } from 'react' +import { Link } from 'react-router-dom' + +export default class HeaderComponent extends Component { + render() { + return ( + + ) + } +}; diff --git a/static/src/App/App.test.js b/static/src/Home/App.test.js similarity index 100% rename from static/src/App/App.test.js rename to static/src/Home/App.test.js diff --git a/static/src/App/App.css b/static/src/Home/Home.css similarity index 100% rename from static/src/App/App.css rename to static/src/Home/Home.css diff --git a/static/src/App/App.js b/static/src/Home/Home.js similarity index 97% rename from static/src/App/App.js rename to static/src/Home/Home.js index 269ab65..9f78ba9 100644 --- a/static/src/App/App.js +++ b/static/src/Home/Home.js @@ -1,8 +1,9 @@ import React, { Component } from 'react' import { Container, Input, Segment, Form, Modal, Button } from 'semantic-ui-react' -import './App.css'; -class AppComponent extends Component { +import './Home.css'; + +export default class HomeComponent extends Component { handleURLChange = (e, { value }) => this.url = value handleURLSubmit = () => { fetch('/api/v1/protected/create', { @@ -104,6 +105,4 @@ class AppComponent extends Component { ) } } -} - -export default AppComponent; +}; \ No newline at end of file diff --git a/static/src/index.js b/static/src/index.js index 628d5f5..66a8e6e 100644 --- a/static/src/index.js +++ b/static/src/index.js @@ -1,15 +1,25 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import 'semantic-ui-css/semantic.min.css'; -import App from './App/App'; import registerServiceWorker from './registerServiceWorker'; +import React from 'react' +import ReactDOM from 'react-dom'; +import { + HashRouter, + Route +} from 'react-router-dom' -import { BrowserRouter } from 'react-router-dom' +import Header from './Header/Header' +import About from './About/About' +import Home from './Home/Home' + +import 'semantic-ui-css/semantic.min.css'; ReactDOM.render(( - - - + +
+
+ + +
+
), document.getElementById('root')) -registerServiceWorker(); + +registerServiceWorker(); \ No newline at end of file