roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-06-16 02:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: modernize deps

Browse source
This commit is contained in:
Katie Thornhill 2019-11-19 23:56:52 -05:00
parent b1ccf1e425
commit 36af7ac8f2
No known key found for this signature in database
GPG key ID: F76EDC6541A99644
17 changed files with 20495 additions and 15406 deletions
Download patch file Download diff file Expand all files Collapse all files

5
UI/src/App.js
View file

@ -17,8 +17,7 @@ const store = configureStore(undefined, history)
window.__APP_STORE__ = store
@DragDropContext(HTML5Backend)
class App extends Component {
class _App extends Component {
componentWillMount() {
store.dispatch(userInit)
}
@ -36,4 +35,4 @@ class App extends Component {
}
}
export default App
export default DragDropContext(HTML5Backend)(_App)

3
UI/src/components/oauth-bot-flow/index.js
View file

@ -2,7 +2,6 @@ import React, { Component } from 'react'
import { connect } from 'react-redux'
import superagent from 'superagent'
@connect()
class OauthCallback extends Component {
state = {
notReady: true,
@ -29,4 +28,4 @@ class OauthCallback extends Component {
}
}
export default OauthCallback
export default connect(OauthCallback)

3
UI/src/components/oauth-callback/index.js
View file

@ -4,7 +4,6 @@ import superagent from 'superagent'
import { connect } from 'react-redux'
import { fetchServers } from '../../actions'
@connect()
class OauthCallback extends Component {
state = {
notReady: true,
@ -84,4 +83,4 @@ class OauthCallback extends Component {
}
}
export default OauthCallback
export default connect(OauthCallback)

3
UI/src/components/oauth-flow/index.js
View file

@ -5,7 +5,6 @@ import { connect } from 'react-redux'
import uuidv4 from 'uuid/v4'
import { fetchServers } from '../../actions'
@connect()
class OauthCallback extends Component {
state = {
notReady: true,
@ -83,4 +82,4 @@ class OauthCallback extends Component {
}
}
export default OauthCallback
export default connect(OauthCallback)

46
UI/src/components/role-editor/Category.js
View file

@ -1,29 +1,9 @@
import React, { Component } from 'react'
import { DropTarget } from 'react-dnd'
import Role from '../role/draggable'
import CategoryEditor from './CategoryEditor'
@DropTarget(
Symbol.for('dnd: role'),
{
drop(props, monitor, element) {
props.onDrop(monitor.getItem())
},
canDrop(props, monitor) {
return (
props.mode !== Symbol.for('edit') && monitor.getItem().category !== props.name
)
},
},
(connect, monitor) => ({
connectDropTarget: connect.dropTarget(),
isOver: monitor.isOver(),
isOverCurrent: monitor.isOver({ shallow: true }),
canDrop: monitor.canDrop(),
itemType: monitor.getItemType(),
})
)
class Category extends Component {
render() {
const {
@ -66,4 +46,26 @@ class Category extends Component {
)
}
}
export default Category
const dropTarget = DropTarget(
Symbol.for('dnd: role'),
{
drop(props, monitor, element) {
props.onDrop(monitor.getItem())
},
canDrop(props, monitor) {
return (
props.mode !== Symbol.for('edit') && monitor.getItem().category !== props.name
)
},
},
(connect, monitor) => ({
connectDropTarget: connect.dropTarget(),
isOver: monitor.isOver(),
isOverCurrent: monitor.isOver({ shallow: true }),
canDrop: monitor.canDrop(),
itemType: monitor.getItemType(),
})
)
export default dropTarget(Category)

5
UI/src/components/role-editor/index.js
View file

@ -16,8 +16,7 @@ const mapState = ({ rolePicker, roleEditor, servers }, ownProps) => ({
server: servers.get(ownProps.match.params.server),
})
@connect(mapState)
@DropTarget(
const dropTarget = DropTarget(
Symbol.for('dnd: role'),
{
drop(props, monitor, element) {
@ -232,4 +231,4 @@ class RoleEditor extends Component {
}
}
export default RoleEditor
export default dropTarget(connect(mapState)(RoleEditor))

3
UI/src/components/role-picker/index.js
View file

@ -14,7 +14,6 @@ const mapState = ({ rolePicker, servers }, ownProps) => {
}
}
@connect(mapState)
class RolePicker extends Component {
componentWillMount() {
const {
@ -207,4 +206,4 @@ class RolePicker extends Component {
}
}
export default RolePicker
export default connect(mapState)(RolePicker)

16
UI/src/components/role/draggable.js
View file

@ -1,19 +1,8 @@
import React, { Component } from 'react'
import { DragSource } from 'react-dnd'
import Role from './index'
// @DragSource(Symbol.for('dnd: role'), {
// beginDrag ({ role, categoryId }) {
// return { role, category: categoryId }
// }
// },
// (connect, monitor) => ({
// connectDragSource: connect.dragSource(),
// isDragging: monitor.isDragging()
// }))
export default
@DragSource(
const dragSource = DragSource(
Symbol.for('dnd: role'),
{
beginDrag({ role, categoryId }) {
@ -25,8 +14,11 @@ export default
isDragging: monitor.isDragging(),
})
)
class DraggableRole extends Component {
render() {
return <Role {...this.props} type="drag" />
}
}
export default dragSource(DraggableRole)

5
UI/src/components/servers/UserCard.js
View file

@ -1,11 +1,10 @@
import React, { Component } from 'react'
import ImmutablePropTypes from 'react-immutable-proptypes'
import { NavLink } from 'react-router-dom'
import { connect } from 'react-redux'
import { NavLink } from 'react-router-dom'
import * as Actions from '../../actions'
import './UserCard.sass'
@connect()
class UserCard extends Component {
static propTypes = {
user: ImmutablePropTypes.map,
@ -67,4 +66,4 @@ class UserCard extends Component {
}
}
export default UserCard
export default connect()(UserCard)

3
UI/src/components/servers/index.js
View file

@ -20,7 +20,6 @@ const mapState = ({ servers, user, appState }) => {
}
}
@connect(mapState)
class Servers extends Component {
get defaultPath() {
console.log(this.props.servers.toJS())
@ -65,4 +64,4 @@ class Servers extends Component {
}
}
export default Servers
export default connect(mapState)(Servers)

7
UI/src/router/index.js
View file

@ -9,10 +9,7 @@ import Servers from '../components/servers'
import ServerLanding from '../components/servers/ServerLanding'
import Pages, { Error404, Landing } from '../pages'
export default
@withRouter
@connect(({ appState, user }) => ({ ready: appState.ready, user }))
class AppRouter extends Component {
class _AppRouter extends Component {
render() {
const isLoggedIn = this.props.user.get('isLoggedIn')
@ -52,3 +49,5 @@ class AppRouter extends Component {
)
}
}
export default withRouter(connect(({ appState, user }) => ({ ready: appState.ready, user }))(_AppRouter))