Browse Source

Added recent shorted URLs listing: fix #43

Moved back to the HistoryRouter
dependabot/npm_and_yarn/web/prismjs-1.21.0
Max Schmitt 8 years ago
parent
commit
2da6de9747
  1. 4
      static/src/About/About.js
  2. 2
      static/src/Recent/Recent.js
  3. 10
      static/src/index.js

4
static/src/About/About.js

@ -7,8 +7,8 @@ export default class AboutComponent extends Component {
info: null info: null
} }
componentDidMount() { componentWillMount() {
this.setState({ info: this.props.location.state.info }) this.setState({ info: this.props.info })
} }
render() { render() {

2
static/src/Recent/Recent.js

@ -8,7 +8,7 @@ export default class RecentComponent extends Component {
recent: null recent: null
} }
componentWillMount() { componentDidMount() {
fetch('/api/v1/protected/recent', { fetch('/api/v1/protected/recent', {
method: 'POST', method: 'POST',
headers: { headers: {

10
static/src/index.js

@ -1,6 +1,6 @@
import React, { Component } from 'react' import React, { Component } from 'react'
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { MemoryRouter, Route, Link } from 'react-router-dom' import { HashRouter, Route, Link } from 'react-router-dom'
import { Menu, Container, Modal, Button, Image, Icon } from 'semantic-ui-react' import { Menu, Container, Modal, Button, Image, Icon } from 'semantic-ui-react'
import toastr from 'toastr' import toastr from 'toastr'
import 'semantic-ui-css/semantic.min.css'; import 'semantic-ui-css/semantic.min.css';
@ -28,7 +28,7 @@ export default class BaseComponent extends Component {
this.setState({ oAuthOpen: true }) this.setState({ oAuthOpen: true })
} }
componentDidMount() { componentWillMount() {
fetch('/api/v1/info') fetch('/api/v1/info')
.then(d => d.json()) .then(d => d.json())
.then(info => this.setState({ info })) .then(info => this.setState({ info }))
@ -129,7 +129,7 @@ export default class BaseComponent extends Component {
) )
} }
return ( return (
<MemoryRouter> <HashRouter>
<Container style={{ paddingTop: "15px" }}> <Container style={{ paddingTop: "15px" }}>
<Menu stackable> <Menu stackable>
<Menu.Item as={Link} to="/" name='shorten' onClick={this.handleItemClick} > <Menu.Item as={Link} to="/" name='shorten' onClick={this.handleItemClick} >
@ -158,13 +158,13 @@ export default class BaseComponent extends Component {
</Menu.Menu> </Menu.Menu>
</Menu> </Menu>
<Route exact path="/" component={Home} /> <Route exact path="/" component={Home} />
<Route path="/about" component={About} /> <Route path="/about" render={() => <About info={info} />} />
<Route path="/ShareX" component={ShareX} /> <Route path="/ShareX" component={ShareX} />
<Route path="/Lookup" component={Lookup} /> <Route path="/Lookup" component={Lookup} />
<Route path="/recent" component={Recent} /> <Route path="/recent" component={Recent} />
<Route path="/visitors/:id" component={Visitors} /> <Route path="/visitors/:id" component={Visitors} />
</Container> </Container>
</MemoryRouter> </HashRouter>
) )
} }
} }

Loading…
Cancel
Save