diff --git a/static/package.json b/static/package.json index a5a23ab..0c45543 100644 --- a/static/package.json +++ b/static/package.json @@ -12,6 +12,7 @@ "react": "^16.0.0", "react-dom": "^16.0.0", "react-router": "^4.2.0", + "react-router-dom": "^4.2.2", "react-scripts": "1.0.17", "semantic-ui-css": "^2.2.12", "semantic-ui-react": "^0.76.0" diff --git a/static/src/Menu/Menu.js b/static/src/Menu/Menu.js deleted file mode 100644 index 04073d1..0000000 --- a/static/src/Menu/Menu.js +++ /dev/null @@ -1,82 +0,0 @@ -import React, { Component } from 'react' -import { Container, Menu, Input } from 'semantic-ui-react' -import Home from '../App/App' - -import React from 'react' -import { render } from 'react-dom' - -// First we import some modules... -import { Router, Route, IndexRoute, Link, hashHistory } from 'react-router' - -// Make a new component to render inside of Inbox -const Message = React.createClass({ - render() { - return

Message

- } -}) - -const Inbox = React.createClass({ - render() { - return ( -
-

Inbox

-
- ) - } -}) - - - -class MenuComponent extends Component { - componentWillMount() { - - } - - state = { - activeItem: 'home', - history: null - } - - handleItemClick = (e, { name }) => this.setState({ activeItem: name }) - - render() { - const { activeItem, history } = this.state - let currentItem; - switch (activeItem) { - case 'home': - currentItem = - break; - } - return ( - // - // - // - // - // - // - // - // - // - // - // - // - // {{ currentItem }} - // - - - - - - {/* add some nested routes where we want the UI to nest */} - {/* render the stats page when at `/inbox` */} - - {/* render the message component at /inbox/messages/123 */} - - - - - ) - } -} - -export default MenuComponent; diff --git a/static/src/index.html b/static/src/index.html deleted file mode 100644 index 0d1ff9f..0000000 --- a/static/src/index.html +++ /dev/null @@ -1,18 +0,0 @@ - - - -
- - - - - - - - \ No newline at end of file diff --git a/static/src/index.js b/static/src/index.js index 70993d5..628d5f5 100644 --- a/static/src/index.js +++ b/static/src/index.js @@ -3,8 +3,13 @@ import ReactDOM from 'react-dom'; import './index.css'; import 'semantic-ui-css/semantic.min.css'; import App from './App/App'; -import Menu from './Menu/Menu'; import registerServiceWorker from './registerServiceWorker'; -ReactDOM.render(, document.getElementById('root')); +import { BrowserRouter } from 'react-router-dom' + +ReactDOM.render(( + + + +), document.getElementById('root')) registerServiceWorker(); diff --git a/static/yarn.lock b/static/yarn.lock index f535986..6debfff 100644 --- a/static/yarn.lock +++ b/static/yarn.lock @@ -3746,6 +3746,10 @@ jsx-ast-utils@^2.0.0: dependencies: array-includes "^3.0.3" +killable@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b" + kind-of@^3.0.2: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5059,6 +5063,17 @@ react-error-overlay@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-3.0.0.tgz#c2bc8f4d91f1375b3dad6d75265d51cd5eeaf655" +react-router-dom@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d" + dependencies: + history "^4.7.2" + invariant "^2.2.2" + loose-envify "^1.3.1" + prop-types "^15.5.4" + react-router "^4.2.0" + warning "^3.0.0" + react-router@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" @@ -5071,9 +5086,9 @@ react-router@^4.2.0: prop-types "^15.5.4" warning "^3.0.0" -react-scripts@1.0.16: - version "1.0.16" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.0.16.tgz#0d3c7ec30925fb0017cd185b1056ee085065f92c" +react-scripts@1.0.17: + version "1.0.17" + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.0.17.tgz#c30029123b561a060227af4d7797d50a222d3fbf" dependencies: autoprefixer "7.1.6" babel-core "6.26.0" @@ -5108,7 +5123,7 @@ react-scripts@1.0.16: sw-precache-webpack-plugin "0.11.4" url-loader "0.6.2" webpack "3.8.1" - webpack-dev-server "2.9.3" + webpack-dev-server "2.9.4" webpack-manifest-plugin "1.3.2" whatwg-fetch "2.0.3" optionalDependencies: @@ -5479,9 +5494,9 @@ semantic-ui-css@^2.2.12: dependencies: jquery x.* -semantic-ui-react@^0.75.1: - version "0.75.1" - resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.75.1.tgz#81c2ed7ed45562f89e5049c5a64195b9638d8daf" +semantic-ui-react@^0.76.0: + version "0.76.0" + resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.76.0.tgz#39d8135416d787d904e0361399006fb8e0b24c8a" dependencies: babel-runtime "^6.25.0" classnames "^2.2.5" @@ -6263,9 +6278,9 @@ webpack-dev-middleware@^1.11.0: range-parser "^1.0.3" time-stamp "^2.0.0" -webpack-dev-server@2.9.3: - version "2.9.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.3.tgz#f0554e88d129e87796a6f74a016b991743ca6f81" +webpack-dev-server@2.9.4: + version "2.9.4" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" @@ -6281,6 +6296,7 @@ webpack-dev-server@2.9.3: import-local "^0.1.1" internal-ip "1.2.0" ip "^1.1.5" + killable "^1.0.0" loglevel "^1.4.1" opn "^5.1.0" portfinder "^1.0.9"